From 054c0881696a85f537e93b4950a28f505a3dc0f7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 24 Sep 2009 18:04:36 -0400 Subject: =?UTF-8?q?Bug=C2=A0589153=20-=20Use=20GtkBuilder=20instead=20of?= =?UTF-8?q?=20libglade?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- widgets/misc/Makefile.am | 8 +- widgets/misc/e-dateedit.c | 136 +++++- widgets/misc/e-image-chooser.c | 99 +++- widgets/misc/e-image-chooser.h | 3 +- widgets/misc/e-import-assistant.c | 1 - widgets/misc/e-send-options.c | 108 ++--- widgets/misc/e-send-options.glade | 822 --------------------------------- widgets/misc/e-send-options.ui | 942 ++++++++++++++++++++++++++++++++++++++ 8 files changed, 1214 insertions(+), 905 deletions(-) delete mode 100644 widgets/misc/e-send-options.glade create mode 100644 widgets/misc/e-send-options.ui (limited to 'widgets/misc') diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am index e43494b879..33b9311d90 100644 --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -2,7 +2,7 @@ if OS_WIN32 WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libfilter.la endif -privsolib_LTLIBRARIES = libemiscwidgets.la +privsolib_LTLIBRARIES = libemiscwidgets.la widgetsincludedir = $(privincludedir)/misc @@ -14,7 +14,7 @@ pilot_sources = pilot_headers = endif -glade_DATA = e-send-options.glade +ui_DATA = e-send-options.ui widgetsinclude_HEADERS = \ $(pilot_headers) \ @@ -85,7 +85,7 @@ libemiscwidgets_la_CPPFLAGS = \ -I$(top_srcdir)/filter \ -I$(top_srcdir)/widgets \ -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DG_LOG_DOMAIN=__FILE__ \ $(EVOLUTION_MAIL_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) @@ -220,7 +220,7 @@ test_preferences_window_LDADD = \ EXTRA_DIST = \ - $(glade_DATA) \ + $(ui_DATA) \ e-pilot-settings.h \ e-pilot-settings.c \ ChangeLog.pre-1-4 diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index 2b0eb8acd5..268931a357 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -40,6 +40,7 @@ #include #include #include +#include #include "e-calendar.h" #define E_DATE_EDIT_GET_PRIVATE(obj) \ @@ -112,13 +113,20 @@ struct _EDateEditPrivate { /* set to TRUE when the date has been changed by typing to the entry */ gboolean has_been_changed; + + gboolean allow_no_date_set; }; enum { PROP_0, + PROP_ALLOW_NO_DATE_SET, + PROP_SHOW_DATE, + PROP_SHOW_TIME, PROP_SHOW_WEEK_NUMBERS, PROP_USE_24_HOUR_FORMAT, - PROP_WEEK_START_DAY + PROP_WEEK_START_DAY, + PROP_TWODIGIT_YEAR_CAN_FUTURE, + PROP_SET_NONE }; enum { @@ -207,6 +215,24 @@ date_edit_set_property (GObject *object, GParamSpec *pspec) { switch (property_id) { + case PROP_ALLOW_NO_DATE_SET: + e_date_edit_set_allow_no_date_set ( + E_DATE_EDIT (object), + g_value_get_boolean (value)); + return; + + case PROP_SHOW_DATE: + e_date_edit_set_show_date ( + E_DATE_EDIT (object), + g_value_get_boolean (value)); + return; + + case PROP_SHOW_TIME: + e_date_edit_set_show_time ( + E_DATE_EDIT (object), + g_value_get_boolean (value)); + return; + case PROP_SHOW_WEEK_NUMBERS: e_date_edit_set_show_week_numbers ( E_DATE_EDIT (object), @@ -224,6 +250,17 @@ date_edit_set_property (GObject *object, E_DATE_EDIT (object), g_value_get_int (value)); return; + + case PROP_TWODIGIT_YEAR_CAN_FUTURE: + e_date_edit_set_twodigit_year_can_future ( + E_DATE_EDIT (object), + g_value_get_boolean (value)); + return; + + case PROP_SET_NONE: + if (g_value_get_boolean (value)) + e_date_edit_set_time (E_DATE_EDIT (object), -1); + return; } G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -236,6 +273,24 @@ date_edit_get_property (GObject *object, GParamSpec *pspec) { switch (property_id) { + case PROP_ALLOW_NO_DATE_SET: + g_value_set_boolean ( + value, e_date_edit_get_allow_no_date_set ( + E_DATE_EDIT (object))); + return; + + case PROP_SHOW_DATE: + g_value_set_boolean ( + value, e_date_edit_get_show_date ( + E_DATE_EDIT (object))); + return; + + case PROP_SHOW_TIME: + g_value_set_boolean ( + value, e_date_edit_get_show_time ( + E_DATE_EDIT (object))); + return; + case PROP_SHOW_WEEK_NUMBERS: g_value_set_boolean ( value, e_date_edit_get_show_week_numbers ( @@ -253,6 +308,12 @@ date_edit_get_property (GObject *object, value, e_date_edit_get_week_start_day ( E_DATE_EDIT (object))); return; + + case PROP_TWODIGIT_YEAR_CAN_FUTURE: + g_value_set_boolean ( + value, e_date_edit_get_twodigit_year_can_future ( + E_DATE_EDIT (object))); + return; } G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -294,6 +355,36 @@ date_edit_class_init (EDateEditClass *class) widget_class->mnemonic_activate = e_date_edit_mnemonic_activate; widget_class->grab_focus = e_date_edit_grab_focus; + g_object_class_install_property ( + object_class, + PROP_ALLOW_NO_DATE_SET, + g_param_spec_boolean ( + "allow-no-date-set", + "Allow No Date Set", + NULL, + FALSE, + G_PARAM_READWRITE)); + + g_object_class_install_property ( + object_class, + PROP_SHOW_DATE, + g_param_spec_boolean ( + "show-date", + "Show Date", + NULL, + TRUE, + G_PARAM_READWRITE)); + + g_object_class_install_property ( + object_class, + PROP_SHOW_TIME, + g_param_spec_boolean ( + "show-time", + "Show Time", + NULL, + TRUE, + G_PARAM_READWRITE)); + g_object_class_install_property ( object_class, PROP_SHOW_WEEK_NUMBERS, @@ -326,6 +417,26 @@ date_edit_class_init (EDateEditClass *class) 0, G_PARAM_READWRITE)); + g_object_class_install_property ( + object_class, + PROP_TWODIGIT_YEAR_CAN_FUTURE, + g_param_spec_boolean ( + "twodigit-year-can-future", + "Two-digit year can be treated as future", + NULL, + TRUE, + G_PARAM_READWRITE)); + + g_object_class_install_property ( + object_class, + PROP_SET_NONE, + g_param_spec_boolean ( + "set-none", + "Sets None as selected date", + NULL, + TRUE, + G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + signals[CHANGED] = g_signal_new ( "changed", G_OBJECT_CLASS_TYPE (object_class), @@ -587,6 +698,9 @@ create_children (EDateEdit *dedit) gtk_container_add (GTK_CONTAINER (bbox), priv->none_button); g_signal_connect (priv->none_button, "clicked", G_CALLBACK (on_date_popup_none_button_clicked), dedit); + e_binding_new ( + dedit, "allow-no-date-set", + priv->none_button, "visible"); } /* GtkWidget::mnemonic_activate() handler for the EDateEdit */ @@ -965,6 +1079,8 @@ e_date_edit_set_show_date (EDateEdit *dedit, gtk_widget_show (priv->space); else gtk_widget_hide (priv->space); + + g_object_notify (G_OBJECT (dedit), "show-date"); } /** @@ -1006,6 +1122,8 @@ e_date_edit_set_show_time (EDateEdit *dedit, priv->show_time = show_time; e_date_edit_update_time_combo_state (dedit); + + g_object_notify (G_OBJECT (dedit), "show-time"); } /** @@ -1156,24 +1274,22 @@ e_date_edit_set_use_24_hour_format (EDateEdit *dedit, /* Whether we allow the date to be set to 'None'. e_date_edit_get_time() will return (time_t) -1 in this case. */ gboolean -e_date_edit_get_allow_no_date_set (EDateEdit *dedit) +e_date_edit_get_allow_no_date_set (EDateEdit *dedit) { g_return_val_if_fail (E_IS_DATE_EDIT (dedit), FALSE); - return GTK_WIDGET_VISIBLE (dedit->priv->none_button); + return dedit->priv->allow_no_date_set; } void -e_date_edit_set_allow_no_date_set (EDateEdit *dedit, - gboolean allow_no_date_set) +e_date_edit_set_allow_no_date_set (EDateEdit *dedit, + gboolean allow_no_date_set) { g_return_if_fail (E_IS_DATE_EDIT (dedit)); - if (allow_no_date_set) { - gtk_widget_show (dedit->priv->none_button); - } else { - gtk_widget_hide (dedit->priv->none_button); + dedit->priv->allow_no_date_set = allow_no_date_set; + if (!allow_no_date_set) { /* If the date is showing, we make sure it isn't 'None' (we don't really mind if the time is empty), else if just the time is showing we make sure it isn't 'None'. */ @@ -1185,6 +1301,8 @@ e_date_edit_set_allow_no_date_set (EDateEdit *dedit, e_date_edit_set_time (dedit, 0); } } + + g_object_notify (G_OBJECT (dedit), "allow-no-date-set"); } /* The range of time to show in the time combo popup. */ diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c index 32a3f2a899..5ef4e7cd3e 100644 --- a/widgets/misc/e-image-chooser.c +++ b/widgets/misc/e-image-chooser.c @@ -28,6 +28,7 @@ #include "e-image-chooser.h" #include "e-util/e-util.h" +#include "e-util/e-icon-factory.h" #define E_IMAGE_CHOOSER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ @@ -41,6 +42,14 @@ struct _EImageChooserPrivate { gint image_buf_size; gint image_width; gint image_height; + + /* Default Image */ + gchar *icon_name; +}; + +enum { + PROP_0, + PROP_ICON_NAME }; enum { @@ -269,6 +278,66 @@ exit: gtk_drag_finish (context, handled, FALSE, time); } +static void +image_chooser_set_icon_name (EImageChooser *chooser, + const gchar *icon_name) +{ + GtkIconTheme *icon_theme; + GtkIconInfo *icon_info; + const gchar *filename; + gint width, height; + + g_return_if_fail (chooser->priv->icon_name == NULL); + + chooser->priv->icon_name = g_strdup (icon_name); + + icon_theme = gtk_icon_theme_get_default (); + gtk_icon_size_lookup (GTK_ICON_SIZE_DIALOG, &width, &height); + + icon_info = gtk_icon_theme_lookup_icon ( + icon_theme, icon_name, height, 0); + g_return_if_fail (icon_info != NULL); + + filename = gtk_icon_info_get_filename (icon_info); + e_image_chooser_set_from_file (chooser, filename); + gtk_icon_info_free (icon_info); +} + +static void +image_chooser_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + switch (property_id) { + case PROP_ICON_NAME: + image_chooser_set_icon_name ( + E_IMAGE_CHOOSER (object), + g_value_get_string (value)); + return; + } + + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); +} + +static void +image_chooser_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + switch (property_id) { + case PROP_ICON_NAME: + g_value_set_string ( + value, + e_image_chooser_get_icon_name ( + E_IMAGE_CHOOSER (object))); + return; + } + + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); +} + static void image_chooser_dispose (GObject *object) { @@ -298,6 +367,7 @@ image_chooser_finalize (GObject *object) priv = E_IMAGE_CHOOSER_GET_PRIVATE (object); g_free (priv->image_buf); + g_free (priv->icon_name); /* Chain up to parent's finalize() method. */ G_OBJECT_CLASS (parent_class)->finalize (object); @@ -312,9 +382,22 @@ e_image_chooser_class_init (EImageChooserClass *class) g_type_class_add_private (class, sizeof (EImageChooserPrivate)); object_class = G_OBJECT_CLASS (class); + object_class->set_property = image_chooser_set_property; + object_class->get_property = image_chooser_get_property; object_class->dispose = image_chooser_dispose; object_class->finalize = image_chooser_finalize; + g_object_class_install_property ( + object_class, + PROP_ICON_NAME, + g_param_spec_string ( + "icon-name", + "Icon Name", + NULL, + "stock_person", + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY)); + signals[CHANGED] = g_signal_new ( "changed", G_OBJECT_CLASS_TYPE (object_class), @@ -397,10 +480,22 @@ e_image_chooser_get_type (void) return type; } +const gchar * +e_image_chooser_get_icon_name (EImageChooser *chooser) +{ + g_return_val_if_fail (E_IS_IMAGE_CHOOSER (chooser), NULL); + + return chooser->priv->icon_name; +} + GtkWidget * -e_image_chooser_new (void) +e_image_chooser_new (const gchar *icon_name) { - return g_object_new (E_TYPE_IMAGE_CHOOSER, NULL); + g_return_val_if_fail (icon_name != NULL, NULL); + + return g_object_new ( + E_TYPE_IMAGE_CHOOSER, + "icon-name", icon_name, NULL); } gboolean diff --git a/widgets/misc/e-image-chooser.h b/widgets/misc/e-image-chooser.h index 7116500dc4..3338e16cd7 100644 --- a/widgets/misc/e-image-chooser.h +++ b/widgets/misc/e-image-chooser.h @@ -62,7 +62,8 @@ struct _EImageChooserClass { }; GType e_image_chooser_get_type (void); -GtkWidget * e_image_chooser_new (void); +GtkWidget * e_image_chooser_new (const gchar *icon_name); +const gchar * e_image_chooser_get_icon_name (EImageChooser *chooser); gboolean e_image_chooser_set_from_file (EImageChooser *chooser, const gchar *filename); gboolean e_image_chooser_set_image_data (EImageChooser *chooser, diff --git a/widgets/misc/e-import-assistant.c b/widgets/misc/e-import-assistant.c index 10e60c6bfb..2a1b980eb5 100644 --- a/widgets/misc/e-import-assistant.c +++ b/widgets/misc/e-import-assistant.c @@ -27,7 +27,6 @@ #include #include -#include #include #include "e-util/e-error.h" diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c index aa6c41e6d2..c134bfba6e 100644 --- a/widgets/misc/e-send-options.c +++ b/widgets/misc/e-send-options.c @@ -28,7 +28,6 @@ #include #include -#include #include #include "e-util/e-util.h" @@ -38,8 +37,7 @@ #include "e-send-options.h" struct _ESendOptionsDialogPrivate { - /* Glade XML data */ - GladeXML *xml; + GtkBuilder *builder; gboolean gopts_needed; gboolean global; @@ -403,48 +401,46 @@ static gboolean get_widgets (ESendOptionsDialog *sod) { ESendOptionsDialogPrivate *priv; + GtkBuilder *builder; priv = sod->priv; + builder = sod->priv->builder; -#define GW(name) glade_xml_get_widget (priv->xml, name) - - priv->main = GW ("send-options-dialog"); + priv->main = e_builder_get_widget (builder, "send-options-dialog"); if (!priv->main) return FALSE; - priv->priority = GW ("combo-priority"); - priv->status = GW ("status-tracking"); - priv->security = GW ("security-combo"); - priv->notebook = (GtkNotebook *)GW ("notebook"); - priv->reply_request = GW ("reply-request-button"); - priv->reply_convenient = GW ("reply-convinient"); - priv->reply_within = GW ("reply-within"); - priv->within_days = GW ("within-days"); - priv->delay_delivery = GW ("delay-delivery-button"); - priv->delay_until = GW ("until-date"); + priv->priority = e_builder_get_widget (builder, "combo-priority"); + priv->status = e_builder_get_widget (builder, "status-tracking"); + priv->security = e_builder_get_widget (builder, "security-combo"); + priv->notebook = (GtkNotebook *)e_builder_get_widget (builder, "notebook"); + priv->reply_request = e_builder_get_widget (builder, "reply-request-button"); + priv->reply_convenient = e_builder_get_widget (builder, "reply-convinient"); + priv->reply_within = e_builder_get_widget (builder, "reply-within"); + priv->within_days = e_builder_get_widget (builder, "within-days"); + priv->delay_delivery = e_builder_get_widget (builder, "delay-delivery-button"); + priv->delay_until = e_builder_get_widget (builder, "until-date"); gtk_widget_show (priv->delay_until); - priv->expiration = GW ("expiration-button"); - priv->expire_after = GW ("expire-after"); - priv->create_sent = GW ("create-sent-button"); - priv->delivered = GW ("delivered"); - priv->delivered_opened = GW ("delivered-opened"); - priv->all_info = GW ("all-info"); - priv->autodelete = GW ("autodelete"); - priv->when_opened = GW ("open-combo"); - priv->when_declined = GW ("delete-combo"); - priv->when_accepted = GW ("accept-combo"); - priv->when_completed = GW ("complete-combo"); - priv->security_label = GW ("security-label"); - priv->gopts_label = GW ("gopts-label"); - priv->sopts_label = GW ("slabel"); - priv->priority_label = GW ("priority-label"); - priv->until_label = GW ("until-label"); - priv->opened_label = GW ("opened-label"); - priv->declined_label = GW ("declined-label"); - priv->accepted_label = GW ("accepted-label"); - priv->completed_label = GW ("completed-label"); - -#undef GW + priv->expiration = e_builder_get_widget (builder, "expiration-button"); + priv->expire_after = e_builder_get_widget (builder, "expire-after"); + priv->create_sent = e_builder_get_widget (builder, "create-sent-button"); + priv->delivered = e_builder_get_widget (builder, "delivered"); + priv->delivered_opened = e_builder_get_widget (builder, "delivered-opened"); + priv->all_info = e_builder_get_widget (builder, "all-info"); + priv->autodelete = e_builder_get_widget (builder, "autodelete"); + priv->when_opened = e_builder_get_widget (builder, "open-combo"); + priv->when_declined = e_builder_get_widget (builder, "delete-combo"); + priv->when_accepted = e_builder_get_widget (builder, "accept-combo"); + priv->when_completed = e_builder_get_widget (builder, "complete-combo"); + priv->security_label = e_builder_get_widget (builder, "security-label"); + priv->gopts_label = e_builder_get_widget (builder, "gopts-label"); + priv->sopts_label = e_builder_get_widget (builder, "slabel"); + priv->priority_label = e_builder_get_widget (builder, "priority-label"); + priv->until_label = e_builder_get_widget (builder, "until-label"); + priv->opened_label = e_builder_get_widget (builder, "opened-label"); + priv->declined_label = e_builder_get_widget (builder, "declined-label"); + priv->accepted_label = e_builder_get_widget (builder, "accepted-label"); + priv->completed_label = e_builder_get_widget (builder, "completed-label"); return (priv->priority && priv->security @@ -558,21 +554,6 @@ e_sendoptions_get_need_general_options (ESendOptionsDialog *sod) return sod->priv->gopts_needed; } -GtkWidget * send_options_make_dateedit (void); - -GtkWidget * -send_options_make_dateedit (void) -{ - EDateEdit *dedit; - - dedit = E_DATE_EDIT (e_date_edit_new ()); - - e_date_edit_set_show_date (dedit, TRUE); - e_date_edit_set_show_time (dedit, TRUE); - - return GTK_WIDGET (dedit); -} - gboolean e_sendoptions_set_global (ESendOptionsDialog *sod, gboolean set) { @@ -597,7 +578,7 @@ static void e_send_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 ( @@ -614,25 +595,20 @@ e_sendoptions_dialog_run (ESendOptionsDialog *sod, GtkWidget *parent, Item_type { ESendOptionsDialogPrivate *priv; GtkWidget *toplevel; - gchar *filename; g_return_val_if_fail (sod != NULL || E_IS_SENDOPTIONS_DIALOG (sod), FALSE); priv = sod->priv; - filename = g_build_filename (EVOLUTION_GLADEDIR, - "e-send-options.glade", - NULL); - priv->xml = glade_xml_new (filename, NULL, NULL); - g_free (filename); + /* Make sure our custom widget classes are registered with + * GType before we load the GtkBuilder definition file. */ + E_TYPE_DATE_EDIT; - if (!priv->xml) { - g_message ( G_STRLOC ": Could not load the Glade XML file "); - return FALSE; - } + priv->builder = gtk_builder_new (); + e_load_ui_builder_definition (priv->builder, "e-send-options.ui"); if (!get_widgets(sod)) { - g_object_unref (priv->xml); + g_object_unref (priv->builder); g_message (G_STRLOC ": Could not get the Widgets \n"); return FALSE; } @@ -745,7 +721,7 @@ e_sendoptions_dialog_init (GObject *object) sod->data->gopts->security = 0; priv->gopts_needed = TRUE; - priv->xml = NULL; + priv->builder = NULL; priv->main = NULL; priv->notebook = NULL; diff --git a/widgets/misc/e-send-options.glade b/widgets/misc/e-send-options.glade deleted file mode 100644 index 58ee7f32c4..0000000000 --- a/widgets/misc/e-send-options.glade +++ /dev/null @@ -1,822 +0,0 @@ - - - - - - True - True - Send Options - False - True - mouse - dialog - False - - - True - True - - - True - True - - - True - 12 - 4 - 4 - 12 - 12 - - - True - 0 - - - 2 - 4 - 1 - 2 - - - - - - True - 0 - none - - - True - 12 - 2 - 3 - 12 - 12 - - - R_eply requested - True - True - False - True - True - - - 3 - GTK_FILL - - - - - - True - 0 - 12 - - - True - 2 - 3 - 12 - 12 - - - Wi_thin - True - True - False - True - True - - - 1 - 2 - GTK_FILL - - - - - - True - True - 5 0 100 1 10 0 - 1 - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - days - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - - _When convenient - True - True - False - True - True - reply-within - - - 3 - GTK_FILL - - - - - - - - 3 - 1 - 2 - - - - - - - - - True - <b>Replies</b> - True - - - label_item - - - - - 4 - 2 - 3 - GTK_FILL - - - - - - True - 0 - none - - - True - 12 - 4 - 2 - - - _Delay message delivery - True - True - False - True - True - - - GTK_FILL - - - - - - True - 0 - - - 1 - 2 - - - - - - True - 12 - - - True - 12 - 12 - - - True - 0 - _After: - True - expire-after - - - False - False - 0 - - - - - True - True - 2 0 100 1 10 0 - 1 - - - False - False - 1 - - - - - True - 0 - days - - - False - False - 2 - - - - - - - 2 - 3 - 4 - GTK_EXPAND - - - - - _Set expiration date - True - True - False - True - True - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - - True - 12 - - - True - True - 12 - 12 - - - True - 0 - _Until: - True - until-date - - - False - False - 0 - - - - - True - send_options_make_dateedit - - - False - False - 1 - - - - - - - 2 - 1 - 2 - - - - - - - - True - <b>Delivery Options</b> - True - - - label_item - - - - - 4 - 3 - 4 - GTK_FILL - - - - - - True - Undefined -High -Standard -Low - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - 1 - _Priority: - True - combo-priority - - - 1 - 2 - - - - - - True - 1 - _Classification: - True - security-combo - - - GTK_FILL - - - - - - True - Normal -Proprietary -Confidential -Secret -Top Secret -For Your Eyes Only - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - - - - - - - - - True - Gene_ral Options - True - - - False - tab - - - - - True - 12 - 12 - - - True - 0 - none - - - True - 12 - - - True - 12 - 12 - - - Creat_e a sent item to track information - True - True - False - True - True - - - False - False - 0 - - - - - True - 19 - - - _Delivered - True - True - False - True - True - - - - - False - False - 1 - - - - - True - 19 - - - Deli_vered and opened - True - True - False - True - True - delivered - - - - - False - False - 2 - - - - - True - 19 - - - _All information - True - True - False - True - True - delivered - - - - - False - False - 3 - - - - - True - 19 - - - A_uto-delete sent item - True - True - False - True - True - - - - - False - False - 4 - - - - - - - - - True - <b>Status Tracking</b> - True - True - - - label_item - - - - - False - False - 0 - - - - - True - 0 - none - - - True - 12 - - - True - 12 - 4 - 2 - 12 - 12 - - - True - 1 - _When opened: - True - open-combo - - - GTK_FILL - - - - - - True - 1 - When decli_ned: - True - delete-combo - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - When co_mpleted: - True - complete-combo - - - 3 - 4 - GTK_FILL - - - - - - True - 1 - When acce_pted: - True - accept-combo - - - 2 - 3 - GTK_FILL - - - - - - True - None -Mail Receipt - - - 1 - 2 - GTK_FILL - - - - - True - None -Mail Receipt - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - None -Mail Receipt - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - True - None -Mail Receipt - - - 1 - 2 - 3 - 4 - - - - - - - - - True - <b>Return Notification</b> - True - True - - - label_item - - - - - False - False - 1 - - - - - 1 - - - - - True - Sta_tus Tracking - True - - - 1 - False - tab - - - - - 2 - - - - - True - end - - - gtk-help - -11 - True - True - True - False - True - - - False - False - 0 - - - - - gtk-cancel - -6 - True - True - True - False - True - - - False - False - 1 - - - - - gtk-ok - -5 - True - True - True - False - True - - - False - False - 2 - - - - - False - end - 0 - - - - - - diff --git a/widgets/misc/e-send-options.ui b/widgets/misc/e-send-options.ui new file mode 100644 index 0000000000..e43eb52eef --- /dev/null +++ b/widgets/misc/e-send-options.ui @@ -0,0 +1,942 @@ + + + + 100 + 0 + 10 + 1 + 0 + 5 + + + 100 + 0 + 10 + 1 + 0 + 2 + + + + + + + + Undefined + + + High + + + Standard + + + Low + + + + + + + + + + Normal + + + Proprietary + + + Confidential + + + Secret + + + Top Secret + + + For Your Eyes Only + + + + + + + + + + None + + + Mail Receipt + + + + + + + + + + None + + + Mail Receipt + + + + + + + + + + None + + + Mail Receipt + + + + + + + + + + None + + + Mail Receipt + + + + + + + True + True + Send Options + False + True + mouse + dialog + False + + + True + True + + + True + True + + + True + 12 + 4 + 4 + 12 + 12 + + + True + 0 + + + 2 + 4 + 1 + 2 + + + + + + True + 0 + none + + + True + 12 + 2 + 3 + 12 + 12 + + + R_eply requested + True + True + False + True + True + + + 3 + GTK_FILL + + + + + + True + 0 + 12 + + + True + 2 + 3 + 12 + 12 + + + Wi_thin + True + True + False + True + True + + + 1 + 2 + GTK_FILL + + + + + + True + True + adjustment1 + 1 + + + 1 + 2 + 1 + 2 + + + + + + True + 0 + days + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + + _When convenient + True + True + False + True + True + reply-within + + + 3 + GTK_FILL + + + + + + + + 3 + 1 + 2 + + + + + + + + + True + <b>Replies</b> + True + + + + + 4 + 2 + 3 + GTK_FILL + + + + + + True + 0 + none + + + True + 12 + 4 + 2 + + + _Delay message delivery + True + True + False + True + True + + + GTK_FILL + + + + + + True + 0 + + + 1 + 2 + + + + + + True + 12 + + + True + 12 + 12 + + + True + 0 + _After: + True + expire-after + + + False + False + 0 + + + + + True + True + adjustment2 + 1 + + + False + False + 1 + + + + + True + 0 + days + + + False + False + 2 + + + + + + + 2 + 3 + 4 + GTK_EXPAND + + + + + _Set expiration date + True + True + False + True + True + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + True + 12 + + + True + True + 12 + 12 + + + True + 0 + _Until: + True + until-date + + + False + False + 0 + + + + + True + + + False + False + 1 + + + + + + + 2 + 1 + 2 + + + + + + + + True + <b>Delivery Options</b> + True + + + + + 4 + 3 + 4 + GTK_FILL + + + + + + True + model1 + + + + 0 + + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + 1 + _Priority: + True + combo-priority + + + 1 + 2 + + + + + + True + 1 + _Classification: + True + security-combo + + + GTK_FILL + + + + + + True + model2 + + + + 0 + + + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + + + + + + + + + True + Gene_ral Options + True + + + False + + + + + True + 12 + 12 + + + True + 0 + none + + + True + 12 + + + True + 12 + 12 + + + Creat_e a sent item to track information + True + True + False + True + True + + + False + False + 0 + + + + + True + 19 + + + _Delivered + True + True + False + True + True + + + + + False + False + 1 + + + + + True + 19 + + + Deli_vered and opened + True + True + False + True + True + delivered + + + + + False + False + 2 + + + + + True + 19 + + + _All information + True + True + False + True + True + delivered + + + + + False + False + 3 + + + + + True + 19 + + + A_uto-delete sent item + True + True + False + True + True + + + + + False + False + 4 + + + + + + + + + True + <b>Status Tracking</b> + True + True + + + + + False + False + 0 + + + + + True + 0 + none + + + True + 12 + + + True + 12 + 4 + 2 + 12 + 12 + + + True + 1 + _When opened: + True + open-combo + + + GTK_FILL + + + + + + True + 1 + When decli_ned: + True + delete-combo + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + When co_mpleted: + True + complete-combo + + + 3 + 4 + GTK_FILL + + + + + + True + 1 + When acce_pted: + True + accept-combo + + + 2 + 3 + GTK_FILL + + + + + + True + model3 + + + + 0 + + + + + 1 + 2 + GTK_FILL + + + + + True + model4 + + + + 0 + + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + model5 + + + + 0 + + + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + True + model6 + + + + 0 + + + + + 1 + 2 + 3 + 4 + + + + + + + + + True + <b>Return Notification</b> + True + True + + + + + False + False + 1 + + + + + + + True + Sta_tus Tracking + True + + + 1 + False + + + + + 2 + + + + + True + end + + + gtk-help + True + True + True + False + True + + + False + False + 0 + + + + + gtk-cancel + True + True + True + False + True + + + False + False + 1 + + + + + gtk-ok + True + True + True + False + True + + + False + False + 2 + + + + + False + end + 0 + + + + + + helpbutton1 + cancelbutton1 + okbutton1 + + + -- cgit v1.2.3