From a96eefdf0f10a9a051e65f6e88a24dc3abe40fc5 Mon Sep 17 00:00:00 2001 From: Stelios Tsampas Date: Mon, 17 Jul 2017 17:32:35 +0300 Subject: * Bring pluing Linux(gtk) interfaces up to date. --- plugins/bladesio1/Makefile.am | 26 +- plugins/bladesio1/gui.c | 3 +- plugins/dfcdrom/Makefile.am | 26 +- plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui | 167 ++++---- plugins/dfcdrom/cdrcfg-0.1df/main.c | 7 +- plugins/dfinput/Makefile.am | 26 +- plugins/dfinput/cfg-gtk.c | 4 +- plugins/dfinput/dfinput.ui | 160 ++++---- plugins/dfnet/Makefile.am | 26 +- plugins/dfnet/dfnet.ui | 41 +- plugins/dfnet/gui.c | 3 +- plugins/dfsound/Makefile.am | 25 +- plugins/dfsound/spucfg-0.1df/dfsound.ui | 168 ++++---- plugins/dfsound/spucfg-0.1df/main.c | 3 +- plugins/dfxvideo/Makefile.am | 26 +- plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui | 280 ++++++------- plugins/dfxvideo/gpucfg-0.1df/main.c | 3 +- plugins/peopsxgl/Makefile.am | 26 +- plugins/peopsxgl/gpucfg/main.c | 3 +- plugins/peopsxgl/gpucfg/peopsxgl.ui | 646 ++++++++++++++---------------- 20 files changed, 855 insertions(+), 814 deletions(-) mode change 100755 => 100644 plugins/dfnet/dfnet.ui mode change 100755 => 100644 plugins/dfsound/spucfg-0.1df/dfsound.ui mode change 100755 => 100644 plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui mode change 100755 => 100644 plugins/peopsxgl/gpucfg/peopsxgl.ui (limited to 'plugins') diff --git a/plugins/bladesio1/Makefile.am b/plugins/bladesio1/Makefile.am index 9e0b6ab5..880aa647 100644 --- a/plugins/bladesio1/Makefile.am +++ b/plugins/bladesio1/Makefile.am @@ -12,9 +12,29 @@ AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -I$(top_srcdir)/libpcsxcore -I../../include bin_PROGRAMS = cfgBladeSio1 -cfgBladeSio1_SOURCES = gui.c sio1.h +cfgBladeSio1_SOURCES = gui.c sio1.h GtkResources.c GtkResources.h cfgBladeSio1_LDADD = $(GTK3_LIBS) -glade_DATA = sio1.ui -gladedir = $(datadir)/psemu/ +# gresource.xml is dynamically generated in CMake. Mirror that here in a static way. +define gresource_xml = + + + + sio1.ui + + +endef + +bladesio1.gresource.xml: + $(file >$@,$(gresource_xml)) +bladesio1_gresource: bladesio1.gresource.xml + $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/$<) +GtkResources.c: bladesio1.gresource.xml $(bladesio1_gresource) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source --c-name bladesio1 $< +GtkResources.h: bladesio1.gresource.xml $(bladesio1_gresource) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header --c-name bladesio1 $< + + +#glade_DATA = sio1.ui +#gladedir = $(datadir)/psemu/ EXTRA_DIST = $(glade_DATA) diff --git a/plugins/bladesio1/gui.c b/plugins/bladesio1/gui.c index 99979f15..37ffb83f 100644 --- a/plugins/bladesio1/gui.c +++ b/plugins/bladesio1/gui.c @@ -103,7 +103,7 @@ void configure() { builder = gtk_builder_new(); - if(!gtk_builder_add_from_file(builder, DATADIR "sio1.ui", NULL)) + if(!gtk_builder_add_from_resource(builder, "/org/pcsxr/bladesio1/sio1.ui", NULL)) g_warning("We could not load the interface!"); settingsRead(); @@ -166,6 +166,7 @@ void about() { GtkWidget *widget; widget = gtk_about_dialog_new(); + gtk_about_dialog_set_logo_icon_name (GTK_ABOUT_DIALOG(widget), "help-about"); gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(widget), "Link Cable"); gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), "1.0"); gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(widget), authors); diff --git a/plugins/dfcdrom/Makefile.am b/plugins/dfcdrom/Makefile.am index 6bc42c35..4b3dec4b 100644 --- a/plugins/dfcdrom/Makefile.am +++ b/plugins/dfcdrom/Makefile.am @@ -27,9 +27,29 @@ AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -I$(top_srcdir)/libpcsxcore -I../../include bin_PROGRAMS = cfgDFCdrom -cfgDFCdrom_SOURCES = cdrcfg-0.1df/main.c +cfgDFCdrom_SOURCES = cdrcfg-0.1df/main.c GtkResources.c GtkResources.h cfgDFCdrom_LDADD = $(GTK3_LIBS) -glade_DATA = cdrcfg-0.1df/dfcdrom.ui -gladedir = $(datadir)/psemu/ +# gresource.xml is dynamically generated in CMake. Mirror that here in a static way. +define gresource_xml = + + + + dfcdrom.ui + + +endef + +dfcdrom.gresource.xml: + $(file >$@,$(gresource_xml)) +dfcdrom_gresource: dfcdrom.gresource.xml + $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/cdrcfg-0.1df --generate-dependencies $(srcdir)/$<) +GtkResources.c: dfcdrom.gresource.xml $(dfcdrom_gresource) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/cdrcfg-0.1df --generate-source --c-name dfcdrom $< +GtkResources.h: dfcdrom.gresource.xml $(dfcdrom_gresource) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/cdrcfg-0.1df --generate-header --c-name dfcdrom $< + + +#glade_DATA = cdrcfg-0.1df/dfcdrom.ui +#gladedir = $(datadir)/psemu/ EXTRA_DIST = $(glade_DATA) diff --git a/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui b/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui index c282b2a1..988dee16 100644 --- a/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui +++ b/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui @@ -1,6 +1,7 @@ + - + 32 2048 @@ -13,6 +14,76 @@ 1 4 + + + + + + + + Normal (No Cache) + + + Threaded - Faster (With Cache) + + + + + + + + + + + Default + + + 125ms + + + 250ms + + + 500ms + + + 1s + + + 2s + + + 4s + + + 8s + + + 16s + + + 32s + + + 1min + + + 2min + + + 4min + + + 8min + + + 16min + + + 32min + + + True False @@ -58,16 +129,17 @@ - + True False + vertical True False 0 - + True False 5 @@ -104,11 +176,12 @@ False 0 - + True False + vertical - + True False 5 @@ -117,8 +190,8 @@ True False - 0 Select read mode: + 0 False @@ -152,7 +225,7 @@ - + True False 5 @@ -161,8 +234,8 @@ True False - 0 Cache Size (Def. 64): + 0 False @@ -195,7 +268,7 @@ - + True False 5 @@ -204,8 +277,8 @@ True False - 0 Spindown Time: + 0 False @@ -240,7 +313,7 @@ - + True False 5 @@ -249,8 +322,8 @@ True False - 0 Cdrom Speed (Def. 0 = MAX): + 0 False @@ -321,74 +394,4 @@ cfg_closebutton - - - - - - - - Normal (No Cache) - - - Threaded - Faster (With Cache) - - - - - - - - - - - Default - - - 125ms - - - 250ms - - - 500ms - - - 1s - - - 2s - - - 4s - - - 8s - - - 16s - - - 32s - - - 1min - - - 2min - - - 4min - - - 8min - - - 16min - - - 32min - - - diff --git a/plugins/dfcdrom/cdrcfg-0.1df/main.c b/plugins/dfcdrom/cdrcfg-0.1df/main.c index cc55aa36..a8aa4b67 100755 --- a/plugins/dfcdrom/cdrcfg-0.1df/main.c +++ b/plugins/dfcdrom/cdrcfg-0.1df/main.c @@ -208,7 +208,7 @@ long CDRconfigure() { builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(builder, DATADIR "dfcdrom.ui", NULL)) { + if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/dfcdrom/dfcdrom.ui", NULL)) { g_warning("We could not load the interface!"); return 0; } @@ -256,6 +256,7 @@ void CDRabout() { "Wei Mingzhi ", NULL}; widget = gtk_about_dialog_new(); + gtk_about_dialog_set_logo_icon_name (GTK_ABOUT_DIALOG(widget), "help-about"); 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); @@ -276,13 +277,13 @@ int main(int argc, char *argv[]) { gtk_init(&argc, &argv); if (argc < 2) { - printf ("Usage: cfgBladeSio1 {about | configure}\n"); + printf ("Usage: cfgDFCdrom {about | configure}\n"); return 0; } if (strcmp(argv[1], "configure") != 0 && strcmp(argv[1], "about") != 0) { - printf ("Usage: cfgBladeSio1 {about | configure}\n"); + printf ("Usage: cfgDFCdrom {about | configure}\n"); return 0; } diff --git a/plugins/dfinput/Makefile.am b/plugins/dfinput/Makefile.am index 70f86fd1..11eee3eb 100644 --- a/plugins/dfinput/Makefile.am +++ b/plugins/dfinput/Makefile.am @@ -13,9 +13,29 @@ AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -I../../include -I$(top_srcdir)/libpcsxcore $(SDL2_CFLAGS) $(SDL_CFLAGS) bin_PROGRAMS = cfgDFInput -cfgDFInput_SOURCES = cfg-gtk.c pad.h +cfgDFInput_SOURCES = cfg-gtk.c pad.h GtkResources.c GtkResources.h cfgDFInput_LDADD = $(GTK3_LIBS) $(SDL2_LIBS) $(SDL_LIBS) -lX11 -glade_DATA = dfinput.ui -gladedir = $(datadir)/psemu/ +# gresource.xml is dynamically generated in CMake. Mirror that here in a static way. +define gresource_xml = + + + + dfinput.ui + + +endef + +dfinput.gresource.xml: + $(file >$@,$(gresource_xml)) +dfinput_gresource: dfinput.gresource.xml + $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/$<) +GtkResources.c: dfinput.gresource.xml $(dfinput_gresource) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source --c-name dfinput $< +GtkResources.h: dfinput.gresource.xml $(dfinput_gresource) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header --c-name dfinput $< + + +#glade_DATA = dfinput.ui +#gladedir = $(datadir)/psemu/ EXTRA_DIST = $(glade_DATA) diff --git a/plugins/dfinput/cfg-gtk.c b/plugins/dfinput/cfg-gtk.c index 5f26040f..61218cea 100755 --- a/plugins/dfinput/cfg-gtk.c +++ b/plugins/dfinput/cfg-gtk.c @@ -246,7 +246,6 @@ static void UpdateKeyList() { gtk_tree_view_set_model(GTK_TREE_VIEW(widget), GTK_TREE_MODEL(store)); g_object_unref(G_OBJECT(store)); - gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(widget), TRUE); gtk_widget_show(widget); } } @@ -655,7 +654,7 @@ long PADconfigure() { xml = gtk_builder_new(); - if (!gtk_builder_add_from_file(xml, DATADIR "dfinput.ui", NULL)) { + if (!gtk_builder_add_from_resource(xml, "/org/pcsxr/dfinput/dfinput.ui", NULL)) { g_warning("We could not load the interface!"); return -1; } @@ -837,6 +836,7 @@ void PADabout() { GtkWidget *widget; widget = gtk_about_dialog_new(); + gtk_about_dialog_set_logo_icon_name (GTK_ABOUT_DIALOG(widget), "help-about"); gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(widget), "Gamepad/Keyboard Input"); gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), "1.2"); gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(widget), authors); diff --git a/plugins/dfinput/dfinput.ui b/plugins/dfinput/dfinput.ui index 17dfbdb9..f189d8b3 100644 --- a/plugins/dfinput/dfinput.ui +++ b/plugins/dfinput/dfinput.ui @@ -1,23 +1,58 @@ + - + + + + + + + + + Digital Pad + + + Analog Pad + + + Mouse + + + + + + + + + + + Digital Pad + + + Analog Pad + + + Mouse + + + False - + True False 5 - 2 True True - + True False 5 + vertical 2 @@ -29,14 +64,12 @@ True False - 0 Device: + 0 0 0 - 1 - 1 @@ -47,22 +80,18 @@ 1 0 - 1 - 1 True False - 0 Type: + 0 0 1 - 1 - 1 @@ -80,8 +109,6 @@ 1 1 - 1 - 1 @@ -113,7 +140,6 @@ True True 5 - True etched-in @@ -132,7 +158,7 @@ - + True False 20 @@ -143,7 +169,7 @@ True True - + True False @@ -151,7 +177,7 @@ True False gtk-edit - 1 + 1 True @@ -186,7 +212,7 @@ True True - + True False @@ -194,7 +220,7 @@ True False gtk-undo - 1 + 1 True @@ -243,10 +269,11 @@ - + True False 5 + vertical 2 @@ -258,14 +285,12 @@ True False - 0 Device: + 0 0 0 - 1 - 1 @@ -276,22 +301,18 @@ 1 0 - 1 - 1 True False - 0 Type: + 0 0 1 - 1 - 1 @@ -309,8 +330,6 @@ 1 1 - 1 - 1 @@ -342,7 +361,6 @@ True True 5 - True etched-in @@ -361,7 +379,7 @@ - + True False 20 @@ -372,7 +390,7 @@ True True - + True False @@ -380,7 +398,7 @@ True False gtk-edit - 1 + 1 True @@ -415,7 +433,7 @@ True True - + True False @@ -423,7 +441,7 @@ True False gtk-undo - 1 + 1 True @@ -471,14 +489,16 @@ Controller 2 + 1 False - + True False 5 + vertical 2 @@ -490,14 +510,12 @@ True False - 0 Device: + 0 0 0 - 1 - 1 @@ -508,8 +526,6 @@ 1 0 - 1 - 1 @@ -526,7 +542,6 @@ True True 5 - True etched-in @@ -545,7 +560,7 @@ - + True False 20 @@ -556,7 +571,7 @@ True True - + True False @@ -564,7 +579,7 @@ True False gtk-edit - 1 + 1 True @@ -599,7 +614,7 @@ True True - + True False @@ -607,7 +622,7 @@ True False gtk-undo - 1 + 1 True @@ -655,14 +670,16 @@ Emulator keys + 2 False - + True False 5 + vertical 5 @@ -726,9 +743,13 @@ + + 0 + 0 + - + True False end @@ -748,46 +769,11 @@ + 0 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 d639c652..4000b8c4 100755 --- a/plugins/dfnet/Makefile.am +++ b/plugins/dfnet/Makefile.am @@ -12,9 +12,29 @@ AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -I$(top_srcdir)/libpcsxcore -I../../include bin_PROGRAMS = cfgDFNet -cfgDFNet_SOURCES = gui.c +cfgDFNet_SOURCES = gui.c GtkResources.c GtkResources.h cfgDFNet_LDADD = $(GTK3_LIBS) -glade_DATA = dfnet.ui -gladedir = $(datadir)/psemu/ +# gresource.xml is dynamically generated in CMake. Mirror that here in a static way. +define gresource_xml = + + + + dfnet.ui + + +endef + +dfnet.gresource.xml: + $(file >$@,$(gresource_xml)) +dfnet_gresource: dfnet.gresource.xml + $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/$<) +GtkResources.c: dfnet.gresource.xml $(dfnet_gresource) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source --c-name dfnet $< +GtkResources.h: dfnet.gresource.xml $(dfnet_gresource) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header --c-name dfnet $< + + +#glade_DATA = dfnet.ui +#gladedir = $(datadir)/psemu/ EXTRA_DIST = $(glade_DATA) diff --git a/plugins/dfnet/dfnet.ui b/plugins/dfnet/dfnet.ui old mode 100755 new mode 100644 index bdad3a1d..7ab884c2 --- a/plugins/dfnet/dfnet.ui +++ b/plugins/dfnet/dfnet.ui @@ -1,6 +1,7 @@ + - + False 5 @@ -25,7 +26,7 @@ True True - + True False @@ -44,8 +45,8 @@ True False - 0 Start Game + 0 True @@ -68,7 +69,7 @@ True True - + True False @@ -87,8 +88,8 @@ True False - 0 Play Offline + 0 True @@ -114,9 +115,10 @@ - + True False + vertical 12 @@ -136,20 +138,18 @@ If you selected Client please enter the IP address the Server gave to you in the - + True False - 2 - 2 - 8 12 + 8 True True True - + True False @@ -168,8 +168,8 @@ If you selected Client please enter the IP address the Server gave to you in the True False - 0 Copy PC IP to Clipboard + 0 True @@ -182,7 +182,7 @@ If you selected Client please enter the IP address the Server gave to you in the 1 - 2 + 0 @@ -195,9 +195,7 @@ If you selected Client please enter the IP address the Server gave to you in the 1 - 2 1 - 2 @@ -210,6 +208,10 @@ If you selected Client please enter the IP address the Server gave to you in the True True + + 0 + 0 + @@ -223,8 +225,8 @@ If you selected Client please enter the IP address the Server gave to you in the rbServer + 0 1 - 2 @@ -236,9 +238,10 @@ If you selected Client please enter the IP address the Server gave to you in the - + True False + vertical 6 @@ -254,15 +257,15 @@ If you selected Client please enter the IP address the Server gave to you in the - + True False True False - 0 Port Number + 0 True diff --git a/plugins/dfnet/gui.c b/plugins/dfnet/gui.c index 06c4b888..85d0871f 100755 --- a/plugins/dfnet/gui.c +++ b/plugins/dfnet/gui.c @@ -103,7 +103,7 @@ long CFGopen() { builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(builder, DATADIR "dfnet.ui", NULL)) { + if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/dfnet/dfnet.ui", NULL)) { g_warning("We could not load the interface!"); return 0; } @@ -182,6 +182,7 @@ void CFGabout() { GtkWidget *widget; widget = gtk_about_dialog_new(); + gtk_about_dialog_set_logo_icon_name (GTK_ABOUT_DIALOG(widget), "help-about"); 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); diff --git a/plugins/dfsound/Makefile.am b/plugins/dfsound/Makefile.am index 53255556..b34f3267 100755 --- a/plugins/dfsound/Makefile.am +++ b/plugins/dfsound/Makefile.am @@ -49,9 +49,28 @@ bin_PROGRAMS = cfgDFSound cfgDFSound_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -DDATADIR=\"${datadir}/psemu/\" \ $(GTK3_CFLAGS) $(AM_CPPFLAGS) -cfgDFSound_SOURCES = spucfg-0.1df/main.c +cfgDFSound_SOURCES = spucfg-0.1df/main.c GtkResources.c GtkResources.h cfgDFSound_LDADD = $(GTK3_LIBS) -glade_DATA = spucfg-0.1df/dfsound.ui -gladedir = $(datadir)/psemu/ +# gresource.xml is dynamically generated in CMake. Mirror that here in a static way. +define gresource_xml = + + + + dfsound.ui + + +endef + +dfsound.gresource.xml: + $(file >$@,$(gresource_xml)) +dfsound_gresource: dfsound.gresource.xml + $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/spucfg-0.1df --generate-dependencies $(srcdir)/$<) +GtkResources.c: dfsound.gresource.xml $(dfsound_gresource) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/spucfg-0.1df --generate-source --c-name dfsound $< +GtkResources.h: dfsound.gresource.xml $(dfsound_gresource) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/spucfg-0.1df --generate-header --c-name dfsound $< + +#glade_DATA = spucfg-0.1df/dfsound.ui +#gladedir = $(datadir)/psemu/ EXTRA_DIST = $(glade_DATA) diff --git a/plugins/dfsound/spucfg-0.1df/dfsound.ui b/plugins/dfsound/spucfg-0.1df/dfsound.ui old mode 100755 new mode 100644 index 1c816a1d..9d897204 --- a/plugins/dfsound/spucfg-0.1df/dfsound.ui +++ b/plugins/dfsound/spucfg-0.1df/dfsound.ui @@ -1,6 +1,67 @@ + - + + + + + + + + + None + + + Simple + + + Gaussian + + + Cubic + + + + + + + + + + + Off + + + Simple + + + Playstation + + + + + + + + + + + None + + + Low + + + Medium + + + Loud + + + Loudest + + + False 5 @@ -42,9 +103,10 @@ - + True False + vertical 6 @@ -57,54 +119,49 @@ False 5 - + True False - 3 - 2 - 5 5 + 5 + True True False - 0 Volume: right + 0 - GTK_FILL - + 0 + 0 True False - 0 Interpolation: right + 0 + 0 2 - 3 - GTK_FILL - True False - 0 Reverb: right + 0 + 0 1 - 2 - GTK_FILL - @@ -121,8 +178,7 @@ 1 - 2 - GTK_FILL + 0 @@ -139,11 +195,7 @@ 1 - 2 1 - 2 - GTK_FILL - GTK_FILL @@ -160,11 +212,7 @@ 1 - 2 2 - 3 - GTK_FILL - GTK_FILL @@ -189,9 +237,10 @@ False 5 - + True False + vertical 6 @@ -234,9 +283,10 @@ False 5 - + True False + vertical 6 @@ -334,64 +384,4 @@ btn_close - - - - - - - - None - - - Simple - - - Gaussian - - - Cubic - - - - - - - - - - - Off - - - Simple - - - Playstation - - - - - - - - - - - None - - - Low - - - Medium - - - Loud - - - Loudest - - - diff --git a/plugins/dfsound/spucfg-0.1df/main.c b/plugins/dfsound/spucfg-0.1df/main.c index 2a57a67f..2fe837b7 100755 --- a/plugins/dfsound/spucfg-0.1df/main.c +++ b/plugins/dfsound/spucfg-0.1df/main.c @@ -82,6 +82,7 @@ int main(int argc, char *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_logo_icon_name (GTK_ABOUT_DIALOG(widget), "help-about"); 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); @@ -98,7 +99,7 @@ int main(int argc, char *argv[]) else if (strcmp(argv[1], "configure") == 0) { builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(builder, DATADIR "dfsound.ui", NULL)) { + if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/dfsound/dfsound.ui", NULL)) { g_warning("We could not load the interface!"); return 0; } diff --git a/plugins/dfxvideo/Makefile.am b/plugins/dfxvideo/Makefile.am index 3036da5f..86e8ef3a 100755 --- a/plugins/dfxvideo/Makefile.am +++ b/plugins/dfxvideo/Makefile.am @@ -26,9 +26,29 @@ libDFXVideo_la_LDFLAGS = -module -avoid-version libDFXVideo_la_LIBADD = -lX11 -lXv -lXext -lm bin_PROGRAMS = cfgDFXVideo -cfgDFXVideo_SOURCES = gpucfg-0.1df/main.c +cfgDFXVideo_SOURCES = gpucfg-0.1df/main.c GtkResources.c GtkResources.h cfgDFXVideo_LDADD = $(GTK3_LIBS) -lXext -glade_DATA = gpucfg-0.1df/dfxvideo.ui -gladedir = $(datadir)/psemu/ +# gresource.xml is dynamically generated in CMake. Mirror that here in a static way. +define gresource_xml = + + + + dfxvideo.ui + + +endef + +dfxvideo.gresource.xml: + $(file >$@,$(gresource_xml)) +dfxvideo_gresource: dfxvideo.gresource.xml + $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/gpucfg-0.1df --generate-dependencies $(srcdir)/$<) +GtkResources.c: dfxvideo.gresource.xml $(dfxvideo_gresource) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/gpucfg-0.1df --generate-source --c-name dfxvideo $< +GtkResources.h: dfxvideo.gresource.xml $(dfxvideo_gresource) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/gpucfg-0.1df --generate-header --c-name dfxvideo $< + + +#glade_DATA = gpucfg-0.1df/dfxvideo.ui +#gladedir = $(datadir)/psemu/ EXTRA_DIST = $(glade_DATA) diff --git a/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui b/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui old mode 100755 new mode 100644 index 6acee0d6..54633d89 --- a/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui +++ b/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui @@ -1,6 +1,85 @@ + - + + + + + + + + + 0: Off (fastest) + + + 1: Game dependant + + + 2: Always + + + + + + + + + + + 320x240 + + + 640x480 + + + 800x600 + + + 1024x768 + + + 1152x864 + + + 1280x1024 + + + 1600x1200 + + + + + + + + + + + 0: None + + + 1: 2xSai + + + 2: 2xSuperSai + + + 3: SuperEagle + + + 4: Scale2x + + + 5: Scale3x + + + 6: HQ2X + + + 7: HQ3X + + + True False @@ -12,9 +91,10 @@ dialog - + True False + vertical 6 @@ -30,55 +110,50 @@ 5 5 - + True False + vertical - + True False - 3 - 2 - 30 6 + True True False - 0 Initial Window Size: + 0 - GTK_FILL - + 0 + 0 True False - 0 Stretching: + 0 + 0 1 - 2 - GTK_FILL - True False - 0 Dithering: + 0 + 0 2 - 3 - GTK_FILL - @@ -96,11 +171,7 @@ 1 - 2 1 - 2 - GTK_FILL - GTK_FILL @@ -118,15 +189,11 @@ 1 - 2 2 - 3 - GTK_FILL - GTK_FILL - + True False 10 @@ -170,7 +237,7 @@ 1 - 2 + 0 @@ -181,7 +248,7 @@ - + True False @@ -232,9 +299,10 @@ 5 5 - + True False + vertical Show FPS @@ -270,10 +338,9 @@ - + True False - 3 12 @@ -287,8 +354,8 @@ True - GTK_FILL - + 0 + 0 @@ -300,9 +367,7 @@ 1 - 2 - - + 0 @@ -319,7 +384,7 @@ 2 - 3 + 0 @@ -354,9 +419,10 @@ 5 5 - + True False + vertical Use game fixes @@ -379,15 +445,11 @@ False 19 - + True False - 6 - 2 16 - - - + True Disable CPU Saving @@ -400,10 +462,8 @@ True + 0 4 - 5 - GTK_FILL - @@ -418,8 +478,8 @@ True - GTK_FILL - + 0 + 0 @@ -434,10 +494,8 @@ True + 0 5 - 6 - GTK_FILL - @@ -452,10 +510,8 @@ True + 0 1 - 2 - GTK_FILL - @@ -470,10 +526,8 @@ True + 0 2 - 3 - GTK_FILL - @@ -488,10 +542,8 @@ True + 0 3 - 4 - GTK_FILL - @@ -508,9 +560,7 @@ 1 - 2 - GTK_FILL - + 0 @@ -527,11 +577,7 @@ 1 - 2 1 - 2 - GTK_FILL - @@ -548,11 +594,7 @@ 1 - 2 2 - 3 - GTK_FILL - @@ -569,11 +611,7 @@ 1 - 2 3 - 4 - GTK_FILL - @@ -590,11 +628,7 @@ 1 - 2 4 - 5 - GTK_FILL - @@ -611,11 +645,7 @@ 1 - 2 5 - 6 - GTK_FILL - @@ -639,7 +669,7 @@ - + True False 12 @@ -669,82 +699,4 @@ - - - - - - - - 0: Off (fastest) - - - 1: Game dependant - - - 2: Always - - - - - - - - - - - 320x240 - - - 640x480 - - - 800x600 - - - 1024x768 - - - 1152x864 - - - 1280x1024 - - - 1600x1200 - - - - - - - - - - - 0: None - - - 1: 2xSai - - - 2: 2xSuperSai - - - 3: SuperEagle - - - 4: Scale2x - - - 5: Scale3x - - - 6: HQ2X - - - 7: HQ3X - - - diff --git a/plugins/dfxvideo/gpucfg-0.1df/main.c b/plugins/dfxvideo/gpucfg-0.1df/main.c index 805495e6..ef44ed1c 100755 --- a/plugins/dfxvideo/gpucfg-0.1df/main.c +++ b/plugins/dfxvideo/gpucfg-0.1df/main.c @@ -135,6 +135,7 @@ main (int argc, char *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_logo_icon_name (GTK_ABOUT_DIALOG(widget), "help-about"); 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); @@ -151,7 +152,7 @@ main (int argc, char *argv[]) else { builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(builder, DATADIR "dfxvideo.ui", NULL)) { + if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/dfxvideo/dfxvideo.ui", NULL)) { g_warning("We could not load the interface!"); return -1; } diff --git a/plugins/peopsxgl/Makefile.am b/plugins/peopsxgl/Makefile.am index 9bcd6bea..a37643e6 100755 --- a/plugins/peopsxgl/Makefile.am +++ b/plugins/peopsxgl/Makefile.am @@ -26,9 +26,29 @@ libpeopsxgl_la_LDFLAGS = -module -avoid-version libpeopsxgl_la_LIBADD = -lX11 -lXxf86vm -lGL -lm bin_PROGRAMS = cfgpeopsxgl -cfgpeopsxgl_SOURCES = gpucfg/main.c +cfgpeopsxgl_SOURCES = gpucfg/main.c GtkResources.c GtkResources.h cfgpeopsxgl_LDADD = $(GTK3_LIBS) -glade_DATA = gpucfg/peopsxgl.ui -gladedir = $(datadir)/psemu/ +# gresource.xml is dynamically generated in CMake. Mirror that here in a static way. +define gresource_xml = + + + + peopsxgl.ui + + +endef + +peopsxgl.gresource.xml: + $(file >$@,$(gresource_xml)) +peopsxgl_gresource: peopsxgl.gresource.xml + $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/gpucfg --generate-dependencies $(srcdir)/$<) +GtkResources.c: peopsxgl.gresource.xml $(peopsxgl_gresource) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/gpucfg --generate-source --c-name peopsxgl $< +GtkResources.h: peopsxgl.gresource.xml $(peopsxgl_gresource) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/gpucfg --generate-header --c-name peopsxgl $< + + +#glade_DATA = gpucfg/peopsxgl.ui +#gladedir = $(datadir)/psemu/ EXTRA_DIST = $(glade_DATA) diff --git a/plugins/peopsxgl/gpucfg/main.c b/plugins/peopsxgl/gpucfg/main.c index 812ec5f9..b29c85fb 100755 --- a/plugins/peopsxgl/gpucfg/main.c +++ b/plugins/peopsxgl/gpucfg/main.c @@ -257,7 +257,7 @@ int main( int argc, char **argv ) { builder = gtk_builder_new(); // Load the glade file - if ( !gtk_builder_add_from_file( builder, DATADIR "peopsxgl.ui", &error ) ) { + if ( !gtk_builder_add_from_resource( builder, "/org/pcsxr/peopsxgl/peopsxgl.ui", &error ) ) { g_warning( "%s", error->message ); g_free( error ); return( 1 ); @@ -269,6 +269,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_logo_icon_name (GTK_ABOUT_DIALOG(widget), "help-about"); 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); diff --git a/plugins/peopsxgl/gpucfg/peopsxgl.ui b/plugins/peopsxgl/gpucfg/peopsxgl.ui old mode 100755 new mode 100644 index 895c8d45..c53a9852 --- a/plugins/peopsxgl/gpucfg/peopsxgl.ui +++ b/plugins/peopsxgl/gpucfg/peopsxgl.ui @@ -1,6 +1,170 @@ + - + + + 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 + + + + + + + + + + + None - Fastest, most glitches + + + Minimum - Missing screens + + + Standard - OK for most games + + + Enhanced - Shows more stuff + + + Extended - Causing garbage + + + + + + + + + + + None (Standard) + + + 2xSaI (Much vram needed) + + + Scaled (Needs tex filtering) + + + + + + + + + + + None + + + Standard - Glitches will happen + + + Extended - No black borders + + + Standard without sprites - Unfiltered 2D + + + Extended without sprites - Unfiltered 2D + + + Standard + smoothed sprites + + + Extended + smoothed sprites + + + + + + + + + + + Don't care - Use driver's default textures + + + 4444 - Fast, but less colorful + + + 5551 - Nice colors, bad transparency + + + 8888 - Best colors, more ram needed + + + BGR8888 - Faster on some cards + + + + + -1 + 255 + 1 + 10 + + + 1024 + 1 + 10 + + + 9999 + 1 + 10 + + + 9999 + 1 + 10 + False 5 @@ -14,24 +178,94 @@ False vertical 2 + + + True + False + end + + + Fast + True + True + True + Autoconfigure for fast display + + + False + False + 0 + True + + + + + Beautiful + True + True + True + Auto configure for beautiful display + + + False + False + 1 + True + + + + + gtk-ok + True + True + True + True + + + False + False + 2 + + + + + gtk-cancel + True + True + True + True + + + False + False + 3 + + + + + False + True + end + 0 + + True True - + True False 10 + vertical 5 - + True False - 2 - 2 - 5 5 + 5 True @@ -42,9 +276,7 @@ 1 - 2 - - + 0 @@ -57,37 +289,31 @@ 1 - 2 1 - 2 - - True False - 0 Width: + 0 - - + 0 + 0 True False - 0 Height: + 0 + 0 1 - 2 - - @@ -170,49 +396,53 @@ - + True False 10 + vertical 5 - + True False - 3 - 2 - 5 5 + 5 + True True False - 0 Quality: + 0 + + 0 + 0 + True False - 0 Filtering: + 0 + 0 1 - 2 True False - 0 HiRes Tex: + 0 + 0 2 - 3 @@ -229,7 +459,7 @@ 1 - 2 + 0 @@ -246,9 +476,7 @@ 1 - 2 1 - 2 @@ -265,9 +493,7 @@ 1 - 2 2 - 3 @@ -278,7 +504,7 @@ - + True False 5 @@ -286,8 +512,8 @@ True False - 0 VRam size in MBytes (0..1024, 0=auto): + 0 False @@ -333,10 +559,11 @@ - + True False 10 + vertical 5 @@ -374,9 +601,10 @@ False 20 - + True False + vertical 5 @@ -396,7 +624,7 @@ - + True False 5 @@ -490,49 +718,53 @@ - + True False 10 + vertical 5 - + True False - 3 - 2 - 5 5 + 5 + True True False - 0 Offscreen drawing: + 0 + + 0 + 0 + True False - 0 Framebuffer textures: + 0 + 0 1 - 2 True False - 0 Framebuffer access: + 0 + 0 2 - 3 @@ -549,7 +781,7 @@ 1 - 2 + 0 @@ -566,9 +798,7 @@ 1 - 2 1 - 2 @@ -585,9 +815,7 @@ 1 - 2 2 - 3 @@ -659,13 +887,14 @@ - + True False 10 + vertical 5 - + True False 5 @@ -826,10 +1055,11 @@ - + True False 10 + vertical 5 @@ -852,13 +1082,12 @@ False 20 - + True False - 9 - 2 - 5 5 + 5 + True Battle cursor (FF7) @@ -869,7 +1098,8 @@ True - + 0 + 0 @@ -883,8 +1113,7 @@ 1 - 2 - + 0 @@ -897,9 +1126,8 @@ True + 0 1 - 2 - @@ -912,9 +1140,8 @@ True + 0 2 - 3 - @@ -927,9 +1154,8 @@ True + 0 3 - 4 - @@ -942,9 +1168,8 @@ True + 0 4 - 5 - @@ -957,9 +1182,8 @@ True + 0 5 - 6 - @@ -972,9 +1196,8 @@ True + 0 6 - 7 - @@ -987,9 +1210,8 @@ True + 0 7 - 8 - @@ -1002,9 +1224,8 @@ True + 0 8 - 9 - @@ -1018,10 +1239,7 @@ 1 - 2 1 - 2 - @@ -1035,10 +1253,7 @@ 1 - 2 2 - 3 - @@ -1052,10 +1267,7 @@ 1 - 2 3 - 4 - @@ -1069,10 +1281,7 @@ 1 - 2 4 - 5 - @@ -1086,10 +1295,7 @@ 1 - 2 5 - 6 - @@ -1103,16 +1309,12 @@ 1 - 2 6 - 7 - Unused - True False True False @@ -1121,10 +1323,7 @@ 1 - 2 - 7 - 8 - + 8 @@ -1138,10 +1337,7 @@ 1 - 2 - 8 - 9 - + 7 @@ -1176,77 +1372,6 @@ 0 - - - True - False - end - - - Fast - True - True - True - Autoconfigure for fast display - - - False - False - 0 - True - - - - - Beautiful - True - True - True - Auto configure for beautiful display - - - False - False - 1 - True - - - - - gtk-ok - True - True - True - True - - - False - False - 2 - - - - - gtk-cancel - True - True - True - True - - - False - False - 3 - - - - - False - True - end - 0 - - @@ -1256,167 +1381,4 @@ btnCancel - - 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 - - - - - - - - - - - None - Fastest, most glitches - - - Minimum - Missing screens - - - Standard - OK for most games - - - Enhanced - Shows more stuff - - - Extended - Causing garbage - - - - - - - - - - - None (Standard) - - - 2xSaI (Much vram needed) - - - Scaled (Needs tex filtering) - - - - - - - - - - - None - - - Standard - Glitches will happen - - - Extended - No black borders - - - Standard without sprites - Unfiltered 2D - - - Extended without sprites - Unfiltered 2D - - - Standard + smoothed sprites - - - Extended + smoothed sprites - - - - - - - - - - - Don't care - Use driver's default textures - - - 4444 - Fast, but less colorful - - - 5551 - Nice colors, bad transparency - - - 8888 - Best colors, more ram needed - - - BGR8888 - Faster on some cards - - - - - -1 - 255 - 1 - 10 - - - 1024 - 1 - 10 - - - 9999 - 1 - 10 - - - 9999 - 1 - 10 - -- cgit v1.2.3