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

3 files changed, 263 insertions, 220 deletions

diff --git a/plugins/dfxvideo/Makefile.am b/plugins/dfxvideo/Makefile.am
index 7e56a9c6..bc487db4 100644
--- a/plugins/dfxvideo/Makefile.am
+++ b/plugins/dfxvideo/Makefile.am
@@ -8,7 +8,7 @@ SUFFIXES = .asm
 
 AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
 	-DDATADIR=\"${datadir}/psemu/\" \
-	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
+	$(GTK2_CFLAGS)\
 	-I../../libpcsxcore \
 	-I../../include
 
@@ -27,8 +27,8 @@ libDFXVideo_la_LIBADD = -lX11 -lXv -lXext -lm
 
 bin_PROGRAMS = cfgDFXVideo
 cfgDFXVideo_SOURCES = gpucfg-0.1df/main.c
-cfgDFXVideo_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS) -lXext
+cfgDFXVideo_LDADD = $(GTK2_LIBS) -lXext
 
-glade_DATA = gpucfg-0.1df/dfxvideo.glade2
+glade_DATA = gpucfg-0.1df/dfxvideo.ui
 gladedir = $(datadir)/psemu/
 EXTRA_DIST = $(glade_DATA)
diff --git a/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2 b/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui
index ded3c1a2..b60c02d3 100644
--- a/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2
+++ b/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<glade-interface>
-  <!-- interface-requires gtk+ 2.8 -->
+<interface>
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy project-wide -->
-  <widget class="GtkWindow" id="CfgWnd">
+  <object class="GtkWindow" id="CfgWnd">
     <property name="visible">True</property>
     <property name="border_width">10</property>
     <property name="title" translatable="yes">Configure X11 Video</property>
@@ -12,49 +12,49 @@
     <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_CfgWnd_destroy"/>
     <child>
-      <widget class="GtkVBox" id="vbox1">
+      <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
-          <widget class="GtkFrame" id="frame1">
+          <object class="GtkFrame" id="frame1">
             <property name="visible">True</property>
             <property name="label_xalign">0</property>
             <child>
-              <widget class="GtkAlignment" id="alignment4">
+              <object class="GtkAlignment" id="alignment4">
                 <property name="visible">True</property>
                 <property name="top_padding">6</property>
                 <property name="bottom_padding">6</property>
                 <property name="left_padding">12</property>
                 <property name="right_padding">12</property>
                 <child>
-                  <widget class="GtkVBox" id="vbox7">
+                  <object class="GtkVBox" id="vbox7">
                     <property name="visible">True</property>
                     <property name="orientation">vertical</property>
                     <child>
-                      <widget class="GtkTable" id="table1">
+                      <object class="GtkTable" id="table1">
                         <property name="visible">True</property>
                         <property name="n_rows">3</property>
                         <property name="n_columns">2</property>
                         <property name="column_spacing">30</property>
                         <property name="row_spacing">6</property>
                         <child>
-                          <widget class="GtkLabel" id="label14">
+                          <object class="GtkLabel" id="label14">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Initial Window Size:</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label15">
+                          <object class="GtkLabel" id="label15">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Stretching:</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
@@ -63,11 +63,11 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label16">
+                          <object class="GtkLabel" id="label16">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Dithering:</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
@@ -76,18 +76,17 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkComboBox" id="stretchCombo2">
+                          <object class="GtkComboBox" id="stretchCombo2">
                             <property name="visible">True</property>
+                            <property name="model">liststoreStretching</property>
                             <property name="active">0</property>
-                            <property name="items" translatable="yes">0: None
-1: 2xSai
-2: 2xSuperSai
-3: SuperEagle
-4: Scale2x
-5: Scale3x
-6: HQ2X
-7: HQ3X</property>
-                          </widget>
+                            <child>
+                              <object class="GtkCellRendererText" id="cellrenderertextStretching"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
@@ -98,13 +97,17 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkComboBox" id="ditherCombo2">
+                          <object class="GtkComboBox" id="ditherCombo2">
                             <property name="visible">True</property>
+                            <property name="model">liststoreDither</property>
                             <property name="active">1</property>
-                            <property name="items" translatable="yes">0: Off (fastest)
-1: Game dependant
-2: Always</property>
-                          </widget>
+                            <child>
+                              <object class="GtkCellRendererText" id="cellrenderertextDither"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
@@ -115,120 +118,110 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkHBox" id="hbox2">
+                          <object class="GtkHBox" id="hbox2">
                             <property name="visible">True</property>
                             <property name="spacing">10</property>
                             <child>
-                              <widget class="GtkComboBox" id="resCombo2">
+                              <object class="GtkComboBox" id="resCombo2">
                                 <property name="visible">True</property>
+                                <property name="model">liststoreRes</property>
                                 <property name="active">2</property>
-                                <property name="items" translatable="yes">320x240
-640x480
-800x600
-1024x768
-1152x864
-1280x1024
-1600x1200</property>
-                              </widget>
+                                <child>
+                                  <object class="GtkCellRendererText" id="cellrenderertextRes"/>
+                                  <attributes>
+                                    <attribute name="text">0</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
                               <packing>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkCheckButton" id="checkFullscreen">
+                              <object class="GtkCheckButton" id="checkFullscreen">
                                 <property name="label" translatable="yes">Fullscreen</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip" translatable="yes">Toggle windowed/fullscreen mode.</property>
+                                <property name="tooltip_text" translatable="yes">Toggle windowed/fullscreen mode.</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkHBox" id="hbox1">
+                      <object class="GtkHBox" id="hbox1">
                         <property name="visible">True</property>
                         <child>
-                          <widget class="GtkCheckButton" id="maintain43">
+                          <object class="GtkCheckButton" id="maintain43">
                             <property name="label" translatable="yes">Maintain 4:3 Aspect Ratio</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="label10">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;b&gt;Screen&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-              </widget>
-              <packing>
-                <property name="type">label_item</property>
-              </packing>
+              </object>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkFrame" id="frame2">
+          <object class="GtkFrame" id="frame2">
             <property name="visible">True</property>
             <property name="label_xalign">0</property>
             <child>
-              <widget class="GtkAlignment" id="alignment2">
+              <object class="GtkAlignment" id="alignment2">
                 <property name="visible">True</property>
                 <property name="top_padding">6</property>
                 <property name="bottom_padding">6</property>
                 <property name="left_padding">12</property>
                 <property name="right_padding">12</property>
                 <child>
-                  <widget class="GtkVBox" id="vbox3">
+                  <object class="GtkVBox" id="vbox3">
                     <property name="visible">True</property>
                     <property name="orientation">vertical</property>
                     <child>
-                      <widget class="GtkCheckButton" id="checkShowFPS">
+                      <object class="GtkCheckButton" id="checkShowFPS">
                         <property name="label" translatable="yes">Show FPS</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip" translatable="yes">Toggle whether the FPS will be shown.</property>
+                        <property name="tooltip_text" translatable="yes">Toggle whether the FPS will be shown.</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
@@ -236,15 +229,15 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="checkFrameSkip">
+                      <object class="GtkCheckButton" id="checkFrameSkip">
                         <property name="label" translatable="yes">Enable frame skipping</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip" translatable="yes">Skip frames when rendering.</property>
+                        <property name="tooltip_text" translatable="yes">Skip frames when rendering.</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
@@ -252,32 +245,32 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkTable" id="table2">
+                      <object class="GtkTable" id="table2">
                         <property name="visible">True</property>
                         <property name="n_columns">3</property>
                         <property name="column_spacing">12</property>
                         <child>
-                          <widget class="GtkCheckButton" id="checkSetFPS">
+                          <object class="GtkCheckButton" id="checkSetFPS">
                             <property name="label" translatable="yes">Set FPS</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="tooltip" translatable="yes">Enable this if games display too quickly.</property>
+                            <property name="tooltip_text" translatable="yes">Enable this if games display too quickly.</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkEntry" id="entryFPS">
+                          <object class="GtkEntry" id="entryFPS">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="width_chars">4</property>
                             <property name="text" translatable="yes">200.0</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
@@ -286,7 +279,7 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkCheckButton" id="checkAutoFPSLimit">
+                          <object class="GtkCheckButton" id="checkAutoFPSLimit">
                             <property name="label" translatable="yes">Autodetect FPS limit</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -295,62 +288,52 @@
                             <property name="use_underline">True</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="right_attach">3</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label11">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;b&gt;Framerate&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-              </widget>
-              <packing>
-                <property name="type">label_item</property>
-              </packing>
-            </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">1</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkFrame" id="frame3">
+          <object class="GtkFrame" id="frame3">
             <property name="visible">True</property>
             <property name="label_xalign">0</property>
             <child>
-              <widget class="GtkAlignment" id="alignment3">
+              <object class="GtkAlignment" id="alignment3">
                 <property name="visible">True</property>
                 <property name="top_padding">6</property>
                 <property name="bottom_padding">6</property>
                 <property name="left_padding">12</property>
                 <property name="right_padding">12</property>
                 <child>
-                  <widget class="GtkVBox" id="vbox4">
+                  <object class="GtkVBox" id="vbox4">
                     <property name="visible">True</property>
                     <property name="orientation">vertical</property>
                     <child>
-                      <widget class="GtkCheckButton" id="checkUseFixes">
+                      <object class="GtkCheckButton" id="checkUseFixes">
                         <property name="label" translatable="yes">Use game fixes</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
@@ -358,25 +341,25 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkAlignment" id="alignment5">
+                      <object class="GtkAlignment" id="alignment5">
                         <property name="visible">True</property>
                         <property name="left_padding">19</property>
                         <child>
-                          <widget class="GtkTable" id="table_fixes">
+                          <object class="GtkTable" id="table_fixes">
                             <property name="visible">True</property>
                             <property name="n_rows">6</property>
                             <property name="n_columns">2</property>
                             <property name="column_spacing">16</property>
                             <child>
-                              <widget class="GtkCheckButton" id="checkFix5">
+                              <object class="GtkCheckButton" id="checkFix5">
                                 <property name="label" translatable="yes">Disable CPU Saving</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
-                                <property name="tooltip" translatable="yes">For precise framerate</property>
+                                <property name="tooltip_text" translatable="yes">For precise framerate</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="top_attach">4</property>
                                 <property name="bottom_attach">5</property>
@@ -385,30 +368,30 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkCheckButton" id="checkFix1">
+                              <object class="GtkCheckButton" id="checkFix1">
                                 <property name="label" translatable="yes">Odd/even bit hack</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
-                                <property name="tooltip" translatable="yes">Chrono Cross</property>
+                                <property name="tooltip_text" translatable="yes">Chrono Cross</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
                                 <property name="y_options"></property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkCheckButton" id="checkFix6">
+                              <object class="GtkCheckButton" id="checkFix6">
                                 <property name="label" translatable="yes">PC FPS calculation</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
-                                <property name="tooltip" translatable="yes">Better FPS limit in some</property>
+                                <property name="tooltip_text" translatable="yes">Better FPS limit in some</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="top_attach">5</property>
                                 <property name="bottom_attach">6</property>
@@ -417,15 +400,15 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkCheckButton" id="checkFix2">
+                              <object class="GtkCheckButton" id="checkFix2">
                                 <property name="label" translatable="yes">Expand screen width</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
-                                <property name="tooltip" translatable="yes">Capcom fighting games</property>
+                                <property name="tooltip_text" translatable="yes">Capcom fighting games</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
@@ -434,15 +417,15 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkCheckButton" id="checkFix3">
+                              <object class="GtkCheckButton" id="checkFix3">
                                 <property name="label" translatable="yes">Ignore brightness color</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
-                                <property name="tooltip" translatable="yes">Black screens in Lunar</property>
+                                <property name="tooltip_text" translatable="yes">Black screens in Lunar</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
@@ -451,15 +434,15 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkCheckButton" id="checkFix4">
+                              <object class="GtkCheckButton" id="checkFix4">
                                 <property name="label" translatable="yes">Disable coordinate check</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
-                                <property name="tooltip" translatable="yes">Compatibility mode</property>
+                                <property name="tooltip_text" translatable="yes">Compatibility mode</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="top_attach">3</property>
                                 <property name="bottom_attach">4</property>
@@ -468,16 +451,16 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkCheckButton" id="checkFix7">
+                              <object class="GtkCheckButton" id="checkFix7">
                                 <property name="label" translatable="yes">Lazy screen update</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip" translatable="yes">Pandemonium 2</property>
+                                <property name="tooltip_text" translatable="yes">Pandemonium 2</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
@@ -486,16 +469,16 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkCheckButton" id="checkFix8">
+                              <object class="GtkCheckButton" id="checkFix8">
                                 <property name="label" translatable="yes">Old frame skipping</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip" translatable="yes">Skip every second frame</property>
+                                <property name="tooltip_text" translatable="yes">Skip every second frame</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
@@ -506,16 +489,16 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkCheckButton" id="checkFix9">
+                              <object class="GtkCheckButton" id="checkFix9">
                                 <property name="label" translatable="yes">Repeated flat tex triangles</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip" translatable="yes">Needed by Dark Forces</property>
+                                <property name="tooltip_text" translatable="yes">Needed by Dark Forces</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
@@ -526,16 +509,16 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkCheckButton" id="checkFix10">
+                              <object class="GtkCheckButton" id="checkFix10">
                                 <property name="label" translatable="yes">Draw quads with triangles</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip" translatable="yes">better g-colors, worse textures</property>
+                                <property name="tooltip_text" translatable="yes">better g-colors, worse textures</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
@@ -546,16 +529,16 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkCheckButton" id="checkFix11">
+                              <object class="GtkCheckButton" id="checkFix11">
                                 <property name="label" translatable="yes">Fake 'gpu busy' states</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip" translatable="yes">Toggle busy flags after drawing</property>
+                                <property name="tooltip_text" translatable="yes">Toggle busy flags after drawing</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
@@ -568,58 +551,126 @@
                             <child>
                               <placeholder/>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="label12">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;b&gt;Compatibility&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-              </widget>
-              <packing>
-                <property name="type">label_item</property>
-              </packing>
+              </object>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">2</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkHButtonBox" id="hbuttonbox1">
+          <object class="GtkHButtonBox" id="hbuttonbox1">
             <property name="visible">True</property>
             <property name="spacing">12</property>
             <property name="layout_style">end</property>
             <child>
-              <widget class="GtkButton" id="btn_close">
+              <object class="GtkButton" id="btn_close">
                 <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">3</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+  </object>
+  <object class="GtkListStore" id="liststoreStretching">
+    <columns>
+      <!-- column-name Item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">0: None</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">1: 2xSai</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">2: 2xSuperSai</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">3: SuperEagle</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">4: Scale2x</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">5: Scale3x</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">6: HQ2X</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">7: HQ3X</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="liststoreDither">
+    <columns>
+      <!-- column-name Item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">0: Off (fastest)</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">1: Game dependant</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">2: Always</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="liststoreRes">
+    <columns>
+      <!-- column-name Item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">320x240</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">640x480</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">800x600</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">1024x768</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">1152x864</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">1280x1024</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">1600x1200</col>
+      </row>
+    </data>
+  </object>
+</interface>
diff --git a/plugins/dfxvideo/gpucfg-0.1df/main.c b/plugins/dfxvideo/gpucfg-0.1df/main.c
index 4edc0a25..3b3ac85f 100644
--- a/plugins/dfxvideo/gpucfg-0.1df/main.c
+++ b/plugins/dfxvideo/gpucfg-0.1df/main.c
@@ -1,5 +1,4 @@
 #include <gtk/gtk.h>

-#include <glade/glade.h>

 

 #include "config.h"

 

@@ -14,6 +13,9 @@
 #include <string.h>

 #include <sys/stat.h>

 

+GtkBuilder *builder;

+GtkWidget *widget, *MainWindow;

+

 void SaveConfig(GtkWidget *widget, gpointer user_datal);

 

 #define READBINARY "rb"

@@ -63,11 +65,9 @@ void set_widget_sensitive(GtkWidget *widget, gpointer user_data)
 void on_fullscreen_toggled(GtkWidget *widget, gpointer user_data)

 {

 	GtkWidget *check, *resCombo2;

-	GladeXML *xml;

-	xml = (GladeXML*) user_data;

 

-	check = glade_xml_get_widget(xml, "checkFullscreen");

-	resCombo2 = glade_xml_get_widget(xml, "resCombo2");

+	check = gtk_builder_get_object(builder, "checkFullscreen");

+	resCombo2 = gtk_builder_get_object(builder, "resCombo2");

 

 	set_widget_sensitive(resCombo2, !gtk_toggle_button_get_active(check));

 }

@@ -75,11 +75,9 @@ void on_fullscreen_toggled(GtkWidget *widget, gpointer user_data)
 void on_use_fixes_toggled(GtkWidget *widget, gpointer user_data)

 {

 	GtkWidget *check, *table_fixes;

-	GladeXML *xml;

-	xml = (GladeXML*) user_data;

-	check = glade_xml_get_widget (xml, "checkUseFixes");

+	check = gtk_builder_get_object(builder,"checkUseFixes");

 

-	table_fixes = glade_xml_get_widget (xml, "table_fixes");

+	table_fixes = gtk_builder_get_object(builder,"table_fixes");

 

 	/* Set the state of each of the fixes to the value of the use fixes toggle */

 	gtk_container_foreach (GTK_CONTAINER (table_fixes), (GtkCallback) set_widget_sensitive,

@@ -89,12 +87,10 @@ void on_use_fixes_toggled(GtkWidget *widget, gpointer user_data)
 void on_fps_toggled(GtkWidget *widget, gpointer user_data)

 {

 	GtkWidget *checkSetFPS, *checkAutoFPSLimit, *entryFPS;

-	GladeXML *xml;

 

-	xml = (GladeXML*) user_data;

-	checkSetFPS = glade_xml_get_widget(xml, "checkSetFPS");

-	checkAutoFPSLimit = glade_xml_get_widget(xml, "checkAutoFPSLimit");

-	entryFPS = glade_xml_get_widget(xml, "entryFPS");

+	checkSetFPS = gtk_builder_get_object(builder, "checkSetFPS");

+	checkAutoFPSLimit = gtk_builder_get_object(builder, "checkAutoFPSLimit");

+	entryFPS = gtk_builder_get_object(builder, "entryFPS");

 

 	set_widget_sensitive(entryFPS,

 		gtk_toggle_button_get_active(checkSetFPS) && !gtk_toggle_button_get_active(checkAutoFPSLimit));

@@ -103,9 +99,7 @@ void on_fps_toggled(GtkWidget *widget, gpointer user_data)
 

 void OnConfigClose(GtkWidget *widget, gpointer user_data)

 {

-	GladeXML *xml = (GladeXML *)user_data;

-

-	gtk_widget_destroy(glade_xml_get_widget(xml, "CfgWnd"));

+	gtk_widget_destroy(gtk_builder_get_object(builder, "CfgWnd"));

 	gtk_exit(0);

 }

 

@@ -113,7 +107,6 @@ int
 main (int argc, char *argv[])

 {

   GtkWidget *CfgWnd, *widget;

-  GladeXML *xml;

   FILE *in;char t[256];int len,val; 

   float valf;

   char * pB, * p;

@@ -158,13 +151,14 @@ main (int argc, char *argv[])
 		return 0;

     }

 

-    xml = glade_xml_new(DATADIR "dfxvideo.glade2", "CfgWnd", NULL);

-    if (!xml) {

+	builder = gtk_builder_new();

+	

+	if (!gtk_builder_add_from_file(builder, DATADIR "dfxvideo.ui", NULL)) {

 		g_warning("We could not load the interface!");

 		return -1;

-    }

+	}

 

-    /*ADB wndMain = glade_xml_get_widget(xml, "CfgWnd");*/

+    /*ADB wndMain = gtk_builder_get_object(builder, "CfgWnd");*/

 

   strcpy(cfg, CONFIG_FILENAME);

 

@@ -194,7 +188,7 @@ main (int argc, char *argv[])
   else if (val == 640) val = VIDMODE_640x480;

   else if (val == 320) val = VIDMODE_320x200;

 

-  gtk_combo_box_set_active(GTK_COMBO_BOX (glade_xml_get_widget(xml, "resCombo2")), val);

+  gtk_combo_box_set_active(GTK_COMBO_BOX (gtk_builder_get_object(builder, "resCombo2")), val);

 

   val=0;

   if(pB)

@@ -204,7 +198,7 @@ main (int argc, char *argv[])
     val = set_limit (p, len, 0, 9);

    }

 

-  gtk_combo_box_set_active(GTK_COMBO_BOX (glade_xml_get_widget(xml, "stretchCombo2")), val);

+  gtk_combo_box_set_active(GTK_COMBO_BOX (gtk_builder_get_object(builder, "stretchCombo2")), val);

 

   val=0;

   if(pB)

@@ -214,7 +208,7 @@ main (int argc, char *argv[])
            val = set_limit (p, len, 0, 2);

    }

 

-   gtk_combo_box_set_active(GTK_COMBO_BOX (glade_xml_get_widget(xml, "ditherCombo2")), val);

+   gtk_combo_box_set_active(GTK_COMBO_BOX (gtk_builder_get_object(builder, "ditherCombo2")), val);

 

  val=0;

   if(pB)

@@ -224,7 +218,7 @@ main (int argc, char *argv[])
     val = set_limit (p, len, 0, 1);

    }

 

-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "maintain43")), val);

+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "maintain43")), val);

   

   val=0; //ADB Leave - these are default values

   if(pB)

@@ -234,7 +228,7 @@ main (int argc, char *argv[])
         val = set_limit (p, len, 0, 1);

    }

 

-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "checkFullscreen")), val);

+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "checkFullscreen")), val);

 

   val=0;

   if(pB)

@@ -244,7 +238,7 @@ main (int argc, char *argv[])
         val = set_limit (p, len, 0, 1);

    }

 

-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "checkShowFPS")), val);

+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "checkShowFPS")), val);

 

   val=1;

   if(pB)

@@ -253,7 +247,7 @@ main (int argc, char *argv[])
 

         val = set_limit (p, len, 0, 1);

    }

-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "checkSetFPS")), val);

+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "checkSetFPS")), val);

 

   val=0;

   if(pB)

@@ -262,7 +256,7 @@ main (int argc, char *argv[])
 

         val = set_limit (p, len, 1, 2);

    }

-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "checkAutoFPSLimit")), (val-1));

+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "checkAutoFPSLimit")), (val-1));

 

  val=0;

   if(pB)

@@ -271,7 +265,7 @@ main (int argc, char *argv[])
         val = set_limit (p, len, 0, 1);

    }

 

-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "checkFrameSkip")), val);

+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "checkFrameSkip")), val);

 

  valf=200;

   if(pB)

@@ -282,7 +276,7 @@ main (int argc, char *argv[])
     if(valf>500) valf=500;

    }

   sprintf(tempstr,"%.1f",valf);

-  gtk_entry_set_text(glade_xml_get_widget(xml, "entryFPS"),tempstr);

+  gtk_entry_set_text(gtk_builder_get_object(builder, "entryFPS"),tempstr);

 

   val=0;

   if(pB)

@@ -291,7 +285,7 @@ main (int argc, char *argv[])
 

         val = set_limit (p, len, 0, 1);

    }

-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "checkUseFixes")), val);

+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "checkUseFixes")), val);

 

    

 	if(pB)

@@ -304,39 +298,39 @@ main (int argc, char *argv[])
 	for (i=0; i<11; i++)

 	{

 		sprintf(tempstr, "checkFix%d", i+1);

-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, tempstr)), (val>>i)&1 );

+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,tempstr)), (val>>i)&1 );

 	}

 

 

   if(pB) free(pB);

 

-	widget = glade_xml_get_widget(xml, "CfgWnd");

+	widget = gtk_builder_get_object(builder, "CfgWnd");

 	g_signal_connect_data(GTK_OBJECT(widget), "destroy",

-			G_CALLBACK(SaveConfig), xml, NULL, 0);

+			G_CALLBACK(SaveConfig), NULL, NULL, 0);

 

-	widget = glade_xml_get_widget(xml, "btn_close");

+	widget = gtk_builder_get_object(builder, "btn_close");

 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",

-			G_CALLBACK(OnConfigClose), xml, NULL, G_CONNECT_AFTER);

+			G_CALLBACK(OnConfigClose), NULL, NULL, G_CONNECT_AFTER);

 

-	widget = glade_xml_get_widget(xml, "checkFullscreen");

+	widget = gtk_builder_get_object(builder, "checkFullscreen");

 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",

-			G_CALLBACK(on_fullscreen_toggled), xml, NULL, G_CONNECT_AFTER);

+			G_CALLBACK(on_fullscreen_toggled), NULL, NULL, G_CONNECT_AFTER);

 

-	widget = glade_xml_get_widget(xml, "checkUseFixes");

+	widget = gtk_builder_get_object(builder, "checkUseFixes");

 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",

-			G_CALLBACK(on_use_fixes_toggled), xml, NULL, G_CONNECT_AFTER);

+			G_CALLBACK(on_use_fixes_toggled), NULL, NULL, G_CONNECT_AFTER);

 

-	widget = glade_xml_get_widget(xml, "checkSetFPS");

+	widget = gtk_builder_get_object(builder, "checkSetFPS");

 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",

-			G_CALLBACK(on_fps_toggled), xml, NULL, G_CONNECT_AFTER);

+			G_CALLBACK(on_fps_toggled), NULL, NULL, G_CONNECT_AFTER);

 

-	widget = glade_xml_get_widget(xml, "checkAutoFPSLimit");

+	widget = gtk_builder_get_object(builder, "checkAutoFPSLimit");

 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",

-			G_CALLBACK(on_fps_toggled), xml, NULL, G_CONNECT_AFTER);

+			G_CALLBACK(on_fps_toggled), NULL, NULL, G_CONNECT_AFTER);

 

-	on_fullscreen_toggled(widget, (gpointer) xml);

-	on_fps_toggled(widget, (gpointer) xml);

-	on_use_fixes_toggled(widget, (gpointer) xml);

+	on_fullscreen_toggled(widget, NULL);

+	on_fps_toggled(widget, NULL);

+	on_use_fixes_toggled(widget, NULL);

 

   gtk_main ();

   return 0;

@@ -377,7 +371,6 @@ void SetCfgVal(char * pB,char * pE,int val)
 void SaveConfig(GtkWidget *widget, gpointer user_data)

 {

   FILE *in;int len,val;char * pB;

-	GladeXML *xml;

   char cfg[255];

   char tempstr[50];

   int i;

@@ -395,9 +388,8 @@ void SaveConfig(GtkWidget *widget, gpointer user_data)
     len = fread(pB, 1, 32767, in);

     fclose(in);

    }

-   xml = (GladeXML*) user_data;

 

-  val = gtk_combo_box_get_active (GTK_COMBO_BOX (glade_xml_get_widget (xml, "resCombo2")));

+  val = gtk_combo_box_get_active (GTK_COMBO_BOX (gtk_builder_get_object(builder,"resCombo2")));

 

  if (val == VIDMODE_320x200) { SetCfgVal(pB,"\nResX",320); SetCfgVal(pB,"\nResY",240); }

  else if (val == VIDMODE_640x480) { SetCfgVal(pB,"\nResX",640); SetCfgVal(pB,"\nResY",480); }

@@ -407,35 +399,35 @@ void SaveConfig(GtkWidget *widget, gpointer user_data)
  else if (val == VIDMODE_1280x1024) { SetCfgVal(pB,"\nResX",1280); SetCfgVal(pB,"\nResY",1024); }

  else if (val == VIDMODE_1600x1200) { SetCfgVal(pB,"\nResX",1600); SetCfgVal(pB,"\nResY",1200); }

 

- val = gtk_combo_box_get_active (GTK_COMBO_BOX (glade_xml_get_widget (xml, "stretchCombo2")));

+ val = gtk_combo_box_get_active (GTK_COMBO_BOX (gtk_builder_get_object(builder,"stretchCombo2")));

  SetCfgVal(pB,"\nNoStretch",val);

 

- val = gtk_combo_box_get_active (GTK_COMBO_BOX (glade_xml_get_widget (xml, "ditherCombo2")));

+ val = gtk_combo_box_get_active (GTK_COMBO_BOX (gtk_builder_get_object(builder,"ditherCombo2")));

  SetCfgVal(pB,"\nDithering",val);

 

-    val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "maintain43")));

+    val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,"maintain43")));

  SetCfgVal(pB,"\nMaintain43",val);

 

-     val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkFullscreen")));

+     val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,"checkFullscreen")));

  SetCfgVal(pB,"\nFullScreen",val);

 

-     val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkShowFPS")));

+     val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,"checkShowFPS")));

  SetCfgVal(pB,"\nShowFPS",val);

 

-     val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkSetFPS")));

+     val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,"checkSetFPS")));

  SetCfgVal(pB,"\nUseFrameLimit",val);

 

- val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkAutoFPSLimit")));

+ val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,"checkAutoFPSLimit")));

  SetCfgVal(pB,"\nFPSDetection",val+1);

 

-  val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkFrameSkip")));

+  val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,"checkFrameSkip")));

  SetCfgVal(pB,"\nUseFrameSkip",val);

 

  //Framerate stored *10

- val = atof(gtk_entry_get_text(glade_xml_get_widget(xml, "entryFPS"))) * 10;

+ val = atof(gtk_entry_get_text(gtk_builder_get_object(builder, "entryFPS"))) * 10;

  SetCfgVal(pB,"\nFrameRate",val);

 

- val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkUseFixes")));

+ val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,"checkUseFixes")));

  SetCfgVal(pB,"\nUseFixes",val);

 

 

@@ -443,7 +435,7 @@ void SaveConfig(GtkWidget *widget, gpointer user_data)
 	for (i=0; i<11; i++)

 	{

 		sprintf(tempstr, "checkFix%d", i+1);

-		if( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, tempstr))) )

+		if( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,tempstr))) )

 			val |= 1 << i;

 	}