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/dfcdrom/Makefile.am | 26 ++++- plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui | 167 ++++++++++++++++---------------- plugins/dfcdrom/cdrcfg-0.1df/main.c | 7 +- 3 files changed, 112 insertions(+), 88 deletions(-) (limited to 'plugins/dfcdrom') 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; } -- cgit v1.2.3