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

6 files changed, 79 insertions, 16 deletions

diff --git a/plugins/dfinput/cfg-gtk2.c b/plugins/dfinput/cfg-gtk2.c
index a0e34647..c2013833 100644
--- a/plugins/dfinput/cfg-gtk2.c
+++ b/plugins/dfinput/cfg-gtk2.c
@@ -213,6 +213,13 @@ static void UpdateKey() {
 }
 
 static void OnConfigExit(GtkWidget *widget, gpointer user_data) {
+	gtk_widget_destroy(widget);
+	SDL_Quit();
+
+	gtk_exit(0);
+}
+
+static void OnConfigOk(GtkWidget *widget, gpointer user_data) {
 	SaveConfig();
 
 	gtk_widget_destroy(widget);
@@ -560,9 +567,13 @@ long PADconfigure() {
 	g_signal_connect_data(GTK_OBJECT(widget), "delete_event",
 		GTK_SIGNAL_FUNC(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btnclose");
+	widget = glade_xml_get_widget(xml, "btncancel");
+	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+		GTK_SIGNAL_FUNC(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
+
+	widget = glade_xml_get_widget(xml, "btnok");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnConfigExit), xml, NULL, G_CONNECT_AFTER);
+		GTK_SIGNAL_FUNC(OnConfigOk), xml, NULL, G_CONNECT_AFTER);
 
 	PopulateDevList();
 	UpdateKeyList();
diff --git a/plugins/dfinput/dfinput.glade2 b/plugins/dfinput/dfinput.glade2
index c7bdd114..e7958be0 100644
--- a/plugins/dfinput/dfinput.glade2
+++ b/plugins/dfinput/dfinput.glade2
@@ -463,8 +463,8 @@ Analog Pad</property>
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <widget class="GtkButton" id="btnclose">
-                <property name="label">gtk-close</property>
+              <widget class="GtkButton" id="btncancel">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -476,6 +476,20 @@ Analog Pad</property>
                 <property name="position">0</property>
               </packing>
             </child>
+            <child>
+              <widget class="GtkButton" id="btnok">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
           </widget>
           <packing>
             <property name="expand">False</property>
diff --git a/plugins/dfsound/spucfg-0.1df/dfsound.glade2 b/plugins/dfsound/spucfg-0.1df/dfsound.glade2
index 12d3e8ac..f50bb8bf 100644
--- a/plugins/dfsound/spucfg-0.1df/dfsound.glade2
+++ b/plugins/dfsound/spucfg-0.1df/dfsound.glade2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <glade-interface>
-  <!-- interface-requires gtk+ 2.6 -->
-  <!-- interface-naming-policy toplevel-contextual -->
+  <!-- interface-requires gtk+ 2.8 -->
+  <!-- interface-naming-policy project-wide -->
   <widget class="GtkWindow" id="CfgWnd">
     <property name="visible">True</property>
     <property name="border_width">10</property>
@@ -279,10 +279,25 @@ Cubic</property>
         <child>
           <widget 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">
-                <property name="label">gtk-close</property>
+              <widget class="GtkButton" id="btn_cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="btn_ok">
+                <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -292,7 +307,7 @@ Cubic</property>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </widget>
diff --git a/plugins/dfsound/spucfg-0.1df/main.c b/plugins/dfsound/spucfg-0.1df/main.c
index 8008e87d..1b910372 100644
--- a/plugins/dfsound/spucfg-0.1df/main.c
+++ b/plugins/dfsound/spucfg-0.1df/main.c
@@ -213,7 +213,11 @@ int main(int argc, char *argv[])
 	g_signal_connect_data(GTK_OBJECT(widget), "delete_event",
 			GTK_SIGNAL_FUNC(on_config_clicked), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_close");
+	widget = glade_xml_get_widget(xml, "btn_cancel");
+	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+			GTK_SIGNAL_FUNC(on_config_clicked), NULL, NULL, G_CONNECT_AFTER);
+
+	widget = glade_xml_get_widget(xml, "btn_ok");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			GTK_SIGNAL_FUNC(SaveConfig), xml, NULL, G_CONNECT_AFTER);
 
diff --git a/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2 b/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2
index 62e7c597..c0a18a1c 100644
--- a/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2
+++ b/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <glade-interface>
-  <!-- interface-requires gtk+ 2.6 -->
-  <!-- interface-naming-policy toplevel-contextual -->
+  <!-- interface-requires gtk+ 2.8 -->
+  <!-- interface-naming-policy project-wide -->
   <widget class="GtkWindow" id="CfgWnd">
     <property name="visible">True</property>
     <property name="border_width">10</property>
@@ -693,10 +693,25 @@
         <child>
           <widget 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">
-                <property name="label">gtk-close</property>
+              <widget class="GtkButton" id="btn_cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="btn_ok">
+                <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -706,7 +721,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </widget>
diff --git a/plugins/dfxvideo/gpucfg-0.1df/main.c b/plugins/dfxvideo/gpucfg-0.1df/main.c
index 9a012b19..105dcdd9 100644
--- a/plugins/dfxvideo/gpucfg-0.1df/main.c
+++ b/plugins/dfxvideo/gpucfg-0.1df/main.c
@@ -285,7 +285,11 @@ main (int argc, char *argv[])
 	g_signal_connect_data(GTK_OBJECT(widget), "delete_event",
 			GTK_SIGNAL_FUNC(on_config_clicked), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_close");
+	widget = glade_xml_get_widget(xml, "btn_cancel");
+	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+			GTK_SIGNAL_FUNC(on_config_clicked), NULL, NULL, G_CONNECT_AFTER);
+
+	widget = glade_xml_get_widget(xml, "btn_ok");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			GTK_SIGNAL_FUNC(SaveConfig), xml, NULL, G_CONNECT_AFTER);