From 5883ee6487832da502dd004bf6a06085d50c30ed Mon Sep 17 00:00:00 2001 From: "SND\\edgbla_cp" Date: Tue, 20 Nov 2012 21:01:10 +0000 Subject: gtk3 (thanks to Rafał Mużyło); MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@81326 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- plugins/bladesio1/Makefile.am | 4 +- plugins/bladesio1/gui.c | 1 - plugins/bladesio1/sio1.ui | 234 ++++++++++++--------- plugins/dfcdrom/Makefile.am | 4 +- plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui | 84 ++------ plugins/dfcdrom/cdrcfg-0.1df/main.c | 11 +- plugins/dfinput/Makefile.am | 4 +- plugins/dfinput/cfg-gtk2.c | 32 ++- plugins/dfinput/dfinput.ui | 329 +++++++++++++----------------- plugins/dfnet/Makefile.am | 4 +- plugins/dfnet/dfnet.ui | 234 ++++++++++++--------- plugins/dfnet/gui.c | 5 +- plugins/dfsound/Makefile.am | 4 +- plugins/dfsound/spucfg-0.1df/dfsound.ui | 14 +- plugins/dfsound/spucfg-0.1df/main.c | 15 +- plugins/dfxvideo/Makefile.am | 4 +- plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui | 161 ++++++++++----- plugins/dfxvideo/gpucfg-0.1df/main.c | 21 +- plugins/peopsxgl/Makefile.am | 4 +- plugins/peopsxgl/gpucfg/main.c | 43 ++-- plugins/peopsxgl/gpucfg/peopsxgl.ui | 244 +++++++++++++++------- 21 files changed, 799 insertions(+), 657 deletions(-) (limited to 'plugins') diff --git a/plugins/bladesio1/Makefile.am b/plugins/bladesio1/Makefile.am index 0a51c332..b8ac8aa7 100644 --- a/plugins/bladesio1/Makefile.am +++ b/plugins/bladesio1/Makefile.am @@ -8,12 +8,12 @@ libBladeSio1_la_LDFLAGS = -module -avoid-version AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK2_CFLAGS) \ + $(GTK3_CFLAGS) \ -I../../libpcsxcore -I../../include bin_PROGRAMS = cfgBladeSio1 cfgBladeSio1_SOURCES = gui.c -cfgBladeSio1_LDADD = $(GTK2_LIBS) +cfgBladeSio1_LDADD = $(GTK3_LIBS) glade_DATA = sio1.ui gladedir = $(datadir)/psemu/ diff --git a/plugins/bladesio1/gui.c b/plugins/bladesio1/gui.c index 9bd1e852..d08d308f 100644 --- a/plugins/bladesio1/gui.c +++ b/plugins/bladesio1/gui.c @@ -73,7 +73,6 @@ int main( int argc, char *argv[] ) textdomain( GETTEXT_PACKAGE ); #endif - gtk_set_locale(); gtk_init( &argc, &argv ); if( argc > 1 ) diff --git a/plugins/bladesio1/sio1.ui b/plugins/bladesio1/sio1.ui index 957c449c..bdad3a1d 100644 --- a/plugins/bladesio1/sio1.ui +++ b/plugins/bladesio1/sio1.ui @@ -1,27 +1,127 @@ - + - - + + False 5 False True center normal - False - + True + False vertical 5 + + + True + False + end + + + True + True + True + + + True + False + + + True + False + gtk-network + + + False + False + 0 + + + + + True + False + 0 + Start Game + + + True + True + 1 + + + + + + + False + False + 0 + + + + + True + True + True + + + True + False + + + True + False + gtk-no + + + False + False + 0 + + + + + True + False + 0 + Play Offline + + + True + True + 1 + + + + + + + False + False + 1 + + + + + False + True + end + 0 + + True - vertical + False 12 True + False Select here if you'll be Server (Player1) or Client (Player2). If you select Server you must Copy your IP address to the Clipboard and paste if (Ctrl+V) wherever the Client can see it. @@ -30,12 +130,15 @@ If you selected Client please enter the IP address the Server gave to you in the True + True + True 0 True + False 2 2 8 @@ -48,9 +151,11 @@ If you selected Client please enter the IP address the Server gave to you in the True + False True + False gtk-copy @@ -62,9 +167,13 @@ If you selected Client please enter the IP address the Server gave to you in the True + False + 0 Copy PC IP to Clipboard + True + True 1 @@ -81,8 +190,8 @@ If you selected Client please enter the IP address the Server gave to you in the True True 15 - ● - + ● + 1 @@ -97,6 +206,7 @@ If you selected Client please enter the IP address the Server gave to you in the True True False + 0 True True @@ -107,6 +217,7 @@ If you selected Client please enter the IP address the Server gave to you in the True True False + 0 True True rbServer @@ -118,6 +229,8 @@ If you selected Client please enter the IP address the Server gave to you in the + True + True 2 1 @@ -125,27 +238,35 @@ If you selected Client please enter the IP address the Server gave to you in the True - vertical + False 6 True + False Do not change if not necessary (remember it must be changed on both sides). True + True + True 0 True + False True + False + 0 Port Number + True + True 0 @@ -154,110 +275,33 @@ If you selected Client please enter the IP address the Server gave to you in the True True 5 - ● + ● + True + True 1 + True + True 1 + True + True 2 - - 1 - - - - - True - end - - - True - True - True - - - True - - - True - gtk-network - - - False - False - 0 - - - - - True - Start Game - - - 1 - - - - - - - False - False - 0 - - - - - True - True - True - - - True - - - True - gtk-no - - - False - False - 0 - - - - - True - Play Offline - - - 1 - - - - - - - False - False - 1 - - - False - end - 0 + True + 1 diff --git a/plugins/dfcdrom/Makefile.am b/plugins/dfcdrom/Makefile.am index b001ab0f..b4c729f9 100644 --- a/plugins/dfcdrom/Makefile.am +++ b/plugins/dfcdrom/Makefile.am @@ -23,12 +23,12 @@ endif AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK2_CFLAGS) \ + $(GTK3_CFLAGS) \ -I../../libpcsxcore -I../../include bin_PROGRAMS = cfgDFCdrom cfgDFCdrom_SOURCES = cdrcfg-0.1df/main.c -cfgDFCdrom_LDADD = $(GTK2_LIBS) +cfgDFCdrom_LDADD = $(GTK3_LIBS) glade_DATA = cdrcfg-0.1df/dfcdrom.ui gladedir = $(datadir)/psemu/ diff --git a/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui b/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui index 50f6fef9..8a1d4bc1 100644 --- a/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui +++ b/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui @@ -1,29 +1,29 @@ - - + True False 5 CDR configuration + False True center normal - + True False + vertical - + True False end gtk-close - False True True True @@ -60,17 +60,14 @@ False 5 - + True False Choose your CD-ROM device or type its path if it's not listed + True - + False - False - False - True - True @@ -84,7 +81,7 @@ - True + False True 0 @@ -103,10 +100,12 @@ True False 5 + 5 True False + 0 Select read mode: @@ -140,17 +139,6 @@ 0 - - - True - False - - - False - True - 1 - - True @@ -161,6 +149,7 @@ True False + 0 Cache Size (Def. 64): @@ -175,8 +164,6 @@ True False False - True - True 1 True @@ -191,18 +178,7 @@ True True - 2 - - - - - True - False - - - False - True - 3 + 1 @@ -215,6 +191,7 @@ True False + 0 Spindown Time: @@ -243,21 +220,10 @@ - - True - True - 4 - - - - - True - False - False True - 5 + 2 @@ -270,6 +236,7 @@ True False + 0 Cdrom Speed (Def. 0 = MAX): @@ -284,8 +251,6 @@ True False False - True - True 1 True @@ -300,35 +265,24 @@ True True - 6 - - - - - True - False - - - False - True - 7 + 3 Enable subchannel read - False True True False 5 True + 0 True False False - 8 + 4 diff --git a/plugins/dfcdrom/cdrcfg-0.1df/main.c b/plugins/dfcdrom/cdrcfg-0.1df/main.c index a35466d2..c07bf1f8 100755 --- a/plugins/dfcdrom/cdrcfg-0.1df/main.c +++ b/plugins/dfcdrom/cdrcfg-0.1df/main.c @@ -170,7 +170,7 @@ void fill_drives_list(GtkWidget *widget) { } gtk_combo_box_set_model(GTK_COMBO_BOX(widget), GTK_TREE_MODEL(store)); - gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(widget), 0); + gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(widget), 0); } static void OnConfigExit(GtkWidget *widget, gpointer user_data) { @@ -196,7 +196,7 @@ static void OnConfigExit(GtkWidget *widget, gpointer user_data) { SaveConf(); gtk_widget_destroy(widget); - gtk_exit(0); + exit(0); } long CDRconfigure() { @@ -206,11 +206,11 @@ long CDRconfigure() { gtk_window_set_title(GTK_WINDOW(MainWindow), _("CDR configuration")); widget = gtk_builder_get_object(builder, "CfgWnd"); - g_signal_connect_data(GTK_OBJECT(widget), "delete_event", + g_signal_connect_data(G_OBJECT(widget), "delete_event", G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "cfg_closebutton"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "cddev_comboboxentry"); @@ -245,7 +245,7 @@ void CDRabout() { "Wei Mingzhi ", NULL}; widget = gtk_about_dialog_new(); - gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(widget), "CD-ROM Device Reader"); + gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(widget), "CD-ROM Device Reader"); gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), "1.0"); gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(widget), authors); gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), "http://pcsxr.codeplex.com/"); @@ -262,7 +262,6 @@ int main(int argc, char *argv[]) { textdomain(GETTEXT_PACKAGE); #endif - gtk_set_locale(); gtk_init(&argc, &argv); if (argc != 2) return 0; diff --git a/plugins/dfinput/Makefile.am b/plugins/dfinput/Makefile.am index f4926905..55016cb0 100644 --- a/plugins/dfinput/Makefile.am +++ b/plugins/dfinput/Makefile.am @@ -9,12 +9,12 @@ libDFInput_la_LIBADD = -lpthread -lX11 $(SDL_LIBS) AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK2_CFLAGS) \ + $(GTK3_CFLAGS) \ -I../../include -I../../libpcsxcore $(SDL_CFLAGS) bin_PROGRAMS = cfgDFInput cfgDFInput_SOURCES = cfg-gtk2.c pad.h -cfgDFInput_LDADD = $(GTK2_LIBS) $(SDL_LIBS) -lX11 +cfgDFInput_LDADD = $(GTK3_LIBS) $(SDL_LIBS) -lX11 glade_DATA = dfinput.ui gladedir = $(datadir)/psemu/ diff --git a/plugins/dfinput/cfg-gtk2.c b/plugins/dfinput/cfg-gtk2.c index 18f746d3..941d7848 100755 --- a/plugins/dfinput/cfg-gtk2.c +++ b/plugins/dfinput/cfg-gtk2.c @@ -261,7 +261,7 @@ static void OnConfigExit(GtkWidget *widget, gpointer user_data) { SDL_Quit(); XCloseDisplay(g.Disp); - gtk_exit(0); + exit(0); } static void TreeSelectionChanged(GtkTreeSelection *selection, gpointer user_data) { @@ -663,11 +663,11 @@ long PADconfigure() { G_CALLBACK(TreeSelectionChanged), (gpointer)1, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(xml, "CfgWnd"); - g_signal_connect_data(GTK_OBJECT(widget), "delete_event", + g_signal_connect_data(G_OBJECT(widget), "delete_event", G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(xml, "btnclose"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER); PopulateDevList(); @@ -675,7 +675,7 @@ long PADconfigure() { widget = gtk_builder_get_object(xml, "checkmt"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), g.cfg.Threaded); - g_signal_connect_data(GTK_OBJECT(widget), "toggled", + g_signal_connect_data(G_OBJECT(widget), "toggled", G_CALLBACK(OnThreadedToggled), NULL, NULL, G_CONNECT_AFTER); /* @@ -685,11 +685,11 @@ long PADconfigure() { G_CALLBACK(OnHideCursorToggled), NULL, NULL, G_CONNECT_AFTER); */ widget = gtk_builder_get_object(xml, "combodev1"); - g_signal_connect_data(GTK_OBJECT(widget), "changed", + g_signal_connect_data(G_OBJECT(widget), "changed", G_CALLBACK(OnDeviceChanged), (gpointer)0, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(xml, "combodev2"); - g_signal_connect_data(GTK_OBJECT(widget), "changed", + g_signal_connect_data(G_OBJECT(widget), "changed", G_CALLBACK(OnDeviceChanged), (gpointer)1, NULL, G_CONNECT_AFTER); int padTypeList[] = { @@ -706,43 +706,43 @@ long PADconfigure() { widget = gtk_builder_get_object(xml, "combotype1"); gtk_combo_box_set_active(GTK_COMBO_BOX(widget), padTypeList[g.cfg.PadDef[0].Type]); - g_signal_connect_data(GTK_OBJECT(widget), "changed", + g_signal_connect_data(G_OBJECT(widget), "changed", G_CALLBACK(OnTypeChanged), (gpointer)0, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(xml, "combotype2"); gtk_combo_box_set_active(GTK_COMBO_BOX(widget), padTypeList[g.cfg.PadDef[1].Type]); - g_signal_connect_data(GTK_OBJECT(widget), "changed", + g_signal_connect_data(G_OBJECT(widget), "changed", G_CALLBACK(OnTypeChanged), (gpointer)1, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(xml, "checkvv1"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), g.cfg.PadDef[0].VisualVibration); - g_signal_connect_data(GTK_OBJECT(widget), "toggled", + g_signal_connect_data(G_OBJECT(widget), "toggled", G_CALLBACK(OnVisualVibration1Toggled), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(xml, "checkvv2"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), g.cfg.PadDef[1].VisualVibration); - g_signal_connect_data(GTK_OBJECT(widget), "toggled", + g_signal_connect_data(G_OBJECT(widget), "toggled", G_CALLBACK(OnVisualVibration2Toggled), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(xml, "btnchange1"); gtk_widget_set_sensitive(widget, FALSE); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnChangeClicked), (gpointer)0, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(xml, "btnreset1"); gtk_widget_set_sensitive(widget, FALSE); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnResetClicked), (gpointer)0, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(xml, "btnchange2"); gtk_widget_set_sensitive(widget, FALSE); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnChangeClicked), (gpointer)1, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(xml, "btnreset2"); gtk_widget_set_sensitive(widget, FALSE); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnResetClicked), (gpointer)1, NULL, G_CONNECT_AFTER); gtk_widget_show(MainWindow); @@ -756,7 +756,7 @@ void PADabout() { GtkWidget *widget; widget = gtk_about_dialog_new(); - gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(widget), "Gamepad/Keyboard Input"); + gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(widget), "Gamepad/Keyboard Input"); gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), "1.1"); gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(widget), authors); gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), "http://www.codeplex.com/pcsxr/"); @@ -773,7 +773,6 @@ int main(int argc, char *argv[]) { textdomain(GETTEXT_PACKAGE); #endif - gtk_set_locale(); gtk_init(&argc, &argv); if (argc > 1 && !strcmp(argv[1], "-about")) { @@ -782,6 +781,5 @@ int main(int argc, char *argv[]) { PADconfigure(); } - gtk_exit(0); return 0; } diff --git a/plugins/dfinput/dfinput.ui b/plugins/dfinput/dfinput.ui index 8151622a..7adb6277 100644 --- a/plugins/dfinput/dfinput.ui +++ b/plugins/dfinput/dfinput.ui @@ -1,41 +1,6 @@ - - - - - - - - - - Digital Pad - - - Analog Pad - - - Mouse - - - - - - - - - - - Digital Pad - - - Analog Pad - - - Mouse - - - + False @@ -52,104 +17,87 @@ True False + 5 2 - + True False + 5 + 5 - + True False - 10 - - - True - False - Device: - - - False - False - 0 - - - - - 150 - True - False - - - True - True - 1 - - + 0 + Device: - False - False - 0 + 0 + 0 + 1 + 1 - + True False - 10 - - - True - False - Type: - - - False - False - 0 - - + + + 1 + 0 + 1 + 1 + + + + + True + False + 0 + Type: + + + 0 + 1 + 1 + 1 + + + + + True + False + liststore2 - - 200 - True - False - liststore2 - - - - 0 - - - - - False - False - 1 - + + + 0 + - False - False - 1 + 1 + 1 + 1 + 1 False - False + True 0 Visual vibration - False True True False + 0 True @@ -160,19 +108,20 @@ + 500 + 275 True True 5 - automatic - automatic True etched-in - 500 - 275 True True + + + @@ -190,7 +139,6 @@ center - False True True True @@ -234,7 +182,6 @@ - False True True True @@ -278,7 +225,7 @@ - True + False True 3 @@ -299,104 +246,87 @@ True False + 5 2 - + True False + 5 + 5 - + True False - 10 - - - True - False - Device: - - - False - False - 0 - - - - - 150 - True - False - - - True - True - 1 - - + 0 + Device: - False - False - 0 + 0 + 0 + 1 + 1 - + True False - 10 - - - True - False - Type: - - - False - False - 0 - - + + + 1 + 0 + 1 + 1 + + + + + True + False + 0 + Type: + + + 0 + 1 + 1 + 1 + + + + + True + False + liststore1 - - 200 - True - False - liststore1 - - - - 0 - - - - - False - False - 1 - + + + 0 + - False - False - 1 + 1 + 1 + 1 + 1 False - False + True 0 Visual vibration - False True True False + 0 True @@ -407,19 +337,20 @@ + 500 + 275 True True 5 - automatic - automatic True etched-in - 500 - 275 True True + + + @@ -437,7 +368,6 @@ center - False True True True @@ -481,7 +411,6 @@ - False True True True @@ -555,10 +484,10 @@ Multi-Threaded (Recommended) - False True True False + 0 True @@ -593,7 +522,6 @@ gtk-close - False True True True @@ -609,9 +537,44 @@ 1 2 + GTK_FILL + + + + + + + + Digital Pad + + + Analog Pad + + + Mouse + + + + + + + + + + + Digital Pad + + + Analog Pad + + + Mouse + + + diff --git a/plugins/dfnet/Makefile.am b/plugins/dfnet/Makefile.am index 835e82a3..004df634 100755 --- a/plugins/dfnet/Makefile.am +++ b/plugins/dfnet/Makefile.am @@ -8,12 +8,12 @@ libDFNet_la_LDFLAGS = -module -avoid-version AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK2_CFLAGS) \ + $(GTK3_CFLAGS) \ -I../../libpcsxcore -I../../include bin_PROGRAMS = cfgDFNet cfgDFNet_SOURCES = gui.c -cfgDFNet_LDADD = $(GTK2_LIBS) +cfgDFNet_LDADD = $(GTK3_LIBS) glade_DATA = dfnet.ui gladedir = $(datadir)/psemu/ diff --git a/plugins/dfnet/dfnet.ui b/plugins/dfnet/dfnet.ui index 957c449c..bdad3a1d 100755 --- a/plugins/dfnet/dfnet.ui +++ b/plugins/dfnet/dfnet.ui @@ -1,27 +1,127 @@ - + - - + + False 5 False True center normal - False - + True + False vertical 5 + + + True + False + end + + + True + True + True + + + True + False + + + True + False + gtk-network + + + False + False + 0 + + + + + True + False + 0 + Start Game + + + True + True + 1 + + + + + + + False + False + 0 + + + + + True + True + True + + + True + False + + + True + False + gtk-no + + + False + False + 0 + + + + + True + False + 0 + Play Offline + + + True + True + 1 + + + + + + + False + False + 1 + + + + + False + True + end + 0 + + True - vertical + False 12 True + False Select here if you'll be Server (Player1) or Client (Player2). If you select Server you must Copy your IP address to the Clipboard and paste if (Ctrl+V) wherever the Client can see it. @@ -30,12 +130,15 @@ If you selected Client please enter the IP address the Server gave to you in the True + True + True 0 True + False 2 2 8 @@ -48,9 +151,11 @@ If you selected Client please enter the IP address the Server gave to you in the True + False True + False gtk-copy @@ -62,9 +167,13 @@ If you selected Client please enter the IP address the Server gave to you in the True + False + 0 Copy PC IP to Clipboard + True + True 1 @@ -81,8 +190,8 @@ If you selected Client please enter the IP address the Server gave to you in the True True 15 - ● - + ● + 1 @@ -97,6 +206,7 @@ If you selected Client please enter the IP address the Server gave to you in the True True False + 0 True True @@ -107,6 +217,7 @@ If you selected Client please enter the IP address the Server gave to you in the True True False + 0 True True rbServer @@ -118,6 +229,8 @@ If you selected Client please enter the IP address the Server gave to you in the + True + True 2 1 @@ -125,27 +238,35 @@ If you selected Client please enter the IP address the Server gave to you in the True - vertical + False 6 True + False Do not change if not necessary (remember it must be changed on both sides). True + True + True 0 True + False True + False + 0 Port Number + True + True 0 @@ -154,110 +275,33 @@ If you selected Client please enter the IP address the Server gave to you in the True True 5 - ● + ● + True + True 1 + True + True 1 + True + True 2 - - 1 - - - - - True - end - - - True - True - True - - - True - - - True - gtk-network - - - False - False - 0 - - - - - True - Start Game - - - 1 - - - - - - - False - False - 0 - - - - - True - True - True - - - True - - - True - gtk-no - - - False - False - 0 - - - - - True - Play Offline - - - 1 - - - - - - - False - False - 1 - - - False - end - 0 + True + 1 diff --git a/plugins/dfnet/gui.c b/plugins/dfnet/gui.c index b1438995..7dbb5642 100755 --- a/plugins/dfnet/gui.c +++ b/plugins/dfnet/gui.c @@ -112,7 +112,7 @@ long CFGopen() { gtk_window_set_title(GTK_WINDOW(MainWindow), _("NetPlay")); widget = gtk_builder_get_object(builder, "btnCopyIP"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnCopyIP), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "tbServerIP"); @@ -182,7 +182,7 @@ void CFGabout() { GtkWidget *widget; widget = gtk_about_dialog_new(); - gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(widget), "Socket NetPlay Driver"); + gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(widget), "Socket NetPlay Driver"); gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), "0.21"); gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(widget), authors); gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), "http://www.codeplex.com/pcsxr/"); @@ -212,7 +212,6 @@ int main(int argc, char *argv[]) { textdomain(GETTEXT_PACKAGE); #endif - gtk_set_locale(); gtk_init(&argc, &argv); if (!strcmp(argv[1], "configure")) { diff --git a/plugins/dfsound/Makefile.am b/plugins/dfsound/Makefile.am index 7f50844e..2cbd3552 100755 --- a/plugins/dfsound/Makefile.am +++ b/plugins/dfsound/Makefile.am @@ -48,9 +48,9 @@ endif bin_PROGRAMS = cfgDFSound cfgDFSound_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK2_CFLAGS) $(AM_CPPFLAGS) + $(GTK3_CFLAGS) $(AM_CPPFLAGS) cfgDFSound_SOURCES = spucfg-0.1df/main.c -cfgDFSound_LDADD = $(GTK2_LIBS) +cfgDFSound_LDADD = $(GTK3_LIBS) glade_DATA = spucfg-0.1df/dfsound.ui gladedir = $(datadir)/psemu/ diff --git a/plugins/dfsound/spucfg-0.1df/dfsound.ui b/plugins/dfsound/spucfg-0.1df/dfsound.ui index 7c27b275..9714f0a7 100755 --- a/plugins/dfsound/spucfg-0.1df/dfsound.ui +++ b/plugins/dfsound/spucfg-0.1df/dfsound.ui @@ -1,7 +1,6 @@ - - + True False @@ -167,12 +166,12 @@ Adjust XA speed - False True True False Choose this if XA music is played too quickly. True + 0 True @@ -210,12 +209,12 @@ High compatibility mode - False True True False Use the asynchronous SPU interface. True + 0 True @@ -227,12 +226,12 @@ SPU IRQ Wait - False True True False Wait for CPU; only useful for some games. True + 0 True @@ -244,12 +243,12 @@ Single channel sound - False True True False Play only one channel for a performance boost. True + 0 True @@ -261,10 +260,10 @@ Frequency Response - Output Filter - False True True False + 0 True @@ -293,7 +292,6 @@ gtk-close - False True True True diff --git a/plugins/dfsound/spucfg-0.1df/main.c b/plugins/dfsound/spucfg-0.1df/main.c index 1a677a25..c18fc724 100755 --- a/plugins/dfsound/spucfg-0.1df/main.c +++ b/plugins/dfsound/spucfg-0.1df/main.c @@ -48,7 +48,7 @@ void on_about_clicked (GtkWidget *widget, gpointer user_data) void OnConfigClose(GtkWidget *widget, gpointer user_data) { gtk_widget_destroy(gtk_builder_get_object(builder, "CfgWnd")); - gtk_exit(0); + exit(0); } int main(int argc, char *argv[]) @@ -76,18 +76,17 @@ int main(int argc, char *argv[]) return 0; } - gtk_set_locale(); gtk_init(&argc, &argv); if (strcmp(argv[1], "ABOUT") == 0) { const char *authors[]= {"Pete Bernert and the P.E.Op.S. team", "Ryan Schultz", "Andrew Burton", NULL}; widget = gtk_about_dialog_new (); - gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (widget), "dfsound PCSXR Sound Plugin"); + gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG (widget), "dfsound PCSXR 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://pcsx-df.sourceforge.net/"); - g_signal_connect_data(GTK_OBJECT(widget), "response", + g_signal_connect_data(G_OBJECT(widget), "response", G_CALLBACK(on_about_clicked), NULL, NULL, G_CONNECT_AFTER); gtk_widget_show (widget); @@ -223,11 +222,11 @@ int main(int argc, char *argv[]) free(pB); widget = gtk_builder_get_object(builder, "CfgWnd"); - g_signal_connect_data(GTK_OBJECT(widget), "destroy", + g_signal_connect_data(G_OBJECT(widget), "destroy", G_CALLBACK(SaveConfig), builder, NULL, 0); widget = gtk_builder_get_object(builder, "btn_close"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnConfigClose), builder, NULL, G_CONNECT_AFTER); gtk_main(); @@ -242,7 +241,7 @@ void SaveConfig(GtkWidget *widget, gpointer user_data) fp = fopen(CONFIG_FILENAME, WRITEBINARY); if (fp == NULL) { fprintf(stderr, "Unable to write to configuration file %s!\n", CONFIG_FILENAME); - gtk_exit(0); + exit(0); } val = gtk_combo_box_get_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "cbVolume2"))); @@ -270,5 +269,5 @@ void SaveConfig(GtkWidget *widget, gpointer user_data) fprintf(fp, "\nUseReverb = %d\n", val); fclose(fp); - gtk_exit(0); + exit(0); } diff --git a/plugins/dfxvideo/Makefile.am b/plugins/dfxvideo/Makefile.am index bc487db4..2af76fde 100755 --- 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)\ + $(GTK3_CFLAGS)\ -I../../libpcsxcore \ -I../../include @@ -27,7 +27,7 @@ libDFXVideo_la_LIBADD = -lX11 -lXv -lXext -lm bin_PROGRAMS = cfgDFXVideo cfgDFXVideo_SOURCES = gpucfg-0.1df/main.c -cfgDFXVideo_LDADD = $(GTK2_LIBS) -lXext +cfgDFXVideo_LDADD = $(GTK3_LIBS) -lXext glade_DATA = gpucfg-0.1df/dfxvideo.ui gladedir = $(datadir)/psemu/ diff --git a/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui b/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui index b60c02d3..2530f076 100755 --- a/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui +++ b/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui @@ -1,39 +1,42 @@ - + - - + True - 10 + False + 5 Configure X11 Video False True center dialog - + True - vertical + False 6 True + False 0 True - 6 - 6 - 12 - 12 + False + 5 + 5 + 5 + 5 True - vertical + False True + False 3 2 30 @@ -41,6 +44,7 @@ True + False 0 Initial Window Size: @@ -52,6 +56,7 @@ True + False 0 Stretching: @@ -65,6 +70,7 @@ True + False 0 Dithering: @@ -78,6 +84,7 @@ True + False liststoreStretching 0 @@ -99,6 +106,7 @@ True + False liststoreDither 1 @@ -120,10 +128,12 @@ True + False 10 True + False liststoreRes 2 @@ -134,6 +144,8 @@ + True + True 0 @@ -146,6 +158,7 @@ True Toggle windowed/fullscreen mode. True + 0 True @@ -162,12 +175,15 @@ + True + True 0 True + False Maintain 4:3 Aspect Ratio @@ -175,6 +191,7 @@ True False True + 0 True @@ -185,6 +202,8 @@ + True + True 1 @@ -194,24 +213,28 @@ + True + True 0 True + False 0 True - 6 - 6 - 12 - 12 + False + 5 + 5 + 5 + 5 True - vertical + False Show FPS @@ -220,6 +243,7 @@ False Toggle whether the FPS will be shown. True + 0 True @@ -236,6 +260,7 @@ False Skip frames when rendering. True + 0 True @@ -247,6 +272,7 @@ True + False 3 12 @@ -257,6 +283,7 @@ False Enable this if games display too quickly. True + 0.5 True @@ -286,6 +313,7 @@ False True True + 0 True True @@ -307,24 +335,28 @@ + True + True 1 True + False 0 True - 6 - 6 - 12 - 12 + False + 5 + 5 + 5 + 5 True - vertical + False Use game fixes @@ -332,6 +364,7 @@ True False True + 0 True @@ -343,13 +376,18 @@ True + False 19 True + False 6 2 16 + + + Disable CPU Saving @@ -358,6 +396,7 @@ False For precise framerate True + 0 True @@ -375,6 +414,7 @@ False Chrono Cross True + 0 True @@ -390,6 +430,7 @@ False Better FPS limit in some True + 0 True @@ -407,6 +448,7 @@ False Capcom fighting games True + 0 True @@ -424,6 +466,7 @@ False Black screens in Lunar True + 0 True @@ -441,6 +484,7 @@ False Compatibility mode True + 0 True @@ -459,6 +503,7 @@ True Pandemonium 2 True + 0 True @@ -477,6 +522,7 @@ True Skip every second frame True + 0 True @@ -497,6 +543,7 @@ True Needed by Dark Forces True + 0 True @@ -517,6 +564,7 @@ True better g-colors, worse textures True + 0 True @@ -537,6 +585,7 @@ True Toggle busy flags after drawing True + 0 True @@ -548,13 +597,12 @@ - - - + True + True 1 @@ -564,12 +612,15 @@ + True + True 2 True + False 12 end @@ -589,87 +640,89 @@ + True + True 3 - + - 0: None - - - 1: 2xSai + 0: Off (fastest) - 2: 2xSuperSai + 1: Game dependant - 3: SuperEagle + 2: Always + + + + + + + + - 4: Scale2x + 320x240 - 5: Scale3x + 640x480 - 6: HQ2X + 800x600 - 7: HQ3X + 1024x768 - - - - - - - - - 0: Off (fastest) + 1152x864 - 1: Game dependant + 1280x1024 - 2: Always + 1600x1200 - + - 320x240 + 0: None - 640x480 + 1: 2xSai - 800x600 + 2: 2xSuperSai - 1024x768 + 3: SuperEagle - 1152x864 + 4: Scale2x - 1280x1024 + 5: Scale3x - 1600x1200 + 6: HQ2X + + + 7: HQ3X diff --git a/plugins/dfxvideo/gpucfg-0.1df/main.c b/plugins/dfxvideo/gpucfg-0.1df/main.c index b7639c6a..1eb550af 100755 --- a/plugins/dfxvideo/gpucfg-0.1df/main.c +++ b/plugins/dfxvideo/gpucfg-0.1df/main.c @@ -96,7 +96,7 @@ void on_fps_toggled(GtkWidget *widget, gpointer user_data) void OnConfigClose(GtkWidget *widget, gpointer user_data) { gtk_widget_destroy(gtk_builder_get_object(builder, "CfgWnd")); - gtk_exit(0); + exit(0); } int @@ -126,19 +126,18 @@ main (int argc, char *argv[]) return 0; } - gtk_set_locale (); gtk_init (&argc, &argv); if (strcmp(argv[1], "ABOUT") == 0) { const char *authors[]= {"Pete Bernert and the P.E.Op.S. team", "Ryan Schultz", "Andrew Burton", NULL}; widget = gtk_about_dialog_new (); - gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (widget), "P.E.Op.S PCSXR Video Plugin"); + gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG (widget), "P.E.Op.S PCSXR 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://pcsx-df.sourceforge.net/"); - g_signal_connect_data(GTK_OBJECT(widget), "response", + g_signal_connect_data(G_OBJECT(widget), "response", G_CALLBACK(on_about_clicked), NULL, NULL, G_CONNECT_AFTER); gtk_widget_show (widget); @@ -301,27 +300,27 @@ main (int argc, char *argv[]) if(pB) free(pB); widget = gtk_builder_get_object(builder, "CfgWnd"); - g_signal_connect_data(GTK_OBJECT(widget), "destroy", + g_signal_connect_data(G_OBJECT(widget), "destroy", G_CALLBACK(SaveConfig), NULL, NULL, 0); widget = gtk_builder_get_object(builder, "btn_close"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(OnConfigClose), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "checkFullscreen"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(on_fullscreen_toggled), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "checkUseFixes"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(on_use_fixes_toggled), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "checkSetFPS"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(on_fps_toggled), NULL, NULL, G_CONNECT_AFTER); widget = gtk_builder_get_object(builder, "checkAutoFPSLimit"); - g_signal_connect_data(GTK_OBJECT(widget), "clicked", + g_signal_connect_data(G_OBJECT(widget), "clicked", G_CALLBACK(on_fps_toggled), NULL, NULL, G_CONNECT_AFTER); on_fullscreen_toggled(widget, NULL); @@ -448,5 +447,5 @@ void SaveConfig(GtkWidget *widget, gpointer user_data) free(pB); // Close the window and exit control from the plugin - gtk_exit (0); + exit (0); } diff --git a/plugins/peopsxgl/Makefile.am b/plugins/peopsxgl/Makefile.am index 2017472a..99c9554c 100755 --- a/plugins/peopsxgl/Makefile.am +++ b/plugins/peopsxgl/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \ -DLOCALE_DIR=\"${datadir}/locale/\" \ -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK2_CFLAGS) \ + $(GTK3_CFLAGS) \ -I../../libpcsxcore -I../../include bindir = @libdir@/games/psemu/ @@ -16,7 +16,7 @@ libpeopsxgl_la_LIBADD = -lX11 -lXxf86vm -lGL -lm bin_PROGRAMS = cfgpeopsxgl cfgpeopsxgl_SOURCES = gpucfg/main.c -cfgpeopsxgl_LDADD = $(GTK2_LIBS) +cfgpeopsxgl_LDADD = $(GTK3_LIBS) glade_DATA = gpucfg/peopsxgl.ui gladedir = $(datadir)/psemu/ diff --git a/plugins/peopsxgl/gpucfg/main.c b/plugins/peopsxgl/gpucfg/main.c index 48495b74..1a812d81 100755 --- a/plugins/peopsxgl/gpucfg/main.c +++ b/plugins/peopsxgl/gpucfg/main.c @@ -68,7 +68,7 @@ GtkWidget *window, *btnBeautiful; // Save values to the config file -void on_btnSave_clicked( GtkObject *object, gpointer user_data ) { +void on_btnSave_clicked( GObject *object, gpointer user_data ) { FILE *out; out = fopen( "gpuPeopsMesaGL.cfg", "w+" ); @@ -136,7 +136,7 @@ void on_btnSave_clicked( GtkObject *object, gpointer user_data ) { // Autoconfiguration callbacks -void on_btnFast_clicked( GtkObject *object, gpointer user_data ) { +void on_btnFast_clicked( GObject *object, gpointer user_data ) { gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinXSize ), 640 ); gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinYSize ), 480 ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkKeepRatio ), 0 ); @@ -168,7 +168,7 @@ void on_btnFast_clicked( GtkObject *object, gpointer user_data ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkGteAccuracy ), 0 ); } -void on_btnBeautiful_clicked( GtkObject *object, gpointer user_data ) { +void on_btnBeautiful_clicked( GObject *object, gpointer user_data ) { gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinXSize ), 640 ); gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinYSize ), 480 ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkKeepRatio ), 0 ); @@ -202,19 +202,19 @@ void on_btnBeautiful_clicked( GtkObject *object, gpointer user_data ) { // Callbacks used to toggle the sensitivity of some parts of the GUI -void on_chkUseGameFixes_toggled( GtkObject *object, gpointer user_data ) { +void on_chkUseGameFixes_toggled( GObject *object, gpointer user_data ) { gtk_widget_set_sensitive( tblGameFixes, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkUseGameFixes ) ) ); } -void on_chkUseFPSLimit_toggled( GtkObject *object, gpointer user_data ) { +void on_chkUseFPSLimit_toggled( GObject *object, gpointer user_data ) { gtk_widget_set_sensitive( vboxFPSLimit, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkUseFPSLimit ) ) ); } -void on_radFPSLimitManual_toggled( GtkObject *object, gpointer user_data ) { +void on_radFPSLimitManual_toggled( GObject *object, gpointer user_data ) { gtk_widget_set_sensitive( spinFPSLimit, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( radFPSLimitManual ) ) ); } -void on_chkScanLines_toggled( GtkObject *object, gpointer user_data ) { +void on_chkScanLines_toggled( GObject *object, gpointer user_data ) { gtk_widget_set_sensitive( spinScanLinesBlend, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkScanLines ) ) ); } @@ -237,7 +237,6 @@ int main( int argc, char **argv ) { textdomain (GETTEXT_PACKAGE); #endif - gtk_set_locale(); gtk_init( &argc, &argv ); builder = gtk_builder_new(); @@ -255,7 +254,7 @@ int main( int argc, char **argv ) { const char *authors[]= {"Adapted from P.E.Op.S OpenGL GPU by Pete Bernert", NULL}; widget = gtk_about_dialog_new(); - gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(widget), "OpenGL GPU Driver"); + gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(widget), "OpenGL GPU Driver"); gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), "1.18"); gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(widget), authors); gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), "http://pcsxr.codeplex.com/"); @@ -728,21 +727,21 @@ int main( int argc, char **argv ) { g_object_unref( G_OBJECT( builder ) ); // Connect callbacks to signals - gtk_signal_connect( GTK_OBJECT( window ), "destroy", G_CALLBACK( gtk_main_quit ), NULL ); - gtk_signal_connect( GTK_OBJECT( btnCancel ), "clicked", G_CALLBACK( gtk_main_quit ), NULL ); - gtk_signal_connect( GTK_OBJECT( btnSave ), "clicked", G_CALLBACK( on_btnSave_clicked ), NULL ); - gtk_signal_connect( GTK_OBJECT( chkUseGameFixes ), "toggled", G_CALLBACK( on_chkUseGameFixes_toggled ), NULL ); - gtk_signal_connect( GTK_OBJECT( chkUseFPSLimit ), "toggled", G_CALLBACK( on_chkUseFPSLimit_toggled ), NULL ); - gtk_signal_connect( GTK_OBJECT( radFPSLimitManual ), "toggled", G_CALLBACK( on_radFPSLimitManual_toggled ), NULL ); - gtk_signal_connect( GTK_OBJECT( chkScanLines ), "toggled", G_CALLBACK( on_chkScanLines_toggled ), NULL ); - gtk_signal_connect( GTK_OBJECT( btnFast ), "clicked", G_CALLBACK( on_btnFast_clicked ), NULL ); - gtk_signal_connect( GTK_OBJECT( btnBeautiful ), "clicked", G_CALLBACK( on_btnBeautiful_clicked ), NULL ); + g_signal_connect(G_OBJECT( window ), "destroy", G_CALLBACK( gtk_main_quit ), NULL ); + g_signal_connect(G_OBJECT( btnCancel ), "clicked", G_CALLBACK( gtk_main_quit ), NULL ); + g_signal_connect(G_OBJECT( btnSave ), "clicked", G_CALLBACK( on_btnSave_clicked ), NULL ); + g_signal_connect(G_OBJECT( chkUseGameFixes ), "toggled", G_CALLBACK( on_chkUseGameFixes_toggled ), NULL ); + g_signal_connect(G_OBJECT( chkUseFPSLimit ), "toggled", G_CALLBACK( on_chkUseFPSLimit_toggled ), NULL ); + g_signal_connect(G_OBJECT( radFPSLimitManual ), "toggled", G_CALLBACK( on_radFPSLimitManual_toggled ), NULL ); + g_signal_connect(G_OBJECT( chkScanLines ), "toggled", G_CALLBACK( on_chkScanLines_toggled ), NULL ); + g_signal_connect(G_OBJECT( btnFast ), "clicked", G_CALLBACK( on_btnFast_clicked ), NULL ); + g_signal_connect(G_OBJECT( btnBeautiful ), "clicked", G_CALLBACK( on_btnBeautiful_clicked ), NULL ); // Call some callbacks to ensure widget state consistency - on_chkUseGameFixes_toggled( GTK_OBJECT( chkUseGameFixes ), NULL ); - on_chkUseFPSLimit_toggled( GTK_OBJECT( chkUseFPSLimit ), NULL ); - on_radFPSLimitManual_toggled( GTK_OBJECT( radFPSLimitManual ), NULL ); - on_chkScanLines_toggled( GTK_OBJECT( chkScanLines ), NULL ); + on_chkUseGameFixes_toggled( G_OBJECT( chkUseGameFixes ), NULL ); + on_chkUseFPSLimit_toggled( G_OBJECT( chkUseFPSLimit ), NULL ); + on_radFPSLimitManual_toggled( G_OBJECT( radFPSLimitManual ), NULL ); + on_chkScanLines_toggled( G_OBJECT( chkScanLines ), NULL ); gtk_widget_show( window ); diff --git a/plugins/peopsxgl/gpucfg/peopsxgl.ui b/plugins/peopsxgl/gpucfg/peopsxgl.ui index 5d90a1fa..6019ba46 100755 --- a/plugins/peopsxgl/gpucfg/peopsxgl.ui +++ b/plugins/peopsxgl/gpucfg/peopsxgl.ui @@ -1,16 +1,17 @@ - + - - + + False 5 OpenGL Driver configuration False center normal - + True + False vertical 2 @@ -20,12 +21,13 @@ True + False 10 - vertical 5 True + False 2 2 5 @@ -34,7 +36,7 @@ True True - • + • x True @@ -49,7 +51,7 @@ True True - • + • y True @@ -65,6 +67,7 @@ True + False 0 Width: @@ -76,6 +79,7 @@ True + False 0 Height: @@ -99,6 +103,7 @@ True True False + 0 True @@ -113,6 +118,7 @@ True True False + 0 True @@ -127,6 +133,7 @@ True True False + 0 True @@ -140,6 +147,7 @@ True + False Window options @@ -149,12 +157,13 @@ True + False 10 - vertical 5 True + False 3 2 5 @@ -162,6 +171,7 @@ True + False 0 Quality: @@ -169,6 +179,7 @@ True + False 0 Filtering: @@ -180,6 +191,7 @@ True + False 0 HiRes Tex: @@ -191,6 +203,7 @@ True + False liststore6 @@ -207,6 +220,7 @@ True + False liststore5 @@ -225,6 +239,7 @@ True + False liststore4 @@ -250,10 +265,12 @@ True + False 5 True + False 0 VRam size in MBytes (0..1024, 0=auto): @@ -267,7 +284,7 @@ True True - • + • v @@ -292,6 +309,7 @@ True + False Textures @@ -302,8 +320,8 @@ True + False 10 - vertical 5 @@ -311,6 +329,7 @@ True True False + 0 True @@ -325,21 +344,24 @@ True True False + 0 True False + True 1 True + False 20 True - vertical + False 5 @@ -347,18 +369,21 @@ True True False + 0 True True radFPSLimitManual False + True 0 True + False 5 @@ -366,6 +391,7 @@ True True False + 0 True True @@ -380,7 +406,7 @@ True False True - • + • f @@ -392,6 +418,7 @@ True + False FPS @@ -403,6 +430,7 @@ False + True 1 @@ -411,6 +439,7 @@ False + True 2 @@ -420,6 +449,7 @@ True True False + 0 True @@ -436,6 +466,7 @@ True + False Framerate @@ -446,12 +477,13 @@ True + False 10 - vertical 5 True + False 3 2 5 @@ -459,6 +491,7 @@ True + False 0 Offscreen drawing: @@ -466,6 +499,7 @@ True + False 0 Framebuffer textures: @@ -477,6 +511,7 @@ True + False 0 Framebuffer access: @@ -488,6 +523,7 @@ True + False liststore3 @@ -504,6 +540,7 @@ True + False liststore2 @@ -522,6 +559,7 @@ True + False liststore1 @@ -550,10 +588,12 @@ True True False + 0 True False + True 1 @@ -563,10 +603,12 @@ True True False + 0 True False + True 2 @@ -576,10 +618,12 @@ True True False + 0 True False + True 3 @@ -591,6 +635,7 @@ True + False Compatibility @@ -601,12 +646,13 @@ True + False 10 - vertical 5 True + False 5 @@ -614,10 +660,12 @@ True True False + 0 True False + True 0 @@ -625,17 +673,19 @@ True True - • + • s False + True 1 False + True 0 @@ -645,10 +695,12 @@ True True False + 0 True False + True 1 @@ -658,10 +710,12 @@ True True False + 0 True False + True 2 @@ -671,10 +725,12 @@ True True False + 0 True False + True 3 @@ -684,10 +740,12 @@ True True False + 0 True False + True 4 @@ -697,10 +755,12 @@ True True False + 0 True False + True 5 @@ -710,10 +770,12 @@ True True False + 0 True False + True 6 @@ -723,10 +785,12 @@ True True False + 0 True False + True 7 @@ -738,6 +802,7 @@ True + False Misc @@ -748,8 +813,8 @@ True + False 10 - vertical 5 @@ -757,20 +822,24 @@ True True False + 0 True - False + True + True 0 True + False 20 True + False 9 2 5 @@ -781,6 +850,7 @@ True True False + 0 True @@ -793,6 +863,7 @@ True True False + 0 True @@ -807,6 +878,7 @@ True True False + 0 True @@ -821,6 +893,7 @@ True True False + 0 True @@ -835,6 +908,7 @@ True True False + 0 True @@ -849,6 +923,7 @@ True True False + 0 True @@ -863,6 +938,7 @@ True True False + 0 True @@ -877,6 +953,7 @@ True True False + 0 True @@ -891,6 +968,7 @@ True True False + 0 True @@ -905,6 +983,7 @@ True True False + 0 True @@ -919,6 +998,7 @@ True True False + 0 True @@ -935,6 +1015,7 @@ True True False + 0 True @@ -951,6 +1032,7 @@ True True False + 0 True @@ -967,6 +1049,7 @@ True True False + 0 True @@ -983,6 +1066,7 @@ True True False + 0 True @@ -999,6 +1083,7 @@ True True False + 0 True @@ -1016,6 +1101,7 @@ False True False + 0 True @@ -1032,6 +1118,7 @@ True True False + 0 True @@ -1046,6 +1133,8 @@ + True + True 1 @@ -1057,6 +1146,7 @@ True + False Special game fixes @@ -1066,12 +1156,15 @@ + False + True 0 - + True + False end @@ -1134,6 +1227,7 @@ False + True end 0 @@ -1147,66 +1241,13 @@ btnCancel - - 9999 - 1 - 10 - - - 9999 - 1 - 10 - - 60 20 200 + 60 1 10 - - - - - - - - Emulated VRam - Ok most times - - - Gfx card buffer reads - - - Gfx card buffer moves - - - Gfx card buffer reads and moves - - - Full Software (FVP) - - - - - - - - - - - Emulated VRam - Needs FVP - - - Black - Fast, no effects - - - Gfx card buffer - Can be slow - - - Gfx card and soft - Slow - - - @@ -1299,14 +1340,67 @@ + + -1 + 255 + 1 + 10 + + + + + + + + + Emulated VRam - Ok most times + + + Gfx card buffer reads + + + Gfx card buffer moves + + + Gfx card buffer reads and moves + + + Full Software (FVP) + + + + + + + + + + + Emulated VRam - Needs FVP + + + Black - Fast, no effects + + + Gfx card buffer - Can be slow + + + Gfx card and soft - Slow + + + 1024 1 10 - - -1 - 255 + + 9999 + 1 + 10 + + + 9999 1 10 -- cgit v1.2.3