From 878ccf4a56535765653f879af7dba1d0fb1c832c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sat, 16 Jan 2010 06:57:26 +0100 Subject: tests: Port from libglade to GtkBuilder Fixes bug #601108. --- tests/icles/Makefile.am | 9 +- tests/icles/metadata_editor.c | 88 ++-------- tests/icles/metadata_editor.glade | 331 ------------------------------------ tests/icles/metadata_editor.ui | 347 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 367 insertions(+), 408 deletions(-) delete mode 100644 tests/icles/metadata_editor.glade create mode 100644 tests/icles/metadata_editor.ui (limited to 'tests/icles') diff --git a/tests/icles/Makefile.am b/tests/icles/Makefile.am index 28f540db6..437a82fd3 100644 --- a/tests/icles/Makefile.am +++ b/tests/icles/Makefile.am @@ -19,20 +19,15 @@ endif if USE_METADATA -if HAVE_GLADE if HAVE_GTK GST_METADATA_TESTS = metadata_editor metadata_editor_SOURCES = metadata_editor.c metadata_editor_CFLAGS = \ - $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GLADE_CFLAGS) + $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) metadata_editor_LDADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-0.10 $(GST_LIBS) \ - $(GLADE_LIBS) -else -GST_METADATA_TESTS = -endif + $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-0.10 $(GST_LIBS) else GST_METADATA_TESTS = endif diff --git a/tests/icles/metadata_editor.c b/tests/icles/metadata_editor.c index 155d58676..81eda9795 100644 --- a/tests/icles/metadata_editor.c +++ b/tests/icles/metadata_editor.c @@ -47,7 +47,6 @@ #include #include -#include #include /* @@ -119,7 +118,7 @@ AppOptions app_options = APP_OPT_ALL; GstTagList *tag_list = NULL; -GladeXML *ui_glade_xml = NULL; +GtkBuilder *builder = NULL; GtkWidget *ui_main_window = NULL; GtkWidget *ui_drawing = NULL; GtkWidget *ui_tree = NULL; @@ -311,7 +310,7 @@ ui_drawing_size_allocate_cb (GtkWidget * drawing_area, } /* - * UI handling functions (mapped by glade) + * UI handling functions (mapped by GtkBuilder) */ gboolean @@ -740,91 +739,40 @@ ui_refresh () gtk_window_set_title (GTK_WINDOW (ui_main_window), filename->str); } -static int -ui_connect_signals() -{ - - glade_xml_signal_connect(ui_glade_xml, "on_checkbuttonCaptureV4l2_toggled", - (GCallback)on_checkbuttonCaptureV4l2_toggled); - - glade_xml_signal_connect(ui_glade_xml, "on_checkbuttonCaptureTest_toggled", - (GCallback)on_checkbuttonCaptureTest_toggled); - - glade_xml_signal_connect(ui_glade_xml, - "on_checkbuttonOptionsDemuxExif_toggled", - (GCallback) on_checkbuttonOptionsDemuxExif_toggled); - - glade_xml_signal_connect(ui_glade_xml, - "on_checkbuttonOptionsDemuxIptc_toggled", - (GCallback) on_checkbuttonOptionsDemuxIptc_toggled); - - glade_xml_signal_connect(ui_glade_xml, - "on_checkbuttonOptionsDemuxXmp_toggled", - (GCallback) on_checkbuttonOptionsDemuxXmp_toggled); - - glade_xml_signal_connect(ui_glade_xml, - "on_checkbuttonOptionsMuxExif_toggled", - (GCallback) on_checkbuttonOptionsMuxExif_toggled); - - glade_xml_signal_connect(ui_glade_xml, - "on_checkbuttonOptionsMuxIptc_toggled", - (GCallback) on_checkbuttonOptionsMuxIptc_toggled); - - glade_xml_signal_connect(ui_glade_xml, - "on_checkbuttonOptionsMuxXmp_toggled", - (GCallback) on_checkbuttonOptionsMuxXmp_toggled); - - glade_xml_signal_connect(ui_glade_xml, "on_buttonSaveFile_clicked", - (GCallback)on_buttonSaveFile_clicked); - - glade_xml_signal_connect(ui_glade_xml, "on_windowMain_delete_event", - (GCallback)on_windowMain_delete_event); - - glade_xml_signal_connect(ui_glade_xml, "on_drawingMain_expose_event", - (GCallback)on_drawingMain_expose_event); - - glade_xml_signal_connect(ui_glade_xml, "on_buttonInsert_clicked", - (GCallback)on_buttonInsert_clicked); - - glade_xml_signal_connect(ui_glade_xml, "on_buttonOpenFile_clicked", - (GCallback)on_buttonOpenFile_clicked); - - return 0; - -} - static int ui_create () { + Gerror *error = NULL; int ret = 0; - ui_glade_xml = glade_xml_new ("metadata_editor.glade", NULL, NULL); - - if (!ui_glade_xml) { - fprintf (stderr, "glade_xml_new failed\n"); + builder = gtk_builder_new (); + if (!gtk_builder_add_from_file (builder, "metadata_editor.ui", &error)) + { + g_warning ("Couldn't load builder file: %s", error->message); + g_error_free (error); ret = -101; goto done; } - ui_main_window = glade_xml_get_widget (ui_glade_xml, "windowMain"); + ui_main_window = GTK_WIDGET (gtk_builder_get_object (builder, "windowMain")); - ui_drawing = glade_xml_get_widget (ui_glade_xml, "drawingMain"); + ui_drawing = GTK_WIDGET (gtk_builder_get_object (builder, "drawingMain")); - ui_tree = glade_xml_get_widget (ui_glade_xml, "treeMain"); + ui_tree = GTK_WIDGET (gtk_builder_get_object (builder, "treeMain")); ui_entry_insert_tag = - GTK_ENTRY (glade_xml_get_widget (ui_glade_xml, "entryTag")); + GTK_ENTRY (gtk_builder_get_object (builder, "entryTag")); ui_entry_insert_value = - GTK_ENTRY (glade_xml_get_widget (ui_glade_xml, "entryValue")); + GTK_ENTRY (gtk_builder_get_object (builder, "entryValue")); ui_chk_bnt_capture_v4l2 = - GTK_TOGGLE_BUTTON (glade_xml_get_widget (ui_glade_xml, - "checkbuttonCaptureV4l2")); + GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, + "checkbuttonCaptureV4l2")); ui_chk_bnt_capture_test = - GTK_TOGGLE_BUTTON (glade_xml_get_widget (ui_glade_xml, - "checkbuttonCaptureTest")); + GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, + "checkbuttonCaptureTest")); if (!(ui_main_window && ui_drawing && ui_tree && ui_entry_insert_tag && ui_entry_insert_value @@ -837,7 +785,7 @@ ui_create () g_signal_connect_after (ui_drawing, "size-allocate", G_CALLBACK (ui_drawing_size_allocate_cb), NULL); - ui_connect_signals(); + gtk_builder_connect_signals (builder, NULL); ui_setup_tree_view (GTK_TREE_VIEW (ui_tree)); diff --git a/tests/icles/metadata_editor.glade b/tests/icles/metadata_editor.glade deleted file mode 100644 index 91aac5356..000000000 --- a/tests/icles/metadata_editor.glade +++ /dev/null @@ -1,331 +0,0 @@ - - - - - - 800 - 600 - GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Metadata Editor - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 200 - 100 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - False - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - True - False - True - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 300 - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - False - False - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - GTK_BUTTONBOX_SPREAD - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Insert - 0 - - - - False - False - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Save File - 0 - - - - 1 - - - - - False - False - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Capture image from camera - 0 - True - - - - False - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Capture image from videotestsrc - 0 - True - - - - False - 1 - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Open File... - 0 - - - - 2 - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Demux options: - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - exif - 0 - True - True - - - - False - 1 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - iptc - 0 - True - True - - - - False - 2 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - xmp - 0 - True - True - - - - False - 3 - - - - - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Mux options: - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - exif - 0 - True - True - - - - False - 1 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - iptc - 0 - True - True - - - - False - 2 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - xmp - 0 - True - True - - - - False - 3 - - - - - 2 - - - - - 2 - - - - - False - False - 1 - - - - - True - False - - - - - - diff --git a/tests/icles/metadata_editor.ui b/tests/icles/metadata_editor.ui new file mode 100644 index 000000000..3cbe076c3 --- /dev/null +++ b/tests/icles/metadata_editor.ui @@ -0,0 +1,347 @@ + + + + + + 800 + 600 + GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Metadata Editor + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 200 + 100 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + False + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + automatic + automatic + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + False + True + + + + + 0 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 300 + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + False + False + 0 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + + + + + 0 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + spread + + + Insert + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + False + False + 0 + + + + + Save File + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + False + False + 1 + + + + + False + False + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + Capture image from camera + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + False + 0 + + + + + Capture image from videotestsrc + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + False + 1 + + + + + Open File... + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + 2 + + + + + 0 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Demux options: + + + 0 + + + + + exif + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + + + + False + 1 + + + + + iptc + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + + + + False + 2 + + + + + xmp + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + + + + False + 3 + + + + + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Mux options: + + + 0 + + + + + exif + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + + + + False + 1 + + + + + iptc + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + + + + False + 2 + + + + + xmp + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + + + + False + 3 + + + + + 2 + + + + + 2 + + + + + False + False + 1 + + + + + True + False + + + + + + -- cgit v1.2.1