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

8 files changed, 69 insertions, 217 deletions

diff --git a/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2 b/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2
index 02164f0c..25610e2e 100644
--- a/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2
+++ b/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2
@@ -295,8 +295,8 @@ Threaded - Faster (With Cache)</property>
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <widget class="GtkButton" id="cfg_cancelbutton">
-                <property name="label">gtk-cancel</property>
+              <widget 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>
@@ -311,23 +311,6 @@ Threaded - Faster (With Cache)</property>
                 <property name="position">0</property>
               </packing>
             </child>
-            <child>
-              <widget class="GtkButton" id="cfg_okbutton">
-                <property name="label">gtk-ok</property>
-                <property name="response_id">-5</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_okbutton_clicked"/>
-              </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/dfcdrom/cdrcfg-0.1df/main.c b/plugins/dfcdrom/cdrcfg-0.1df/main.c
index 9eac7ef4..55172d20 100644
--- a/plugins/dfcdrom/cdrcfg-0.1df/main.c
+++ b/plugins/dfcdrom/cdrcfg-0.1df/main.c
@@ -125,11 +125,6 @@ void fill_drives_list(GtkWidget *widget) {
 }
 
 static void OnConfigExit(GtkWidget *widget, gpointer user_data) {
-	gtk_widget_destroy(widget);
-	gtk_exit(0);
-}
-
-static void OnConfigOk(GtkWidget *widget, gpointer user_data) {
 	GladeXML *xml;
 
 	xml = glade_get_widget_tree(MainWindow);
@@ -178,14 +173,10 @@ long CDRconfigure() {
 	g_signal_connect_data(GTK_OBJECT(widget), "delete_event",
 		GTK_SIGNAL_FUNC(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "cfg_cancelbutton");
+	widget = glade_xml_get_widget(xml, "cfg_closebutton");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 		GTK_SIGNAL_FUNC(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "cfg_okbutton");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnConfigOk), xml, NULL, G_CONNECT_AFTER);
-
 	widget = glade_xml_get_widget(xml, "cddev_comboboxentry");
 	fill_drives_list(widget);
 	gtk_entry_set_text(GTK_ENTRY(GTK_BIN(widget)->child), CdromDev);
diff --git a/plugins/dfinput/cfg-gtk2.c b/plugins/dfinput/cfg-gtk2.c
index 644269ba..0434d363 100644
--- a/plugins/dfinput/cfg-gtk2.c
+++ b/plugins/dfinput/cfg-gtk2.c
@@ -255,13 +255,6 @@ 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);
@@ -631,14 +624,10 @@ 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, "btncancel");
+	widget = glade_xml_get_widget(xml, "btnclose");
 	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(OnConfigOk), xml, NULL, G_CONNECT_AFTER);
-
 	PopulateDevList();
 	UpdateKeyList();
 
diff --git a/plugins/dfinput/dfinput.glade2 b/plugins/dfinput/dfinput.glade2
index e7958be0..c7bdd114 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="btncancel">
-                <property name="label">gtk-cancel</property>
+              <widget class="GtkButton" id="btnclose">
+                <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -476,20 +476,6 @@ 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 8d67fd4d..c071a09e 100644
--- a/plugins/dfsound/spucfg-0.1df/dfsound.glade2
+++ b/plugins/dfsound/spucfg-0.1df/dfsound.glade2
@@ -283,22 +283,8 @@ Cubic</property>
             <property name="spacing">12</property>
             <property name="layout_style">end</property>
             <child>
-              <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>
+              <widget 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>
@@ -308,7 +294,7 @@ Cubic</property>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="position">0</property>
               </packing>
             </child>
           </widget>
diff --git a/plugins/dfsound/spucfg-0.1df/main.c b/plugins/dfsound/spucfg-0.1df/main.c
index 1b910372..5ae2fc67 100644
--- a/plugins/dfsound/spucfg-0.1df/main.c
+++ b/plugins/dfsound/spucfg-0.1df/main.c
@@ -18,7 +18,7 @@
 #define WRITEBINARY "wb"
 #define CONFIG_FILENAME "dfsound.cfg"
 
-void SaveConfig (GtkWidget *widget, gpointer user_datal);
+void SaveConfig(GtkWidget *widget, gpointer user_datal);
 
 /*	This function checks for the value being outside the accepted range,
 	and returns the appropriate boundary value */
@@ -43,16 +43,17 @@ void on_about_clicked (GtkWidget *widget, gpointer user_data)
 	exit (0);
 }
 
-void on_config_clicked (GtkWidget *widget, gpointer user_data)
+void OnConfigClose(GtkWidget *widget, gpointer user_data)
 {
-	gtk_widget_destroy (widget);
-	exit (0);
+	GladeXML *xml = (GladeXML *)user_data;
+
+	gtk_widget_destroy(glade_xml_get_widget(xml, "CfgWnd"));
+	gtk_exit(0);
 }
 
 int main(int argc, char *argv[])
 {
     GtkWidget *widget;
-	GtkWidget *wndMain;
     GladeXML *xml;
     FILE *in;
     char t[256];
@@ -86,7 +87,7 @@ int main(int argc, char *argv[])
 		gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (widget), "dfsound PCSX Sound Plugin");
 		gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (widget), "1.6");
 		gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (widget), authors);
-		gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (widget), "http://home.t-online.de/home/PeteBernert/");
+		gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (widget), "http://pcsx-df.sourceforge.net/");
 
 		g_signal_connect_data(GTK_OBJECT(widget), "response",
 			GTK_SIGNAL_FUNC(on_about_clicked), NULL, NULL, G_CONNECT_AFTER);
@@ -103,13 +104,11 @@ int main(int argc, char *argv[])
 		return 255;
     }
 
-    wndMain = glade_xml_get_widget(xml, "CfgWnd");
-
     strcpy(cfg, CONFIG_FILENAME);
 
     in = fopen(cfg, READBINARY);
     if (in) {
-		pB = (char *) malloc(32767);
+		pB = (char *)malloc(32767);
 		memset(pB, 0, 32767);
 		len = fread(pB, 1, 32767, in);
 		fclose(in);
@@ -204,119 +203,56 @@ int main(int argc, char *argv[])
 		val = set_limit (p, len, 0, 2);
     } else val = 2;
 
-    gtk_combo_box_set_active(GTK_COMBO_BOX (glade_xml_get_widget(xml, "cbReverb2")), val);
+    gtk_combo_box_set_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "cbReverb2")), val);
 
     if (pB)
 		free(pB);
 
 	widget = glade_xml_get_widget(xml, "CfgWnd");
-	g_signal_connect_data(GTK_OBJECT(widget), "delete_event",
-			GTK_SIGNAL_FUNC(on_config_clicked), NULL, NULL, G_CONNECT_AFTER);
+	g_signal_connect_data(GTK_OBJECT(widget), "destroy",
+		GTK_SIGNAL_FUNC(SaveConfig), xml, NULL, 0);
 
-	widget = glade_xml_get_widget(xml, "btn_cancel");
+	widget = glade_xml_get_widget(xml, "btn_close");
 	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);
+		GTK_SIGNAL_FUNC(OnConfigClose), xml, NULL, G_CONNECT_AFTER);
 
     gtk_main();
     return 0;
 }
 
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SetCfgVal(char *pB, char *pE, int val)
-{
-    char *p, *ps, *pC;
-    char t[32];
-
-    sprintf(t,"%d",val);
-//    printf("%s - %s - %d\n", pB, pE, val);
-
-    p = strstr(pB, pE);
-    if (p) {
-		p = strstr(p, "=");
-		if (!p)
-		    return;
-		p++;
-		while (*p && *p != '\n' && (*p < '0' || *p > '9'))
-		    p++;
-		if (*p == 0 || *p == '\n')
-		    return;
-		ps = p;
-		while (*p >= '0' && *p <= '9')
-		    p++;
-		pC = (char *) malloc(32767);
-		strcpy(pC, p);
-		strcpy(ps, t);
-		strcat(pB, pC);
-		free(pC);
-    } else {
-		strcat(pB, pE);
-		strcat(pB, " = ");
-		strcat(pB, t);
-		strcat(pB, "\n");
-    }
-
-}
-
 void SaveConfig(GtkWidget *widget, gpointer user_data)
 {
-    FILE *in;
-    GladeXML *xml;
-    int len, val;
-    char *pB;
-    char cfg[255];
-
-    pB = (char *) malloc(32767);
-    memset(pB, 0, 32767);
-
-    strcpy(cfg, CONFIG_FILENAME);
-
-	/* ADB TODO Why do we read this in to just replace it again? */
-    in = fopen(cfg, READBINARY);
-    if (in) {
-		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, "cbVolume2")));
-    SetCfgVal(pB, "\nVolume", val);
-
-    val = gtk_combo_box_get_active (GTK_COMBO_BOX (glade_xml_get_widget (xml, "cbInterpolation2")));
-	SetCfgVal(pB, "\nUseInterpolation", val);
-
-    val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "chkXASpeed")));
-    SetCfgVal(pB, "\nXAPitch", val);
+	GladeXML *xml = (GladeXML *)user_data;
+	FILE *fp;
+	int val;
+
+	fp = fopen(CONFIG_FILENAME, WRITEBINARY);
+	if (fp == NULL) {
+		fprintf(stderr, "Unable to write to configuration file %s!\n", CONFIG_FILENAME);
+		gtk_exit(0);
+	}
 
-    val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "chkHiCompat")));
-    SetCfgVal(pB, "\nHighCompMode", val);
+	val = gtk_combo_box_get_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "cbVolume2")));
+	fprintf(fp, "\nVolume = %d\n", val);
 
-    val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "chkIRQWait")));
-    SetCfgVal(pB, "\nSPUIRQWait", val);
+	val = gtk_combo_box_get_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "cbInterpolation2")));
+	fprintf(fp, "\nUseInterpolation = %d\n", val);
 
-    val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "chkDisStereo")));
-    SetCfgVal(pB, "\nDisStereo", val);
+	val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "chkXASpeed")));
+	fprintf(fp, "\nXAPitch = %d\n", val);
 
-    val = gtk_combo_box_get_active (GTK_COMBO_BOX (glade_xml_get_widget (xml, "cbReverb2")));
-    SetCfgVal(pB, "\nUseReverb", val);
+	val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "chkHiCompat")));
+	fprintf(fp, "\nHighCompMode = %d\n", val);
 
-    if ((in = fopen(cfg, WRITEBINARY)) != NULL) {
-	fwrite(pB, strlen(pB), 1, in);
-	fclose(in);
-    }	/* ADB TODO Error checking? */
+	val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "chkIRQWait")));
+	fprintf(fp, "\nSPUIRQWait = %d\n", val);
 
-    free(pB);
+	val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "chkDisStereo")));
+	fprintf(fp, "\nDisStereo = %d\n", val);
 
-    gtk_widget_destroy (glade_xml_get_widget (xml, "CfgWnd"));
-//    g_free (xml);
+	val = gtk_combo_box_get_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "cbReverb2")));
+	fprintf(fp, "\nUseReverb = %d\n", val);
 
-	/* Close the window and exit control from the plugin */
-	exit (0);
+	fclose(fp);
+	gtk_exit(0);
 }
diff --git a/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2 b/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2
index d65938dc..e2ef18a5 100644
--- a/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2
+++ b/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2
@@ -697,22 +697,8 @@
             <property name="spacing">12</property>
             <property name="layout_style">end</property>
             <child>
-              <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>
+              <widget 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>
@@ -722,7 +708,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="position">0</property>
               </packing>
             </child>
           </widget>
diff --git a/plugins/dfxvideo/gpucfg-0.1df/main.c b/plugins/dfxvideo/gpucfg-0.1df/main.c
index 9cc0b7c7..83d00327 100644
--- a/plugins/dfxvideo/gpucfg-0.1df/main.c
+++ b/plugins/dfxvideo/gpucfg-0.1df/main.c
@@ -14,7 +14,7 @@
 #include <string.h>
 #include <sys/stat.h>
 
-void SaveConfig (GtkWidget *widget, gpointer user_datal);
+void SaveConfig(GtkWidget *widget, gpointer user_datal);
 
 #define READBINARY "rb"
 #define WRITEBINARY "wb"
@@ -49,24 +49,18 @@ int set_limit (char *p, int len, int lower, int upper)
     return val;
 }
 
-void on_about_clicked (GtkWidget *widget, gpointer user_data)
+void on_about_clicked(GtkWidget *widget, gpointer user_data)
 {
 	gtk_widget_destroy (widget);
 	exit (0);
 }
 
-void on_config_clicked (GtkWidget *widget, gpointer user_data)
-{
-	gtk_widget_destroy (widget);
-	exit (0);
-}
-
-void set_widget_sensitive (GtkWidget *widget, gpointer user_data)
+void set_widget_sensitive(GtkWidget *widget, gpointer user_data)
 {
 	gtk_widget_set_sensitive (widget, (int)user_data);
 }
 
-void on_use_fixes_toggled (GtkWidget *widget, gpointer user_data)
+void on_use_fixes_toggled(GtkWidget *widget, gpointer user_data)
 {
 	GtkWidget *check, *table_fixes;
 	GladeXML *xml;
@@ -80,6 +74,14 @@ void on_use_fixes_toggled (GtkWidget *widget, gpointer user_data)
 		(void *)gtk_toggle_button_get_active (check));
 }
 
+void OnConfigClose(GtkWidget *widget, gpointer user_data)
+{
+	GladeXML *xml = (GladeXML *)user_data;
+
+	gtk_widget_destroy(glade_xml_get_widget(xml, "CfgWnd"));
+	gtk_exit(0);
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -118,7 +120,7 @@ main (int argc, char *argv[])
 		gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (widget), "P.E.Op.S PCSX Video Plugin");
 		gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (widget), "1.17");
 		gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (widget), authors);
-		gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (widget), "http://home.t-online.de/home/PeteBernert/");
+		gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (widget), "http://pcsx-df.sourceforge.net/");
 
 	g_signal_connect_data(GTK_OBJECT(widget), "response",
 			GTK_SIGNAL_FUNC(on_about_clicked), NULL, NULL, G_CONNECT_AFTER);
@@ -282,16 +284,12 @@ main (int argc, char *argv[])
   if(pB) free(pB);
 
 	widget = glade_xml_get_widget(xml, "CfgWnd");
-	g_signal_connect_data(GTK_OBJECT(widget), "delete_event",
-			GTK_SIGNAL_FUNC(on_config_clicked), NULL, NULL, G_CONNECT_AFTER);
+	g_signal_connect_data(GTK_OBJECT(widget), "destroy",
+			GTK_SIGNAL_FUNC(SaveConfig), xml, NULL, 0);
 
-	widget = glade_xml_get_widget(xml, "btn_cancel");
+	widget = glade_xml_get_widget(xml, "btn_close");
 	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);
+			GTK_SIGNAL_FUNC(OnConfigClose), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "checkUseFixes");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
@@ -420,9 +418,6 @@ void SaveConfig(GtkWidget *widget, gpointer user_data)
 
  free(pB);
  
-    gtk_widget_destroy (glade_xml_get_widget (xml, "CfgWnd"));
-//    g_free (xml);
-
-	/* Close the window and exit control from the plugin */
-	exit (0); 
+	// Close the window and exit control from the plugin
+	gtk_exit (0); 
 }