From 054c0881696a85f537e93b4950a28f505a3dc0f7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 24 Sep 2009 18:04:36 -0400 Subject: =?UTF-8?q?Bug=C2=A0589153=20-=20Use=20GtkBuilder=20instead=20of?= =?UTF-8?q?=20libglade?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- widgets/menus/Makefile.am | 12 +- widgets/menus/gal-define-views-dialog.c | 32 ++-- widgets/menus/gal-define-views-dialog.h | 3 +- widgets/menus/gal-define-views.glade | 176 -------------------- widgets/menus/gal-define-views.ui | 177 ++++++++++++++++++++ widgets/menus/gal-view-instance-save-as-dialog.c | 29 ++-- .../menus/gal-view-instance-save-as-dialog.glade | 174 ------------------- widgets/menus/gal-view-instance-save-as-dialog.h | 3 +- widgets/menus/gal-view-instance-save-as-dialog.ui | 174 +++++++++++++++++++ widgets/menus/gal-view-instance.c | 6 +- widgets/menus/gal-view-new-dialog.c | 26 ++- widgets/menus/gal-view-new-dialog.glade | 185 --------------------- widgets/menus/gal-view-new-dialog.h | 3 +- widgets/menus/gal-view-new-dialog.ui | 179 ++++++++++++++++++++ 14 files changed, 580 insertions(+), 599 deletions(-) delete mode 100644 widgets/menus/gal-define-views.glade create mode 100644 widgets/menus/gal-define-views.ui delete mode 100644 widgets/menus/gal-view-instance-save-as-dialog.glade create mode 100644 widgets/menus/gal-view-instance-save-as-dialog.ui delete mode 100644 widgets/menus/gal-view-new-dialog.glade create mode 100644 widgets/menus/gal-view-new-dialog.ui (limited to 'widgets/menus') diff --git a/widgets/menus/Makefile.am b/widgets/menus/Makefile.am index 920dae4685..3a33e64651 100644 --- a/widgets/menus/Makefile.am +++ b/widgets/menus/Makefile.am @@ -4,7 +4,7 @@ libmenus_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DG_LOG_DOMAIN=\"menus\" \ $(GNOME_PLATFORM_CFLAGS) \ $(E_UTIL_CFLAGS) @@ -21,10 +21,10 @@ libmenus_la_SOURCES = \ gal-view-new-dialog.c \ gal-view.c -glade_DATA = \ - gal-define-views.glade \ - gal-view-new-dialog.glade \ - gal-view-instance-save-as-dialog.glade +ui_DATA = \ + gal-define-views.ui \ + gal-view-new-dialog.ui \ + gal-view-instance-save-as-dialog.ui libmenusincludedir = $(privincludedir)/menus @@ -52,6 +52,6 @@ libmenus_la_LIBADD = \ icons = EXTRA_DIST = \ $(icons) \ - $(glade_DATA) + $(ui_DATA) -include $(top_srcdir)/git.mk diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c index 148960e4d5..ade534bc02 100644 --- a/widgets/menus/gal-define-views-dialog.c +++ b/widgets/menus/gal-define-views-dialog.c @@ -186,7 +186,7 @@ gdvd_button_copy_callback(GtkWidget *widget, GalDefineViewsDialog *dialog) GtkWidget *scrolled; ETable *etable; - scrolled = glade_xml_get_widget(dialog->gui, "custom-table"); + scrolled = e_builder_get_widget(dialog->builder, "custom-table"); etable = e_table_scrolled_get_table(E_TABLE_SCROLLED(scrolled)); row = e_table_get_cursor_row (E_TABLE(etable)); @@ -210,10 +210,10 @@ gdvd_cursor_changed_callback (GtkWidget *widget, GalDefineViewsDialog *dialog) &iter)) { gtk_tree_model_get (dialog->model, &iter, COL_GALVIEW_DATA, &item, -1); - button = glade_xml_get_widget (dialog->gui, "button-delete"); + button = e_builder_get_widget (dialog->builder, "button-delete"); gtk_widget_set_sensitive (GTK_WIDGET (button), !item->built_in); - button = glade_xml_get_widget (dialog->gui, "button-modify"); + button = e_builder_get_widget (dialog->builder, "button-modify"); gtk_widget_set_sensitive (GTK_WIDGET (button), !item->built_in); } } @@ -223,7 +223,7 @@ gdvd_connect_signal(GalDefineViewsDialog *dialog, const gchar *widget_name, cons { GtkWidget *widget; - widget = glade_xml_get_widget (dialog->gui, widget_name); + widget = e_builder_get_widget (dialog->builder, widget_name); if (widget) g_signal_connect (widget, signal, handler, dialog); @@ -238,20 +238,14 @@ dialog_response (GalDefineViewsDialog *dialog, gint response_id, gpointer data) static void gal_define_views_dialog_init (GalDefineViewsDialog *dialog) { - GladeXML *gui; GtkWidget *widget; - gchar *filename = g_build_filename (EVOLUTION_GLADEDIR, - "gal-define-views.glade", - NULL); - dialog->collection = NULL; - gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE); - g_free (filename); - dialog->gui = gui; + dialog->builder = gtk_builder_new (); + e_load_ui_builder_definition (dialog->builder, "gal-define-views.ui"); - widget = glade_xml_get_widget (gui, "table-top"); + widget = e_builder_get_widget (dialog->builder, "table-top"); if (!widget) { return; } @@ -268,7 +262,7 @@ gal_define_views_dialog_init (GalDefineViewsDialog *dialog) GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); - dialog->treeview = GTK_TREE_VIEW (glade_xml_get_widget (dialog->gui, "treeview1")); + dialog->treeview = GTK_TREE_VIEW (e_builder_get_widget (dialog->builder, "treeview1")); gtk_tree_view_set_reorderable (GTK_TREE_VIEW (dialog->treeview), FALSE); gtk_tree_view_set_headers_visible (dialog->treeview, TRUE); @@ -291,9 +285,9 @@ gal_define_views_dialog_dispose (GObject *object) { GalDefineViewsDialog *gal_define_views_dialog = GAL_DEFINE_VIEWS_DIALOG(object); - if (gal_define_views_dialog->gui) - g_object_unref(gal_define_views_dialog->gui); - gal_define_views_dialog->gui = NULL; + if (gal_define_views_dialog->builder) + g_object_unref(gal_define_views_dialog->builder); + gal_define_views_dialog->builder = NULL; if (G_OBJECT_CLASS (gal_define_views_dialog_parent_class)->dispose) (* G_OBJECT_CLASS (gal_define_views_dialog_parent_class)->dispose) (object); @@ -349,8 +343,8 @@ gal_define_views_dialog_set_collection(GalDefineViewsDialog *dialog, gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (dialog->model), COL_GALVIEW_NAME, GTK_SORT_ASCENDING); - if (dialog->gui) { - GtkWidget *widget = glade_xml_get_widget(dialog->gui, "label-views"); + if (dialog->builder) { + GtkWidget *widget = e_builder_get_widget(dialog->builder, "label-views"); if (widget && GTK_IS_LABEL (widget)) { if (collection->title) { gchar *text = g_strdup_printf (_("Define Views for %s"), diff --git a/widgets/menus/gal-define-views-dialog.h b/widgets/menus/gal-define-views-dialog.h index a510679567..c4b79a7834 100644 --- a/widgets/menus/gal-define-views-dialog.h +++ b/widgets/menus/gal-define-views-dialog.h @@ -24,7 +24,6 @@ #define __GAL_DEFINE_VIEWS_DIALOG_H__ #include -#include #include @@ -52,7 +51,7 @@ struct _GalDefineViewsDialog GtkDialog parent; /* item specific fields */ - GladeXML *gui; + GtkBuilder *builder; GtkTreeView *treeview; GtkTreeModel *model; diff --git a/widgets/menus/gal-define-views.glade b/widgets/menus/gal-define-views.glade deleted file mode 100644 index 26976c4857..0000000000 --- a/widgets/menus/gal-define-views.glade +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - Define Views for "%s" - GDK_WINDOW_TYPE_HINT_NORMAL - - - True - 6 - - - True - 2 - 1 - 6 - 6 - - - True - 0 - Define Views for %s - - - GTK_FILL - - - - - - True - 6 - 6 - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - True - True - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - GTK_BUTTONBOX_START - - - True - True - gtk-new - True - - - False - False - - - - - True - False - True - True - - - True - 0 - 0 - - - True - 2 - - - True - gtk-properties - - - False - False - - - - - True - _Edit - True - - - False - False - 1 - - - - - - - - - False - False - 1 - - - - - True - True - gtk-delete - True - - - False - False - 2 - - - - - False - False - 1 - - - - - 1 - 2 - - - - - 12 - 2 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-close - True - -5 - - - - - False - GTK_PACK_END - - - - - - \ No newline at end of file diff --git a/widgets/menus/gal-define-views.ui b/widgets/menus/gal-define-views.ui new file mode 100644 index 0000000000..b3314aa4ee --- /dev/null +++ b/widgets/menus/gal-define-views.ui @@ -0,0 +1,177 @@ + + + + + Define Views for "%s" + GDK_WINDOW_TYPE_HINT_NORMAL + + + True + 6 + + + True + 2 + 1 + 6 + 6 + + + True + 0 + Define Views for %s + + + GTK_FILL + + + + + + True + 6 + 6 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + True + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + GTK_BUTTONBOX_START + + + True + True + gtk-new + True + + + False + False + + + + + True + False + True + True + + + True + 0 + 0 + + + True + 2 + + + True + gtk-properties + + + False + False + + + + + True + _Edit + True + + + False + False + 1 + + + + + + + + + False + False + 1 + + + + + True + True + gtk-delete + True + + + False + False + 2 + + + + + False + False + 1 + + + + + 1 + 2 + + + + + 12 + 2 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-close + True + + + + + False + GTK_PACK_END + + + + + + button7 + + + diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c index 76871594e2..37d903c630 100644 --- a/widgets/menus/gal-view-instance-save-as-dialog.c +++ b/widgets/menus/gal-view-instance-save-as-dialog.c @@ -198,9 +198,9 @@ gal_view_instance_save_as_dialog_dispose (GObject *object) { GalViewInstanceSaveAsDialog *gal_view_instance_save_as_dialog = GAL_VIEW_INSTANCE_SAVE_AS_DIALOG (object); - if (gal_view_instance_save_as_dialog->gui) - g_object_unref (gal_view_instance_save_as_dialog->gui); - gal_view_instance_save_as_dialog->gui = NULL; + if (gal_view_instance_save_as_dialog->builder) + g_object_unref (gal_view_instance_save_as_dialog->builder); + gal_view_instance_save_as_dialog->builder = NULL; if (G_OBJECT_CLASS (gal_view_instance_save_as_dialog_parent_class)->dispose) (* G_OBJECT_CLASS (gal_view_instance_save_as_dialog_parent_class)->dispose) (object); @@ -229,22 +229,17 @@ gal_view_instance_save_as_dialog_class_init (GalViewInstanceSaveAsDialogClass *k static void gal_view_instance_save_as_dialog_init (GalViewInstanceSaveAsDialog *dialog) { - GladeXML *gui; GtkWidget *widget; - gchar *filename = g_build_filename (EVOLUTION_GLADEDIR, - "gal-view-instance-save-as-dialog.glade", - NULL); - dialog->instance = NULL; dialog->model = NULL; dialog->collection = NULL; - gui = glade_xml_new_with_domain (filename , NULL, GETTEXT_PACKAGE); - g_free (filename); - dialog->gui = gui; + dialog->builder = gtk_builder_new (); + e_load_ui_builder_definition ( + dialog->builder, "gal-view-instance-save-as-dialog.ui"); - widget = glade_xml_get_widget (gui, "vbox-top"); + widget = e_builder_get_widget (dialog->builder, "vbox-top"); if (!widget) { return; } @@ -262,11 +257,11 @@ gal_view_instance_save_as_dialog_init (GalViewInstanceSaveAsDialog *dialog) GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); - dialog->scrolledwindow = glade_xml_get_widget (dialog->gui, "scrolledwindow2"); - dialog->treeview = GTK_TREE_VIEW (glade_xml_get_widget (dialog->gui, "custom-replace")); - dialog->entry_create = glade_xml_get_widget (dialog->gui, "entry-create"); - dialog->radiobutton_replace = glade_xml_get_widget (dialog->gui, "radiobutton-replace"); - dialog->radiobutton_create = glade_xml_get_widget (dialog->gui, "radiobutton-create"); + dialog->scrolledwindow = e_builder_get_widget (dialog->builder, "scrolledwindow2"); + dialog->treeview = GTK_TREE_VIEW (e_builder_get_widget (dialog->builder, "custom-replace")); + dialog->entry_create = e_builder_get_widget (dialog->builder, "entry-create"); + dialog->radiobutton_replace = e_builder_get_widget (dialog->builder, "radiobutton-replace"); + dialog->radiobutton_create = e_builder_get_widget (dialog->builder, "radiobutton-create"); gtk_tree_view_set_reorderable (GTK_TREE_VIEW (dialog->treeview), FALSE); gtk_tree_view_set_headers_visible (dialog->treeview, FALSE); diff --git a/widgets/menus/gal-view-instance-save-as-dialog.glade b/widgets/menus/gal-view-instance-save-as-dialog.glade deleted file mode 100644 index aa40910113..0000000000 --- a/widgets/menus/gal-view-instance-save-as-dialog.glade +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - GDK_WINDOW_TYPE_HINT_NORMAL - - - True - 8 - - - True - 18 - 12 - - - True - 6 - - - True - True - _Create new view - True - 0 - True - True - - - False - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 24 - - - True - 6 - - - True - _Name: - True - entry-create - - - False - False - - - - - True - False - True - - - 1 - - - - - - - 1 - - - - - False - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - - - True - True - _Replace existing view - True - 0 - True - radiobutton-create - - - False - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 24 - - - 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 - GTK_SHADOW_IN - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - - - - - 1 - - - - - 1 - - - - - 2 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-cancel - True - 0 - - - - - True - True - True - gtk-ok - True - 0 - - - 1 - - - - - False - GTK_PACK_END - - - - - - - diff --git a/widgets/menus/gal-view-instance-save-as-dialog.h b/widgets/menus/gal-view-instance-save-as-dialog.h index 64e97afde8..0f43666760 100644 --- a/widgets/menus/gal-view-instance-save-as-dialog.h +++ b/widgets/menus/gal-view-instance-save-as-dialog.h @@ -24,7 +24,6 @@ #define __GAL_VIEW_INSTANCE_SAVE_AS_DIALOG_H__ #include -#include #include #include @@ -57,7 +56,7 @@ struct _GalViewInstanceSaveAsDialog GtkDialog parent; /* item specific fields */ - GladeXML *gui; + GtkBuilder *builder; GtkTreeView *treeview; GtkTreeModel *model; diff --git a/widgets/menus/gal-view-instance-save-as-dialog.ui b/widgets/menus/gal-view-instance-save-as-dialog.ui new file mode 100644 index 0000000000..c7db68aa5f --- /dev/null +++ b/widgets/menus/gal-view-instance-save-as-dialog.ui @@ -0,0 +1,174 @@ + + + + + GDK_WINDOW_TYPE_HINT_NORMAL + + + True + 8 + + + True + 18 + 12 + + + True + 6 + + + True + True + _Create new view + True + True + True + + + False + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 24 + + + True + 6 + + + True + _Name: + True + entry-create + + + False + False + + + + + True + False + True + + + 1 + + + + + + + 1 + + + + + False + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + True + _Replace existing view + True + True + radiobutton-create + + + False + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 24 + + + 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 + GTK_SHADOW_IN + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + + + + 1 + + + + + 1 + + + + + 2 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + + + + + True + True + True + gtk-ok + True + + + 1 + + + + + False + GTK_PACK_END + + + + + + radiobutton-create + radiobutton-replace + button3 + button1 + + + diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c index bd93b64034..7b903107fe 100644 --- a/widgets/menus/gal-view-instance.c +++ b/widgets/menus/gal-view-instance.c @@ -419,7 +419,11 @@ dialog_response(GtkWidget *dialog, gint id, GalViewInstance *instance) void gal_view_instance_save_as (GalViewInstance *instance) { - GtkWidget *dialog = gal_view_instance_save_as_dialog_new(instance); + GtkWidget *dialog; + + g_return_if_fail (instance != NULL); + + dialog = gal_view_instance_save_as_dialog_new (instance); g_signal_connect(dialog, "response", G_CALLBACK(dialog_response), instance); gtk_widget_show(dialog); diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c index da90fb024d..328cc5e35e 100644 --- a/widgets/menus/gal-view-new-dialog.c +++ b/widgets/menus/gal-view-new-dialog.c @@ -74,17 +74,13 @@ gal_view_new_dialog_class_init (GalViewNewDialogClass *klass) static void gal_view_new_dialog_init (GalViewNewDialog *dialog) { - GladeXML *gui; GtkWidget *widget; - gchar *filename = g_build_filename (EVOLUTION_GLADEDIR, - "gal-view-new-dialog.glade", - NULL); - gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE); - g_free (filename); - dialog->gui = gui; + dialog->builder = gtk_builder_new (); + e_load_ui_builder_definition ( + dialog->builder, "gal-view-new-dialog.ui"); - widget = glade_xml_get_widget (gui, "table-top"); + widget = e_builder_get_widget (dialog->builder, "table-top"); if (!widget) { return; } @@ -111,9 +107,9 @@ gal_view_new_dialog_dispose (GObject *object) { GalViewNewDialog *gal_view_new_dialog = GAL_VIEW_NEW_DIALOG(object); - if (gal_view_new_dialog->gui) - g_object_unref(gal_view_new_dialog->gui); - gal_view_new_dialog->gui = NULL; + if (gal_view_new_dialog->builder) + g_object_unref(gal_view_new_dialog->builder); + gal_view_new_dialog->builder = NULL; if (G_OBJECT_CLASS (gal_view_new_dialog_parent_class)->dispose) (* G_OBJECT_CLASS (gal_view_new_dialog_parent_class)->dispose) (object); @@ -191,8 +187,8 @@ gal_view_new_dialog_construct (GalViewNewDialog *dialog, GtkCellRenderer *rend; dialog->collection = collection; - dialog->list = glade_xml_get_widget(dialog->gui,"list-type-list"); - dialog->entry = glade_xml_get_widget(dialog->gui, "entry-name"); + dialog->list = e_builder_get_widget(dialog->builder,"list-type-list"); + dialog->entry = e_builder_get_widget(dialog->builder, "entry-name"); dialog->list_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER); @@ -243,7 +239,7 @@ gal_view_new_dialog_set_property (GObject *object, guint prop_id, const GValue * switch (prop_id) { case PROP_NAME: - entry = glade_xml_get_widget(dialog->gui, "entry-name"); + entry = e_builder_get_widget(dialog->builder, "entry-name"); if (entry && GTK_IS_ENTRY(entry)) { gtk_entry_set_text(GTK_ENTRY(entry), g_value_get_string (value)); } @@ -264,7 +260,7 @@ gal_view_new_dialog_get_property (GObject *object, guint prop_id, GValue *value, switch (prop_id) { case PROP_NAME: - entry = glade_xml_get_widget(dialog->gui, "entry-name"); + entry = e_builder_get_widget(dialog->builder, "entry-name"); if (entry && GTK_IS_ENTRY(entry)) { g_value_set_string (value, gtk_entry_get_text (GTK_ENTRY (entry))); } diff --git a/widgets/menus/gal-view-new-dialog.glade b/widgets/menus/gal-view-new-dialog.glade deleted file mode 100644 index f182d63ab9..0000000000 --- a/widgets/menus/gal-view-new-dialog.glade +++ /dev/null @@ -1,185 +0,0 @@ - - - - - - - - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - - - - True - False - 8 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - 0 - - - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - 0 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - 4 - 1 - False - 6 - 6 - - - - True - Name of new view: - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - entry-name - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - - - 0 - 1 - 1 - 2 - fill - - - - - - True - Type of view: - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - False - False - False - True - - Type of View - - - - - - 0 - 1 - 3 - 4 - fill - - - - - 0 - True - True - - - - - - - diff --git a/widgets/menus/gal-view-new-dialog.h b/widgets/menus/gal-view-new-dialog.h index 364e1ae472..6b7d2b0335 100644 --- a/widgets/menus/gal-view-new-dialog.h +++ b/widgets/menus/gal-view-new-dialog.h @@ -24,7 +24,6 @@ #define __GAL_VIEW_NEW_DIALOG_H__ #include -#include #include G_BEGIN_DECLS @@ -51,7 +50,7 @@ struct _GalViewNewDialog GtkDialog parent; /* item specific fields */ - GladeXML *gui; + GtkBuilder *builder; GalViewCollection *collection; GalViewFactory *selected_factory; diff --git a/widgets/menus/gal-view-new-dialog.ui b/widgets/menus/gal-view-new-dialog.ui new file mode 100644 index 0000000000..290bc15c54 --- /dev/null +++ b/widgets/menus/gal-view-new-dialog.ui @@ -0,0 +1,179 @@ + + + + + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + + + True + False + 8 + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + True + + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + + + + + 0 + False + True + GTK_PACK_END + + + + + True + 4 + 1 + False + 6 + 6 + + + True + Name of new view: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + entry-name + + + 0 + 1 + 0 + 1 + fill + + + + + + True + True + True + True + 0 + + True + * + False + + + 0 + 1 + 1 + 2 + fill + + + + + True + Type of view: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + True + True + False + False + False + True + + + + + + Type of View + + + + + + + 0 + 1 + 3 + 4 + fill + + + + + 0 + True + True + + + + + + button1 + button3 + + + -- cgit v1.2.3