From 5f868fa161d5827e45a060a0b17b44a997625315 Mon Sep 17 00:00:00 2001 From: "SND\\edgbla_cp" Date: Wed, 8 Jun 2011 09:27:25 +0000 Subject: Rebranding. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@67621 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- plugins/dfcdrom/Makefile.am | 6 +- plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2 | 324 ------------------------ plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui | 368 ++++++++++++++++++++++++++++ plugins/dfcdrom/cdrcfg-0.1df/main.c | 56 ++--- 4 files changed, 396 insertions(+), 358 deletions(-) delete mode 100644 plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2 create mode 100644 plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui (limited to 'plugins/dfcdrom') diff --git a/plugins/dfcdrom/Makefile.am b/plugins/dfcdrom/Makefile.am index 387a3544..b001ab0f 100644 --- a/plugins/dfcdrom/Makefile.am +++ b/plugins/dfcdrom/Makefile.am @@ -23,13 +23,13 @@ endif AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK2_CFLAGS) $(GLADE2_CFLAGS) \ + $(GTK2_CFLAGS) \ -I../../libpcsxcore -I../../include bin_PROGRAMS = cfgDFCdrom cfgDFCdrom_SOURCES = cdrcfg-0.1df/main.c -cfgDFCdrom_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS) +cfgDFCdrom_LDADD = $(GTK2_LIBS) -glade_DATA = cdrcfg-0.1df/dfcdrom.glade2 +glade_DATA = cdrcfg-0.1df/dfcdrom.ui gladedir = $(datadir)/psemu/ EXTRA_DIST = $(glade_DATA) diff --git a/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2 b/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2 deleted file mode 100644 index 25610e2e..00000000 --- a/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2 +++ /dev/null @@ -1,324 +0,0 @@ - - - - - - True - 5 - CDR configuration - True - center - normal - False - - - - True - vertical - - - True - vertical - - - True - 0 - - - True - 10 - - - True - Choose your CD-ROM device or type its path if it's not listed - - - 0 - - - - - - - True - Select CD-ROM device - - - label_item - - - - - 0 - - - - - True - 0 - - - True - vertical - - - True - 5 - - - True - 5 - 5 - Select read mode: - - - False - False - 0 - - - - - True - Normal (No Cache) -Threaded - Faster (With Cache) - - - 1 - - - - - False - False - 0 - - - - - True - - - False - 1 - - - - - True - 5 - 5 - - - True - Cache Size (Def. 64): - - - False - False - 0 - - - - - True - True - 32 32 2048 1 16 0 - 1 - True - - - False - False - end - 1 - - - - - 2 - - - - - True - - - False - 3 - - - - - True - 5 - 5 - - - True - Spindown Time: - - - False - False - 0 - - - - - True - Default -125ms -250ms -500ms -1s -2s -4s -8s -16s -32s -1min -2min -4min -8min -16min -32min - - - False - False - end - 1 - - - - - 4 - - - - - True - - - False - 5 - - - - - True - 5 - 5 - - - True - Cdrom Speed (Def. 0 = MAX): - - - False - False - 0 - - - - - True - True - 0 0 100 1 4 0 - 1 - True - - - False - False - end - 1 - - - - - 6 - - - - - True - - hseparator - - - - False - 7 - - - - - Enable subchannel read - True - True - False - 10 - True - True - - - False - False - 8 - - - - - - - True - Options - - - label_item - - - - - 1 - - - - - 1 - - - - - True - end - - - gtk-close - -6 - True - True - True - False - True - - - - False - False - 0 - - - - - False - end - 0 - - - - - - diff --git a/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui b/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui new file mode 100644 index 00000000..c16dfd17 --- /dev/null +++ b/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui @@ -0,0 +1,368 @@ + + + + + + True + 5 + CDR configuration + True + center + normal + + + + True + vertical + + + True + vertical + + + True + 0 + + + True + 10 + + + True + Choose your CD-ROM device or type its path if it's not listed + + + 0 + + + + + + + 0 + + + + + True + 0 + + + True + vertical + + + True + 5 + + + True + 5 + 5 + Select read mode: + + + False + False + 0 + + + + + True + liststoreReadMode + + + + 0 + + + + + 1 + + + + + False + False + 0 + + + + + True + + + False + 1 + + + + + True + 5 + 5 + + + True + Cache Size (Def. 64): + + + False + False + 0 + + + + + True + True + 1 + True + + + False + False + end + 1 + + + + + 2 + + + + + True + + + False + 3 + + + + + True + 5 + 5 + + + True + Spindown Time: + + + False + False + 0 + + + + + True + liststoreSpindownTime + + + + 0 + + + + + False + False + end + 1 + + + + + 4 + + + + + True + + + False + 5 + + + + + True + 5 + 5 + + + True + Cdrom Speed (Def. 0 = MAX): + + + False + False + 0 + + + + + True + True + 1 + True + + + False + False + end + 1 + + + + + 6 + + + + + True + + + False + 7 + + + + + Enable subchannel read + True + True + False + 10 + True + True + + + False + False + 8 + + + + + + + 1 + + + + + 1 + + + + + True + end + + + gtk-close + True + True + True + False + True + + + + False + False + 0 + + + + + False + end + 0 + + + + + + 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 fbbe29d5..0b62a801 100644 --- a/plugins/dfcdrom/cdrcfg-0.1df/main.c +++ b/plugins/dfcdrom/cdrcfg-0.1df/main.c @@ -22,9 +22,9 @@ #include "../cfg.c" #include -#include -GtkWidget *MainWindow; +GtkBuilder *builder; +GtkWidget *widget, *MainWindow; // function to check if the device is a cdrom int is_cdrom(const char *device) { @@ -174,27 +174,23 @@ void fill_drives_list(GtkWidget *widget) { } static void OnConfigExit(GtkWidget *widget, gpointer user_data) { - GladeXML *xml; - - xml = glade_get_widget_tree(MainWindow); - - widget = glade_xml_get_widget(xml, "cddev_comboboxentry"); + widget = gtk_builder_get_object(builder, "cddev_comboboxentry"); strncpy(CdromDev, gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(widget)))), 255); CdromDev[255] = '\0'; - widget = glade_xml_get_widget(xml, "readmode_combobox"); + widget = gtk_builder_get_object(builder, "readmode_combobox"); ReadMode = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); - widget = glade_xml_get_widget(xml, "subQ_button"); + widget = gtk_builder_get_object(builder, "subQ_button"); UseSubQ = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - widget = glade_xml_get_widget(xml, "spinCacheSize"); + widget = gtk_builder_get_object(builder, "spinCacheSize"); CacheSize = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); - widget = glade_xml_get_widget(xml, "spinCdrSpeed"); + widget = gtk_builder_get_object(builder, "spinCdrSpeed"); CdrSpeed = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); - widget = glade_xml_get_widget(xml, "comboSpinDown"); + widget = gtk_builder_get_object(builder, "comboSpinDown"); SpinDown = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); SaveConf(); @@ -204,45 +200,36 @@ static void OnConfigExit(GtkWidget *widget, gpointer user_data) { } long CDRconfigure() { - GladeXML *xml; - GtkWidget *widget; - LoadConf(); - xml = glade_xml_new(DATADIR "dfcdrom.glade2", "CfgWnd", NULL); - if (xml == NULL) { - g_warning("We could not load the interface!"); - return -1; - } - - MainWindow = glade_xml_get_widget(xml, "CfgWnd"); + MainWindow = gtk_builder_get_object(builder, "CfgWnd"); gtk_window_set_title(GTK_WINDOW(MainWindow), _("CDR configuration")); - widget = glade_xml_get_widget(xml, "CfgWnd"); + widget = gtk_builder_get_object(builder, "CfgWnd"); g_signal_connect_data(GTK_OBJECT(widget), "delete_event", G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER); - widget = glade_xml_get_widget(xml, "cfg_closebutton"); + widget = gtk_builder_get_object(builder, "cfg_closebutton"); g_signal_connect_data(GTK_OBJECT(widget), "clicked", G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER); - widget = glade_xml_get_widget(xml, "cddev_comboboxentry"); + widget = gtk_builder_get_object(builder, "cddev_comboboxentry"); fill_drives_list(widget); gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(widget))), CdromDev); - widget = glade_xml_get_widget(xml, "readmode_combobox"); + widget = gtk_builder_get_object(builder, "readmode_combobox"); gtk_combo_box_set_active(GTK_COMBO_BOX(widget), ReadMode); - widget = glade_xml_get_widget(xml, "subQ_button"); + widget = gtk_builder_get_object(builder, "subQ_button"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), UseSubQ); - widget = glade_xml_get_widget(xml, "spinCacheSize"); + widget = gtk_builder_get_object(builder, "spinCacheSize"); gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), (float)CacheSize); - widget = glade_xml_get_widget(xml, "spinCdrSpeed"); + widget = gtk_builder_get_object(builder, "spinCdrSpeed"); gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), (float)CdrSpeed); - widget = glade_xml_get_widget(xml, "comboSpinDown"); + widget = gtk_builder_get_object(builder, "comboSpinDown"); gtk_combo_box_set_active(GTK_COMBO_BOX(widget), SpinDown); gtk_widget_show(MainWindow); @@ -279,8 +266,15 @@ int main(int argc, char *argv[]) { gtk_init(&argc, &argv); if (argc != 2) return 0; - + if (strcmp(argv[1], "configure") == 0) { + builder = gtk_builder_new(); + + if (!gtk_builder_add_from_file(builder, DATADIR "dfcdrom.ui", NULL)) { + g_warning("We could not load the interface!"); + return 0; + } + CDRconfigure(); } else { CDRabout(); -- cgit v1.2.3