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 --- plugins/groupwise-features/Makefile.am | 16 +- plugins/groupwise-features/junk-settings.c | 35 +- plugins/groupwise-features/junk-settings.glade | 494 ------------ plugins/groupwise-features/junk-settings.h | 6 +- plugins/groupwise-features/junk-settings.ui | 457 +++++++++++ plugins/groupwise-features/properties.glade | 857 --------------------- plugins/groupwise-features/properties.ui | 794 +++++++++++++++++++ plugins/groupwise-features/proxy-add-dialog.glade | 780 ------------------- plugins/groupwise-features/proxy-add-dialog.ui | 730 ++++++++++++++++++ plugins/groupwise-features/proxy-listing.glade | 202 ----- plugins/groupwise-features/proxy-listing.ui | 153 ++++ .../groupwise-features/proxy-login-dialog.glade | 208 ----- plugins/groupwise-features/proxy-login-dialog.ui | 190 +++++ plugins/groupwise-features/proxy-login.c | 28 +- plugins/groupwise-features/proxy.c | 78 +- plugins/groupwise-features/send-options.c | 1 - plugins/groupwise-features/share-folder-common.c | 1 - plugins/groupwise-features/share-folder.c | 62 +- plugins/groupwise-features/share-folder.h | 7 +- 19 files changed, 2419 insertions(+), 2680 deletions(-) delete mode 100644 plugins/groupwise-features/junk-settings.glade create mode 100644 plugins/groupwise-features/junk-settings.ui delete mode 100644 plugins/groupwise-features/properties.glade create mode 100644 plugins/groupwise-features/properties.ui delete mode 100644 plugins/groupwise-features/proxy-add-dialog.glade create mode 100644 plugins/groupwise-features/proxy-add-dialog.ui delete mode 100644 plugins/groupwise-features/proxy-listing.glade create mode 100644 plugins/groupwise-features/proxy-listing.ui delete mode 100644 plugins/groupwise-features/proxy-login-dialog.glade create mode 100644 plugins/groupwise-features/proxy-login-dialog.ui (limited to 'plugins/groupwise-features') diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am index 5032d31689..97aff65f8b 100644 --- a/plugins/groupwise-features/Makefile.am +++ b/plugins/groupwise-features/Makefile.am @@ -20,7 +20,7 @@ liborg_gnome_groupwise_features_la_CPPFLAGS = \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ $(CAMEL_GROUPWISE_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" liborg_gnome_groupwise_features_la_SOURCES = \ @@ -64,12 +64,12 @@ liborg_gnome_groupwise_features_la_LIBADD= \ liborg_gnome_groupwise_features_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -glade_DATA = \ - properties.glade \ - junk-settings.glade \ - proxy-add-dialog.glade \ - proxy-listing.glade \ - proxy-login-dialog.glade +ui_DATA = \ + properties.ui \ + junk-settings.ui \ + proxy-add-dialog.ui \ + proxy-listing.ui \ + proxy-login-dialog.ui error_DATA = \ org-gnome-shared-folder.error \ @@ -83,7 +83,7 @@ errordir = $(privdatadir)/errors BUILT_SOURCES = org-gnome-groupwise-features.eplug $(error_DATA) EXTRA_DIST = \ - $(glade_DATA) \ + $(ui_DATA) \ org-gnome-compose-send-options.xml \ org-gnome-groupwise-features.eplug.xml \ org-gnome-shared-folder.error.xml \ diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c index f7c32ee969..ac985fd213 100644 --- a/plugins/groupwise-features/junk-settings.c +++ b/plugins/groupwise-features/junk-settings.c @@ -23,10 +23,10 @@ #ifdef HAVE_CONFIG_H # include #endif -#include #include "junk-settings.h" #include #include +#include #include #include #include @@ -88,7 +88,7 @@ static void junk_settings_finalise (GObject *obj) { JunkSettings *js = (JunkSettings *) obj; - g_object_unref (js->xml); + g_object_unref (js->builder); free_all(js); G_OBJECT_CLASS (parent_class)->finalize (obj); @@ -370,42 +370,31 @@ user_selected(GtkTreeSelection *selection, JunkSettings *js) static void junk_settings_construct (JunkSettings *js) { - GladeXML *xml; - gchar *gladefile; + js->builder = gtk_builder_new (); + e_load_ui_builder_definition (js->builder, "junk-settings.ui"); - gladefile = g_build_filename (EVOLUTION_GLADEDIR, - "junk-settings.glade", - NULL); - xml = glade_xml_new (gladefile, ROOTNODE, NULL); - g_free (gladefile); - - js->xml =xml; - - if (!js->xml) { - g_warning ("could not get xml"); - } - js->vbox = GTK_VBOX (glade_xml_get_widget(js->xml, "vboxSettings")); - js->table = GTK_VBOX (glade_xml_get_widget (js->xml, "vbox194")); + js->vbox = GTK_VBOX (e_builder_get_widget(js->builder, "vboxSettings")); + js->table = GTK_VBOX (e_builder_get_widget (js->builder, "vbox194")); gtk_widget_set_sensitive (GTK_WIDGET (js->table), FALSE); - js->enable = GTK_RADIO_BUTTON (glade_xml_get_widget (js->xml, "radEnable")); + js->enable = GTK_RADIO_BUTTON (e_builder_get_widget (js->builder, "radEnable")); g_signal_connect ((gpointer) js->enable, "clicked", G_CALLBACK (enable_clicked), js); - js->disable = GTK_RADIO_BUTTON (glade_xml_get_widget (js->xml, "radDisable")); + js->disable = GTK_RADIO_BUTTON (e_builder_get_widget (js->builder, "radDisable")); g_signal_connect ((gpointer) js->disable, "clicked", G_CALLBACK (disable_clicked), js); - js->add_button = GTK_BUTTON (glade_xml_get_widget(js->xml, "Add")); + js->add_button = GTK_BUTTON (e_builder_get_widget(js->builder, "Add")); g_signal_connect((GtkWidget *) js->add_button, "clicked", G_CALLBACK (add_clicked), js); - js->remove = GTK_BUTTON(glade_xml_get_widget(js->xml, "Remove")); + js->remove = GTK_BUTTON(e_builder_get_widget(js->builder, "Remove")); g_signal_connect ((GtkWidget *) js->remove, "clicked", G_CALLBACK (remove_clicked), js); gtk_widget_set_sensitive(GTK_WIDGET (js->remove), FALSE); - js->entry = GTK_ENTRY (glade_xml_get_widget (js->xml, "entry4")); + js->entry = GTK_ENTRY (e_builder_get_widget (js->builder, "entry4")); /*TODO:connect entry and label*/ gtk_widget_show ((GtkWidget *) js->entry); - js->scrolled_window = GTK_WIDGET (glade_xml_get_widget (js->xml,"scrolledwindow4")); + js->scrolled_window = GTK_WIDGET (e_builder_get_widget (js->builder,"scrolledwindow4")); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (js->scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); diff --git a/plugins/groupwise-features/junk-settings.glade b/plugins/groupwise-features/junk-settings.glade deleted file mode 100644 index 15280214c5..0000000000 --- a/plugins/groupwise-features/junk-settings.glade +++ /dev/null @@ -1,494 +0,0 @@ - - - - - - - - Junk Mail Settings - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - - - - True - True - True - True - GTK_POS_TOP - False - False - - - - 12 - True - False - 12 - - - - 0 - True - False - 6 - - - - 0 - True - False - 12 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - True - _Disable - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - _Enable - True - GTK_RELIEF_NORMAL - True - False - False - True - radDisable - - - 0 - False - False - - - - - - True - False - 0 - - - - True - False - 6 - - - - 234 - 209 - True - False - 0 - - - - True - False - 0 - - - - True - Email: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - * - False - - - 2 - True - True - - - - - 0 - True - True - - - - - - True - <b>Junk List:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 6 - False - False - - - - - - 282 - 150 - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - - - - 6 - True - True - - - - - 0 - True - True - - - - - - True - False - 6 - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-add - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - 29 - True - _Add - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-remove - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Remove - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - - - 0 - False - False - - - - - 0 - False - False - - - - - 0 - False - False - - - - - 0 - False - False - - - - - False - True - - - - - - True - _Junk List - True - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - - diff --git a/plugins/groupwise-features/junk-settings.h b/plugins/groupwise-features/junk-settings.h index 3216ed9d9b..d4b59ae480 100644 --- a/plugins/groupwise-features/junk-settings.h +++ b/plugins/groupwise-features/junk-settings.h @@ -24,8 +24,6 @@ #ifndef __JUNK_SETTINGS_H__ #define __JUNK_SETTINGS_H__ -G_BEGIN_DECLS - #include #include #include @@ -36,13 +34,15 @@ G_BEGIN_DECLS #define IS_JUNK_SETTINGS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), JUNK_SETTINGS_TYPE)) #define IS_JUNK_SETTINGS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), JUNK_SETTINGS_TYPE)) +G_BEGIN_DECLS + typedef struct _JunkSettings JunkSettings; typedef struct _JunkSettingsClass JunkSettingsClass; struct _JunkSettings { GtkVBox parent_object; - GladeXML *xml; + GtkBuilder *builder; /* General tab */ diff --git a/plugins/groupwise-features/junk-settings.ui b/plugins/groupwise-features/junk-settings.ui new file mode 100644 index 0000000000..bfa5f74c58 --- /dev/null +++ b/plugins/groupwise-features/junk-settings.ui @@ -0,0 +1,457 @@ + + + + + Junk Mail Settings + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + + + True + True + True + True + GTK_POS_TOP + False + False + + + 12 + True + False + 12 + + + 0 + True + False + 6 + + + 0 + True + False + 12 + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + False + 6 + + + True + True + _Disable + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + True + True + _Enable + True + GTK_RELIEF_NORMAL + True + False + False + True + radDisable + + + 0 + False + False + + + + + True + False + 0 + + + True + False + 6 + + + 234 + 209 + True + False + 0 + + + True + False + 0 + + + True + Email: + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + True + True + True + 0 + + True + * + False + + + 2 + True + True + + + + + 0 + True + True + + + + + True + <b>Junk List:</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 6 + False + False + + + + + 282 + 150 + True + True + GTK_POLICY_ALWAYS + GTK_POLICY_ALWAYS + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + + + 6 + True + True + + + + + 0 + True + True + + + + + True + False + 6 + + + True + True + GTK_RELIEF_NORMAL + True + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + True + False + 2 + + + True + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + 29 + True + _Add + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + True + True + GTK_RELIEF_NORMAL + True + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + True + False + 2 + + + True + gtk-remove + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + _Remove + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + + 0 + False + False + + + + + 0 + False + False + + + + + 0 + False + False + + + + + 0 + False + False + + + + + False + True + + + + + True + _Junk List + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + + diff --git a/plugins/groupwise-features/properties.glade b/plugins/groupwise-features/properties.glade deleted file mode 100644 index 6c36d4ba3e..0000000000 --- a/plugins/groupwise-features/properties.glade +++ /dev/null @@ -1,857 +0,0 @@ - - - - - - - - Folder Properties - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - - - - True - True - True - True - GTK_POS_TOP - False - False - - - - 12 - True - False - 12 - - - - True - False - 6 - - - - True - False - 12 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - True - _Not Shared - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - _Shared With... - True - GTK_RELIEF_NORMAL - True - False - False - True - radNotShared - - - 0 - False - False - - - - - - True - False - 0 - - - - True - False - 6 - - - - True - False - 0 - - - - True - False - 0 - - - - True - _Name: - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - * - False - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - <b>Users:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 6 - False - False - - - - - - 282 - 150 - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - - - - 6 - True - True - - - - - 0 - True - True - - - - - - True - False - 6 - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-jump-to - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Con_tacts... - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-add - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Add - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-remove - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Remove - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gnome-stock-mail-new - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - C_ustomize notification message - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 11 - True - True - - - - - 0 - False - False - - - - - 0 - False - False - - - - - 0 - False - False - - - - - 0 - False - False - - - - - False - True - - - - - - True - _Sharing - True - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - - - - - - - True - Shared Folder Notification - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - - - - 12 - True - False - 12 - - - - True - The participants will receive the following notification. - - False - False - GTK_JUSTIFY_CENTER - False - False - 0.66 - 0.5 - 0 - 0 - - - 1 - False - False - - - - - - 309 - True - False - 12 - - - - True - False - 5 - - - - True - Subject - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - 158 - True - True - True - True - 0 - - True - * - False - - - 6 - False - False - - - - - - True - Message - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - 0 - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_NONE - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.52 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - GTK_BUTTONBOX_END - 6 - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - - - - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - - diff --git a/plugins/groupwise-features/properties.ui b/plugins/groupwise-features/properties.ui new file mode 100644 index 0000000000..5b875e6f05 --- /dev/null +++ b/plugins/groupwise-features/properties.ui @@ -0,0 +1,794 @@ + + + + + Folder Properties + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + + + True + True + True + True + GTK_POS_TOP + False + False + + + 12 + True + False + 12 + + + True + False + 6 + + + True + False + 12 + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + False + 6 + + + True + True + _Not Shared + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + True + True + _Shared With... + True + GTK_RELIEF_NORMAL + True + False + False + True + radNotShared + + + 0 + False + False + + + + + True + False + 0 + + + True + False + 6 + + + True + False + 0 + + + True + False + 0 + + + True + _Name: + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + True + True + True + 0 + + True + * + False + + + 0 + True + True + + + + + 0 + True + True + + + + + True + <b>Users:</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 6 + False + False + + + + + 282 + 150 + True + True + GTK_POLICY_ALWAYS + GTK_POLICY_ALWAYS + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + + + 6 + True + True + + + + + 0 + True + True + + + + + True + False + 6 + + + True + True + GTK_RELIEF_NORMAL + True + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + True + False + 2 + + + True + gtk-jump-to + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + Con_tacts... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + True + True + GTK_RELIEF_NORMAL + True + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + True + False + 2 + + + True + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + _Add + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + True + True + GTK_RELIEF_NORMAL + True + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + True + False + 2 + + + True + gtk-remove + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + _Remove + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + True + False + 2 + + + True + gnome-stock-mail-new + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + C_ustomize notification message + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 11 + True + True + + + + + 0 + False + False + + + + + 0 + False + False + + + + + 0 + False + False + + + + + 0 + False + False + + + + + False + True + + + + + True + _Sharing + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + + + + + True + Shared Folder Notification + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + + + 12 + True + False + 12 + + + True + The participants will receive the following notification. + + False + False + GTK_JUSTIFY_CENTER + False + False + 0.66 + 0.5 + 0 + 0 + + + 1 + False + False + + + + + 309 + True + False + 12 + + + True + False + 5 + + + True + Subject + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + 158 + True + True + True + True + 0 + + True + * + False + + + 6 + False + False + + + + + True + Message + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + 0 + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + True + True + True + False + True + GTK_JUSTIFY_LEFT + GTK_WRAP_NONE + True + 0 + 0 + 0 + 0 + 0 + 0 + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + + + + True + False + 0 + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.52 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + GTK_BUTTONBOX_END + 6 + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + + + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + True + + + + + + 0 + True + True + + + + + 0 + False + True + + + + + + diff --git a/plugins/groupwise-features/proxy-add-dialog.glade b/plugins/groupwise-features/proxy-add-dialog.glade deleted file mode 100644 index 5deb089d4d..0000000000 --- a/plugins/groupwise-features/proxy-add-dialog.glade +++ /dev/null @@ -1,780 +0,0 @@ - - - - - - - 8 - True - Add/Edit - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - True - False - True - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-help - True - GTK_RELIEF_NORMAL - True - -11 - - - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - False - 0 - - - - True - False - 0 - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - 1 - True - 1 - 1 - False - 0 - 0 - - - - True - False - 27 - - - - True - True - True - True - 0 - - True - * - False - - - 0 - True - True - - - - - - True - False - 0 - - - - - - - 0 - True - True - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-jump-to - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Con_tacts - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - 0 - 1 - 0 - 1 - - - - - - - - - - True - <b>Name</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_OUT - - - - True - 0.5 - 0.5 - 1 - 1 - 2 - 7 - 12 - 0 - - - - True - False - 5 - - - - True - 4 - 3 - False - 8 - 43 - - - - True - Mail - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Appointments - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - Reminder Notes - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - Tasks - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - True - permission to read|_Read - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - - 1 - 2 - 0 - 1 - fill - - - - - - - True - True - permission to read|_Read - - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - - 1 - 2 - 1 - 2 - fill - - - - - - - True - True - permission to read|_Read - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - - 1 - 2 - 2 - 3 - fill - - - - - - - True - True - permission to read|_Read - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - - 1 - 2 - 3 - 4 - fill - - - - - - - True - True - _Write - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - True - _Write - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - - 2 - 3 - 1 - 2 - fill - - - - - - - True - True - _Write - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - - 2 - 3 - 2 - 3 - fill - - - - - - - True - True - _Write - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - - 2 - 3 - 3 - 4 - fill - - - - - - 6 - True - True - - - - - - True - False - 7 - - - - True - True - Subscribe to my _alarms - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - - 0 - False - False - - - - - - True - True - Subscribe to my _notifications - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - - 0 - False - False - - - - - - True - True - Modify _folders/options/rules/ - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - - 0 - False - False - - - - - - True - True - Read items marked _private - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - - 0 - False - False - - - - - 0 - True - True - - - - - - - - - - True - Access Rights - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 9 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - diff --git a/plugins/groupwise-features/proxy-add-dialog.ui b/plugins/groupwise-features/proxy-add-dialog.ui new file mode 100644 index 0000000000..16726b1606 --- /dev/null +++ b/plugins/groupwise-features/proxy-add-dialog.ui @@ -0,0 +1,730 @@ + + + + + 8 + True + Add/Edit + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + True + False + True + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + True + + + True + False + 0 + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-help + True + GTK_RELIEF_NORMAL + True + + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + True + + + + + 0 + False + True + GTK_PACK_END + + + + + True + False + 0 + + + True + False + 0 + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + 1 + True + 1 + 1 + False + 0 + 0 + + + True + False + 27 + + + True + True + True + True + 0 + + True + * + False + + + 0 + True + True + + + + + True + False + 0 + + + + + + 0 + True + True + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + True + False + 2 + + + True + gtk-jump-to + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + Con_tacts + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + 0 + 1 + 0 + 1 + + + + + + + + + True + <b>Name</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 0 + True + True + + + + + True + 0 + 0.5 + GTK_SHADOW_OUT + + + True + 0.5 + 0.5 + 1 + 1 + 2 + 7 + 12 + 0 + + + True + False + 5 + + + True + 4 + 3 + False + 8 + 43 + + + True + Mail + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + True + Appointments + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + True + Reminder Notes + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + True + Tasks + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 3 + 4 + fill + + + + + + True + True + permission to read|_Read + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + 1 + 2 + 0 + 1 + fill + + + + + + True + True + permission to read|_Read + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + 1 + 2 + 1 + 2 + fill + + + + + + True + True + permission to read|_Read + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + 1 + 2 + 2 + 3 + fill + + + + + + True + True + permission to read|_Read + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + 1 + 2 + 3 + 4 + fill + + + + + + True + True + _Write + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + 2 + 3 + 0 + 1 + fill + + + + + + True + True + _Write + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + 2 + 3 + 1 + 2 + fill + + + + + + True + True + _Write + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + 2 + 3 + 2 + 3 + fill + + + + + + True + True + _Write + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + 2 + 3 + 3 + 4 + fill + + + + + + 6 + True + True + + + + + True + False + 7 + + + True + True + Subscribe to my _alarms + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + 0 + False + False + + + + + True + True + Subscribe to my _notifications + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + 0 + False + False + + + + + True + True + Modify _folders/options/rules/ + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + 0 + False + False + + + + + True + True + Read items marked _private + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + 0 + False + False + + + + + 0 + True + True + + + + + + + + + True + Access Rights + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 9 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + proxy_help + proxy_cancel + proxy_button_ok + + + diff --git a/plugins/groupwise-features/proxy-listing.glade b/plugins/groupwise-features/proxy-listing.glade deleted file mode 100644 index 2ff0baaa97..0000000000 --- a/plugins/groupwise-features/proxy-listing.glade +++ /dev/null @@ -1,202 +0,0 @@ - - - - - - - - True - dialog1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - 0 - False - True - GTK_PACK_END - - - - - - True - True - True - True - GTK_POS_TOP - True - False - - - - 12 - True - False - 6 - - - - True - False - 0 - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - True - True - False - False - False - True - False - False - False - - - - - 5 - True - True - - - - - - True - False - 6 - - - - True - True - gtk-add - True - GTK_RELIEF_NORMAL - True - - - 6 - False - False - - - - - - True - True - gtk-edit - True - GTK_RELIEF_NORMAL - True - - - 0 - False - False - - - - - - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - True - - - 4 - False - False - - - - - 5 - False - True - - - - - 0 - True - True - - - - - False - True - - - - - - True - Proxy - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - 0 - True - True - - - - - - - diff --git a/plugins/groupwise-features/proxy-listing.ui b/plugins/groupwise-features/proxy-listing.ui new file mode 100644 index 0000000000..e0615cc658 --- /dev/null +++ b/plugins/groupwise-features/proxy-listing.ui @@ -0,0 +1,153 @@ + + + + + True + False + 0 + + + True + True + True + True + GTK_POS_TOP + True + False + + + 12 + True + False + 6 + + + True + False + 0 + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + True + True + False + False + False + True + False + False + False + + + + + 5 + True + True + + + + + True + False + 6 + + + True + True + gtk-add + True + GTK_RELIEF_NORMAL + True + + + 6 + False + False + + + + + True + True + gtk-edit + True + GTK_RELIEF_NORMAL + True + + + 0 + False + False + + + + + True + True + gtk-remove + True + GTK_RELIEF_NORMAL + True + + + 4 + False + False + + + + + 5 + False + True + + + + + 0 + True + True + + + + + False + True + + + + + True + Proxy + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 0 + True + True + + + + diff --git a/plugins/groupwise-features/proxy-login-dialog.glade b/plugins/groupwise-features/proxy-login-dialog.glade deleted file mode 100644 index d774555659..0000000000 --- a/plugins/groupwise-features/proxy-login-dialog.glade +++ /dev/null @@ -1,208 +0,0 @@ - - - - - - - - True - 325 - Proxy Login - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - True - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-help - True - GTK_RELIEF_NORMAL - True - -11 - - - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - 4 - True - True - False - 0 - - - - True - False - 0 - - - - True - False - 0 - - - - 250 - True - True - True - True - 0 - - True - * - False - - - 0 - True - True - - - - - 0 - False - False - - - - - 5 - False - False - - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - True - True - False - False - False - True - False - False - False - - - - - 0 - True - True - - - - - - - - True - <b>Account Name</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 5 - True - True - - - - - - - diff --git a/plugins/groupwise-features/proxy-login-dialog.ui b/plugins/groupwise-features/proxy-login-dialog.ui new file mode 100644 index 0000000000..c5e08fbe5d --- /dev/null +++ b/plugins/groupwise-features/proxy-login-dialog.ui @@ -0,0 +1,190 @@ + + + + + True + 325 + Proxy Login + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + True + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + True + + + True + False + 0 + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-help + True + GTK_RELIEF_NORMAL + True + + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + True + + + + + 0 + False + True + GTK_PACK_END + + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + 4 + True + True + False + 0 + + + True + False + 0 + + + True + False + 0 + + + 250 + True + True + True + True + 0 + + True + * + False + + + 0 + True + True + + + + + 0 + False + False + + + + + 5 + False + False + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + True + True + False + False + False + True + False + False + False + + + + + 0 + True + True + + + + + + + True + <b>Account Name</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 5 + True + True + + + + + + proxy_help + proxy_cancel + proxy_login + + + diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index d4a4475a61..8a8c103614 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -27,7 +27,6 @@ #include #include -#include #include #include @@ -38,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -52,7 +52,7 @@ #include "gw-ui.h" #include "proxy-login.h" -#define GW(name) glade_xml_get_widget (priv->xml, name) +#define GW(name) e_builder_get_widget (priv->builder, name) #define ACCOUNT_PICTURE 0 #define ACCOUNT_NAME 1 @@ -61,8 +61,8 @@ proxyLogin *pld = NULL; static GObjectClass *parent_class = NULL; struct _proxyLoginPrivate { - /* Glade XML data for the Add/Edit Proxy dialog*/ - GladeXML *xml; + /* UI data for the Add/Edit Proxy dialog*/ + GtkBuilder *builder; /* Widgets */ GtkWidget *main; @@ -85,7 +85,7 @@ proxy_login_finalize (GObject *object) g_list_foreach (prd->proxy_list, (GFunc)g_free, NULL); g_list_free (prd->proxy_list); prd->proxy_list = NULL; - g_object_unref (priv->xml); + g_object_unref (priv->builder); g_free (priv->help_section); if (prd->priv) { @@ -134,7 +134,7 @@ proxy_login_init (GObject *object) prd->priv = priv; prd->proxy_list = NULL; - priv->xml = NULL; + priv->builder = NULL; priv->main = NULL; priv->store = NULL; priv->tree = NULL; @@ -282,7 +282,7 @@ proxy_login_cb (GtkDialog *dialog, gint state, GtkWindow *parent) gchar *proxy_name; priv = pld->priv; - account_name_tbox = glade_xml_get_widget (priv->xml, "account_name"); + account_name_tbox = e_builder_get_widget (priv->builder, "account_name"); proxy_name = g_strdup ((gchar *) gtk_entry_get_text ((GtkEntry *) account_name_tbox)); switch (state) { @@ -405,7 +405,7 @@ proxy_login_tree_view_changed_cb(GtkDialog *dialog) return; gtk_tree_model_get (model, &iter, ACCOUNT_NAME, &account_mailid, -1); account_mailid = g_strrstr (account_mailid, "\n") + 1; - account_name_tbox = glade_xml_get_widget (priv->xml, "account_name"); + account_name_tbox = e_builder_get_widget (priv->builder, "account_name"); gtk_entry_set_text((GtkEntry*) account_name_tbox,account_mailid); } @@ -483,7 +483,6 @@ gw_proxy_login_cb (GtkAction *action, EShellView *shell_view) gchar *uri = NULL; proxyLoginPrivate *priv; EGwConnection *cnc; - gchar *gladefile; shell_sidebar = e_shell_view_get_shell_sidebar (shell_view); g_object_get (shell_sidebar, "folder-tree", &folder_tree, NULL); @@ -510,15 +509,12 @@ gw_proxy_login_cb (GtkAction *action, EShellView *shell_view) pld = proxy_login_new(); priv = pld->priv; - gladefile = g_build_filename (EVOLUTION_GLADEDIR, - "proxy-login-dialog.glade", - NULL); - priv->xml = glade_xml_new (gladefile, NULL, NULL); - g_free (gladefile); + priv->builder = gtk_builder_new (); + e_load_ui_builder_definition (priv->builder, "proxy-login-dialog.ui"); - priv->main = glade_xml_get_widget (priv->xml, "proxy_login_dialog"); + priv->main = e_builder_get_widget (priv->builder, "proxy_login_dialog"); pld->account = mail_config_get_account_by_source_url (uri); - priv->tree = GTK_TREE_VIEW (glade_xml_get_widget (priv->xml, "proxy_login_treeview")); + priv->tree = GTK_TREE_VIEW (e_builder_get_widget (priv->builder, "proxy_login_treeview")); priv->store = gtk_tree_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index 545e98787d..7e2aea30bf 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -27,10 +27,10 @@ #include #include -#include #include +#include #include #include #include @@ -52,7 +52,7 @@ #include #include -#define GW(name) glade_xml_get_widget (priv->xml, name) +#define GW(name) e_builder_get_widget (priv->builder, name) #define ACCOUNT_PICTURE 0 #define ACCOUNT_NAME 1 @@ -64,10 +64,10 @@ static GObjectClass *parent_class = NULL; static gboolean proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, gint num, EAccount *account); struct _proxyDialogPrivate { - /* Glade XML data for the Add/Edit Proxy dialog*/ - GladeXML *xml; - /*Glade XML data for Proxy Tab*/ - GladeXML *xml_tab; + /* UI data for the Add/Edit Proxy dialog*/ + GtkBuilder *builder; + /* UI data for Proxy Tab*/ + GtkBuilder *builder_tab; /* Widgets */ GtkWidget *main; @@ -151,7 +151,7 @@ proxy_dialog_finalize (GObject *object) if (priv) { free_proxy_list (priv->proxy_list); g_free (priv->help_section); - g_object_unref (priv->xml_tab); + g_object_unref (priv->builder_tab); g_free (prd->priv); prd->priv = NULL; } @@ -189,8 +189,8 @@ proxy_dialog_init (GObject *object) prd->cnc = NULL; priv->tab_dialog = NULL; - priv->xml = NULL; - priv->xml_tab = NULL; + priv->builder = NULL; + priv->builder_tab = NULL; priv->main = NULL; priv->tree = NULL; priv->store = NULL; @@ -638,7 +638,6 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data) CamelOfflineStore *store; CamelException ex; gint pag_num; - gchar *gladefile; target_account = (EMConfigTargetAccount *)data->config->target; account = target_account->account; @@ -657,24 +656,21 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data) g_object_set_data_full ((GObject *) account, "prd", prd, (GDestroyNotify) g_object_unref); priv = prd->priv; - gladefile = g_build_filename (EVOLUTION_GLADEDIR, - "proxy-listing.glade", - NULL); - priv->xml_tab = glade_xml_new (gladefile, "proxy_vbox", NULL); - g_free (gladefile); + priv->builder_tab = gtk_builder_new (); + e_load_ui_builder_definition (priv->builder_tab, "proxy-listing.ui"); if (account->enabled && (store->state == CAMEL_OFFLINE_STORE_NETWORK_AVAIL)) { - priv->tab_dialog = GTK_WIDGET (glade_xml_get_widget (priv->xml_tab, "proxy_vbox")); - priv->tree = GTK_TREE_VIEW (glade_xml_get_widget (priv->xml_tab, "proxy_access_list")); + priv->tab_dialog = GTK_WIDGET (e_builder_get_widget (priv->builder_tab, "proxy_vbox")); + priv->tree = GTK_TREE_VIEW (e_builder_get_widget (priv->builder_tab, "proxy_access_list")); priv->store = gtk_tree_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING ); proxy_setup_meta_tree_view (account); - addProxy = (GtkButton *) glade_xml_get_widget (priv->xml_tab, "add_proxy"); - removeProxy = (GtkButton *) glade_xml_get_widget (priv->xml_tab, "remove_proxy"); - editProxy = (GtkButton *) glade_xml_get_widget (priv->xml_tab, "edit_proxy"); + addProxy = (GtkButton *) e_builder_get_widget (priv->builder_tab, "add_proxy"); + removeProxy = (GtkButton *) e_builder_get_widget (priv->builder_tab, "remove_proxy"); + editProxy = (GtkButton *) e_builder_get_widget (priv->builder_tab, "edit_proxy"); g_signal_connect (addProxy, "clicked", G_CALLBACK(proxy_add_account), account); g_signal_connect (removeProxy, "clicked", G_CALLBACK(proxy_remove_account), account); @@ -780,7 +776,7 @@ proxy_cancel(GtkWidget *button, EAccount *account) prd = g_object_get_data ((GObject *)account, "prd"); priv = prd->priv; gtk_widget_destroy (priv->main); - g_object_unref (priv->xml); + g_object_unref (priv->builder); } static void @@ -797,7 +793,7 @@ proxy_add_ok (GtkWidget *button, EAccount *account) proxy_update_tree_view (account); gtk_widget_destroy (priv->main); - g_object_unref (priv->xml); + g_object_unref (priv->builder); } static void @@ -814,7 +810,7 @@ proxy_edit_ok (GtkWidget *button, EAccount *account) proxy_update_tree_view (account); gtk_widget_destroy (priv->main); - g_object_unref (priv->xml); + g_object_unref (priv->builder); } static proxyHandler * @@ -901,22 +897,18 @@ proxy_add_account (GtkWidget *button, EAccount *account) ENameSelectorEntry *name_selector_entry; GtkWidget *proxy_name, *name_box; proxyDialog *prd = NULL; - gchar *gladefile; prd = g_object_get_data ((GObject *)account, "prd"); priv = prd->priv; - gladefile = g_build_filename (EVOLUTION_GLADEDIR, - "proxy-add-dialog.glade", - NULL); - priv->xml = glade_xml_new (gladefile, NULL, NULL); - g_free (gladefile); + priv->builder = gtk_builder_new (); + e_load_ui_builder_definition (priv->builder, "proxy-add-dialog.ui"); proxy_dialog_initialize_widgets (account); - priv->main = glade_xml_get_widget (priv->xml, "ProxyAccessRights"); - okButton = (GtkButton *) glade_xml_get_widget (priv->xml,"proxy_button_ok"); - contacts = (GtkButton *) glade_xml_get_widget (priv->xml,"contacts"); - cancel = (GtkButton *) glade_xml_get_widget (priv->xml,"proxy_cancel"); + priv->main = e_builder_get_widget (priv->builder, "ProxyAccessRights"); + okButton = (GtkButton *) e_builder_get_widget (priv->builder,"proxy_button_ok"); + contacts = (GtkButton *) e_builder_get_widget (priv->builder,"contacts"); + cancel = (GtkButton *) e_builder_get_widget (priv->builder,"proxy_cancel"); priv->proxy_name_selector = e_name_selector_new (); name_selector_dialog = e_name_selector_peek_dialog (priv->proxy_name_selector); @@ -934,8 +926,8 @@ proxy_add_account (GtkWidget *button, EAccount *account) g_signal_connect (name_selector_entry, "changed", G_CALLBACK (addressbook_entry_changed), prd); - proxy_name = glade_xml_get_widget (priv->xml, "proxy_account_name"); - name_box = glade_xml_get_widget (priv->xml, "proxy_name_box"); + proxy_name = e_builder_get_widget (priv->builder, "proxy_account_name"); + name_box = e_builder_get_widget (priv->builder, "proxy_name_box"); gtk_widget_hide (proxy_name); gtk_container_add ((GtkContainer *)name_box, (GtkWidget *)name_selector_entry); gtk_widget_show ((GtkWidget *) name_selector_entry); @@ -1002,7 +994,6 @@ proxy_edit_account (GtkWidget *button, EAccount *account) gchar *account_mailid; GtkWidget *contacts; proxyDialog *prd = NULL; - gchar *gladefile; prd = g_object_get_data ((GObject *)account, "prd"); priv = prd->priv; @@ -1016,17 +1007,14 @@ proxy_edit_account (GtkWidget *button, EAccount *account) account_mailid = g_strrstr (account_mailid, "\n") + 1; edited = proxy_get_item_from_list (account, account_mailid); if (edited) { - gladefile = g_build_filename (EVOLUTION_GLADEDIR, - "proxy-add-dialog.glade", - NULL); - priv->xml = glade_xml_new (gladefile, NULL, NULL); - g_free (gladefile); + priv->builder = gtk_builder_new (); + e_load_ui_builder_definition (priv->builder, "proxy-add-dialog.ui"); - priv->main = glade_xml_get_widget (priv->xml, "ProxyAccessRights"); + priv->main = e_builder_get_widget (priv->builder, "ProxyAccessRights"); proxy_dialog_initialize_widgets (account); - okButton = (GtkButton *) glade_xml_get_widget (priv->xml,"proxy_button_ok"); - proxyCancel = (GtkButton *) glade_xml_get_widget (priv->xml,"proxy_cancel"); - contacts = glade_xml_get_widget (priv->xml, "contacts"); + okButton = (GtkButton *) e_builder_get_widget (priv->builder,"proxy_button_ok"); + proxyCancel = (GtkButton *) e_builder_get_widget (priv->builder,"proxy_cancel"); + contacts = e_builder_get_widget (priv->builder, "contacts"); g_signal_connect ((GtkWidget *)okButton, "clicked", G_CALLBACK (proxy_edit_ok), account); g_signal_connect ((GtkWidget *)proxyCancel, "clicked", G_CALLBACK (proxy_cancel), account); diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c index db82ba9ca8..f819501eb2 100644 --- a/plugins/groupwise-features/send-options.c +++ b/plugins/groupwise-features/send-options.c @@ -26,7 +26,6 @@ #include #include -#include #include #include "mail/em-account-editor.h" #include "mail/em-config.h" diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index b00559a81c..14e3b0e5bd 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -45,7 +45,6 @@ #include #include #include -#include #include #include "share-folder.h" #include "gw-ui.h" diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index 62a832be0d..9a39678e77 100644 --- a/plugins/groupwise-features/share-folder.c +++ b/plugins/groupwise-features/share-folder.c @@ -23,10 +23,10 @@ #ifdef HAVE_CONFIG_H # include #endif -#include #include "share-folder.h" #include #include +#include #include #include #include @@ -99,7 +99,7 @@ static void share_folder_finalise (GObject *obj) { ShareFolder *sf = (ShareFolder *) obj; - g_object_unref (sf->xml); + g_object_unref (sf->builder); free_all(sf); G_OBJECT_CLASS (parent_class)->finalize (obj); } @@ -504,29 +504,25 @@ not_cancel_clicked(GtkButton *button, GtkWidget *window) static void notification_clicked(GtkButton *button, ShareFolder *sf) { - static GladeXML *xmln; + static GtkBuilder *builder; GtkButton *not_ok; GtkButton *not_cancel; GtkWidget *vbox; - gchar *gladefile; sf->window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_type_hint (GTK_WINDOW (sf->window), GDK_WINDOW_TYPE_HINT_DIALOG); - gladefile = g_build_filename (EVOLUTION_GLADEDIR, - "properties.glade", - NULL); - xmln = glade_xml_new (gladefile, NROOTNODE , NULL); - g_free (gladefile); + builder = gtk_builder_new (); + e_load_ui_builder_definition (builder, "properties.ui"); - vbox = GTK_WIDGET (glade_xml_get_widget (xmln, "vbox191")); + vbox = GTK_WIDGET (e_builder_get_widget (builder, "vbox191")); gtk_container_add (GTK_CONTAINER (sf->window), vbox); - sf->subject = GTK_ENTRY (glade_xml_get_widget (xmln, "entry3")); + sf->subject = GTK_ENTRY (e_builder_get_widget (builder, "entry3")); gtk_entry_set_text(GTK_ENTRY (sf->subject) , sf->sub); - sf->message = GTK_TEXT_VIEW (glade_xml_get_widget (xmln, "textview1")); - not_ok = GTK_BUTTON (glade_xml_get_widget (xmln, "nOK")); + sf->message = GTK_TEXT_VIEW (e_builder_get_widget (builder, "textview1")); + not_ok = GTK_BUTTON (e_builder_get_widget (builder, "nOK")); g_signal_connect ((gpointer) not_ok, "clicked", G_CALLBACK (not_ok_clicked), sf); - not_cancel = GTK_BUTTON (glade_xml_get_widget (xmln, "nCancel")); + not_cancel = GTK_BUTTON (e_builder_get_widget (builder, "nCancel")); g_signal_connect ((gpointer) not_cancel, "clicked", G_CALLBACK (not_cancel_clicked), sf->window); gtk_window_set_title (GTK_WINDOW (sf->window), _("Custom Notification")); gtk_window_set_position (GTK_WINDOW (sf->window) , GTK_WIN_POS_CENTER_ALWAYS); @@ -672,35 +668,25 @@ delete_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf ) static void share_folder_construct (ShareFolder *sf) { - GladeXML *xml; ENameSelectorDialog *name_selector_dialog; ENameSelectorModel *name_selector_model; ENameSelectorEntry *name_selector_entry; GtkWidget *box; - gchar *gladefile; - gladefile = g_build_filename (EVOLUTION_GLADEDIR, - "properties.glade", - NULL); - xml = glade_xml_new (gladefile, ROOTNODE, NULL); - g_free (gladefile); + sf->builder = gtk_builder_new (); + e_load_ui_builder_definition (sf->builder, "properties.ui"); - sf->xml =xml; - - if (!sf->xml) { - g_warning ("could not get xml"); - } - sf->vbox = GTK_VBOX (glade_xml_get_widget(sf->xml, "vboxSharing")); - sf->table = GTK_VBOX (glade_xml_get_widget (sf->xml, "vbox194")); + sf->vbox = GTK_VBOX (e_builder_get_widget(sf->builder, "vboxSharing")); + sf->table = GTK_VBOX (e_builder_get_widget (sf->builder, "vbox194")); gtk_widget_set_sensitive (GTK_WIDGET (sf->table), FALSE); - sf->shared = GTK_RADIO_BUTTON (glade_xml_get_widget (sf->xml, "radShared")); + sf->shared = GTK_RADIO_BUTTON (e_builder_get_widget (sf->builder, "radShared")); g_signal_connect ((gpointer) sf->shared, "clicked", G_CALLBACK (shared_clicked), sf); - sf->not_shared = GTK_RADIO_BUTTON (glade_xml_get_widget (sf->xml, "radNotShared")); + sf->not_shared = GTK_RADIO_BUTTON (e_builder_get_widget (sf->builder, "radNotShared")); g_signal_connect ((gpointer) sf->not_shared, "clicked", G_CALLBACK (not_shared_clicked), sf); - sf->add_book = GTK_BUTTON (glade_xml_get_widget (sf->xml, "Address")); + sf->add_book = GTK_BUTTON (e_builder_get_widget (sf->builder, "Address")); gtk_widget_set_sensitive (GTK_WIDGET (sf->add_book), TRUE); g_signal_connect((GtkWidget *) sf->add_book, "clicked", G_CALLBACK (address_button_clicked_cb), sf); @@ -715,26 +701,26 @@ share_folder_construct (ShareFolder *sf) name_selector_entry = e_name_selector_peek_section_entry (sf->name_selector, "Add User"); g_signal_connect (name_selector_entry, "changed", G_CALLBACK (addressbook_entry_changed), sf); - gtk_label_set_mnemonic_widget (GTK_LABEL (glade_xml_get_widget (sf->xml, "label557")), GTK_WIDGET (name_selector_entry)); + gtk_label_set_mnemonic_widget (GTK_LABEL (e_builder_get_widget (sf->builder, "label557")), GTK_WIDGET (name_selector_entry)); - sf->add_button = GTK_BUTTON (glade_xml_get_widget(sf->xml, "Add")); + sf->add_button = GTK_BUTTON (e_builder_get_widget(sf->builder, "Add")); g_signal_connect((GtkWidget *) sf->add_button, "clicked", G_CALLBACK (add_clicked), sf); - sf->remove = GTK_BUTTON(glade_xml_get_widget(sf->xml, "Remove")); + sf->remove = GTK_BUTTON(e_builder_get_widget(sf->builder, "Remove")); g_signal_connect ((GtkWidget *) sf->remove, "clicked", G_CALLBACK (remove_clicked), sf); gtk_widget_set_sensitive(GTK_WIDGET (sf->remove), FALSE); - sf->notification = GTK_BUTTON (glade_xml_get_widget (sf->xml, "Notification")); + sf->notification = GTK_BUTTON (e_builder_get_widget (sf->builder, "Notification")); g_signal_connect((GtkWidget *) sf->notification, "clicked", G_CALLBACK (notification_clicked), sf); - sf->name = GTK_ENTRY (glade_xml_get_widget (sf->xml, "entry4")); + sf->name = GTK_ENTRY (e_builder_get_widget (sf->builder, "entry4")); /*TODO:connect name and label*/ gtk_widget_hide (GTK_WIDGET(sf->name)); - box = GTK_WIDGET (glade_xml_get_widget (sf->xml, "hbox227")); + box = GTK_WIDGET (e_builder_get_widget (sf->builder, "hbox227")); gtk_box_pack_start (GTK_BOX (box), (GtkWidget *) name_selector_entry, TRUE, TRUE, 0); gtk_widget_show ((GtkWidget *) name_selector_entry); - sf->scrolled_window = GTK_WIDGET (glade_xml_get_widget (sf->xml,"scrolledwindow4")); + sf->scrolled_window = GTK_WIDGET (e_builder_get_widget (sf->builder,"scrolledwindow4")); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sf->scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h index 8f1f935061..138266ccef 100644 --- a/plugins/groupwise-features/share-folder.h +++ b/plugins/groupwise-features/share-folder.h @@ -24,13 +24,10 @@ #ifndef __SHARE_FOLDER_H__ #define __SHARE_FOLDER_H__ -G_BEGIN_DECLS - #include #include #include #include -#include #define _SHARE_FOLDER_TYPE (share_folder_get_type ()) #define SHARE_FOLDER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SHARE_FOLDER, ShareFolder)) @@ -38,13 +35,15 @@ G_BEGIN_DECLS #define IS_SHARE_FOLDER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SHARE_FOLDER_TYPE)) #define IS_SHARE_FOLDER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SHARE_FOLDER_TYPE)) +G_BEGIN_DECLS + typedef struct _ShareFolder ShareFolder; typedef struct _ShareFolderClass ShareFolderClass; struct _ShareFolder { GtkVBox parent_object; - GladeXML *xml; + GtkBuilder *builder; /* General tab */ -- cgit v1.2.3