gtk3 (thanks to Rafał Mużyło);

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@81326 e17a0e51-4ae3-4d35-97c3-1a29b211df97

3 files changed, 192 insertions, 99 deletions

diff --git a/plugins/peopsxgl/Makefile.am b/plugins/peopsxgl/Makefile.am
index 2017472a..99c9554c 100755
--- a/plugins/peopsxgl/Makefile.am
+++ b/plugins/peopsxgl/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
 	-DLOCALE_DIR=\"${datadir}/locale/\" \
 	-DDATADIR=\"${datadir}/psemu/\" \
-	$(GTK2_CFLAGS) \
+	$(GTK3_CFLAGS) \
 	-I../../libpcsxcore -I../../include
 
 bindir = @libdir@/games/psemu/
@@ -16,7 +16,7 @@ libpeopsxgl_la_LIBADD = -lX11 -lXxf86vm -lGL -lm
 
 bin_PROGRAMS = cfgpeopsxgl
 cfgpeopsxgl_SOURCES = gpucfg/main.c
-cfgpeopsxgl_LDADD = $(GTK2_LIBS)
+cfgpeopsxgl_LDADD = $(GTK3_LIBS)
 
 glade_DATA = gpucfg/peopsxgl.ui
 gladedir = $(datadir)/psemu/
diff --git a/plugins/peopsxgl/gpucfg/main.c b/plugins/peopsxgl/gpucfg/main.c
index 48495b74..1a812d81 100755
--- a/plugins/peopsxgl/gpucfg/main.c
+++ b/plugins/peopsxgl/gpucfg/main.c
@@ -68,7 +68,7 @@ GtkWidget *window,
           *btnBeautiful;
 
 // Save values to the config file
-void on_btnSave_clicked( GtkObject *object, gpointer user_data ) {
+void on_btnSave_clicked( GObject *object, gpointer user_data ) {
     FILE *out;
     out = fopen( "gpuPeopsMesaGL.cfg", "w+" );
 
@@ -136,7 +136,7 @@ void on_btnSave_clicked( GtkObject *object, gpointer user_data ) {
 
 // Autoconfiguration callbacks
 
-void on_btnFast_clicked( GtkObject *object, gpointer user_data ) {
+void on_btnFast_clicked( GObject *object, gpointer user_data ) {
     gtk_spin_button_set_value(    GTK_SPIN_BUTTON(   spinXSize ),           640 );
     gtk_spin_button_set_value(    GTK_SPIN_BUTTON(   spinYSize ),           480 );
     gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkKeepRatio ),          0 );
@@ -168,7 +168,7 @@ void on_btnFast_clicked( GtkObject *object, gpointer user_data ) {
 	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkGteAccuracy ),        0 );
 }
 
-void on_btnBeautiful_clicked( GtkObject *object, gpointer user_data ) {
+void on_btnBeautiful_clicked( GObject *object, gpointer user_data ) {
     gtk_spin_button_set_value(    GTK_SPIN_BUTTON(   spinXSize ),           640 );
     gtk_spin_button_set_value(    GTK_SPIN_BUTTON(   spinYSize ),           480 );
     gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkKeepRatio ),          0 );
@@ -202,19 +202,19 @@ void on_btnBeautiful_clicked( GtkObject *object, gpointer user_data ) {
 
 // Callbacks used to toggle the sensitivity of some parts of the GUI
 
-void on_chkUseGameFixes_toggled( GtkObject *object, gpointer user_data ) {
+void on_chkUseGameFixes_toggled( GObject *object, gpointer user_data ) {
     gtk_widget_set_sensitive( tblGameFixes, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkUseGameFixes ) ) );
 }
 
-void on_chkUseFPSLimit_toggled( GtkObject *object, gpointer user_data ) {
+void on_chkUseFPSLimit_toggled( GObject *object, gpointer user_data ) {
     gtk_widget_set_sensitive( vboxFPSLimit, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkUseFPSLimit ) ) );
 }
 
-void on_radFPSLimitManual_toggled( GtkObject *object, gpointer user_data ) {
+void on_radFPSLimitManual_toggled( GObject *object, gpointer user_data ) {
     gtk_widget_set_sensitive( spinFPSLimit, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( radFPSLimitManual ) ) );
 }
 
-void on_chkScanLines_toggled( GtkObject *object, gpointer user_data ) {
+void on_chkScanLines_toggled( GObject *object, gpointer user_data ) {
     gtk_widget_set_sensitive( spinScanLinesBlend, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkScanLines ) ) );
 }
 
@@ -237,7 +237,6 @@ int main( int argc, char **argv ) {
     textdomain (GETTEXT_PACKAGE);
 #endif
 
-    gtk_set_locale();
     gtk_init( &argc, &argv );
 
     builder = gtk_builder_new();
@@ -255,7 +254,7 @@ int main( int argc, char **argv ) {
         const char *authors[]= {"Adapted from P.E.Op.S OpenGL GPU by Pete Bernert", NULL};
 
         widget = gtk_about_dialog_new();
-        gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(widget), "OpenGL GPU Driver");
+        gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(widget), "OpenGL GPU Driver");
         gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), "1.18");
         gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(widget), authors);
         gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), "http://pcsxr.codeplex.com/");
@@ -728,21 +727,21 @@ int main( int argc, char **argv ) {
     g_object_unref( G_OBJECT( builder ) );
 
     // Connect callbacks to signals
-    gtk_signal_connect( GTK_OBJECT( window ),            "destroy", G_CALLBACK( gtk_main_quit ),                NULL );
-    gtk_signal_connect( GTK_OBJECT( btnCancel ),         "clicked", G_CALLBACK( gtk_main_quit ),                NULL );
-    gtk_signal_connect( GTK_OBJECT( btnSave ),           "clicked", G_CALLBACK( on_btnSave_clicked ),           NULL );
-    gtk_signal_connect( GTK_OBJECT( chkUseGameFixes ),   "toggled", G_CALLBACK( on_chkUseGameFixes_toggled ),   NULL );
-    gtk_signal_connect( GTK_OBJECT( chkUseFPSLimit ),    "toggled", G_CALLBACK( on_chkUseFPSLimit_toggled ),    NULL );
-    gtk_signal_connect( GTK_OBJECT( radFPSLimitManual ), "toggled", G_CALLBACK( on_radFPSLimitManual_toggled ), NULL );
-    gtk_signal_connect( GTK_OBJECT( chkScanLines ),      "toggled", G_CALLBACK( on_chkScanLines_toggled ),      NULL );
-    gtk_signal_connect( GTK_OBJECT( btnFast ),           "clicked", G_CALLBACK( on_btnFast_clicked ),           NULL );
-    gtk_signal_connect( GTK_OBJECT( btnBeautiful ),      "clicked", G_CALLBACK( on_btnBeautiful_clicked ),      NULL );
+    g_signal_connect(G_OBJECT( window ),            "destroy", G_CALLBACK( gtk_main_quit ),                NULL );
+    g_signal_connect(G_OBJECT( btnCancel ),         "clicked", G_CALLBACK( gtk_main_quit ),                NULL );
+    g_signal_connect(G_OBJECT( btnSave ),           "clicked", G_CALLBACK( on_btnSave_clicked ),           NULL );
+    g_signal_connect(G_OBJECT( chkUseGameFixes ),   "toggled", G_CALLBACK( on_chkUseGameFixes_toggled ),   NULL );
+    g_signal_connect(G_OBJECT( chkUseFPSLimit ),    "toggled", G_CALLBACK( on_chkUseFPSLimit_toggled ),    NULL );
+    g_signal_connect(G_OBJECT( radFPSLimitManual ), "toggled", G_CALLBACK( on_radFPSLimitManual_toggled ), NULL );
+    g_signal_connect(G_OBJECT( chkScanLines ),      "toggled", G_CALLBACK( on_chkScanLines_toggled ),      NULL );
+    g_signal_connect(G_OBJECT( btnFast ),           "clicked", G_CALLBACK( on_btnFast_clicked ),           NULL );
+    g_signal_connect(G_OBJECT( btnBeautiful ),      "clicked", G_CALLBACK( on_btnBeautiful_clicked ),      NULL );
 
     // Call some callbacks to ensure widget state consistency
-    on_chkUseGameFixes_toggled(   GTK_OBJECT( chkUseGameFixes   ), NULL );
-    on_chkUseFPSLimit_toggled(    GTK_OBJECT( chkUseFPSLimit    ), NULL );
-    on_radFPSLimitManual_toggled( GTK_OBJECT( radFPSLimitManual ), NULL );
-    on_chkScanLines_toggled(      GTK_OBJECT( chkScanLines      ), NULL );
+    on_chkUseGameFixes_toggled(   G_OBJECT( chkUseGameFixes   ), NULL );
+    on_chkUseFPSLimit_toggled(    G_OBJECT( chkUseFPSLimit    ), NULL );
+    on_radFPSLimitManual_toggled( G_OBJECT( radFPSLimitManual ), NULL );
+    on_chkScanLines_toggled(      G_OBJECT( chkScanLines      ), NULL );
 
     gtk_widget_show( window );
 
diff --git a/plugins/peopsxgl/gpucfg/peopsxgl.ui b/plugins/peopsxgl/gpucfg/peopsxgl.ui
index 5d90a1fa..6019ba46 100755
--- a/plugins/peopsxgl/gpucfg/peopsxgl.ui
+++ b/plugins/peopsxgl/gpucfg/peopsxgl.ui
@@ -1,16 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.14"/>
-  <!-- interface-naming-policy project-wide -->
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="MainDialog">
+    <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">OpenGL Driver configuration</property>
     <property name="resizable">False</property>
     <property name="window_position">center</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox3">
+      <object class="GtkBox" id="dialog-vbox3">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
@@ -20,12 +21,13 @@
             <child>
               <object class="GtkVBox" id="vbox2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">10</property>
-                <property name="orientation">vertical</property>
                 <property name="spacing">5</property>
                 <child>
                   <object class="GtkTable" id="table2">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="n_rows">2</property>
                     <property name="n_columns">2</property>
                     <property name="column_spacing">5</property>
@@ -34,7 +36,7 @@
                       <object class="GtkSpinButton" id="spinXSize">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="invisible_char">&#x2022;</property>
+                        <property name="invisible_char">•</property>
                         <property name="adjustment">x</property>
                         <property name="numeric">True</property>
                       </object>
@@ -49,7 +51,7 @@
                       <object class="GtkSpinButton" id="spinYSize">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="invisible_char">&#x2022;</property>
+                        <property name="invisible_char">•</property>
                         <property name="adjustment">y</property>
                         <property name="numeric">True</property>
                       </object>
@@ -65,6 +67,7 @@
                     <child>
                       <object class="GtkLabel" id="label7">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Width:</property>
                       </object>
@@ -76,6 +79,7 @@
                     <child>
                       <object class="GtkLabel" id="label8">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Height:</property>
                       </object>
@@ -99,6 +103,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
@@ -113,6 +118,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
@@ -127,6 +133,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
@@ -140,6 +147,7 @@
             <child type="tab">
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Window options</property>
               </object>
               <packing>
@@ -149,12 +157,13 @@
             <child>
               <object class="GtkVBox" id="vbox6">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">10</property>
-                <property name="orientation">vertical</property>
                 <property name="spacing">5</property>
                 <child>
                   <object class="GtkTable" id="table3">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="n_rows">3</property>
                     <property name="n_columns">2</property>
                     <property name="column_spacing">5</property>
@@ -162,6 +171,7 @@
                     <child>
                       <object class="GtkLabel" id="label9">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Quality:</property>
                       </object>
@@ -169,6 +179,7 @@
                     <child>
                       <object class="GtkLabel" id="label10">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Filtering:</property>
                       </object>
@@ -180,6 +191,7 @@
                     <child>
                       <object class="GtkLabel" id="label11">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">HiRes Tex:</property>
                       </object>
@@ -191,6 +203,7 @@
                     <child>
                       <object class="GtkComboBox" id="cbxTexQuality">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="model">liststore6</property>
                         <child>
                           <object class="GtkCellRendererText" id="cellrenderertext6"/>
@@ -207,6 +220,7 @@
                     <child>
                       <object class="GtkComboBox" id="cbxTexFiltering">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="model">liststore5</property>
                         <child>
                           <object class="GtkCellRendererText" id="cellrenderertext5"/>
@@ -225,6 +239,7 @@
                     <child>
                       <object class="GtkComboBox" id="cbxHiResTex">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="model">liststore4</property>
                         <child>
                           <object class="GtkCellRendererText" id="cellrenderertext4"/>
@@ -250,10 +265,12 @@
                 <child>
                   <object class="GtkHBox" id="hbox4">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="spacing">5</property>
                     <child>
                       <object class="GtkLabel" id="label12">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">VRam size in MBytes (0..1024, 0=auto):</property>
                       </object>
@@ -267,7 +284,7 @@
                       <object class="GtkSpinButton" id="spinVRam">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="invisible_char">&#x2022;</property>
+                        <property name="invisible_char">•</property>
                         <property name="adjustment">v</property>
                       </object>
                       <packing>
@@ -292,6 +309,7 @@
             <child type="tab">
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Textures</property>
               </object>
               <packing>
@@ -302,8 +320,8 @@
             <child>
               <object class="GtkVBox" id="vbox3">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">10</property>
-                <property name="orientation">vertical</property>
                 <property name="spacing">5</property>
                 <child>
                   <object class="GtkCheckButton" id="chkShowFPS">
@@ -311,6 +329,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
@@ -325,21 +344,24 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkAlignment" id="alignment3">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="left_padding">20</property>
                     <child>
                       <object class="GtkVBox" id="vboxFPSLimit">
                         <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
+                        <property name="can_focus">False</property>
                         <property name="spacing">5</property>
                         <child>
                           <object class="GtkRadioButton" id="radFPSLimitAuto">
@@ -347,18 +369,21 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="xalign">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">radFPSLimitManual</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkHBox" id="hbox2">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="spacing">5</property>
                             <child>
                               <object class="GtkRadioButton" id="radFPSLimitManual">
@@ -366,6 +391,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
@@ -380,7 +406,7 @@
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
-                                <property name="invisible_char">&#x2022;</property>
+                                <property name="invisible_char">•</property>
                                 <property name="adjustment">f</property>
                               </object>
                               <packing>
@@ -392,6 +418,7 @@
                             <child>
                               <object class="GtkLabel" id="label13">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">FPS</property>
                               </object>
                               <packing>
@@ -403,6 +430,7 @@
                           </object>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -411,6 +439,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
@@ -420,6 +449,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
@@ -436,6 +466,7 @@
             <child type="tab">
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Framerate</property>
               </object>
               <packing>
@@ -446,12 +477,13 @@
             <child>
               <object class="GtkVBox" id="vbox8">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">10</property>
-                <property name="orientation">vertical</property>
                 <property name="spacing">5</property>
                 <child>
                   <object class="GtkTable" id="table4">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="n_rows">3</property>
                     <property name="n_columns">2</property>
                     <property name="column_spacing">5</property>
@@ -459,6 +491,7 @@
                     <child>
                       <object class="GtkLabel" id="label14">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Offscreen drawing:</property>
                       </object>
@@ -466,6 +499,7 @@
                     <child>
                       <object class="GtkLabel" id="label15">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Framebuffer textures:</property>
                       </object>
@@ -477,6 +511,7 @@
                     <child>
                       <object class="GtkLabel" id="label16">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Framebuffer access:</property>
                       </object>
@@ -488,6 +523,7 @@
                     <child>
                       <object class="GtkComboBox" id="cbxOffscreen">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="model">liststore3</property>
                         <child>
                           <object class="GtkCellRendererText" id="cellrenderertext3"/>
@@ -504,6 +540,7 @@
                     <child>
                       <object class="GtkComboBox" id="cbxFBTex">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="model">liststore2</property>
                         <child>
                           <object class="GtkCellRendererText" id="cellrenderertext2"/>
@@ -522,6 +559,7 @@
                     <child>
                       <object class="GtkComboBox" id="cbxFBAccess">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="model">liststore1</property>
                         <child>
                           <object class="GtkCellRendererText" id="cellrenderertext1"/>
@@ -550,10 +588,12 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -563,10 +603,12 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
@@ -576,10 +618,12 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
@@ -591,6 +635,7 @@
             <child type="tab">
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Compatibility</property>
               </object>
               <packing>
@@ -601,12 +646,13 @@
             <child>
               <object class="GtkVBox" id="vbox5">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">10</property>
-                <property name="orientation">vertical</property>
                 <property name="spacing">5</property>
                 <child>
                   <object class="GtkHBox" id="hbox3">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="spacing">5</property>
                     <child>
                       <object class="GtkCheckButton" id="chkScanLines">
@@ -614,10 +660,12 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
@@ -625,17 +673,19 @@
                       <object class="GtkSpinButton" id="spinScanLinesBlend">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="invisible_char">&#x2022;</property>
+                        <property name="invisible_char">•</property>
                         <property name="adjustment">s</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
@@ -645,10 +695,12 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -658,10 +710,12 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
@@ -671,10 +725,12 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
@@ -684,10 +740,12 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">4</property>
                   </packing>
                 </child>
@@ -697,10 +755,12 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">5</property>
                   </packing>
                 </child>
@@ -710,10 +770,12 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">6</property>
                   </packing>
                 </child>
@@ -723,10 +785,12 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">7</property>
                   </packing>
                 </child>
@@ -738,6 +802,7 @@
             <child type="tab">
               <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Misc</property>
               </object>
               <packing>
@@ -748,8 +813,8 @@
             <child>
               <object class="GtkVBox" id="vbox1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">10</property>
-                <property name="orientation">vertical</property>
                 <property name="spacing">5</property>
                 <child>
                   <object class="GtkCheckButton" id="chkUseGameFixes">
@@ -757,20 +822,24 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkAlignment" id="alignment8">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="left_padding">20</property>
                     <child>
                       <object class="GtkTable" id="tblGameFixes">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="n_rows">9</property>
                         <property name="n_columns">2</property>
                         <property name="column_spacing">5</property>
@@ -781,6 +850,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -793,6 +863,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -807,6 +878,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -821,6 +893,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -835,6 +908,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -849,6 +923,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -863,6 +938,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -877,6 +953,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -891,6 +968,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -905,6 +983,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -919,6 +998,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -935,6 +1015,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -951,6 +1032,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -967,6 +1049,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -983,6 +1066,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -999,6 +1083,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -1016,6 +1101,7 @@
                             <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -1032,6 +1118,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -1046,6 +1133,8 @@
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -1057,6 +1146,7 @@
             <child type="tab">
               <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Special game fixes</property>
               </object>
               <packing>
@@ -1066,12 +1156,15 @@
             </child>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area3">
+          <object class="GtkButtonBox" id="dialog-action_area3">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="btnFast">
@@ -1134,6 +1227,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="pack_type">end</property>
             <property name="position">0</property>
           </packing>
@@ -1147,66 +1241,13 @@
       <action-widget response="0">btnCancel</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkAdjustment" id="x">
-    <property name="upper">9999</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="y">
-    <property name="upper">9999</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
   <object class="GtkAdjustment" id="f">
-    <property name="value">60</property>
     <property name="lower">20</property>
     <property name="upper">200</property>
+    <property name="value">60</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkListStore" id="liststore1">
-    <columns>
-      <!-- column-name item -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Emulated VRam - Ok most times</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Gfx card buffer reads</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Gfx card buffer moves</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Gfx card buffer reads and moves</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Full Software (FVP)</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="liststore2">
-    <columns>
-      <!-- column-name item -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Emulated VRam - Needs FVP</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Black - Fast, no effects</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Gfx card buffer - Can be slow</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Gfx card and soft - Slow</col>
-      </row>
-    </data>
-  </object>
   <object class="GtkListStore" id="liststore3">
     <columns>
       <!-- column-name item -->
@@ -1299,14 +1340,67 @@
       </row>
     </data>
   </object>
+  <object class="GtkAdjustment" id="s">
+    <property name="lower">-1</property>
+    <property name="upper">255</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkListStore" id="liststore1">
+    <columns>
+      <!-- column-name item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Emulated VRam - Ok most times</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Gfx card buffer reads</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Gfx card buffer moves</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Gfx card buffer reads and moves</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Full Software (FVP)</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="liststore2">
+    <columns>
+      <!-- column-name item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Emulated VRam - Needs FVP</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Black - Fast, no effects</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Gfx card buffer - Can be slow</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Gfx card and soft - Slow</col>
+      </row>
+    </data>
+  </object>
   <object class="GtkAdjustment" id="v">
     <property name="upper">1024</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" id="s">
-    <property name="lower">-1</property>
-    <property name="upper">255</property>
+  <object class="GtkAdjustment" id="x">
+    <property name="upper">9999</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="y">
+    <property name="upper">9999</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>