From 5361dd49c582f601dbc5cb5a47a38f65bec9d8d4 Mon Sep 17 00:00:00 2001 From: "SND\\weimingzhi_cp" Date: Thu, 6 Jan 2011 03:01:13 +0000 Subject: - dfnet, dfinput: migrated to gtkbuilder. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@61799 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- plugins/dfinput/Makefile.am | 2 +- plugins/dfinput/cfg-gtk2.c | 77 +++--- plugins/dfinput/dfinput.glade2 | 489 -------------------------------------- plugins/dfinput/dfinput.ui | 527 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 558 insertions(+), 537 deletions(-) delete mode 100644 plugins/dfinput/dfinput.glade2 create mode 100644 plugins/dfinput/dfinput.ui (limited to 'plugins/dfinput') diff --git a/plugins/dfinput/Makefile.am b/plugins/dfinput/Makefile.am index 08bb5ff3..a7ef7888 100644 --- a/plugins/dfinput/Makefile.am +++ b/plugins/dfinput/Makefile.am @@ -16,6 +16,6 @@ bin_PROGRAMS = cfgDFInput cfgDFInput_SOURCES = cfg-gtk2.c pad.h cfgDFInput_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS) $(SDL_LIBS) -lX11 -glade_DATA = dfinput.glade2 +glade_DATA = dfinput.ui gladedir = $(datadir)/psemu/ EXTRA_DIST = $(glade_DATA) diff --git a/plugins/dfinput/cfg-gtk2.c b/plugins/dfinput/cfg-gtk2.c index cfbd8fa2..54d8b482 100644 --- a/plugins/dfinput/cfg-gtk2.c +++ b/plugins/dfinput/cfg-gtk2.c @@ -21,9 +21,9 @@ #include #include #include -#include GtkWidget *MainWindow; +GtkBuilder *xml; const int DPad[DKEY_TOTAL] = { DKEY_UP, @@ -75,7 +75,6 @@ const char *AnalogText[] = { }; static int GetSelectedKeyIndex(int padnum) { - GladeXML *xml; GtkTreeSelection *selection; GtkTreeIter iter; GtkTreeModel *model; @@ -83,9 +82,7 @@ static int GetSelectedKeyIndex(int padnum) { gboolean selected; int i; - xml = glade_get_widget_tree(MainWindow); - - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(glade_xml_get_widget(xml, padnum == 0 ? "treeview1" : "treeview2"))); + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(gtk_builder_get_object(xml, padnum == 0 ? "treeview1" : "treeview2"))); selected = gtk_tree_selection_get_selected(selection, &model, &iter); if (!selected) { @@ -180,15 +177,12 @@ static void GetAnalogDescription(char *buf, int joynum, int analognum, int dir) static void UpdateKeyList() { const char *widgetname[2] = {"treeview1", "treeview2"}; - GladeXML *xml; GtkWidget *widget; GtkListStore *store; GtkTreeIter iter; int i, j; char buf[256]; - xml = glade_get_widget_tree(MainWindow); - for (i = 0; i < 2; i++) { int total; @@ -198,7 +192,7 @@ static void UpdateKeyList() { total = DKEY_TOTAL - 2; } - widget = glade_xml_get_widget(xml, widgetname[i]); + widget = gtk_builder_get_object(xml, widgetname[i]); store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING); @@ -226,20 +220,17 @@ static void UpdateKeyList() { static void UpdateKey() { const char *widgetname[2] = {"treeview1", "treeview2"}; int i, index; - GladeXML *xml; GtkWidget *widget; GtkTreeModel *model; GtkTreeIter iter; GValue value = {0, }; char buf[256]; - xml = glade_get_widget_tree(MainWindow); - for (i = 0; i < 2; i++) { index = GetSelectedKeyIndex(i); if (index == -1) continue; - widget = glade_xml_get_widget(xml, widgetname[i]); + widget = gtk_builder_get_object(xml, widgetname[i]); gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)), &model, &iter); if (index < DKEY_TOTAL) { @@ -264,7 +255,6 @@ static void OnConfigExit(GtkWidget *widget, gpointer user_data) { } static void TreeSelectionChanged(GtkTreeSelection *selection, gpointer user_data) { - GladeXML *xml; GtkTreeIter iter; GtkTreeModel *model; GtkTreePath *path; @@ -281,24 +271,20 @@ static void TreeSelectionChanged(GtkTreeSelection *selection, gpointer user_data // If a row was selected, and the row is not blank, we can now enable // some of the disabled widgets - xml = glade_get_widget_tree(MainWindow); - if ((int)user_data == 0) { - gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btnchange1")), TRUE); - gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btnreset1")), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(xml, "btnchange1")), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(xml, "btnreset1")), TRUE); } else { - gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btnchange2")), TRUE); - gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btnreset2")), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(xml, "btnchange2")), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(xml, "btnreset2")), TRUE); } } else { - xml = glade_get_widget_tree(MainWindow); - if ((int)user_data == 0) { - gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btnchange1")), FALSE); - gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btnreset1")), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(xml, "btnchange1")), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(xml, "btnreset1")), FALSE); } else { - gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btnchange2")), FALSE); - gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btnreset2")), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(xml, "btnchange2")), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(xml, "btnreset2")), FALSE); } } } @@ -538,16 +524,13 @@ static void PopulateDevList() { const char *widgetname[2] = {"combodev1", "combodev2"}; int i, j, n; GtkWidget *widget; - GladeXML *xml; GtkTreeIter iter; GtkListStore *store; GtkCellRenderer *renderer; char buf[256]; - xml = glade_get_widget_tree(MainWindow); - for (i = 0; i < 2; i++) { - widget = glade_xml_get_widget(xml, widgetname[i]); + widget = gtk_builder_get_object(xml, widgetname[i]); renderer = gtk_cell_renderer_text_new(); gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(widget), renderer, FALSE); @@ -578,7 +561,6 @@ static void PopulateDevList() { } long PADconfigure() { - GladeXML *xml; GtkWidget *widget; GtkTreeSelection *treesel; GtkTreeViewColumn *column; @@ -591,16 +573,17 @@ long PADconfigure() { LoadPADConfig(); - xml = glade_xml_new(DATADIR "dfinput.glade2", "CfgWnd", NULL); - if (xml == NULL) { + xml = gtk_builder_new(); + + if (!gtk_builder_add_from_file(xml, DATADIR "dfinput.ui", NULL)) { g_warning("We could not load the interface!"); return -1; } - MainWindow = glade_xml_get_widget(xml, "CfgWnd"); + MainWindow = gtk_builder_get_object(xml, "CfgWnd"); gtk_window_set_title(GTK_WINDOW(MainWindow), _("Gamepad/Keyboard Input Configuration")); - widget = glade_xml_get_widget(xml, "treeview1"); + widget = gtk_builder_get_object(xml, "treeview1"); // column for key renderer = gtk_cell_renderer_text_new(); @@ -620,7 +603,7 @@ long PADconfigure() { g_signal_connect_data(G_OBJECT(treesel), "changed", G_CALLBACK(TreeSelectionChanged), (gpointer)0, NULL, G_CONNECT_AFTER); - widget = glade_xml_get_widget(xml, "treeview2"); + widget = gtk_builder_get_object(xml, "treeview2"); // column for key renderer = gtk_cell_renderer_text_new(); @@ -640,58 +623,58 @@ long PADconfigure() { g_signal_connect_data(G_OBJECT(treesel), "changed", G_CALLBACK(TreeSelectionChanged), (gpointer)1, NULL, G_CONNECT_AFTER); - widget = glade_xml_get_widget(xml, "CfgWnd"); + widget = gtk_builder_get_object(xml, "CfgWnd"); g_signal_connect_data(GTK_OBJECT(widget), "delete_event", GTK_SIGNAL_FUNC(OnConfigExit), NULL, NULL, G_CONNECT_AFTER); - widget = glade_xml_get_widget(xml, "btnclose"); + widget = gtk_builder_get_object(xml, "btnclose"); g_signal_connect_data(GTK_OBJECT(widget), "clicked", GTK_SIGNAL_FUNC(OnConfigExit), NULL, NULL, G_CONNECT_AFTER); PopulateDevList(); UpdateKeyList(); - widget = glade_xml_get_widget(xml, "checkmt"); + 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", GTK_SIGNAL_FUNC(OnThreadedToggled), NULL, NULL, G_CONNECT_AFTER); - widget = glade_xml_get_widget(xml, "combodev1"); + widget = gtk_builder_get_object(xml, "combodev1"); g_signal_connect_data(GTK_OBJECT(widget), "changed", GTK_SIGNAL_FUNC(OnDeviceChanged), (gpointer)0, NULL, G_CONNECT_AFTER); - widget = glade_xml_get_widget(xml, "combodev2"); + widget = gtk_builder_get_object(xml, "combodev2"); g_signal_connect_data(GTK_OBJECT(widget), "changed", GTK_SIGNAL_FUNC(OnDeviceChanged), (gpointer)1, NULL, G_CONNECT_AFTER); - widget = glade_xml_get_widget(xml, "combotype1"); + widget = gtk_builder_get_object(xml, "combotype1"); gtk_combo_box_set_active(GTK_COMBO_BOX(widget), g.cfg.PadDef[0].Type == PSE_PAD_TYPE_ANALOGPAD ? 1 : 0); g_signal_connect_data(GTK_OBJECT(widget), "changed", GTK_SIGNAL_FUNC(OnTypeChanged), (gpointer)0, NULL, G_CONNECT_AFTER); - widget = glade_xml_get_widget(xml, "combotype2"); + widget = gtk_builder_get_object(xml, "combotype2"); gtk_combo_box_set_active(GTK_COMBO_BOX(widget), g.cfg.PadDef[1].Type == PSE_PAD_TYPE_ANALOGPAD ? 1 : 0); g_signal_connect_data(GTK_OBJECT(widget), "changed", GTK_SIGNAL_FUNC(OnTypeChanged), (gpointer)1, NULL, G_CONNECT_AFTER); - widget = glade_xml_get_widget(xml, "btnchange1"); + widget = gtk_builder_get_object(xml, "btnchange1"); gtk_widget_set_sensitive(widget, FALSE); g_signal_connect_data(GTK_OBJECT(widget), "clicked", GTK_SIGNAL_FUNC(OnChangeClicked), (gpointer)0, NULL, G_CONNECT_AFTER); - widget = glade_xml_get_widget(xml, "btnreset1"); + widget = gtk_builder_get_object(xml, "btnreset1"); gtk_widget_set_sensitive(widget, FALSE); g_signal_connect_data(GTK_OBJECT(widget), "clicked", GTK_SIGNAL_FUNC(OnResetClicked), (gpointer)0, NULL, G_CONNECT_AFTER); - widget = glade_xml_get_widget(xml, "btnchange2"); + widget = gtk_builder_get_object(xml, "btnchange2"); gtk_widget_set_sensitive(widget, FALSE); g_signal_connect_data(GTK_OBJECT(widget), "clicked", GTK_SIGNAL_FUNC(OnChangeClicked), (gpointer)1, NULL, G_CONNECT_AFTER); - widget = glade_xml_get_widget(xml, "btnreset2"); + widget = gtk_builder_get_object(xml, "btnreset2"); gtk_widget_set_sensitive(widget, FALSE); g_signal_connect_data(GTK_OBJECT(widget), "clicked", GTK_SIGNAL_FUNC(OnResetClicked), (gpointer)1, NULL, G_CONNECT_AFTER); diff --git a/plugins/dfinput/dfinput.glade2 b/plugins/dfinput/dfinput.glade2 deleted file mode 100644 index c7bdd114..00000000 --- a/plugins/dfinput/dfinput.glade2 +++ /dev/null @@ -1,489 +0,0 @@ - - - - - - 5 - False - center - normal - False - - - True - vertical - 2 - - - True - True - - - True - vertical - 2 - - - True - - - True - 10 - - - True - Device: - - - False - False - 0 - - - - - 150 - True - - - 1 - - - - - False - False - 0 - - - - - True - 10 - - - True - Type: - - - False - False - 0 - - - - - 200 - True - Digital Pad -Analog Pad - - - False - False - 1 - - - - - False - False - 1 - - - - - False - False - 0 - - - - - True - True - 5 - automatic - automatic - True - etched-in - - - 500 - 275 - True - True - - - - - 1 - - - - - True - 20 - center - - - True - True - True - - - True - - - True - gtk-edit - 1 - - - 0 - - - - - True - Change - - - 1 - - - - - - - False - False - 0 - - - - - True - True - True - - - True - - - True - gtk-undo - 1 - - - 0 - - - - - True - Reset - - - 1 - - - - - - - False - False - 1 - - - - - 2 - - - - - - - True - Controller 1 - - - False - tab - - - - - True - vertical - 2 - - - True - - - True - 10 - - - True - Device: - - - False - False - 0 - - - - - 150 - True - - - 1 - - - - - False - False - 0 - - - - - True - 10 - - - True - Type: - - - False - False - 0 - - - - - 200 - True - Digital Pad -Analog Pad - - - False - False - 1 - - - - - False - False - 1 - - - - - False - False - 0 - - - - - True - True - 5 - automatic - automatic - True - etched-in - - - 500 - 275 - True - True - - - - - 1 - - - - - True - 20 - center - - - True - True - True - - - True - - - True - gtk-edit - 1 - - - 0 - - - - - True - Change - - - 1 - - - - - - - False - False - 0 - - - - - True - True - True - - - True - - - True - gtk-undo - 1 - - - 0 - - - - - True - Reset - - - 1 - - - - - - - False - False - 1 - - - - - False - False - 2 - - - - - 1 - - - - - True - Controller 2 - - - 1 - False - tab - - - - - True - vertical - 20 - - - Multi-Threaded (Recommended) - True - True - False - True - - - False - False - 16 - 0 - - - - - 2 - - - - - True - Options - - - 2 - False - tab - - - - - 1 - - - - - True - end - - - gtk-close - True - True - True - True - - - False - False - 0 - - - - - False - end - 0 - - - - - - diff --git a/plugins/dfinput/dfinput.ui b/plugins/dfinput/dfinput.ui new file mode 100644 index 00000000..144a14c8 --- /dev/null +++ b/plugins/dfinput/dfinput.ui @@ -0,0 +1,527 @@ + + + + + + + + + + + + Digital Pad + + + Analog Pad + + + + + + + + + + + Digital Pad + + + Analog Pad + + + + + 5 + False + center + normal + False + + + True + vertical + 2 + + + True + True + + + True + vertical + 2 + + + True + + + True + 10 + + + True + Device: + + + False + False + 0 + + + + + 150 + True + + + 1 + + + + + False + False + 0 + + + + + True + 10 + + + True + Type: + + + False + False + 0 + + + + + 200 + True + liststore2 + + + + 0 + + + + + False + False + 1 + + + + + False + False + 1 + + + + + False + False + 0 + + + + + True + True + 5 + automatic + automatic + True + etched-in + + + 500 + 275 + True + True + + + + + 1 + + + + + True + 20 + center + + + True + True + True + + + True + + + True + gtk-edit + 1 + + + 0 + + + + + True + Change + + + 1 + + + + + + + False + False + 0 + + + + + True + True + True + + + True + + + True + gtk-undo + 1 + + + 0 + + + + + True + Reset + + + 1 + + + + + + + False + False + 1 + + + + + 2 + + + + + + + True + Controller 1 + + + False + + + + + True + vertical + 2 + + + True + + + True + 10 + + + True + Device: + + + False + False + 0 + + + + + 150 + True + + + 1 + + + + + False + False + 0 + + + + + True + 10 + + + True + Type: + + + False + False + 0 + + + + + 200 + True + liststore1 + + + + 0 + + + + + False + False + 1 + + + + + False + False + 1 + + + + + False + False + 0 + + + + + True + True + 5 + automatic + automatic + True + etched-in + + + 500 + 275 + True + True + + + + + 1 + + + + + True + 20 + center + + + True + True + True + + + True + + + True + gtk-edit + 1 + + + 0 + + + + + True + Change + + + 1 + + + + + + + False + False + 0 + + + + + True + True + True + + + True + + + True + gtk-undo + 1 + + + 0 + + + + + True + Reset + + + 1 + + + + + + + False + False + 1 + + + + + False + False + 2 + + + + + 1 + + + + + True + Controller 2 + + + 1 + False + + + + + True + vertical + 20 + + + Multi-Threaded (Recommended) + True + True + False + True + + + False + False + 16 + 0 + + + + + 2 + + + + + True + Options + + + 2 + False + + + + + 1 + + + + + True + end + + + gtk-close + True + True + True + True + + + False + False + 0 + + + + + False + end + 0 + + + + + + btnclose + + + -- cgit v1.2.3