- dfnet, dfinput: migrated to gtkbuilder.

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

3 files changed, 76 insertions, 71 deletions

diff --git a/plugins/dfnet/Makefile.am b/plugins/dfnet/Makefile.am
index eb0fa50e..4db81928 100644
--- a/plugins/dfnet/Makefile.am
+++ b/plugins/dfnet/Makefile.am
@@ -15,6 +15,6 @@ bin_PROGRAMS = cfgDFNet
 cfgDFNet_SOURCES = gui.c
 cfgDFNet_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
 
-glade_DATA = dfnet.glade2
+glade_DATA = dfnet.ui
 gladedir = $(datadir)/psemu/
 EXTRA_DIST = $(glade_DATA)
diff --git a/plugins/dfnet/dfnet.glade2 b/plugins/dfnet/dfnet.ui
index 36c9b4b6..957c449c 100644
--- a/plugins/dfnet/dfnet.glade2
+++ b/plugins/dfnet/dfnet.ui
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<glade-interface>
-  <!-- interface-requires gtk+ 2.8 -->
+<interface>
+  <!-- interface-requires gtk+ 2.16 -->
   <!-- interface-naming-policy project-wide -->
-  <widget class="GtkDialog" id="dlgStart">
+  <object class="GtkDialog" id="dlgStart">
     <property name="border_width">5</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
@@ -10,15 +10,17 @@
     <property name="type_hint">normal</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-          <widget class="GtkVBox" id="vbox1">
+          <object class="GtkVBox" id="vbox1">
             <property name="visible">True</property>
+            <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
-              <widget class="GtkLabel" id="label1">
+              <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Select here if you'll be Server (Player1) or Client (Player2).
 
@@ -26,31 +28,31 @@ If you select Server you must Copy your IP address to the Clipboard and paste if
 
 If you selected Client please enter the IP address the Server gave to you in the IP Address Control.</property>
                 <property name="wrap">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkTable" id="table1">
+              <object class="GtkTable" id="table1">
                 <property name="visible">True</property>
                 <property name="n_rows">2</property>
                 <property name="n_columns">2</property>
                 <property name="column_spacing">8</property>
                 <property name="row_spacing">12</property>
                 <child>
-                  <widget class="GtkButton" id="btnCopyIP">
+                  <object class="GtkButton" id="btnCopyIP">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <child>
-                      <widget class="GtkHBox" id="hbox2">
+                      <object class="GtkHBox" id="hbox2">
                         <property name="visible">True</property>
                         <child>
-                          <widget class="GtkImage" id="image1">
+                          <object class="GtkImage" id="image1">
                             <property name="visible">True</property>
                             <property name="stock">gtk-copy</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
@@ -58,30 +60,30 @@ If you selected Client please enter the IP address the Server gave to you in the
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label4">
+                          <object class="GtkLabel" id="label4">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Copy PC IP to Clipboard</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkEntry" id="tbServerIP">
+                  <object class="GtkEntry" id="tbServerIP">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="max_length">15</property>
                     <property name="invisible_char">&#x25CF;</property>
                     <signal name="activate" handler="on_tbServerIP_activate"/>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
@@ -90,17 +92,17 @@ If you selected Client please enter the IP address the Server gave to you in the
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkRadioButton" id="rbServer">
+                  <object class="GtkRadioButton" id="rbServer">
                     <property name="label" translatable="yes">Server (Player1)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                 </child>
                 <child>
-                  <widget class="GtkRadioButton" id="rbClient">
+                  <object class="GtkRadioButton" id="rbClient">
                     <property name="label" translatable="yes">Client (Player2)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -108,88 +110,88 @@ If you selected Client please enter the IP address the Server gave to you in the
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">rbServer</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="padding">2</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkVBox" id="vbox2">
+              <object class="GtkVBox" id="vbox2">
                 <property name="visible">True</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
-                  <widget class="GtkLabel" id="label2">
+                  <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">Do not change if not necessary (remember it must be changed on both sides).</property>
                     <property name="wrap">True</property>
-                  </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="GtkLabel" id="label3">
+                      <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">Port Number</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkEntry" id="tbPort">
+                      <object class="GtkEntry" id="tbPort">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="max_length">5</property>
                         <property name="invisible_char">&#x25CF;</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">2</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">1</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area1">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <widget class="GtkButton" id="btnStart">
-                <property name="response_id">-5</property>
+              <object class="GtkButton" id="btnStart">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <child>
-                  <widget class="GtkHBox" id="hbox3">
+                  <object class="GtkHBox" id="hbox3">
                     <property name="visible">True</property>
                     <child>
-                      <widget class="GtkImage" id="image2">
+                      <object class="GtkImage" id="image2">
                         <property name="visible">True</property>
                         <property name="stock">gtk-network</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
@@ -197,17 +199,17 @@ If you selected Client please enter the IP address the Server gave to you in the
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label5">
+                      <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">Start Game</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
@@ -215,19 +217,18 @@ If you selected Client please enter the IP address the Server gave to you in the
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="btnOffline">
-                <property name="response_id">-6</property>
+              <object class="GtkButton" id="btnOffline">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <child>
-                  <widget class="GtkHBox" id="hbox4">
+                  <object class="GtkHBox" id="hbox4">
                     <property name="visible">True</property>
                     <child>
-                      <widget class="GtkImage" id="image3">
+                      <object class="GtkImage" id="image3">
                         <property name="visible">True</property>
                         <property name="stock">gtk-no</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
@@ -235,31 +236,35 @@ If you selected Client please enter the IP address the Server gave to you in the
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label6">
+                      <object class="GtkLabel" id="label6">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">Play Offline</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-              </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="expand">False</property>
             <property name="pack_type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+    <action-widgets>
+      <action-widget response="-5">btnStart</action-widget>
+      <action-widget response="-6">btnOffline</action-widget>
+    </action-widgets>
+  </object>
+</interface>
diff --git a/plugins/dfnet/gui.c b/plugins/dfnet/gui.c
index 60e165a7..181fecb4 100644
--- a/plugins/dfnet/gui.c
+++ b/plugins/dfnet/gui.c
@@ -11,7 +11,6 @@
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 #include <signal.h>
 
 #include "cfg.c"
@@ -96,48 +95,49 @@ void OnCopyIP(GtkWidget *widget, gpointer user_data) {
 }
 
 long CFGopen() {
-	GladeXML *xml;
+	GtkBuilder *builder;
 	GtkWidget *widget, *MainWindow;
 	char buf[256];
 
 	LoadConf();
 
-	xml = glade_xml_new(DATADIR "dfnet.glade2", "dlgStart", NULL);
-	if (xml == NULL) {
+	builder = gtk_builder_new();
+
+	if (!gtk_builder_add_from_file(builder, DATADIR "dfnet.ui", NULL)) {
 		g_warning("We could not load the interface!");
 		return 0;
 	}
 
-	MainWindow = glade_xml_get_widget(xml, "dlgStart");
+	MainWindow = gtk_builder_get_object(builder, "dlgStart");
 	gtk_window_set_title(GTK_WINDOW(MainWindow), _("NetPlay"));
 
-	widget = glade_xml_get_widget(xml, "btnCopyIP");
+	widget = gtk_builder_get_object(builder, "btnCopyIP");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 		GTK_SIGNAL_FUNC(OnCopyIP), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "tbServerIP");
+	widget = gtk_builder_get_object(builder, "tbServerIP");
 	gtk_entry_set_text(GTK_ENTRY(widget), conf.ipAddress);
 
-	widget = glade_xml_get_widget(xml, "tbPort");
+	widget = gtk_builder_get_object(builder, "tbPort");
 	sprintf(buf, "%d", conf.PortNum);
 	gtk_entry_set_text(GTK_ENTRY(widget), buf);
 
 	if (conf.PlayerNum == 1) {
-		widget = glade_xml_get_widget(xml, "rbServer");
+		widget = gtk_builder_get_object(builder, "rbServer");
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE);
 	} else {
-		widget = glade_xml_get_widget(xml, "rbClient");
+		widget = gtk_builder_get_object(builder, "rbClient");
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE);
 	}
 
 	if (gtk_dialog_run(GTK_DIALOG(MainWindow)) == GTK_RESPONSE_OK) {
-		widget = glade_xml_get_widget(xml, "tbServerIP");
+		widget = gtk_builder_get_object(builder, "tbServerIP");
 		strcpy(conf.ipAddress, gtk_entry_get_text(GTK_ENTRY(widget)));
 
-		widget = glade_xml_get_widget(xml, "tbPort");
+		widget = gtk_builder_get_object(builder, "tbPort");
 		conf.PortNum = atoi(gtk_entry_get_text(GTK_ENTRY(widget)));
 
-		widget = glade_xml_get_widget(xml, "rbServer");
+		widget = gtk_builder_get_object(builder, "rbServer");
 		if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
 			conf.PlayerNum = 1;
 		} else {