From b7e261606bffd87c8bcc81a76cf09b276eca7ec1 Mon Sep 17 00:00:00 2001 From: "SND\\weimingzhi_cp" Date: Mon, 28 Dec 2009 09:04:21 +0000 Subject: git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@39695 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2 | 21 +--- plugins/dfcdrom/cdrcfg-0.1df/main.c | 11 +- plugins/dfinput/cfg-gtk2.c | 13 +-- plugins/dfinput/dfinput.glade2 | 18 +--- plugins/dfsound/spucfg-0.1df/dfsound.glade2 | 20 +--- plugins/dfsound/spucfg-0.1df/main.c | 140 +++++++------------------- plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2 | 20 +--- plugins/dfxvideo/gpucfg-0.1df/main.c | 43 ++++---- 8 files changed, 69 insertions(+), 217 deletions(-) (limited to 'plugins') 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) True end - - gtk-cancel + + gtk-close -6 True True @@ -311,23 +311,6 @@ Threaded - Faster (With Cache) 0 - - - gtk-ok - -5 - True - True - True - False - True - - - - False - False - 1 - - False 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 True end - - gtk-cancel + + gtk-close True True True @@ -476,20 +476,6 @@ Analog Pad 0 - - - gtk-ok - True - True - True - True - - - False - False - 1 - - False 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 12 end - - gtk-cancel - True - True - True - True - - - False - False - 0 - - - - - gtk-ok + + gtk-close True True True @@ -308,7 +294,7 @@ Cubic False False - 1 + 0 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 @@ 12 end - - gtk-cancel - True - True - True - True - - - False - False - 0 - - - - - gtk-ok + + gtk-close True True True @@ -722,7 +708,7 @@ False False - 1 + 0 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 #include -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); } -- cgit v1.2.3