Rebranding.

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

3 files changed, 173 insertions, 135 deletions

diff --git a/plugins/dfcdrom/Makefile.am b/plugins/dfcdrom/Makefile.am
index 387a3544..b001ab0f 100644
--- a/plugins/dfcdrom/Makefile.am
+++ b/plugins/dfcdrom/Makefile.am
@@ -23,13 +23,13 @@ endif
 
 AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
 	-DDATADIR=\"${datadir}/psemu/\" \
-	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
+	$(GTK2_CFLAGS) \
 	-I../../libpcsxcore -I../../include
 
 bin_PROGRAMS = cfgDFCdrom
 cfgDFCdrom_SOURCES = cdrcfg-0.1df/main.c
-cfgDFCdrom_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
+cfgDFCdrom_LDADD = $(GTK2_LIBS)
 
-glade_DATA = cdrcfg-0.1df/dfcdrom.glade2
+glade_DATA = cdrcfg-0.1df/dfcdrom.ui
 gladedir = $(datadir)/psemu/
 EXTRA_DIST = $(glade_DATA)
diff --git a/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2 b/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui
index 25610e2e..c16dfd17 100644
--- a/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2
+++ b/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui
@@ -1,76 +1,66 @@
 <?xml version="1.0"?>
-<glade-interface>
-  <!-- interface-requires gtk+ 2.6 -->
+<interface>
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
-  <widget class="GtkDialog" id="CfgWnd">
+  <object class="GtkDialog" id="CfgWnd">
     <property name="visible">True</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">CDR configuration</property>
     <property name="modal">True</property>
     <property name="window_position">center</property>
     <property name="type_hint">normal</property>
-    <property name="has_separator">False</property>
     <signal name="show" handler="on_cfg_dialog_show"/>
     <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>
         <child>
-          <widget class="GtkVBox" id="vbox1">
+          <object class="GtkVBox" id="vbox1">
             <property name="visible">True</property>
             <property name="orientation">vertical</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="GtkHBox" id="hbox5">
+                  <object class="GtkHBox" id="hbox5">
                     <property name="visible">True</property>
                     <property name="border_width">10</property>
                     <child>
-                      <widget class="GtkComboBoxEntry" id="cddev_comboboxentry">
+                      <object class="GtkComboBoxEntry" id="cddev_comboboxentry">
                         <property name="visible">True</property>
-                        <property name="tooltip" translatable="yes">Choose your CD-ROM device or type its path if it's not listed</property>
-                      </widget>
+                        <property name="tooltip_text" translatable="yes">Choose your CD-ROM device or type its path if it's not listed</property>
+                      </object>
                       <packing>
                         <property name="position">0</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="cdr_label">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Select CD-ROM device</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
-                </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="GtkVBox" id="vbox2">
+                  <object class="GtkVBox" id="vbox2">
                     <property name="visible">True</property>
                     <property name="orientation">vertical</property>
                     <child>
-                      <widget class="GtkHBox" id="hbox1">
+                      <object class="GtkHBox" id="hbox1">
                         <property name="visible">True</property>
                         <property name="border_width">5</property>
                         <child>
-                          <widget class="GtkLabel" id="readmode_label">
+                          <object class="GtkLabel" id="readmode_label">
                             <property name="visible">True</property>
                             <property name="xpad">5</property>
                             <property name="ypad">5</property>
                             <property name="label" translatable="yes">Select read mode:</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
@@ -78,16 +68,21 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkComboBox" id="readmode_combobox">
+                          <object class="GtkComboBox" id="readmode_combobox">
                             <property name="visible">True</property>
-                            <property name="items" translatable="yes">Normal (No Cache)
-Threaded - Faster (With Cache)</property>
-                          </widget>
+                            <property name="model">liststoreReadMode</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="cellrenderertextReadMode"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
                           <packing>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
@@ -95,24 +90,24 @@ Threaded - Faster (With Cache)</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkHSeparator" id="hseparator1">
+                      <object class="GtkHSeparator" id="hseparator1">
                         <property name="visible">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkHBox" id="hbox2">
+                      <object class="GtkHBox" id="hbox2">
                         <property name="visible">True</property>
                         <property name="border_width">5</property>
                         <property name="spacing">5</property>
                         <child>
-                          <widget class="GtkLabel" id="label4">
+                          <object class="GtkLabel" id="label4">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Cache Size (Def. 64):</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
@@ -120,13 +115,12 @@ Threaded - Faster (With Cache)</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkSpinButton" id="spinCacheSize">
+                          <object class="GtkSpinButton" id="spinCacheSize">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="adjustment">32 32 2048 1 16 0</property>
                             <property name="climb_rate">1</property>
                             <property name="numeric">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
@@ -134,30 +128,30 @@ Threaded - Faster (With Cache)</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkHSeparator" id="hseparator2">
+                      <object class="GtkHSeparator" id="hseparator2">
                         <property name="visible">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkHBox" id="hbox4">
+                      <object class="GtkHBox" id="hbox4">
                         <property name="visible">True</property>
                         <property name="border_width">5</property>
                         <property name="spacing">5</property>
                         <child>
-                          <widget class="GtkLabel" id="label7">
+                          <object class="GtkLabel" id="label7">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Spindown Time:</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
@@ -165,25 +159,16 @@ Threaded - Faster (With Cache)</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkComboBox" id="comboSpinDown">
+                          <object class="GtkComboBox" id="comboSpinDown">
                             <property name="visible">True</property>
-                            <property name="items" translatable="yes">Default
-125ms
-250ms
-500ms
-1s
-2s
-4s
-8s
-16s
-32s
-1min
-2min
-4min
-8min
-16min
-32min</property>
-                          </widget>
+                            <property name="model">liststoreSpindownTime</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="cellrenderertextSpindownTime"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
@@ -191,30 +176,30 @@ Threaded - Faster (With Cache)</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">4</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkHSeparator" id="hseparator3">
+                      <object class="GtkHSeparator" id="hseparator3">
                         <property name="visible">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="position">5</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkHBox" id="hbox3">
+                      <object class="GtkHBox" id="hbox3">
                         <property name="visible">True</property>
                         <property name="border_width">5</property>
                         <property name="spacing">5</property>
                         <child>
-                          <widget class="GtkLabel" id="label5">
+                          <object class="GtkLabel" id="label5">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Cdrom Speed (Def. 0 = MAX):</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
@@ -222,13 +207,12 @@ Threaded - Faster (With Cache)</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkSpinButton" id="spinCdrSpeed">
+                          <object class="GtkSpinButton" id="spinCdrSpeed">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="adjustment">0 0 100 1 4 0</property>
                             <property name="climb_rate">1</property>
                             <property name="numeric">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
@@ -236,25 +220,22 @@ Threaded - Faster (With Cache)</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">6</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkHSeparator" id="cfg_hseparator">
+                      <object class="GtkHSeparator" id="cfg_hseparator">
                         <property name="visible">True</property>
-                        <accessibility>
-                          <atkproperty name="AtkObject::accessible-name" translatable="yes">hseparator</atkproperty>
-                        </accessibility>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="position">7</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="subQ_button">
+                      <object class="GtkCheckButton" id="subQ_button">
                         <property name="label" translatable="yes">Enable subchannel read</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -262,63 +243,126 @@ Threaded - Faster (With Cache)</property>
                         <property name="border_width">10</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">8</property>
                       </packing>
                     </child>
-                  </widget>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="options_label">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Options</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">1</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="cfg_dialog-action_area">
+          <object class="GtkHButtonBox" id="cfg_dialog-action_area">
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <widget class="GtkButton" id="cfg_closebutton">
+              <object class="GtkButton" id="cfg_closebutton">
                 <property name="label">gtk-close</property>
-                <property name="response_id">-6</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>
                 <signal name="clicked" handler="on_cfg_cancelbutton_clicked"/>
-              </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="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="-6">cfg_closebutton</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkListStore" id="liststoreReadMode">
+    <columns>
+      <!-- column-name Item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Normal (No Cache)</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Threaded - Faster (With Cache)</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="liststoreSpindownTime">
+    <columns>
+      <!-- column-name Item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Default</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">125ms</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">250ms</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">500ms</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">1s</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">2s</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">4s</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">8s</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">16s</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">32s</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">1min</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">2min</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">4min</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">8min</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">16min</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">32min</col>
+      </row>
+    </data>
+  </object>
+</interface>
diff --git a/plugins/dfcdrom/cdrcfg-0.1df/main.c b/plugins/dfcdrom/cdrcfg-0.1df/main.c
index fbbe29d5..0b62a801 100644
--- a/plugins/dfcdrom/cdrcfg-0.1df/main.c
+++ b/plugins/dfcdrom/cdrcfg-0.1df/main.c
@@ -22,9 +22,9 @@
 #include "../cfg.c"

 

 #include <gtk/gtk.h>

-#include <glade/glade.h>

 

-GtkWidget *MainWindow;

+GtkBuilder *builder;

+GtkWidget *widget, *MainWindow;

 

 // function to check if the device is a cdrom

 int is_cdrom(const char *device) {

@@ -174,27 +174,23 @@ void fill_drives_list(GtkWidget *widget) {
 }

 

 static void OnConfigExit(GtkWidget *widget, gpointer user_data) {

-	GladeXML *xml;

-

-	xml = glade_get_widget_tree(MainWindow);

-

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

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

 	strncpy(CdromDev, gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(widget)))), 255);

 	CdromDev[255] = '\0';

 

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

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

 	ReadMode = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));

 

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

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

 	UseSubQ = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));

 

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

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

 	CacheSize = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));

 

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

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

 	CdrSpeed = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));

 

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

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

 	SpinDown = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));

 

 	SaveConf();

@@ -204,45 +200,36 @@ static void OnConfigExit(GtkWidget *widget, gpointer user_data) {
 }

 

 long CDRconfigure() {

-	GladeXML *xml;

-	GtkWidget *widget;

-

 	LoadConf();

 

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

-	if (xml == NULL) {

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

-		return -1;

-	}

-

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

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

 	gtk_window_set_title(GTK_WINDOW(MainWindow), _("CDR configuration"));

 

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

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

 	g_signal_connect_data(GTK_OBJECT(widget), "delete_event",

 		G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);

 

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

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

 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",

 		G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);

 

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

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

 	fill_drives_list(widget);

 	gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(widget))), CdromDev);

 

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

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

 	gtk_combo_box_set_active(GTK_COMBO_BOX(widget), ReadMode);

 

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

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

 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), UseSubQ);

 

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

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

 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), (float)CacheSize);

 

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

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

 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), (float)CdrSpeed);

 

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

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

 	gtk_combo_box_set_active(GTK_COMBO_BOX(widget), SpinDown);

 

 	gtk_widget_show(MainWindow);

@@ -279,8 +266,15 @@ int main(int argc, char *argv[]) {
 	gtk_init(&argc, &argv);

 

 	if (argc != 2) return 0;

-

+	

 	if (strcmp(argv[1], "configure") == 0) {

+		builder = gtk_builder_new();

+		

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

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

+			return 0;

+		}

+		

 		CDRconfigure();

 	} else {

 		CDRabout();