From 32dd1c9ae523ad1f346446a6892f1feee9a4e0ba Mon Sep 17 00:00:00 2001 From: "SND\\edgbla_cp" Date: Wed, 8 Jun 2011 15:32:50 +0000 Subject: git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@67641 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- plugins/dfxvideo/Makefile.am | 6 +- plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2 | 625 ------------------------ plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui | 676 ++++++++++++++++++++++++++ plugins/dfxvideo/gpucfg-0.1df/main.c | 118 +++-- 4 files changed, 734 insertions(+), 691 deletions(-) delete mode 100644 plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2 create mode 100644 plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui (limited to 'plugins') diff --git a/plugins/dfxvideo/Makefile.am b/plugins/dfxvideo/Makefile.am index 7e56a9c6..bc487db4 100644 --- a/plugins/dfxvideo/Makefile.am +++ b/plugins/dfxvideo/Makefile.am @@ -8,7 +8,7 @@ SUFFIXES = .asm AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK2_CFLAGS) $(GLADE2_CFLAGS) \ + $(GTK2_CFLAGS)\ -I../../libpcsxcore \ -I../../include @@ -27,8 +27,8 @@ libDFXVideo_la_LIBADD = -lX11 -lXv -lXext -lm bin_PROGRAMS = cfgDFXVideo cfgDFXVideo_SOURCES = gpucfg-0.1df/main.c -cfgDFXVideo_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS) -lXext +cfgDFXVideo_LDADD = $(GTK2_LIBS) -lXext -glade_DATA = gpucfg-0.1df/dfxvideo.glade2 +glade_DATA = gpucfg-0.1df/dfxvideo.ui gladedir = $(datadir)/psemu/ EXTRA_DIST = $(glade_DATA) diff --git a/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2 b/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2 deleted file mode 100644 index ded3c1a2..00000000 --- a/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2 +++ /dev/null @@ -1,625 +0,0 @@ - - - - - - True - 10 - Configure X11 Video - False - True - center - dialog - - - - True - vertical - 6 - - - True - 0 - - - True - 6 - 6 - 12 - 12 - - - True - vertical - - - True - 3 - 2 - 30 - 6 - - - True - 0 - Initial Window Size: - - - GTK_FILL - - - - - - True - 0 - Stretching: - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - Dithering: - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - 0: None -1: 2xSai -2: 2xSuperSai -3: SuperEagle -4: Scale2x -5: Scale3x -6: HQ2X -7: HQ3X - - - 1 - 2 - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - 1 - 0: Off (fastest) -1: Game dependant -2: Always - - - 1 - 2 - 2 - 3 - GTK_FILL - GTK_FILL - - - - - True - 10 - - - True - 2 - 320x240 -640x480 -800x600 -1024x768 -1152x864 -1280x1024 -1600x1200 - - - 0 - - - - - Fullscreen - True - True - False - True - Toggle windowed/fullscreen mode. - True - True - - - False - False - 1 - - - - - 1 - 2 - - - - - 0 - - - - - True - - - Maintain 4:3 Aspect Ratio - True - True - False - True - True - - - False - False - 0 - - - - - 1 - - - - - - - - - True - <b>Screen</b> - True - - - label_item - - - - - 0 - - - - - True - 0 - - - True - 6 - 6 - 12 - 12 - - - True - vertical - - - Show FPS - True - True - False - Toggle whether the FPS will be shown. - True - True - - - False - False - 0 - - - - - Enable frame skipping - True - True - False - Skip frames when rendering. - True - True - - - False - False - 1 - - - - - True - 3 - 12 - - - Set FPS - True - True - False - Enable this if games display too quickly. - True - True - - - GTK_FILL - - - - - - True - True - 4 - 200.0 - - - 1 - 2 - - - - - - - Autodetect FPS limit - True - True - False - True - True - True - True - - - 2 - 3 - - - - - False - False - 2 - - - - - - - - - True - <b>Framerate</b> - True - - - label_item - - - - - 1 - - - - - True - 0 - - - True - 6 - 6 - 12 - 12 - - - True - vertical - - - Use game fixes - True - True - False - True - True - - - False - False - 0 - - - - - True - 19 - - - True - 6 - 2 - 16 - - - Disable CPU Saving - True - True - False - For precise framerate - True - True - - - 4 - 5 - GTK_FILL - - - - - - Odd/even bit hack - True - True - False - Chrono Cross - True - True - - - GTK_FILL - - - - - - PC FPS calculation - True - True - False - Better FPS limit in some - True - True - - - 5 - 6 - GTK_FILL - - - - - - Expand screen width - True - True - False - Capcom fighting games - True - True - - - 1 - 2 - GTK_FILL - - - - - - Ignore brightness color - True - True - False - Black screens in Lunar - True - True - - - 2 - 3 - GTK_FILL - - - - - - Disable coordinate check - True - True - False - Compatibility mode - True - True - - - 3 - 4 - GTK_FILL - - - - - - Lazy screen update - True - True - False - True - Pandemonium 2 - True - True - - - 1 - 2 - GTK_FILL - - - - - - Old frame skipping - True - True - False - True - Skip every second frame - True - True - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - - Repeated flat tex triangles - True - True - False - True - Needed by Dark Forces - True - True - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - - Draw quads with triangles - True - True - False - True - better g-colors, worse textures - True - True - - - 1 - 2 - 3 - 4 - GTK_FILL - - - - - - Fake 'gpu busy' states - True - True - False - True - Toggle busy flags after drawing - True - True - - - 1 - 2 - 4 - 5 - GTK_FILL - - - - - - - - - - - 1 - - - - - - - - - True - <b>Compatibility</b> - True - - - label_item - - - - - 2 - - - - - True - 12 - end - - - gtk-close - True - True - True - False - True - - - False - False - 0 - - - - - 3 - - - - - - diff --git a/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui b/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui new file mode 100644 index 00000000..b60c02d3 --- /dev/null +++ b/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui @@ -0,0 +1,676 @@ + + + + + + True + 10 + Configure X11 Video + False + True + center + dialog + + + + True + vertical + 6 + + + True + 0 + + + True + 6 + 6 + 12 + 12 + + + True + vertical + + + True + 3 + 2 + 30 + 6 + + + True + 0 + Initial Window Size: + + + GTK_FILL + + + + + + True + 0 + Stretching: + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + Dithering: + + + 2 + 3 + GTK_FILL + + + + + + True + liststoreStretching + 0 + + + + 0 + + + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + liststoreDither + 1 + + + + 0 + + + + + 1 + 2 + 2 + 3 + GTK_FILL + GTK_FILL + + + + + True + 10 + + + True + liststoreRes + 2 + + + + 0 + + + + + 0 + + + + + Fullscreen + True + True + False + True + Toggle windowed/fullscreen mode. + True + True + + + False + False + 1 + + + + + 1 + 2 + + + + + 0 + + + + + True + + + Maintain 4:3 Aspect Ratio + True + True + False + True + True + + + False + False + 0 + + + + + 1 + + + + + + + + + 0 + + + + + True + 0 + + + True + 6 + 6 + 12 + 12 + + + True + vertical + + + Show FPS + True + True + False + Toggle whether the FPS will be shown. + True + True + + + False + False + 0 + + + + + Enable frame skipping + True + True + False + Skip frames when rendering. + True + True + + + False + False + 1 + + + + + True + 3 + 12 + + + Set FPS + True + True + False + Enable this if games display too quickly. + True + True + + + GTK_FILL + + + + + + True + True + 4 + 200.0 + + + 1 + 2 + + + + + + + Autodetect FPS limit + True + True + False + True + True + True + True + + + 2 + 3 + + + + + False + False + 2 + + + + + + + + + 1 + + + + + True + 0 + + + True + 6 + 6 + 12 + 12 + + + True + vertical + + + Use game fixes + True + True + False + True + True + + + False + False + 0 + + + + + True + 19 + + + True + 6 + 2 + 16 + + + Disable CPU Saving + True + True + False + For precise framerate + True + True + + + 4 + 5 + GTK_FILL + + + + + + Odd/even bit hack + True + True + False + Chrono Cross + True + True + + + GTK_FILL + + + + + + PC FPS calculation + True + True + False + Better FPS limit in some + True + True + + + 5 + 6 + GTK_FILL + + + + + + Expand screen width + True + True + False + Capcom fighting games + True + True + + + 1 + 2 + GTK_FILL + + + + + + Ignore brightness color + True + True + False + Black screens in Lunar + True + True + + + 2 + 3 + GTK_FILL + + + + + + Disable coordinate check + True + True + False + Compatibility mode + True + True + + + 3 + 4 + GTK_FILL + + + + + + Lazy screen update + True + True + False + True + Pandemonium 2 + True + True + + + 1 + 2 + GTK_FILL + + + + + + Old frame skipping + True + True + False + True + Skip every second frame + True + True + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + Repeated flat tex triangles + True + True + False + True + Needed by Dark Forces + True + True + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + Draw quads with triangles + True + True + False + True + better g-colors, worse textures + True + True + + + 1 + 2 + 3 + 4 + GTK_FILL + + + + + + Fake 'gpu busy' states + True + True + False + True + Toggle busy flags after drawing + True + True + + + 1 + 2 + 4 + 5 + GTK_FILL + + + + + + + + + + + 1 + + + + + + + + + 2 + + + + + True + 12 + end + + + gtk-close + True + True + True + False + True + + + False + False + 0 + + + + + 3 + + + + + + + + + + + + + 0: None + + + 1: 2xSai + + + 2: 2xSuperSai + + + 3: SuperEagle + + + 4: Scale2x + + + 5: Scale3x + + + 6: HQ2X + + + 7: HQ3X + + + + + + + + + + + 0: Off (fastest) + + + 1: Game dependant + + + 2: Always + + + + + + + + + + + 320x240 + + + 640x480 + + + 800x600 + + + 1024x768 + + + 1152x864 + + + 1280x1024 + + + 1600x1200 + + + + diff --git a/plugins/dfxvideo/gpucfg-0.1df/main.c b/plugins/dfxvideo/gpucfg-0.1df/main.c index 4edc0a25..3b3ac85f 100644 --- a/plugins/dfxvideo/gpucfg-0.1df/main.c +++ b/plugins/dfxvideo/gpucfg-0.1df/main.c @@ -1,5 +1,4 @@ #include -#include #include "config.h" @@ -14,6 +13,9 @@ #include #include +GtkBuilder *builder; +GtkWidget *widget, *MainWindow; + void SaveConfig(GtkWidget *widget, gpointer user_datal); #define READBINARY "rb" @@ -63,11 +65,9 @@ void set_widget_sensitive(GtkWidget *widget, gpointer user_data) void on_fullscreen_toggled(GtkWidget *widget, gpointer user_data) { GtkWidget *check, *resCombo2; - GladeXML *xml; - xml = (GladeXML*) user_data; - check = glade_xml_get_widget(xml, "checkFullscreen"); - resCombo2 = glade_xml_get_widget(xml, "resCombo2"); + check = gtk_builder_get_object(builder, "checkFullscreen"); + resCombo2 = gtk_builder_get_object(builder, "resCombo2"); set_widget_sensitive(resCombo2, !gtk_toggle_button_get_active(check)); } @@ -75,11 +75,9 @@ void on_fullscreen_toggled(GtkWidget *widget, gpointer user_data) void on_use_fixes_toggled(GtkWidget *widget, gpointer user_data) { GtkWidget *check, *table_fixes; - GladeXML *xml; - xml = (GladeXML*) user_data; - check = glade_xml_get_widget (xml, "checkUseFixes"); + check = gtk_builder_get_object(builder,"checkUseFixes"); - table_fixes = glade_xml_get_widget (xml, "table_fixes"); + table_fixes = gtk_builder_get_object(builder,"table_fixes"); /* Set the state of each of the fixes to the value of the use fixes toggle */ gtk_container_foreach (GTK_CONTAINER (table_fixes), (GtkCallback) set_widget_sensitive, @@ -89,12 +87,10 @@ void on_use_fixes_toggled(GtkWidget *widget, gpointer user_data) void on_fps_toggled(GtkWidget *widget, gpointer user_data) { GtkWidget *checkSetFPS, *checkAutoFPSLimit, *entryFPS; - GladeXML *xml; - xml = (GladeXML*) user_data; - checkSetFPS = glade_xml_get_widget(xml, "checkSetFPS"); - checkAutoFPSLimit = glade_xml_get_widget(xml, "checkAutoFPSLimit"); - entryFPS = glade_xml_get_widget(xml, "entryFPS"); + checkSetFPS = gtk_builder_get_object(builder, "checkSetFPS"); + checkAutoFPSLimit = gtk_builder_get_object(builder, "checkAutoFPSLimit"); + entryFPS = gtk_builder_get_object(builder, "entryFPS"); set_widget_sensitive(entryFPS, gtk_toggle_button_get_active(checkSetFPS) && !gtk_toggle_button_get_active(checkAutoFPSLimit)); @@ -103,9 +99,7 @@ void on_fps_toggled(GtkWidget *widget, gpointer user_data) void OnConfigClose(GtkWidget *widget, gpointer user_data) { - GladeXML *xml = (GladeXML *)user_data; - - gtk_widget_destroy(glade_xml_get_widget(xml, "CfgWnd")); + gtk_widget_destroy(gtk_builder_get_object(builder, "CfgWnd")); gtk_exit(0); } @@ -113,7 +107,6 @@ int main (int argc, char *argv[]) { GtkWidget *CfgWnd, *widget; - GladeXML *xml; FILE *in;char t[256];int len,val; float valf; char * pB, * p; @@ -158,13 +151,14 @@ main (int argc, char *argv[]) return 0; } - xml = glade_xml_new(DATADIR "dfxvideo.glade2", "CfgWnd", NULL); - if (!xml) { + builder = gtk_builder_new(); + + if (!gtk_builder_add_from_file(builder, DATADIR "dfxvideo.ui", NULL)) { g_warning("We could not load the interface!"); return -1; - } + } - /*ADB wndMain = glade_xml_get_widget(xml, "CfgWnd");*/ + /*ADB wndMain = gtk_builder_get_object(builder, "CfgWnd");*/ strcpy(cfg, CONFIG_FILENAME); @@ -194,7 +188,7 @@ main (int argc, char *argv[]) else if (val == 640) val = VIDMODE_640x480; else if (val == 320) val = VIDMODE_320x200; - gtk_combo_box_set_active(GTK_COMBO_BOX (glade_xml_get_widget(xml, "resCombo2")), val); + gtk_combo_box_set_active(GTK_COMBO_BOX (gtk_builder_get_object(builder, "resCombo2")), val); val=0; if(pB) @@ -204,7 +198,7 @@ main (int argc, char *argv[]) val = set_limit (p, len, 0, 9); } - gtk_combo_box_set_active(GTK_COMBO_BOX (glade_xml_get_widget(xml, "stretchCombo2")), val); + gtk_combo_box_set_active(GTK_COMBO_BOX (gtk_builder_get_object(builder, "stretchCombo2")), val); val=0; if(pB) @@ -214,7 +208,7 @@ main (int argc, char *argv[]) val = set_limit (p, len, 0, 2); } - gtk_combo_box_set_active(GTK_COMBO_BOX (glade_xml_get_widget(xml, "ditherCombo2")), val); + gtk_combo_box_set_active(GTK_COMBO_BOX (gtk_builder_get_object(builder, "ditherCombo2")), val); val=0; if(pB) @@ -224,7 +218,7 @@ main (int argc, char *argv[]) val = set_limit (p, len, 0, 1); } - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "maintain43")), val); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "maintain43")), val); val=0; //ADB Leave - these are default values if(pB) @@ -234,7 +228,7 @@ main (int argc, char *argv[]) val = set_limit (p, len, 0, 1); } - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "checkFullscreen")), val); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "checkFullscreen")), val); val=0; if(pB) @@ -244,7 +238,7 @@ main (int argc, char *argv[]) val = set_limit (p, len, 0, 1); } - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "checkShowFPS")), val); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "checkShowFPS")), val); val=1; if(pB) @@ -253,7 +247,7 @@ main (int argc, char *argv[]) val = set_limit (p, len, 0, 1); } - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "checkSetFPS")), val); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "checkSetFPS")), val); val=0; if(pB) @@ -262,7 +256,7 @@ main (int argc, char *argv[]) val = set_limit (p, len, 1, 2); } - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "checkAutoFPSLimit")), (val-1)); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "checkAutoFPSLimit")), (val-1)); val=0; if(pB) @@ -271,7 +265,7 @@ main (int argc, char *argv[]) val = set_limit (p, len, 0, 1); } - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "checkFrameSkip")), val); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "checkFrameSkip")), val); valf=200; if(pB) @@ -282,7 +276,7 @@ main (int argc, char *argv[]) if(valf>500) valf=500; } sprintf(tempstr,"%.1f",valf); - gtk_entry_set_text(glade_xml_get_widget(xml, "entryFPS"),tempstr); + gtk_entry_set_text(gtk_builder_get_object(builder, "entryFPS"),tempstr); val=0; if(pB) @@ -291,7 +285,7 @@ main (int argc, char *argv[]) val = set_limit (p, len, 0, 1); } - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "checkUseFixes")), val); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "checkUseFixes")), val); if(pB) @@ -304,39 +298,39 @@ main (int argc, char *argv[]) for (i=0; i<11; i++) { sprintf(tempstr, "checkFix%d", i+1); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, tempstr)), (val>>i)&1 ); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,tempstr)), (val>>i)&1 ); } if(pB) free(pB); - widget = glade_xml_get_widget(xml, "CfgWnd"); + widget = gtk_builder_get_object(builder, "CfgWnd"); g_signal_connect_data(GTK_OBJECT(widget), "destroy", - G_CALLBACK(SaveConfig), xml, NULL, 0); + G_CALLBACK(SaveConfig), NULL, NULL, 0); - widget = glade_xml_get_widget(xml, "btn_close"); + widget = gtk_builder_get_object(builder, "btn_close"); g_signal_connect_data(GTK_OBJECT(widget), "clicked", - G_CALLBACK(OnConfigClose), xml, NULL, G_CONNECT_AFTER); + G_CALLBACK(OnConfigClose), NULL, NULL, G_CONNECT_AFTER); - widget = glade_xml_get_widget(xml, "checkFullscreen"); + widget = gtk_builder_get_object(builder, "checkFullscreen"); g_signal_connect_data(GTK_OBJECT(widget), "clicked", - G_CALLBACK(on_fullscreen_toggled), xml, NULL, G_CONNECT_AFTER); + G_CALLBACK(on_fullscreen_toggled), NULL, NULL, G_CONNECT_AFTER); - widget = glade_xml_get_widget(xml, "checkUseFixes"); + widget = gtk_builder_get_object(builder, "checkUseFixes"); g_signal_connect_data(GTK_OBJECT(widget), "clicked", - G_CALLBACK(on_use_fixes_toggled), xml, NULL, G_CONNECT_AFTER); + G_CALLBACK(on_use_fixes_toggled), NULL, NULL, G_CONNECT_AFTER); - widget = glade_xml_get_widget(xml, "checkSetFPS"); + widget = gtk_builder_get_object(builder, "checkSetFPS"); g_signal_connect_data(GTK_OBJECT(widget), "clicked", - G_CALLBACK(on_fps_toggled), xml, NULL, G_CONNECT_AFTER); + G_CALLBACK(on_fps_toggled), NULL, NULL, G_CONNECT_AFTER); - widget = glade_xml_get_widget(xml, "checkAutoFPSLimit"); + widget = gtk_builder_get_object(builder, "checkAutoFPSLimit"); g_signal_connect_data(GTK_OBJECT(widget), "clicked", - G_CALLBACK(on_fps_toggled), xml, NULL, G_CONNECT_AFTER); + G_CALLBACK(on_fps_toggled), NULL, NULL, G_CONNECT_AFTER); - on_fullscreen_toggled(widget, (gpointer) xml); - on_fps_toggled(widget, (gpointer) xml); - on_use_fixes_toggled(widget, (gpointer) xml); + on_fullscreen_toggled(widget, NULL); + on_fps_toggled(widget, NULL); + on_use_fixes_toggled(widget, NULL); gtk_main (); return 0; @@ -377,7 +371,6 @@ void SetCfgVal(char * pB,char * pE,int val) void SaveConfig(GtkWidget *widget, gpointer user_data) { FILE *in;int len,val;char * pB; - GladeXML *xml; char cfg[255]; char tempstr[50]; int i; @@ -395,9 +388,8 @@ void SaveConfig(GtkWidget *widget, gpointer user_data) 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, "resCombo2"))); + val = gtk_combo_box_get_active (GTK_COMBO_BOX (gtk_builder_get_object(builder,"resCombo2"))); if (val == VIDMODE_320x200) { SetCfgVal(pB,"\nResX",320); SetCfgVal(pB,"\nResY",240); } else if (val == VIDMODE_640x480) { SetCfgVal(pB,"\nResX",640); SetCfgVal(pB,"\nResY",480); } @@ -407,35 +399,35 @@ void SaveConfig(GtkWidget *widget, gpointer user_data) else if (val == VIDMODE_1280x1024) { SetCfgVal(pB,"\nResX",1280); SetCfgVal(pB,"\nResY",1024); } else if (val == VIDMODE_1600x1200) { SetCfgVal(pB,"\nResX",1600); SetCfgVal(pB,"\nResY",1200); } - val = gtk_combo_box_get_active (GTK_COMBO_BOX (glade_xml_get_widget (xml, "stretchCombo2"))); + val = gtk_combo_box_get_active (GTK_COMBO_BOX (gtk_builder_get_object(builder,"stretchCombo2"))); SetCfgVal(pB,"\nNoStretch",val); - val = gtk_combo_box_get_active (GTK_COMBO_BOX (glade_xml_get_widget (xml, "ditherCombo2"))); + val = gtk_combo_box_get_active (GTK_COMBO_BOX (gtk_builder_get_object(builder,"ditherCombo2"))); SetCfgVal(pB,"\nDithering",val); - val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "maintain43"))); + val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,"maintain43"))); SetCfgVal(pB,"\nMaintain43",val); - val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkFullscreen"))); + val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,"checkFullscreen"))); SetCfgVal(pB,"\nFullScreen",val); - val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkShowFPS"))); + val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,"checkShowFPS"))); SetCfgVal(pB,"\nShowFPS",val); - val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkSetFPS"))); + val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,"checkSetFPS"))); SetCfgVal(pB,"\nUseFrameLimit",val); - val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkAutoFPSLimit"))); + val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,"checkAutoFPSLimit"))); SetCfgVal(pB,"\nFPSDetection",val+1); - val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkFrameSkip"))); + val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,"checkFrameSkip"))); SetCfgVal(pB,"\nUseFrameSkip",val); //Framerate stored *10 - val = atof(gtk_entry_get_text(glade_xml_get_widget(xml, "entryFPS"))) * 10; + val = atof(gtk_entry_get_text(gtk_builder_get_object(builder, "entryFPS"))) * 10; SetCfgVal(pB,"\nFrameRate",val); - val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkUseFixes"))); + val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,"checkUseFixes"))); SetCfgVal(pB,"\nUseFixes",val); @@ -443,7 +435,7 @@ void SaveConfig(GtkWidget *widget, gpointer user_data) for (i=0; i<11; i++) { sprintf(tempstr, "checkFix%d", i+1); - if( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, tempstr))) ) + if( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,tempstr))) ) val |= 1 << i; } -- cgit v1.2.3