From 054c0881696a85f537e93b4950a28f505a3dc0f7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 24 Sep 2009 18:04:36 -0400 Subject: Bug 589153 - Use GtkBuilder instead of libglade MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/attachment-reminder/Makefile.am | 6 +- plugins/attachment-reminder/attachment-reminder.c | 67 +- .../attachment-reminder/attachment-reminder.glade | 85 -- plugins/caldav/Makefile.am | 2 +- plugins/email-custom-header/Makefile.am | 11 +- plugins/email-custom-header/email-custom-header.c | 110 +- .../email-custom-header/email-custom-header.glade | 176 --- .../org-gnome-email-custom-header.glade | 104 -- .../org-gnome-email-custom-header.ui | 96 ++ .../exchange-operations/e-foreign-folder-dialog.ui | 243 ++++ .../exchange-change-password.ui | 230 ++++ plugins/exchange-operations/exchange-delegates.ui | 601 +++++++++ .../exchange-operations/exchange-folder-tree.ui | 85 ++ plugins/exchange-operations/exchange-oof.ui | 493 ++++++++ .../exchange-operations/exchange-passwd-expiry.ui | 89 ++ .../exchange-permissions-dialog.ui | 541 +++++++++ .../exchange-operations/exchange-send-options.ui | 422 +++++++ plugins/face/Makefile.am | 4 +- plugins/google-account-setup/Makefile.am | 2 +- 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 +- plugins/hula-account-setup/Makefile.am | 2 +- plugins/imap-features/Makefile.am | 7 +- plugins/imap-features/imap-headers.c | 33 +- plugins/imap-features/imap-headers.glade | 377 ------ plugins/imap-features/imap-headers.ui | 328 +++++ plugins/publish-calendar/Makefile.am | 8 +- plugins/publish-calendar/publish-calendar.c | 26 +- plugins/publish-calendar/publish-calendar.glade | 1269 -------------------- plugins/publish-calendar/publish-calendar.ui | 823 +++++++++++++ plugins/publish-calendar/url-editor-dialog.c | 23 +- plugins/publish-calendar/url-editor-dialog.h | 3 +- plugins/templates/Makefile.am | 9 +- plugins/templates/templates.c | 66 +- plugins/templates/templates.glade | 126 -- 52 files changed, 6609 insertions(+), 4957 deletions(-) delete mode 100644 plugins/attachment-reminder/attachment-reminder.glade delete mode 100644 plugins/email-custom-header/email-custom-header.glade delete mode 100644 plugins/email-custom-header/org-gnome-email-custom-header.glade create mode 100644 plugins/email-custom-header/org-gnome-email-custom-header.ui create mode 100644 plugins/exchange-operations/e-foreign-folder-dialog.ui create mode 100644 plugins/exchange-operations/exchange-change-password.ui create mode 100644 plugins/exchange-operations/exchange-delegates.ui create mode 100644 plugins/exchange-operations/exchange-folder-tree.ui create mode 100644 plugins/exchange-operations/exchange-oof.ui create mode 100644 plugins/exchange-operations/exchange-passwd-expiry.ui create mode 100644 plugins/exchange-operations/exchange-permissions-dialog.ui create mode 100644 plugins/exchange-operations/exchange-send-options.ui 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 delete mode 100644 plugins/imap-features/imap-headers.glade create mode 100644 plugins/imap-features/imap-headers.ui delete mode 100644 plugins/publish-calendar/publish-calendar.glade create mode 100644 plugins/publish-calendar/publish-calendar.ui delete mode 100644 plugins/templates/templates.glade (limited to 'plugins') diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am index 1db3b79dad..66725b0de4 100644 --- a/plugins/attachment-reminder/Makefile.am +++ b/plugins/attachment-reminder/Makefile.am @@ -5,8 +5,7 @@ error_DATA = org-gnome-attachment-reminder.error errordir = $(privdatadir)/errors plugin_DATA = \ - org-gnome-evolution-attachment-reminder.eplug \ - attachment-reminder.glade + org-gnome-evolution-attachment-reminder.eplug plugin_LTLIBRARIES = liborg-gnome-evolution-attachment-reminder.la @@ -62,8 +61,7 @@ endif EXTRA_DIST = org-gnome-evolution-attachment-reminder.eplug.xml \ org-gnome-attachment-reminder.error.xml \ - $(schema_in_files) \ - attachment-reminder.glade + $(schema_in_files) BUILT_SOURCES = org-gnome-evolution-attachment-reminder.eplug \ org-gnome-attachment-reminder.error diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c index 330fd5df8f..7ed74678f5 100644 --- a/plugins/attachment-reminder/attachment-reminder.c +++ b/plugins/attachment-reminder/attachment-reminder.c @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -53,7 +54,6 @@ #define SIGNATURE "-- " typedef struct { - GladeXML *xml; GConfClient *gconf; GtkWidget *treeview; GtkWidget *clue_add; @@ -438,7 +438,6 @@ destroy_ui_data (gpointer data) if (!ui) return; - g_object_unref (ui->xml); g_object_unref (ui->gconf); g_free (ui); } @@ -454,19 +453,59 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) GSList *clue_list = NULL, *list; GtkTreeModel *model; - UIData *ui = g_new0 (UIData, 1); + GtkWidget *reminder_configuration_box; + GtkWidget *clue_container; + GtkWidget *scrolledwindow1; + GtkWidget *clue_treeview; + GtkWidget *vbuttonbox2; + GtkWidget *clue_add; + GtkWidget *clue_edit; + GtkWidget *clue_remove; - gchar *gladefile; + UIData *ui = g_new0 (UIData, 1); - gladefile = g_build_filename (EVOLUTION_PLUGINDIR, - "attachment-reminder.glade", - NULL); - ui->xml = glade_xml_new (gladefile, "reminder_configuration_box", NULL); - g_free (gladefile); + reminder_configuration_box = gtk_vbox_new (FALSE, 5); + gtk_widget_show (reminder_configuration_box); + gtk_widget_set_size_request (reminder_configuration_box, 385, 189); + + clue_container = gtk_hbox_new (FALSE, 6); + gtk_widget_show (clue_container); + gtk_box_pack_start (GTK_BOX (reminder_configuration_box), clue_container, TRUE, TRUE, 0); + + scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_show (scrolledwindow1); + gtk_box_pack_start (GTK_BOX (clue_container), scrolledwindow1, TRUE, TRUE, 0); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + clue_treeview = gtk_tree_view_new (); + gtk_widget_show (clue_treeview); + gtk_container_add (GTK_CONTAINER (scrolledwindow1), clue_treeview); + gtk_container_set_border_width (GTK_CONTAINER (clue_treeview), 1); + + vbuttonbox2 = gtk_vbutton_box_new (); + gtk_widget_show (vbuttonbox2); + gtk_box_pack_start (GTK_BOX (clue_container), vbuttonbox2, FALSE, TRUE, 0); + gtk_button_box_set_layout (GTK_BUTTON_BOX (vbuttonbox2), GTK_BUTTONBOX_START); + gtk_box_set_spacing (GTK_BOX (vbuttonbox2), 6); + + clue_add = gtk_button_new_from_stock ("gtk-add"); + gtk_widget_show (clue_add); + gtk_container_add (GTK_CONTAINER (vbuttonbox2), clue_add); + GTK_WIDGET_SET_FLAGS (clue_add, GTK_CAN_DEFAULT); + + clue_edit = gtk_button_new_from_stock ("gtk-edit"); + gtk_widget_show (clue_edit); + gtk_container_add (GTK_CONTAINER (vbuttonbox2), clue_edit); + GTK_WIDGET_SET_FLAGS (clue_edit, GTK_CAN_DEFAULT); + + clue_remove = gtk_button_new_from_stock ("gtk-remove"); + gtk_widget_show (clue_remove); + gtk_container_add (GTK_CONTAINER (vbuttonbox2), clue_remove); + GTK_WIDGET_SET_FLAGS (clue_remove, GTK_CAN_DEFAULT); ui->gconf = gconf_client_get_default (); - ui->treeview = glade_xml_get_widget (ui->xml, "clue_treeview"); + ui->treeview = clue_treeview; ui->store = gtk_list_store_new (CLUE_N_COLUMNS, G_TYPE_STRING); @@ -483,14 +522,14 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (selection_changed), ui); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (ui->treeview), TRUE); - ui->clue_add = glade_xml_get_widget (ui->xml, "clue_add"); + ui->clue_add = clue_add; g_signal_connect (G_OBJECT (ui->clue_add), "clicked", G_CALLBACK (clue_add_clicked), ui); - ui->clue_remove = glade_xml_get_widget (ui->xml, "clue_remove"); + ui->clue_remove = clue_remove; g_signal_connect (G_OBJECT (ui->clue_remove), "clicked", G_CALLBACK (clue_remove_clicked), ui); gtk_widget_set_sensitive (ui->clue_remove, FALSE); - ui->clue_edit = glade_xml_get_widget (ui->xml, "clue_edit"); + ui->clue_edit = clue_edit; g_signal_connect (G_OBJECT (ui->clue_edit), "clicked", G_CALLBACK (clue_edit_clicked), ui); gtk_widget_set_sensitive (ui->clue_edit, FALSE); @@ -514,7 +553,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) hbox = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (hbox), glade_xml_get_widget (ui->xml, "reminder_configuration_box"), TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), reminder_configuration_box, TRUE, TRUE, 0); /* to let free data properly on destroy of configuration widget */ g_object_set_data_full (G_OBJECT (hbox), "myui-data", ui, destroy_ui_data); diff --git a/plugins/attachment-reminder/attachment-reminder.glade b/plugins/attachment-reminder/attachment-reminder.glade deleted file mode 100644 index 720047f8c3..0000000000 --- a/plugins/attachment-reminder/attachment-reminder.glade +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - True - window1 - - - 385 - 189 - True - 5 - - - True - 6 - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - True - 1 - - - - - - - True - 6 - GTK_BUTTONBOX_START - - - True - True - True - gtk-add - True - 0 - - - - - True - True - True - gtk-edit - True - 0 - - - 1 - - - - - True - True - True - gtk-remove - True - 0 - - - 2 - - - - - False - 1 - - - - - - - - diff --git a/plugins/caldav/Makefile.am b/plugins/caldav/Makefile.am index 7ab5a141b4..51e12acbe1 100644 --- a/plugins/caldav/Makefile.am +++ b/plugins/caldav/Makefile.am @@ -7,7 +7,7 @@ liborg_gnome_evolution_caldav_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I . \ -I$(top_srcdir) \ - -DCALDAV_GLADEDIR=\""$(gladedir)"\" \ + -DCALDAV_UIDIR=\""$(uidir)"\" \ $(EVOLUTION_CALENDAR_CFLAGS) liborg_gnome_evolution_caldav_la_SOURCES = caldav-source.c diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am index d38ac68230..3f67f845ed 100644 --- a/plugins/email-custom-header/Makefile.am +++ b/plugins/email-custom-header/Makefile.am @@ -14,8 +14,8 @@ liborg_gnome_email_custom_header_la_CPPFLAGS = \ -I$(top_builddir)/composer \ $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DCONNECTOR_GLADEDIR=\""$(gladedir)"\" + -DEVOLUTION_UIDIR=\""$(uidir)"\" \ + -DCONNECTOR_UIDIR=\""$(uidir)"\" liborg_gnome_email_custom_header_la_SOURCES = \ email-custom-header.c \ @@ -57,14 +57,13 @@ install-data-local: fi endif -glade_DATA = \ - org-gnome-email-custom-header.glade \ - email-custom-header.glade +ui_DATA = \ + org-gnome-email-custom-header.ui EXTRA_DIST = \ org-gnome-email-custom-header.eplug.xml \ $(schema_in_files) \ - $(glade_DATA) + $(ui_DATA) BUILT_SOURCES = \ org-gnome-email-custom-header.eplug \ diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index dad324aa02..d30a40afa6 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -28,7 +28,6 @@ #include #include #include -#include #include "mail/em-utils.h" #include "mail/em-event.h" #include "composer/e-msg-composer.h" @@ -41,7 +40,6 @@ #define GCONF_KEY_CUSTOM_HEADER "/apps/evolution/eplugin/email_custom_header/customHeader" typedef struct { - GladeXML *xml; GConfClient *gconf; GtkWidget *treeview; GtkWidget *header_add; @@ -57,8 +55,7 @@ enum { }; struct _EmailCustomHeaderOptionsDialogPrivate { - /* Glade XML data */ - GladeXML *xml; + GtkBuilder *builder; /*Widgets*/ GtkWidget *main; GtkWidget *page; @@ -119,7 +116,7 @@ epech_get_widgets (CustomHeaderOptionsDialog *mch) EmailCustomHeaderOptionsDialogPrivate *priv; priv = mch->priv; -#define EMAIL_CUSTOM_HEADER(name) glade_xml_get_widget (priv->xml, name) +#define EMAIL_CUSTOM_HEADER(name) e_builder_get_widget (priv->builder, name) priv->main = EMAIL_CUSTOM_HEADER ("email-custom-header-dialog"); if (!priv->main) @@ -207,7 +204,7 @@ epech_header_options_cb (GtkDialog *dialog, gint state, gpointer func_data) case GTK_RESPONSE_CANCEL: gtk_widget_hide (priv->main); gtk_widget_destroy (priv->main); - g_object_unref (priv->xml); + g_object_unref (priv->builder); break; case GTK_RESPONSE_HELP: e_display_help ( @@ -224,24 +221,17 @@ epech_dialog_run (CustomHeaderOptionsDialog *mch, GtkWidget *parent) { EmailCustomHeaderOptionsDialogPrivate *priv; GtkWidget *toplevel; - gchar *filename; g_return_val_if_fail (mch != NULL || EMAIL_CUSTOM_HEADER_OPTIONS_IS_DIALOG (mch), FALSE); priv = mch->priv; epech_get_header_list (mch); - filename = g_build_filename (EVOLUTION_GLADEDIR, - "org-gnome-email-custom-header.glade", - NULL); - priv->xml = glade_xml_new (filename, NULL, NULL); - g_free (filename); - - if (!priv->xml) { - d (printf ("\n Could not load the Glade XML file\n")); - } + priv->builder = gtk_builder_new (); + e_load_ui_builder_definition ( + priv->builder, "org-gnome-email-custom-header.ui"); if (!epech_get_widgets(mch)) { - g_object_unref (priv->xml); + g_object_unref (priv->builder); d (printf ("\n Could not get the Widgets\n")); } @@ -424,7 +414,7 @@ epech_dialog_init (GObject *object) mch = EMAIL_CUSTOM_HEADEROPTIONS_DIALOG (object); priv = g_new0 (EmailCustomHeaderOptionsDialogPrivate, 1); mch->priv = priv; - priv->xml = NULL; + priv->builder = NULL; priv->main = NULL; priv->page = NULL; priv->header_table = NULL; @@ -861,7 +851,6 @@ destroy_cd_data (gpointer data) if (!cd) return; - g_object_unref (cd->xml); g_object_unref (cd->gconf); g_free (cd); } @@ -880,22 +869,77 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) gchar *buffer; GtkTreeViewColumn *col; gint col_pos; - GConfClient *client = gconf_client_get_default(); - ConfigData *cd = g_new0 (ConfigData, 1); - gchar *gladefile; - - gladefile = g_build_filename (EVOLUTION_GLADEDIR, - "email-custom-header.glade", - NULL); - cd->xml = glade_xml_new (gladefile, "ech_configuration_box", NULL); - g_free (gladefile); + GtkWidget *ech_configuration_box; + GtkWidget *vbox2; + GtkWidget *label1; + GtkWidget *header_configuration_box; + GtkWidget *header_container; + GtkWidget *scrolledwindow1; + GtkWidget *header_treeview; + GtkWidget *vbuttonbox1; + GtkWidget *header_add; + GtkWidget *header_edit; + GtkWidget *header_remove; + + ech_configuration_box = gtk_vbox_new (FALSE, 0); + gtk_widget_show (ech_configuration_box); + + vbox2 = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox2); + gtk_box_pack_start (GTK_BOX (ech_configuration_box), vbox2, FALSE, FALSE, 0); + + /* To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values */ + label1 = gtk_label_new (_("The format for specifying a Custom Header key value is:\nName of the Custom Header key values separated by \";\".")); + gtk_widget_show (label1); + gtk_box_pack_start (GTK_BOX (vbox2), label1, FALSE, TRUE, 0); + gtk_label_set_justify (GTK_LABEL (label1), GTK_JUSTIFY_CENTER); + gtk_label_set_line_wrap (GTK_LABEL (label1), TRUE); + + header_configuration_box = gtk_vbox_new (FALSE, 5); + gtk_widget_show (header_configuration_box); + gtk_box_pack_start (GTK_BOX (ech_configuration_box), header_configuration_box, TRUE, TRUE, 0); + + header_container = gtk_hbox_new (FALSE, 6); + gtk_widget_show (header_container); + gtk_box_pack_start (GTK_BOX (header_configuration_box), header_container, TRUE, TRUE, 0); + + scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_show (scrolledwindow1); + gtk_box_pack_start (GTK_BOX (header_container), scrolledwindow1, TRUE, TRUE, 0); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + header_treeview = gtk_tree_view_new (); + gtk_widget_show (header_treeview); + gtk_container_add (GTK_CONTAINER (scrolledwindow1), header_treeview); + gtk_container_set_border_width (GTK_CONTAINER (header_treeview), 1); + + vbuttonbox1 = gtk_vbutton_box_new (); + gtk_widget_show (vbuttonbox1); + gtk_box_pack_start (GTK_BOX (header_container), vbuttonbox1, FALSE, TRUE, 0); + gtk_button_box_set_layout (GTK_BUTTON_BOX (vbuttonbox1), GTK_BUTTONBOX_START); + gtk_box_set_spacing (GTK_BOX (vbuttonbox1), 6); + + header_add = gtk_button_new_from_stock ("gtk-add"); + gtk_widget_show (header_add); + gtk_container_add (GTK_CONTAINER (vbuttonbox1), header_add); + GTK_WIDGET_SET_FLAGS (header_add, GTK_CAN_DEFAULT); + + header_edit = gtk_button_new_from_stock ("gtk-edit"); + gtk_widget_show (header_edit); + gtk_container_add (GTK_CONTAINER (vbuttonbox1), header_edit); + GTK_WIDGET_SET_FLAGS (header_edit, GTK_CAN_DEFAULT); + + header_remove = gtk_button_new_from_stock ("gtk-remove"); + gtk_widget_show (header_remove); + gtk_container_add (GTK_CONTAINER (vbuttonbox1), header_remove); + GTK_WIDGET_SET_FLAGS (header_remove, GTK_CAN_DEFAULT); cd->gconf = gconf_client_get_default (); - cd->treeview = glade_xml_get_widget (cd->xml, "header_treeview"); + cd->treeview = header_treeview; cd->store = gtk_list_store_new (HEADER_N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING); @@ -927,14 +971,14 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (selection_changed), cd); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (cd->treeview), TRUE); - cd->header_add = glade_xml_get_widget (cd->xml, "header_add"); + cd->header_add = header_add; g_signal_connect (G_OBJECT (cd->header_add), "clicked", G_CALLBACK (header_add_clicked), cd); - cd->header_remove = glade_xml_get_widget (cd->xml, "header_remove"); + cd->header_remove = header_remove; g_signal_connect (G_OBJECT (cd->header_remove), "clicked", G_CALLBACK (header_remove_clicked), cd); gtk_widget_set_sensitive (cd->header_remove, FALSE); - cd->header_edit = glade_xml_get_widget (cd->xml, "header_edit"); + cd->header_edit = header_edit; g_signal_connect (G_OBJECT (cd->header_edit), "clicked", G_CALLBACK (header_edit_clicked), cd); gtk_widget_set_sensitive (cd->header_edit, FALSE); @@ -968,7 +1012,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) hbox = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (hbox), glade_xml_get_widget (cd->xml, "ech_configuration_box"), TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), ech_configuration_box, TRUE, TRUE, 0); /* to let free data properly on destroy of configuration widget */ g_object_set_data_full (G_OBJECT (hbox), "mycd-data", cd, destroy_cd_data); diff --git a/plugins/email-custom-header/email-custom-header.glade b/plugins/email-custom-header/email-custom-header.glade deleted file mode 100644 index 14a618f977..0000000000 --- a/plugins/email-custom-header/email-custom-header.glade +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - - True - window1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 0 - - - - True - False - 0 - - - - True - The format for specifying a Custom Header key value is: -Name of the Custom Header key values separated by ";". - False - False - GTK_JUSTIFY_CENTER - True - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - 0 - False - False - - - - - - True - False - 5 - - - - True - False - 6 - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - 1 - True - True - True - False - False - True - False - False - False - - - - - 0 - True - True - - - - - - True - GTK_BUTTONBOX_START - 6 - - - - True - True - True - gtk-add - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - True - gtk-edit - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - True - - - - - 0 - False - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - diff --git a/plugins/email-custom-header/org-gnome-email-custom-header.glade b/plugins/email-custom-header/org-gnome-email-custom-header.glade deleted file mode 100644 index 142f0b7408..0000000000 --- a/plugins/email-custom-header/org-gnome-email-custom-header.glade +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - True - True - Email Custom Header - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_MOUSE - False - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - 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 - - - - - - 12 - True - 4 - 4 - False - 12 - 12 - - - 0 - False - False - - - - - - - diff --git a/plugins/email-custom-header/org-gnome-email-custom-header.ui b/plugins/email-custom-header/org-gnome-email-custom-header.ui new file mode 100644 index 0000000000..e1d347df8c --- /dev/null +++ b/plugins/email-custom-header/org-gnome-email-custom-header.ui @@ -0,0 +1,96 @@ + + + + + True + True + Email Custom Header + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_MOUSE + False + False + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + 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 + + + + + 12 + True + 4 + 4 + False + 12 + 12 + + + 0 + False + False + + + + + + helpbutton1 + cancelbutton1 + okbutton1 + + + diff --git a/plugins/exchange-operations/e-foreign-folder-dialog.ui b/plugins/exchange-operations/e-foreign-folder-dialog.ui new file mode 100644 index 0000000000..f24ffd6d37 --- /dev/null +++ b/plugins/exchange-operations/e-foreign-folder-dialog.ui @@ -0,0 +1,243 @@ + + + + + + + + + + a + + + b + + + + + + + + + + a + + + b + + + + + True + Open Other User's Folder + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + True + + + True + False + 8 + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + + + + + True + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + True + + + + + 0 + False + True + GTK_PACK_END + + + + + True + 3 + 2 + False + 3 + 3 + + + True + _Account: + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + True + _Folder Name: + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + True + False + 0 + + + + + + 1 + 2 + 1 + 2 + fill + + + + + + True + True + _User: + True + GTK_RELIEF_NORMAL + True + + + 0 + 1 + 1 + 2 + fill + + + + + + True + False + True + True + model1 + + + + 0 + + + + + 1 + 2 + 2 + 3 + fill + fill + + + + + True + False + True + model2 + + + + 0 + + + + + 1 + 2 + 0 + 1 + fill + fill + + + + + 2 + True + True + + + + + + button3 + button1 + + + diff --git a/plugins/exchange-operations/exchange-change-password.ui b/plugins/exchange-operations/exchange-change-password.ui new file mode 100644 index 0000000000..953621482c --- /dev/null +++ b/plugins/exchange-operations/exchange-change-password.ui @@ -0,0 +1,230 @@ + + + + + True + Change Password + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + True + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + + + True + False + 0 + + + True + GTK_BUTTONBOX_SPREAD + + + 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 + Your current password has expired. Please change your password now. + False + False + GTK_JUSTIFY_CENTER + True + False + 0.52 + 0.5 + 0 + 6 + + + 0 + False + False + + + + + 6 + True + 3 + 2 + False + 6 + 6 + + + True + Current Password: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + True + New Password: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + True + Confirm Password: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + True + True + True + False + 0 + + True + * + False + + + 1 + 2 + 1 + 2 + + + + + + True + True + True + False + 0 + + True + * + False + + + 1 + 2 + 2 + 3 + + + + + + True + True + True + False + 0 + + True + * + False + + + 1 + 2 + 0 + 1 + 12 + + + + + + 0 + True + True + + + + + + cancelbutton1 + okbutton1 + + + diff --git a/plugins/exchange-operations/exchange-delegates.ui b/plugins/exchange-operations/exchange-delegates.ui new file mode 100644 index 0000000000..5ed605aa57 --- /dev/null +++ b/plugins/exchange-operations/exchange-delegates.ui @@ -0,0 +1,601 @@ + + + + + + + + + + None + + + Reviewer (read-only) + + + Author (read, create) + + + Editor (read, create, edit) + + + + + + + + + + None + + + Reviewer (read-only) + + + Author (read, create) + + + Editor (read, create, edit) + + + + + + + + + + None + + + Reviewer (read-only) + + + Author (read, create) + + + Editor (read, create, edit) + + + + + + + + + + None + + + Reviewer (read-only) + + + Author (read, create) + + + Editor (read, create, edit) + + + + + True + Delegates + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + False + False + + + True + False + 0 + + + True + GTK_BUTTONBOX_END + + + 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 + + + + + 6 + True + False + 6 + + + True + These users will be able to send mail on your behalf +and access your folders with the permissions you give them. + 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 + True + False + False + False + False + False + False + + + 0 + True + True + + + + + True + GTK_BUTTONBOX_START + 6 + + + True + True + True + gtk-add + True + GTK_RELIEF_NORMAL + True + + + + + True + True + True + _Edit + True + GTK_RELIEF_NORMAL + True + + + + + True + True + True + gtk-remove + True + GTK_RELIEF_NORMAL + True + + + + + 0 + False + True + GTK_PACK_END + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + cancelbutton1 + okbutton1 + + + + Delegate Permissions + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + False + False + + + True + False + 0 + + + True + GTK_BUTTONBOX_END + + + 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 + + + + + 12 + True + False + 12 + + + True + Permissions for + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + 4 + 2 + False + 6 + 6 + + + True + C_alendar: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + True + _Tasks: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + True + _Inbox: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + True + Co_ntacts: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 3 + 4 + fill + + + + + + True + False + True + model1 + + + + 0 + + + + + 1 + 2 + 0 + 1 + fill + fill + + + + + True + False + True + model2 + + + + 0 + + + + + 1 + 2 + 1 + 2 + fill + fill + + + + + True + False + True + model3 + + + + 0 + + + + + 1 + 2 + 2 + 3 + fill + fill + + + + + True + False + True + model4 + + + + 0 + + + + + 1 + 2 + 3 + 4 + fill + fill + + + + + 0 + False + False + + + + + True + True + _Summarize permissions + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + True + True + _Delegate can see private items + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + 0 + True + True + + + + + + cancelbutton2 + okbutton2 + + + diff --git a/plugins/exchange-operations/exchange-folder-tree.ui b/plugins/exchange-operations/exchange-folder-tree.ui new file mode 100644 index 0000000000..c34b0dcbfc --- /dev/null +++ b/plugins/exchange-operations/exchange-folder-tree.ui @@ -0,0 +1,85 @@ + + + + + True + Exchange Folder Tree + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + False + 250 + 300 + True + False + True + + + True + False + 0 + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + + + + + 0 + False + True + GTK_PACK_END + + + + + True + False + 0 + + + True + True + GTK_POLICY_ALWAYS + GTK_POLICY_ALWAYS + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + True + True + True + False + False + True + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + okbutton1 + + + diff --git a/plugins/exchange-operations/exchange-oof.ui b/plugins/exchange-operations/exchange-oof.ui new file mode 100644 index 0000000000..f7a0ca3b53 --- /dev/null +++ b/plugins/exchange-operations/exchange-oof.ui @@ -0,0 +1,493 @@ + + + + + 6 + Out of Office Assistant + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + False + False + False + True + + + True + False + 6 + + + True + GTK_BUTTONBOX_END + + + True + True + True + GTK_RELIEF_NORMAL + + + True + 0.5 + 0.5 + 0 + 0 + + + True + False + 2 + + + True + gtk-no + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + No, Don't Change Status + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + + + True + True + True + GTK_RELIEF_NORMAL + + + True + 0.5 + 0.5 + 0 + 0 + + + True + False + 2 + + + True + gtk-yes + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + Yes, Change Status + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + + + 0 + False + True + GTK_PACK_END + + + + + 6 + True + False + 6 + + + True + gtk-dialog-question + 6 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + True + + + + + True + <b>Currently, your status is "Out of the Office". </b> + +Would you like to change your status to "In the Office"? + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + True + True + + + + + 0 + True + True + + + + + + button3 + button4 + + + + True + Out of Office Assistant + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + False + True + False + True + + + True + False + 0 + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + + + + + 0 + False + True + GTK_PACK_END + + + + + 6 + True + False + 6 + + + True + False + 6 + + + True + gtk-dialog-info + 5 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + <small>The message specified below will be automatically sent to each person who sends +mail to you while you are out of the office.</small> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + 0 + False + False + + + + + 6 + True + 2 + 2 + False + 6 + 6 + + + True + <b>Status:</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + True + True + I am currently in the office + True + GTK_RELIEF_NORMAL + False + False + True + + + 1 + 2 + 0 + 1 + fill + + + + + + True + True + I am currently out of the office + True + GTK_RELIEF_NORMAL + False + False + True + oof_no_radio + + + 1 + 2 + 1 + 2 + fill + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + 0 + False + True + + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + 6 + True + False + 6 + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_OUT + GTK_CORNER_TOP_LEFT + + + True + True + True + GTK_JUSTIFY_LEFT + GTK_WRAP_WORD + True + 0 + 0 + 0 + 0 + 0 + 0 + + + + + 0 + True + True + + + + + + + True + <b>Out of Office Message:</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + cancelbutton1 + okbutton1 + + + diff --git a/plugins/exchange-operations/exchange-passwd-expiry.ui b/plugins/exchange-operations/exchange-passwd-expiry.ui new file mode 100644 index 0000000000..2301ca1e31 --- /dev/null +++ b/plugins/exchange-operations/exchange-passwd-expiry.ui @@ -0,0 +1,89 @@ + + + + + True + Password Expiry Warning... + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + False + True + False + True + + + True + False + 0 + + + True + GTK_BUTTONBOX_END + + + True + True + True + True + True + _Change Password + True + GTK_RELIEF_NORMAL + + + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + + + + + + + ok_button + + + + + + + 0 + False + True + GTK_PACK_END + + + + + True + Your password will expire in 7 days... + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 20 + + + 0 + False + False + + + + + + change_passwd_button + ok_button + + + diff --git a/plugins/exchange-operations/exchange-permissions-dialog.ui b/plugins/exchange-operations/exchange-permissions-dialog.ui new file mode 100644 index 0000000000..7433ca6393 --- /dev/null +++ b/plugins/exchange-operations/exchange-permissions-dialog.ui @@ -0,0 +1,541 @@ + + + + + True + window1 + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + + + 6 + True + False + 0 + + + 6 + True + False + 6 + + + True + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + True + True + True + False + False + True + + + + + 0 + True + True + + + + + 4 + True + GTK_BUTTONBOX_SPREAD + 10 + + + True + True + True + gtk-add + True + GTK_RELIEF_NORMAL + True + + + + + True + True + True + gtk-remove + True + GTK_RELIEF_NORMAL + True + + + + + 0 + False + True + + + + + 0 + True + True + + + + + 6 + True + 3 + 2 + False + 6 + 0 + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + True + <b>Permissions</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 2 + 0 + 1 + fill + + + + + + 6 + True + False + 6 + + + True + Role: + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + exchange_permissions_role_optionmenu_new + 0 + 0 + Tue, 06 Aug 2002 20:48:43 GMT + + + 0 + True + True + + + + + 1 + 2 + 1 + 2 + fill + fill + + + + + 6 + True + True + 6 + + + True + False + 12 + + + True + False + 6 + + + True + True + Create items + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + True + True + Read items + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + True + True + Create subfolders + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + 0 + True + True + + + + + True + False + 6 + + + True + True + Cannot Edit + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + True + True + Edit Own Items + True + GTK_RELIEF_NORMAL + True + False + False + True + edit_none_radio + + + 0 + False + False + + + + + True + True + Edit Any Items + True + GTK_RELIEF_NORMAL + True + False + False + True + edit_none_radio + + + 0 + False + False + + + + + 0 + True + True + + + + + 0 + True + True + + + + + True + False + 12 + + + True + False + 6 + + + True + True + Folder owner + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + True + True + Folder contact + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + True + True + Folder visible + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + 0 + True + True + + + + + True + False + 6 + + + True + True + Cannot Delete + True + GTK_RELIEF_NORMAL + True + True + False + True + + + 0 + False + False + + + + + True + True + Delete Own Items + True + GTK_RELIEF_NORMAL + True + False + False + True + delete_none_radio + + + 0 + False + False + + + + + True + True + Delete Any Items + True + GTK_RELIEF_NORMAL + True + False + False + True + delete_none_radio + + + 0 + False + False + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 1 + 2 + 2 + 3 + fill + fill + + + + + 0 + False + True + + + + + + diff --git a/plugins/exchange-operations/exchange-send-options.ui b/plugins/exchange-operations/exchange-send-options.ui new file mode 100644 index 0000000000..edb71f8e4c --- /dev/null +++ b/plugins/exchange-operations/exchange-send-options.ui @@ -0,0 +1,422 @@ + + + + + + + + + + Normal + + + Personal + + + Private + + + Confidential + + + + + + + + + + Normal + + + High + + + Low + + + + + True + Exchange - Send Options + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + 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 + + + + + 6 + True + False + 0 + + + True + False + 0 + + + True + <b>Message Settings</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.490000009537 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 6 + True + 2 + 2 + False + 6 + 0 + + + True + I_mportance: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.490000009537 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + True + _Sensitivity: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + True + False + True + model1 + + + + 0 + + + + + 1 + 2 + 1 + 2 + fill + fill + + + + + True + False + True + model2 + + + + 0 + + + + + 1 + 2 + 0 + 1 + fill + + + + + 0 + False + False + + + + + 0 + False + False + + + + + 6 + True + True + Send as Delegate + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + True + False + 0 + + + True + False + 0 + + + True + False + 0 + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + True + True + _User + True + GTK_RELIEF_NORMAL + True + + + 0 + False + False + + + + + 0 + True + True + + + + + True + False + 0 + + + True + <b>Tracking Options</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 6 + False + False + + + + + 6 + True + True + Request a _delivery receipt for this message + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + 6 + True + True + Request a _read receipt for this message + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + helpbutton1 + cancelbutton1 + okbutton1 + + + diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am index 29444dd3f2..d8bd983ae3 100644 --- a/plugins/face/Makefile.am +++ b/plugins/face/Makefile.am @@ -13,8 +13,8 @@ liborg_gnome_face_la_CPPFLAGS = \ -I$(top_builddir)/mail \ -I$(top_builddir)/composer \ $(EVOLUTION_MAIL_CFLAGS) \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DCONNECTOR_GLADEDIR=\""$(gladedir)"\" + -DEVOLUTION_UIDIR=\""$(uidir)"\" \ + -DCONNECTOR_UIDIR=\""$(uidir)"\" liborg_gnome_face_la_SOURCES = face.c diff --git a/plugins/google-account-setup/Makefile.am b/plugins/google-account-setup/Makefile.am index 731072443f..a6d62fa1a2 100644 --- a/plugins/google-account-setup/Makefile.am +++ b/plugins/google-account-setup/Makefile.am @@ -9,7 +9,7 @@ liborg_gnome_evolution_google_la_CPPFLAGS = \ -I . \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ - -DCALDAV_GLADEDIR=\""$(gladedir)"\" \ + -DCALDAV_UIDIR=\""$(uidir)"\" \ $(EVOLUTION_CALENDAR_CFLAGS) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) 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 */ diff --git a/plugins/hula-account-setup/Makefile.am b/plugins/hula-account-setup/Makefile.am index 551b92cb42..ba86505d92 100644 --- a/plugins/hula-account-setup/Makefile.am +++ b/plugins/hula-account-setup/Makefile.am @@ -9,7 +9,7 @@ liborg_gnome_evolution_hula_account_setup_la_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" + -DEVOLUTION_UIDIR=\""$(uidir)"\" liborg_gnome_evolution_hula_account_setup_la_SOURCES = \ camel-hula-listener.c \ diff --git a/plugins/imap-features/Makefile.am b/plugins/imap-features/Makefile.am index 09edf33303..f79fef3474 100644 --- a/plugins/imap-features/Makefile.am +++ b/plugins/imap-features/Makefile.am @@ -14,7 +14,7 @@ liborg_gnome_imap_features_la_CPPFLAGS = \ -I$(top_srcdir)/mail \ $(EVOLUTION_MAIL_CFLAGS) \ $(CAMEL_IMAP_CFLAGS) \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" liborg_gnome_imap_features_la_SOURCES = imap-headers.c @@ -26,14 +26,15 @@ liborg_gnome_imap_features_la_LIBADD= \ liborg_gnome_imap_features_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -glade_DATA = imap-headers.glade +ui_DATA = \ + imap-headers.ui errordir = $(privdatadir)/errors BUILT_SOURCES = org-gnome-imap-features.eplug $(error_i18n) EXTRA_DIST = \ - $(glade_DATA) \ + $(ui_DATA) \ org-gnome-imap-features.eplug.xml CLEANFILES = $(BUILT_SOURCES) diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c index baa6ee43dc..df567aa020 100644 --- a/plugins/imap-features/imap-headers.c +++ b/plugins/imap-features/imap-headers.c @@ -31,13 +31,12 @@ #include -#include "e-util/e-account-utils.h" +#include +#include #include #include -#include - #include typedef struct _epif_data EPImapFeaturesData; @@ -259,8 +258,7 @@ org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *data) GtkWidget *vbox; CamelURL *url = NULL; CamelException ex; - gchar *gladefile; - GladeXML *gladexml; + GtkBuilder *builder; GtkCellRenderer *renderer; GtkTreeViewColumn *column; GtkTreeIter iter; @@ -275,19 +273,18 @@ org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *data) if (!g_str_has_prefix (account->source->url, "imap://") && !(use_imap && g_str_has_prefix (account->source->url, "groupwise://"))) return NULL; - gladefile = g_build_filename (EVOLUTION_GLADEDIR, "imap-headers.glade", NULL); - gladexml = glade_xml_new (gladefile, "vbox2", NULL); - g_free (gladefile); - - vbox = glade_xml_get_widget (gladexml, "vbox2"); - ui->all_headers = glade_xml_get_widget (gladexml, "allHeaders"); - ui->basic_headers = glade_xml_get_widget (gladexml, "basicHeaders"); - ui->mailing_list_headers = glade_xml_get_widget (gladexml, "mailingListHeaders"); - ui->custom_headers_box = glade_xml_get_widget (gladexml, "custHeaderHbox"); - ui->custom_headers_tree = GTK_TREE_VIEW(glade_xml_get_widget (gladexml, "custHeaderTree")); - ui->add_header = GTK_BUTTON(glade_xml_get_widget (gladexml, "addHeader")); - ui->remove_header = GTK_BUTTON(glade_xml_get_widget (gladexml, "removeHeader")); - ui->entry_header = GTK_ENTRY (glade_xml_get_widget (gladexml, "customHeaderEntry")); + builder = gtk_builder_new (); + e_load_ui_builder_definition (builder, "imap-headers.ui"); + + vbox = e_builder_get_widget (builder, "vbox2"); + ui->all_headers = e_builder_get_widget (builder, "allHeaders"); + ui->basic_headers = e_builder_get_widget (builder, "basicHeaders"); + ui->mailing_list_headers = e_builder_get_widget (builder, "mailingListHeaders"); + ui->custom_headers_box = e_builder_get_widget (builder, "custHeaderHbox"); + ui->custom_headers_tree = GTK_TREE_VIEW(e_builder_get_widget (builder, "custHeaderTree")); + ui->add_header = GTK_BUTTON(e_builder_get_widget (builder, "addHeader")); + ui->remove_header = GTK_BUTTON(e_builder_get_widget (builder, "removeHeader")); + ui->entry_header = GTK_ENTRY (e_builder_get_widget (builder, "customHeaderEntry")); url = camel_url_new (e_account_get_string(account, E_ACCOUNT_SOURCE_URL), &ex); diff --git a/plugins/imap-features/imap-headers.glade b/plugins/imap-features/imap-headers.glade deleted file mode 100644 index 85ca962a9c..0000000000 --- a/plugins/imap-features/imap-headers.glade +++ /dev/null @@ -1,377 +0,0 @@ - - - - - - - True - window1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - 6 - True - False - 6 - - - - 6 - True - 0 - 0 - GTK_SHADOW_NONE - - - - 6 - True - 0 - 0 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - - - - True - Select your IMAP Header Preferences. -The more headers you have the more time it will take to download. - False - False - GTK_JUSTIFY_LEFT - False - True - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - _Fetch All Headers - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - _Basic Headers - (Fastest) -Use this if you do not have filters based on mailing lists - True - GTK_RELIEF_NORMAL - True - False - False - True - allHeaders - - - 0 - False - False - - - - - - True - True - Basic and _Mailing List Headers (Default) - True - GTK_RELIEF_NORMAL - True - False - False - True - allHeaders - - - 0 - False - False - - - - - - - - - - True - <b>IMAP Headers</b> - False - True - GTK_JUSTIFY_LEFT - False - True - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - True - - - - - - 6 - True - 0 - 0 - GTK_SHADOW_NONE - - - - 6 - True - 0 - 0 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - - - - True - True - Give the extra headers that you need to fetch in addition to the above standard headers. -You can ignore this if you choose "All Headers". - False - False - GTK_JUSTIFY_LEFT - False - True - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - 1 - False - 0 - - - 0 - False - True - - - - - - True - False - 5 - - - - True - False - 6 - - - - True - True - True - True - 0 - - True - * - False - - - 0 - False - True - - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - False - False - False - True - False - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - GTK_BUTTONBOX_START - 6 - - - - True - True - gtk-add - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - True - - - - - 4 - False - False - - - - - 0 - True - True - - - - - - - - - - True - <b>Custom Headers</b> - False - True - GTK_JUSTIFY_LEFT - False - True - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - - - diff --git a/plugins/imap-features/imap-headers.ui b/plugins/imap-features/imap-headers.ui new file mode 100644 index 0000000000..3fe49afdc6 --- /dev/null +++ b/plugins/imap-features/imap-headers.ui @@ -0,0 +1,328 @@ + + + + + 6 + True + False + 6 + + + 6 + True + 0 + 0 + GTK_SHADOW_NONE + + + 6 + True + 0 + 0 + 1 + 1 + 0 + 0 + 12 + 0 + + + True + False + 6 + + + True + Select your IMAP Header Preferences. +more headers you have the more time it will take to download. + False + False + GTK_JUSTIFY_LEFT + False + True + 0 + 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + True + _Fetch All Headers + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + True + True + _Basic Headers - (Fastest) +this if you do not have filters based on mailing lists + True + GTK_RELIEF_NORMAL + True + False + False + True + allHeaders + + + 0 + False + False + + + + + True + True + Basic and _Mailing List Headers (Default) + True + GTK_RELIEF_NORMAL + True + False + False + True + allHeaders + + + 0 + False + False + + + + + + + + + True + <b>IMAP Headers</b> + False + True + GTK_JUSTIFY_LEFT + False + True + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 0 + False + True + + + + + 6 + True + 0 + 0 + GTK_SHADOW_NONE + + + 6 + True + 0 + 0 + 1 + 1 + 0 + 0 + 12 + 0 + + + True + False + 6 + + + True + True + Give the extra headers that you need to fetch in addition to the above standard headers. +can ignore this if you choose "All Headers". + False + False + GTK_JUSTIFY_LEFT + False + True + 0 + 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + 1 + False + 0 + + + 0 + False + True + + + + + True + False + 5 + + + True + False + 6 + + + True + True + True + True + 0 + + True + * + False + + + 0 + False + True + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + True + True + False + False + False + True + False + False + False + + + + + 0 + True + True + + + + + 0 + True + True + + + + + True + GTK_BUTTONBOX_START + 6 + + + True + True + gtk-add + True + GTK_RELIEF_NORMAL + True + + + + + True + True + gtk-remove + True + GTK_RELIEF_NORMAL + True + + + + + 4 + False + False + + + + + 0 + True + True + + + + + + + + + True + <b>Custom Headers</b> + False + True + GTK_JUSTIFY_LEFT + False + True + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 0 + True + True + + + + diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am index a8117539e8..60d5e125b5 100644 --- a/plugins/publish-calendar/Makefile.am +++ b/plugins/publish-calendar/Makefile.am @@ -3,8 +3,8 @@ plugin_DATA = \ org-gnome-publish-calendar.eplug -glade_DATA = \ - publish-calendar.glade +ui_DATA = \ + publish-calendar.ui plugin_LTLIBRARIES = liborg-gnome-publish-calendar.la @@ -15,7 +15,7 @@ liborg_gnome_publish_calendar_la_CPPFLAGS = \ -I$(top_builddir)/shell \ $(EVOLUTION_CALENDAR_CFLAGS) \ -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" + -DEVOLUTION_UIDIR=\""$(uidir)"\" liborg_gnome_publish_calendar_la_SOURCES = \ publish-calendar.c \ @@ -38,7 +38,7 @@ liborg_gnome_publish_calendar_la_LIBADD = \ EXTRA_DIST = \ org-gnome-publish-calendar.eplug.xml \ - $(glade_DATA) + $(ui_DATA) CLEANFILES = org-gnome-publish-calendar.eplug diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index 99eed79bc4..cda416974b 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -22,7 +22,6 @@ #include #include -#include #include #include #include @@ -30,6 +29,7 @@ #include #include #include +#include #include #include @@ -691,7 +691,7 @@ online_state_changed (EShell *shell) GtkWidget * publish_calendar_locations (EPlugin *epl, EConfigHookItemFactoryData *data) { - GladeXML *xml; + GtkBuilder *builder; GtkCellRenderer *renderer; GtkTreeSelection *selection; GtkWidget *toplevel; @@ -699,15 +699,11 @@ publish_calendar_locations (EPlugin *epl, EConfigHookItemFactoryData *data) GSList *l; GtkTreeIter iter; GConfClient *client; - gchar *gladefile; - gladefile = g_build_filename (EVOLUTION_GLADEDIR, - "publish-calendar.glade", - NULL); - xml = glade_xml_new (gladefile, "toplevel", NULL); - g_free (gladefile); + builder = gtk_builder_new (); + e_load_ui_builder_definition (builder, "publish-calendar.ui"); - ui->treeview = glade_xml_get_widget (xml, "url list"); + ui->treeview = e_builder_get_widget (builder, "url list"); if (store == NULL) store = gtk_list_store_new (URL_LIST_N_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_POINTER); else @@ -729,10 +725,10 @@ publish_calendar_locations (EPlugin *epl, EConfigHookItemFactoryData *data) gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (ui->treeview), TRUE); g_signal_connect (G_OBJECT (ui->treeview), "row-activated", G_CALLBACK (url_list_double_click), ui); - ui->url_add = glade_xml_get_widget (xml, "url add"); - ui->url_edit = glade_xml_get_widget (xml, "url edit"); - ui->url_remove = glade_xml_get_widget (xml, "url remove"); - ui->url_enable = glade_xml_get_widget (xml, "url enable"); + ui->url_add = e_builder_get_widget (builder, "url add"); + ui->url_edit = e_builder_get_widget (builder, "url edit"); + ui->url_remove = e_builder_get_widget (builder, "url remove"); + ui->url_enable = e_builder_get_widget (builder, "url enable"); g_signal_connect (G_OBJECT (ui->url_add), "clicked", G_CALLBACK (url_add_clicked), ui); g_signal_connect (G_OBJECT (ui->url_edit), "clicked", G_CALLBACK (url_edit_clicked), ui); g_signal_connect (G_OBJECT (ui->url_remove), "clicked", G_CALLBACK (url_remove_clicked), ui); @@ -760,11 +756,11 @@ publish_calendar_locations (EPlugin *epl, EConfigHookItemFactoryData *data) if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)) gtk_tree_selection_select_iter (selection, &iter); - toplevel = glade_xml_get_widget (xml, "toplevel"); + toplevel = e_builder_get_widget (builder, "toplevel"); gtk_widget_show_all (toplevel); gtk_box_pack_start (GTK_BOX (data->parent), toplevel, FALSE, TRUE, 0); - g_object_unref (xml); + g_object_unref (builder); return toplevel; } diff --git a/plugins/publish-calendar/publish-calendar.glade b/plugins/publish-calendar/publish-calendar.glade deleted file mode 100644 index 1f1dca0202..0000000000 --- a/plugins/publish-calendar/publish-calendar.glade +++ /dev/null @@ -1,1269 +0,0 @@ - - - - - - - 12 - True - window1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - - - - True - False - 6 - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - False - False - False - - - - - 0 - True - True - - - - - - True - GTK_BUTTONBOX_START - 6 - - - - True - True - True - gtk-add - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-properties - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Edit - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - - True - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-apply - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - E_nable - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - 0 - False - True - - - - - - - - 6 - 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 - False - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - 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 - - - - - - 6 - True - True - True - True - GTK_POS_TOP - False - False - - - - 6 - True - False - 6 - - - - True - <span weight="bold">General</span> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - 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 - 3 - 2 - False - 6 - 6 - - - - True - _Publish as: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - type_selector - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - iCal -Free/Busy - False - True - - - 1 - 2 - 0 - 1 - fill - fill - - - - - - True - Publishing _Frequency: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - publish_frequency - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - Daily -Weekly -Manual (via Actions menu) - False - True - - - 1 - 2 - 2 - 3 - fill - - - - - - True - Time _duration: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - fb_duration_spin - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - False - 0 - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 1 100 1 10 0 - - - 0 - False - False - - - - - - True - days -weeks -months - False - True - - - 0 - True - True - - - - - 1 - 2 - 1 - 2 - fill - fill - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - <span weight="bold">Sources</span> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - 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 - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - False - True - - - - - - True - Calendar - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 6 - True - False - 6 - - - - True - <span weight="bold">Location</span> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - 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 - 0 - - - - 3 - True - False - 6 - - - - True - Service _type: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - Secure FTP (SSH) -Public FTP -FTP (with login) -Windows share -WebDAV (HTTP) -Secure WebDAV (HTTPS) -Custom Location - False - True - - - 0 - False - True - GTK_PACK_END - - - - - 0 - True - True - - - - - - 3 - True - False - 6 - - - - True - _Server: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - server_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - * - False - - - 0 - False - True - GTK_PACK_END - - - - - 0 - True - True - - - - - - 3 - True - False - 6 - - - - True - _File: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - file_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - * - False - - - 0 - False - True - GTK_PACK_END - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - <span weight="bold">Optional Information</span> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - 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 - 0 - - - - 3 - True - False - 6 - - - - True - P_ort: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - port_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - * - False - - - 0 - False - True - GTK_PACK_END - - - - - 0 - True - True - - - - - - 3 - True - False - 6 - - - - True - _Username: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - username_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - * - False - - - 0 - False - True - GTK_PACK_END - - - - - 0 - True - True - - - - - - 3 - True - False - 6 - - - - True - _Password: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - password_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - True - False - 0 - - True - * - False - - - 0 - False - True - GTK_PACK_END - - - - - 0 - True - True - - - - - - 3 - True - True - _Remember password - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - False - True - - - - - False - True - - - - - - True - Publishing Location - 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/publish-calendar/publish-calendar.ui b/plugins/publish-calendar/publish-calendar.ui new file mode 100644 index 0000000000..f60bc9090b --- /dev/null +++ b/plugins/publish-calendar/publish-calendar.ui @@ -0,0 +1,823 @@ + + + + + + 1 + 1 + 100 + 1 + 10 + + + + + + + + + iCal + + + Free/Busy + + + + + + + + + + + Daily + + + Weekly + + + Manual (via Actions menu) + + + + + + + + + + + days + + + weeks + + + months + + + + + + + + + + + Secure FTP (SSH) + + + Public FTP + + + FTP (with login) + + + Windows share + + + WebDAV (HTTP) + + + Secure WebDAV (HTTPS) + + + Custom Location + + + + + True + True + 6 + + + True + 6 + vertical + 6 + + + True + 0 + <span weight="bold">General</span> + True + + + False + False + 0 + + + + + True + 12 + + + True + + + False + False + 0 + + + + + True + 3 + 2 + 6 + 6 + + + True + 0 + _Publish as: + True + type_selector + + + GTK_FILL + + + + + + True + model1 + + + + 0 + + + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + 0 + Publishing _Frequency: + True + publish_frequency + + + 2 + 3 + GTK_FILL + + + + + + True + model2 + + + + 0 + + + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + True + 0 + Time _duration: + True + fb_duration_spin + + + 1 + 2 + GTK_FILL + + + + + + True + + + True + True + adjustment1 + 1 + + + False + False + 0 + + + + + True + model3 + + + + 0 + + + + + 1 + + + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + 1 + + + + + False + 1 + + + + + True + 0 + <span weight="bold">Sources</span> + True + + + False + False + 2 + + + + + True + 12 + + + True + + + False + False + 0 + + + + + True + True + automatic + automatic + in + + + + + + 1 + + + + + 3 + + + + + + + True + Calendar + + + False + + + + + True + 6 + vertical + 6 + + + True + 0 + <span weight="bold">Location</span> + True + + + False + False + 0 + + + + + True + 12 + + + True + + + False + False + 0 + + + + + True + vertical + + + True + 3 + 6 + + + True + 0 + Service _type: + True + + + False + False + 0 + + + + + True + model4 + + + + 0 + + + + + False + end + 1 + + + + + 0 + + + + + True + 3 + 6 + + + True + 0 + _Server: + True + server_entry + + + False + False + 0 + + + + + True + True + + + False + end + 1 + + + + + 1 + + + + + True + 3 + 6 + + + True + 0 + _File: + True + file_entry + + + False + False + 0 + + + + + True + True + + + False + end + 1 + + + + + 2 + + + + + 1 + + + + + False + 1 + + + + + True + 0 + <span weight="bold">Optional Information</span> + True + + + False + False + 2 + + + + + True + 12 + + + True + + + False + False + 0 + + + + + True + vertical + + + True + 3 + 6 + + + True + 0 + P_ort: + True + port_entry + + + False + False + 0 + + + + + True + True + + + False + end + 1 + + + + + 0 + + + + + True + 3 + 6 + + + True + 0 + _Username: + True + username_entry + + + False + False + 0 + + + + + True + True + + + False + end + 1 + + + + + 1 + + + + + True + 3 + 6 + + + True + 0 + _Password: + True + password_entry + + + False + False + 0 + + + + + True + True + False + + + False + end + 1 + + + + + 2 + + + + + _Remember password + True + True + False + 3 + True + True + + + False + False + 3 + + + + + 1 + + + + + False + 3 + + + + + 1 + + + + + True + Publishing Location + + + 1 + False + + + + + True + 6 + + + True + True + automatic + automatic + in + + + True + True + + + + + 0 + + + + + True + vertical + 6 + start + + + gtk-add + True + True + True + True + True + + + False + False + 0 + + + + + True + True + True + True + + + True + 0 + 0 + + + True + 2 + + + True + gtk-properties + + + False + False + 0 + + + + + True + _Edit + True + + + False + False + 1 + + + + + + + + + False + False + 1 + + + + + gtk-remove + True + True + True + True + True + + + False + False + 2 + + + + + True + True + True + True + + + True + 0 + 0 + + + True + 2 + + + True + gtk-apply + + + False + False + 0 + + + + + True + E_nable + True + + + False + False + 1 + + + + + + + + + False + False + 3 + + + + + False + 1 + + + + diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c index c4fad2aba9..0ef00205ae 100644 --- a/plugins/publish-calendar/url-editor-dialog.c +++ b/plugins/publish-calendar/url-editor-dialog.c @@ -26,6 +26,7 @@ #include #include #include +#include #include static GtkDialogClass *parent_class = NULL; @@ -326,23 +327,17 @@ set_from_uri (UrlEditorDialog *dialog) static gboolean url_editor_dialog_construct (UrlEditorDialog *dialog) { - GladeXML *gui; GtkWidget *toplevel; GConfClient *gconf; GtkSizeGroup *group; EPublishUri *uri; - gchar *gladefile; gconf = gconf_client_get_default (); - gladefile = g_build_filename (EVOLUTION_GLADEDIR, - "publish-calendar.glade", - NULL); - gui = glade_xml_new (gladefile, "publishing toplevel", NULL); - g_free (gladefile); - dialog->gui = gui; + dialog->builder = gtk_builder_new (); + e_load_ui_builder_definition (dialog->builder, "publish-calendar.ui"); -#define GW(name) ((dialog->name) = glade_xml_get_widget (dialog->gui, #name)) +#define GW(name) ((dialog->name) = e_builder_get_widget (dialog->builder, #name)) GW(type_selector); GW(fb_duration_label); GW(fb_duration_spin); @@ -375,11 +370,9 @@ url_editor_dialog_construct (UrlEditorDialog *dialog) GW(file_label); #undef GW - g_return_val_if_fail (gui != NULL, FALSE); - uri = dialog->uri; - toplevel = glade_xml_get_widget (gui, "publishing toplevel"); + toplevel = e_builder_get_widget (dialog->builder, "publishing toplevel"); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), toplevel); gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); @@ -498,9 +491,9 @@ url_editor_dialog_dispose (GObject *obj) g_object_unref (dialog->url_list_model); dialog->url_list_model = NULL; } - if (dialog->gui) { - g_object_unref (dialog->gui); - dialog->gui = NULL; + if (dialog->builder) { + g_object_unref (dialog->builder); + dialog->builder = NULL; } ((GObjectClass *)(parent_class))->dispose (obj); diff --git a/plugins/publish-calendar/url-editor-dialog.h b/plugins/publish-calendar/url-editor-dialog.h index 2fd7c19a4e..d2223547c8 100644 --- a/plugins/publish-calendar/url-editor-dialog.h +++ b/plugins/publish-calendar/url-editor-dialog.h @@ -24,7 +24,6 @@ #define URL_EDITOR_DIALOG_H #include -#include #include #include "publish-location.h" @@ -62,7 +61,7 @@ struct _UrlEditorDialog { GtkTreeModel *url_list_model; EPublishUri *uri; - GladeXML *gui; + GtkBuilder *builder; GtkWidget *type_selector; GtkWidget *fb_duration_label; diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am index 919103c063..9a4c8ed5c0 100644 --- a/plugins/templates/Makefile.am +++ b/plugins/templates/Makefile.am @@ -1,8 +1,6 @@ @EVO_PLUGIN_RULE@ -plugin_DATA = \ - org-gnome-templates.eplug \ - templates.glade +plugin_DATA = org-gnome-templates.eplug plugin_LTLIBRARIES = liborg-gnome-templates.la @@ -14,7 +12,7 @@ liborg_gnome_templates_la_CPPFLAGS = \ -I$(top_builddir)/composer \ $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" liborg_gnome_templates_la_SOURCES = templates.c @@ -56,8 +54,7 @@ install-data-local: endif EXTRA_DIST = org-gnome-templates.eplug.xml \ - $(schema_in_files) \ - templates.glade + $(schema_in_files) BUILT_SOURCES = org-gnome-templates.eplug diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index 9e95b4f9dc..c3e1ff20dd 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -27,7 +27,6 @@ #include #include -#include #include #include @@ -53,7 +52,6 @@ #define GCONF_KEY_TEMPLATE_PLACEHOLDERS "/apps/evolution/mail/template_placeholders" typedef struct { - GladeXML *xml; GConfClient *gconf; GtkWidget *treeview; GtkWidget *clue_add; @@ -114,7 +112,6 @@ destroy_ui_data (gpointer data) if (!ui) return; - g_object_unref (ui->xml); g_object_unref (ui->gconf); g_free (ui); } @@ -355,20 +352,59 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) GtkWidget *hbox; GSList *clue_list = NULL, *list; GtkTreeModel *model; + GtkWidget *templates_configuration_box; + GtkWidget *clue_container; + GtkWidget *scrolledwindow1; + GtkWidget *clue_treeview; + GtkWidget *vbuttonbox2; + GtkWidget *clue_add; + GtkWidget *clue_edit; + GtkWidget *clue_remove; UIData *ui = g_new0 (UIData, 1); - gchar *gladefile; - - gladefile = g_build_filename (EVOLUTION_PLUGINDIR, - "templates.glade", - NULL); - ui->xml = glade_xml_new (gladefile, "templates_configuration_box", NULL); - g_free (gladefile); + templates_configuration_box = gtk_vbox_new (FALSE, 5); + gtk_widget_show (templates_configuration_box); + gtk_widget_set_size_request (templates_configuration_box, 385, 189); + + clue_container = gtk_hbox_new (FALSE, 6); + gtk_widget_show (clue_container); + gtk_box_pack_start (GTK_BOX (templates_configuration_box), clue_container, TRUE, TRUE, 0); + + scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_show (scrolledwindow1); + gtk_box_pack_start (GTK_BOX (clue_container), scrolledwindow1, TRUE, TRUE, 0); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + clue_treeview = gtk_tree_view_new (); + gtk_widget_show (clue_treeview); + gtk_container_add (GTK_CONTAINER (scrolledwindow1), clue_treeview); + gtk_container_set_border_width (GTK_CONTAINER (clue_treeview), 1); + + vbuttonbox2 = gtk_vbutton_box_new (); + gtk_widget_show (vbuttonbox2); + gtk_box_pack_start (GTK_BOX (clue_container), vbuttonbox2, FALSE, TRUE, 0); + gtk_button_box_set_layout (GTK_BUTTON_BOX (vbuttonbox2), GTK_BUTTONBOX_START); + gtk_box_set_spacing (GTK_BOX (vbuttonbox2), 6); + + clue_add = gtk_button_new_from_stock ("gtk-add"); + gtk_widget_show (clue_add); + gtk_container_add (GTK_CONTAINER (vbuttonbox2), clue_add); + GTK_WIDGET_SET_FLAGS (clue_add, GTK_CAN_DEFAULT); + + clue_edit = gtk_button_new_from_stock ("gtk-edit"); + gtk_widget_show (clue_edit); + gtk_container_add (GTK_CONTAINER (vbuttonbox2), clue_edit); + GTK_WIDGET_SET_FLAGS (clue_edit, GTK_CAN_DEFAULT); + + clue_remove = gtk_button_new_from_stock ("gtk-remove"); + gtk_widget_show (clue_remove); + gtk_container_add (GTK_CONTAINER (vbuttonbox2), clue_remove); + GTK_WIDGET_SET_FLAGS (clue_remove, GTK_CAN_DEFAULT); ui->gconf = gconf_client_get_default (); - ui->treeview = glade_xml_get_widget (ui->xml, "clue_treeview"); + ui->treeview = clue_treeview; ui->store = gtk_list_store_new (CLUE_N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING); @@ -391,14 +427,14 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (selection_changed), ui); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (ui->treeview), TRUE); - ui->clue_add = glade_xml_get_widget (ui->xml, "clue_add"); + ui->clue_add = clue_add; g_signal_connect (G_OBJECT (ui->clue_add), "clicked", G_CALLBACK (clue_add_clicked), ui); - ui->clue_remove = glade_xml_get_widget (ui->xml, "clue_remove"); + ui->clue_remove = clue_remove; g_signal_connect (G_OBJECT (ui->clue_remove), "clicked", G_CALLBACK (clue_remove_clicked), ui); gtk_widget_set_sensitive (ui->clue_remove, FALSE); - ui->clue_edit = glade_xml_get_widget (ui->xml, "clue_edit"); + ui->clue_edit = clue_edit; g_signal_connect (G_OBJECT (ui->clue_edit), "clicked", G_CALLBACK (clue_edit_clicked), ui); gtk_widget_set_sensitive (ui->clue_edit, FALSE); @@ -424,7 +460,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) hbox = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (hbox), glade_xml_get_widget (ui->xml, "templates_configuration_box"), TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), templates_configuration_box, TRUE, TRUE, 0); /* to let free data properly on destroy of configuration widget */ g_object_set_data_full (G_OBJECT (hbox), "myui-data", ui, destroy_ui_data); diff --git a/plugins/templates/templates.glade b/plugins/templates/templates.glade deleted file mode 100644 index 60720ef3e0..0000000000 --- a/plugins/templates/templates.glade +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - True - window1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - 385 - 189 - True - False - 5 - - - - True - False - 6 - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - 1 - True - True - True - False - False - True - False - False - False - - - - - 0 - True - True - - - - - - True - GTK_BUTTONBOX_START - 6 - - - - True - True - True - gtk-add - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - True - gtk-edit - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - True - - - - - 0 - False - True - - - - - 0 - True - True - - - - - - - -- cgit v1.2.3