* Bring pluing Linux(gtk) interfaces up to date.

3 files changed, 103 insertions, 93 deletions

diff --git a/plugins/dfsound/Makefile.am b/plugins/dfsound/Makefile.am
index 53255556..b34f3267 100755
--- a/plugins/dfsound/Makefile.am
+++ b/plugins/dfsound/Makefile.am
@@ -49,9 +49,28 @@ bin_PROGRAMS = cfgDFSound
 cfgDFSound_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
 	-DDATADIR=\"${datadir}/psemu/\" \
 	$(GTK3_CFLAGS) $(AM_CPPFLAGS)
-cfgDFSound_SOURCES = spucfg-0.1df/main.c
+cfgDFSound_SOURCES = spucfg-0.1df/main.c GtkResources.c GtkResources.h
 cfgDFSound_LDADD = $(GTK3_LIBS)
 
-glade_DATA = spucfg-0.1df/dfsound.ui
-gladedir = $(datadir)/psemu/
+# gresource.xml is dynamically generated in CMake. Mirror that here in a static way.
+define gresource_xml =
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/pcsxr/dfsound">
+    <file>dfsound.ui</file>
+  </gresource>
+</gresources>
+endef
+
+dfsound.gresource.xml:
+	$(file >$@,$(gresource_xml))
+dfsound_gresource: dfsound.gresource.xml
+	$(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/spucfg-0.1df --generate-dependencies $(srcdir)/$<)
+GtkResources.c: dfsound.gresource.xml $(dfsound_gresource)
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/spucfg-0.1df --generate-source --c-name dfsound $<
+GtkResources.h: dfsound.gresource.xml $(dfsound_gresource)
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/spucfg-0.1df --generate-header --c-name dfsound $<
+
+#glade_DATA = spucfg-0.1df/dfsound.ui
+#gladedir = $(datadir)/psemu/
 EXTRA_DIST = $(glade_DATA)
diff --git a/plugins/dfsound/spucfg-0.1df/dfsound.ui b/plugins/dfsound/spucfg-0.1df/dfsound.ui
index 1c816a1d..9d897204 100755..100644
--- a/plugins/dfsound/spucfg-0.1df/dfsound.ui
+++ b/plugins/dfsound/spucfg-0.1df/dfsound.ui
@@ -1,6 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.19.0 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkListStore" id="liststoreInterpolation">
+    <columns>
+      <!-- column-name Item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">None</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Simple</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Gaussian</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Cubic</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="liststoreReverb">
+    <columns>
+      <!-- column-name Item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Off</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Simple</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Playstation</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="liststoreVolume">
+    <columns>
+      <!-- column-name Item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">None</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Low</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Medium</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Loud</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Loudest</col>
+      </row>
+    </data>
+  </object>
   <object class="GtkDialog" id="CfgWnd">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -42,9 +103,10 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox1">
+          <object class="GtkBox" id="vbox1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkFrame" id="frame1">
@@ -57,54 +119,49 @@
                     <property name="can_focus">False</property>
                     <property name="border_width">5</property>
                     <child>
-                      <object class="GtkTable" id="table1">
+                      <object class="GtkGrid" id="table1">
                         <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>
                         <property name="row_spacing">5</property>
+                        <property name="column_spacing">5</property>
+                        <property name="column_homogeneous">True</property>
                         <child>
                           <object class="GtkLabel" id="label1v">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">Volume:</property>
                             <property name="justify">right</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
                           </packing>
                         </child>
                         <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">Interpolation:</property>
                             <property name="justify">right</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
                             <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <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">Reverb:</property>
                             <property name="justify">right</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
                             <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
@@ -121,8 +178,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="top_attach">0</property>
                           </packing>
                         </child>
                         <child>
@@ -139,11 +195,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
@@ -160,11 +212,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
                             <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                       </object>
@@ -189,9 +237,10 @@
                     <property name="can_focus">False</property>
                     <property name="border_width">5</property>
                     <child>
-                      <object class="GtkVBox" id="vbox3">
+                      <object class="GtkBox" id="vbox3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="chkXASpeed">
@@ -234,9 +283,10 @@
                     <property name="can_focus">False</property>
                     <property name="border_width">5</property>
                     <child>
-                      <object class="GtkVBox" id="vbox4">
+                      <object class="GtkBox" id="vbox4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="chkHiCompat">
@@ -334,64 +384,4 @@
       <action-widget response="0">btn_close</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkListStore" id="liststoreInterpolation">
-    <columns>
-      <!-- column-name Item -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">None</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Simple</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Gaussian</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Cubic</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="liststoreReverb">
-    <columns>
-      <!-- column-name Item -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Off</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Simple</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Playstation</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="liststoreVolume">
-    <columns>
-      <!-- column-name Item -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">None</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Low</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Medium</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Loud</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Loudest</col>
-      </row>
-    </data>
-  </object>
 </interface>
diff --git a/plugins/dfsound/spucfg-0.1df/main.c b/plugins/dfsound/spucfg-0.1df/main.c
index 2a57a67f..2fe837b7 100755
--- a/plugins/dfsound/spucfg-0.1df/main.c
+++ b/plugins/dfsound/spucfg-0.1df/main.c
@@ -82,6 +82,7 @@ int main(int argc, char *argv[])
 	if (strcmp(argv[1], "about") == 0) {
 		const char *authors[]= {"Pete Bernert and the P.E.Op.S. team", "Ryan Schultz", "Andrew Burton", NULL};
 		widget = gtk_about_dialog_new ();
+		gtk_about_dialog_set_logo_icon_name (GTK_ABOUT_DIALOG(widget), "help-about");
 		gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG (widget), "dfsound PCSXR Sound Plugin");
 		gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (widget), "1.6");
 		gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (widget), authors);
@@ -98,7 +99,7 @@ int main(int argc, char *argv[])
 	else if (strcmp(argv[1], "configure") == 0) {
 		builder = gtk_builder_new();
 
-		if (!gtk_builder_add_from_file(builder, DATADIR "dfsound.ui", NULL)) {
+		if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/dfsound/dfsound.ui", NULL)) {
 			g_warning("We could not load the interface!");
 			return 0;
 		}