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/dfxvideo/Makefile.am | 26 ++- plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui | 280 +++++++++++++----------------- plugins/dfxvideo/gpucfg-0.1df/main.c | 3 +- 3 files changed, 141 insertions(+), 168 deletions(-) mode change 100755 => 100644 plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui (limited to 'plugins/dfxvideo') 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; } -- cgit v1.2.3