aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/misc
diff options
context:
space:
mode:
Diffstat (limited to 'widgets/misc')
-rw-r--r--widgets/misc/ChangeLog13
-rw-r--r--widgets/misc/e-send-options.c153
-rw-r--r--widgets/misc/e-send-options.glade7
-rw-r--r--widgets/misc/e-send-options.h7
4 files changed, 167 insertions, 13 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index f70a3507a3..f7b96ea213 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,16 @@
+2005-01-10 Chenthill Palanisamy <pchenthill@novell.com>
+
+ * e-send-options.c: (e_send_options_get_widgets_data),
+ (e_send_options_fill_widgets_with_data), (page_changed_cb),
+ (init_widgets), (get_widgets), (setup_widgets),
+ (e_sendoptions_set_global), (e_sendoptions_dialog_run),
+ (e_sendoptions_dialog_finalize), (e_sendoptions_dialog_dispose),
+ (e_sendoptions_dialog_init), (e_sendoptions_dialog_class_init),
+ (e_sendoptions_dialog_get_type): Added code to support global options.
+ Filled the finalize and dispose functions.
+ * e-send-options.glade: Changed a label id.
+ * e-send-options.h: Added the set_global function.
+
2005-01-06 JP Rosevear <jpr@novell.com>
* Makefile.am: dist the glade file
diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c
index f8aad5c94b..dbb6b34825 100644
--- a/widgets/misc/e-send-options.c
+++ b/widgets/misc/e-send-options.c
@@ -35,6 +35,7 @@ struct _ESendOptionsDialogPrivate {
GladeXML *xml;
gboolean gopts_needed;
+ gboolean global;
/* Widgets */
@@ -43,6 +44,8 @@ struct _ESendOptionsDialogPrivate {
/* Noteboook to add options page and status tracking page*/
GtkNotebook *notebook;
+ GtkWidget *status;
+
/* priority */
GtkWidget *priority;
@@ -93,6 +96,7 @@ static void e_sendoptions_dialog_finalize (GObject *object);
static void e_sendoptions_dialog_init (GObject *object);
static void e_sendoptions_dialog_dispose (GObject *object);
+static GObjectClass *parent_class = NULL;
static void
e_send_options_get_widgets_data (ESendOptionsDialog *sod)
@@ -106,7 +110,8 @@ e_send_options_get_widgets_data (ESendOptionsDialog *sod)
sopts = sod->data->sopts;
gopts->priority = gtk_combo_box_get_active ((GtkComboBox *) priv->priority);
-
+ gopts->classify = gtk_combo_box_get_active ((GtkComboBox *) priv->classification);
+
gopts->reply_enabled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->reply_request));
gopts->reply_convenient = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->reply_convenient));
gopts->reply_within = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (priv->within_days));
@@ -148,7 +153,8 @@ e_send_options_fill_widgets_with_data (ESendOptionsDialog *sod)
tmp = time (NULL);
gtk_combo_box_set_active ((GtkComboBox *) priv->priority, gopts->priority);
-
+ gtk_combo_box_set_active ((GtkComboBox *) priv->classification, gopts->classify);
+
if (gopts->reply_enabled)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->reply_request), TRUE);
else
@@ -229,6 +235,7 @@ sensitize_widgets (ESendOptionsDialog *sod)
gtk_widget_set_sensitive (priv->delivered, FALSE);
gtk_widget_set_sensitive (priv->delivered_opened, FALSE);
gtk_widget_set_sensitive (priv->all_info, FALSE);
+ gtk_widget_set_sensitive (priv->autodelete, FALSE);
}
}
@@ -292,6 +299,7 @@ sent_item_toggled_cb (GtkWidget *toggle, gpointer data)
gtk_widget_set_sensitive (priv->delivered, active);
gtk_widget_set_sensitive (priv->delivered_opened, active);
gtk_widget_set_sensitive (priv->all_info, active);
+ gtk_widget_set_sensitive (priv->autodelete, active);
}
@@ -315,7 +323,45 @@ delay_until_date_changed_cb (GtkWidget *dedit, gpointer data)
e_date_edit_set_time (E_DATE_EDIT (priv->delay_until), 0);
}
+static void
+page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, gpointer data)
+{
+ ESendOptionsDialog *sod = data;
+ ESendOptionsDialogPrivate *priv = sod->priv;
+ e_send_options_get_widgets_data (sod);
+ if (num > 0) {
+ if (num == 1) {
+ gtk_widget_hide (priv->accepted_label);
+ gtk_widget_hide (priv->when_accepted);
+ gtk_widget_hide (priv->completed_label);
+ gtk_widget_hide (priv->when_completed);
+ gtk_widget_set_sensitive (priv->autodelete, TRUE);
+ sod->data->sopts = sod->data->mopts;
+ } else if (num == 2) {
+ gtk_widget_hide (priv->completed_label);
+ gtk_widget_hide (priv->when_completed);
+ gtk_widget_hide (priv->classification_label);
+ gtk_widget_hide (priv->classification);
+ gtk_widget_set_sensitive (priv->autodelete, FALSE);
+
+ gtk_widget_show (priv->accepted_label);
+ gtk_widget_show (priv->when_accepted);
+ sod->data->sopts = sod->data->copts;
+ } else {
+ gtk_widget_set_sensitive (priv->autodelete, FALSE);
+
+ gtk_widget_show (priv->completed_label);
+ gtk_widget_show (priv->when_completed);
+ gtk_widget_show (priv->accepted_label);
+ gtk_widget_show (priv->when_accepted);
+ sod->data->sopts = sod->data->topts;
+ }
+ }
+ e_send_options_fill_widgets_with_data (sod);
+}
+
+
static void
init_widgets (ESendOptionsDialog *sod)
{
@@ -330,6 +376,10 @@ init_widgets (ESendOptionsDialog *sod)
g_signal_connect (priv->delay_until, "changed", G_CALLBACK (delay_until_date_changed_cb), sod);
+ if (priv->global)
+ g_signal_connect (priv->notebook, "switch-page", G_CALLBACK (page_changed_cb), sod);
+
+
}
static gboolean
@@ -346,6 +396,7 @@ get_widgets (ESendOptionsDialog *sod)
return FALSE;
priv->priority = GW ("combo-priority");
+ priv->status = GW ("status-tracking");
priv->classification = GW ("classification-combo");
priv->notebook = GW ("notebook");
priv->reply_request = GW ("reply-request-button");
@@ -368,7 +419,7 @@ get_widgets (ESendOptionsDialog *sod)
priv->when_completed = GW ("complete-combo");
priv->classification_label = GW ("classification-label");
priv->gopts_label = GW ("gopts-label");
- priv->sopts_label = GW ("sopts-label");
+ priv->sopts_label = GW ("slabel");
priv->priority_label = GW ("priority-label");
priv->until_label = GW ("until-label");
priv->opened_label = GW ("opened-label");
@@ -380,6 +431,7 @@ get_widgets (ESendOptionsDialog *sod)
return (priv->priority
&& priv->classification
+ && priv->status
&& priv->reply_request
&& priv->reply_convenient
&& priv->reply_within
@@ -401,7 +453,6 @@ get_widgets (ESendOptionsDialog *sod)
&& priv->priority_label
&& priv->opened_label
&& priv->gopts_label
- && priv->sopts_label
&& priv->declined_label
&& priv->accepted_label
&& priv->completed_label);
@@ -429,6 +480,17 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type)
gtk_label_set_mnemonic_widget (GTK_LABEL (priv->completed_label), priv->when_completed);
gtk_label_set_mnemonic_widget (GTK_LABEL (priv->until_label), priv->delay_until);
+ if (priv->global) {
+ GtkWidget *widget = gtk_label_new ("Calendar");
+ gtk_label_set_text (GTK_LABEL (priv->sopts_label), "Mail");
+ gtk_notebook_append_page (priv->notebook, priv->status, widget);
+ gtk_widget_show (widget);
+ widget = gtk_label_new ("Task");
+ gtk_widget_show (widget);
+ gtk_notebook_append_page (priv->notebook, priv->status,widget);
+ gtk_notebook_set_show_tabs (priv->notebook, TRUE);
+ }
+
switch (type) {
case E_ITEM_MAIL:
gtk_widget_hide (priv->accepted_label);
@@ -490,6 +552,16 @@ send_options_make_dateedit (void)
return GTK_WIDGET (dedit);
}
+gboolean
+e_sendoptions_set_global (ESendOptionsDialog *sod, gboolean set)
+{
+ g_return_val_if_fail (E_IS_SENDOPTIONS_DIALOG (sod), FALSE);
+
+ sod->priv->global = set;
+
+ return TRUE;
+}
+
gboolean
e_sendoptions_dialog_run (ESendOptionsDialog *sod, GtkWidget *parent, Item_type type)
{
@@ -497,6 +569,8 @@ e_sendoptions_dialog_run (ESendOptionsDialog *sod, GtkWidget *parent, Item_type
GtkWidget *toplevel;
int result;
+ g_return_val_if_fail (sod != NULL || E_IS_SENDOPTIONS_DIALOG (sod), FALSE);
+
priv = sod->priv;
priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/e-send-options.glade", NULL, NULL);
@@ -510,11 +584,17 @@ e_sendoptions_dialog_run (ESendOptionsDialog *sod, GtkWidget *parent, Item_type
g_message (G_STRLOC ": Could not get the Widgets \n");
return FALSE;
}
-
+
+ if (priv->global) {
+ g_free (sod->data->sopts);
+ sod->data->sopts = sod->data->mopts;
+ }
+
setup_widgets (sod, type);
toplevel = gtk_widget_get_toplevel (priv->main);
- gtk_window_set_transient_for (GTK_WINDOW (toplevel),
+ if (parent)
+ gtk_window_set_transient_for (GTK_WINDOW (toplevel),
GTK_WINDOW (parent));
e_send_options_fill_widgets_with_data (sod);
@@ -536,11 +616,62 @@ e_sendoptions_dialog_run (ESendOptionsDialog *sod, GtkWidget *parent, Item_type
static void
e_sendoptions_dialog_finalize (GObject *object)
{
+ ESendOptionsDialog *sod = (ESendOptionsDialog *) object;
+ ESendOptionsDialogPrivate *priv;
+
+ g_return_if_fail (E_IS_SENDOPTIONS_DIALOG (sod));
+ priv = sod->priv;
+
+ if (sod->data->gopts) {
+ g_free (sod->data->gopts);
+ sod->data->gopts = NULL;
+ }
+
+ if (!priv->global && sod->data->sopts) {
+ g_free (sod->data->sopts);
+ sod->data->sopts = NULL;
+ }
+
+ if (sod->data->mopts) {
+ g_free (sod->data->mopts);
+ sod->data->mopts = NULL;
+ }
+
+ if (sod->data->copts) {
+ g_free (sod->data->copts);
+ sod->data->copts = NULL;
+ }
+
+ if (sod->data->topts) {
+ g_free (sod->data->topts);
+ sod->data->topts = NULL;
+ }
+
+ if (sod->data) {
+ g_free (sod->data);
+ sod->data = NULL;
+ }
+
+ if (sod->priv) {
+ g_free (sod->priv);
+ sod->priv = NULL;
+ }
+
+ if (parent_class->finalize)
+ (* parent_class->finalize) (object);
+
}
static void
e_sendoptions_dialog_dispose (GObject *object)
{
+ ESendOptionsDialog *sod = (ESendOptionsDialog *) object;
+
+ g_return_if_fail (E_IS_SENDOPTIONS_DIALOG (sod));
+
+ if (parent_class->dispose)
+ (* parent_class->dispose) (object);
+
}
/* Object initialization function for the task page */
@@ -556,11 +687,15 @@ e_sendoptions_dialog_init (GObject *object)
new = g_new0 (ESendOptionsData, 1);
new->gopts = g_new0 (ESendOptionsGeneral, 1);
new->sopts = g_new0 (ESendOptionsStatusTracking, 1);
+ new->mopts = g_new0 (ESendOptionsStatusTracking, 1);
+ new->copts = g_new0 (ESendOptionsStatusTracking, 1);
+ new->topts = g_new0 (ESendOptionsStatusTracking, 1);
priv = g_new0 (ESendOptionsDialogPrivate, 1);
sod->priv = priv;
sod->data = new;
sod->data->initialized = FALSE;
+ sod->data->gopts->classify = 0;
priv->gopts_needed = TRUE;
priv->xml = NULL;
@@ -568,6 +703,7 @@ e_sendoptions_dialog_init (GObject *object)
priv->main = NULL;
priv->notebook = NULL;
priv->priority = NULL;
+ priv->status = NULL;
priv->classification = NULL;
priv->reply_request = NULL;
priv->reply_convenient = NULL;
@@ -579,6 +715,7 @@ e_sendoptions_dialog_init (GObject *object)
priv->create_sent = NULL;
priv->delivered =NULL;
priv->delivered_opened = NULL;
+ priv->global = FALSE;
priv->all_info = NULL;
priv->when_opened = NULL;
priv->when_declined = NULL;
@@ -601,11 +738,10 @@ e_sendoptions_dialog_class_init (GObjectClass *object)
{
ESendOptionsDialogClass *klass;
GObjectClass *object_class;
- GtkWidgetClass *widget_class;
klass = E_SENDOPTIONS_DIALOG_CLASS (object);
+ parent_class = g_type_class_peek_parent (klass);
object_class = G_OBJECT_CLASS (klass);
- widget_class = GTK_WIDGET_CLASS (klass);
object_class->finalize = e_sendoptions_dialog_finalize;
object_class->dispose = e_sendoptions_dialog_dispose;
@@ -633,4 +769,3 @@ GType e_sendoptions_dialog_get_type (void)
}
return type;
}
-
diff --git a/widgets/misc/e-send-options.glade b/widgets/misc/e-send-options.glade
index 6c973fbc0d..bb6618b106 100644
--- a/widgets/misc/e-send-options.glade
+++ b/widgets/misc/e-send-options.glade
@@ -82,7 +82,8 @@
<child>
<widget class="GtkNotebook" id="notebook">
<property name="visible">True</property>
- <property name="show_tabs">False</property>
+ <property name="can_focus">True</property>
+ <property name="show_tabs">True</property>
<property name="show_border">True</property>
<property name="tab_pos">GTK_POS_TOP</property>
<property name="scrollable">False</property>
@@ -1157,9 +1158,9 @@ Mail Receipt</property>
</child>
<child>
- <widget class="GtkLabel" id="sopts-label">
+ <widget class="GtkLabel" id="slabel">
<property name="visible">True</property>
- <property name="label" translatable="yes">Sta_tus Tracking</property>
+ <property name="label" translatable="yes">Sta_tus Tracking</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/widgets/misc/e-send-options.h b/widgets/misc/e-send-options.h
index 180325c034..ba48734e5a 100644
--- a/widgets/misc/e-send-options.h
+++ b/widgets/misc/e-send-options.h
@@ -37,6 +37,7 @@ typedef struct _ESendOptionsDialogClass ESendOptionsDialogClass;
typedef struct _ESendOptionsDialogPrivate ESendOptionsDialogPrivate;
typedef enum {
+ E_ITEM_NONE,
E_ITEM_MAIL,
E_ITEM_CALENDAR,
E_ITEM_TASK
@@ -62,6 +63,7 @@ typedef enum {
typedef struct {
ESendOptionsPriority priority;
+ gint classify;
gboolean reply_enabled;
gboolean reply_convenient;
gint reply_within;
@@ -86,6 +88,9 @@ typedef struct {
ESendOptionsGeneral *gopts;
ESendOptionsStatusTracking *sopts;
+ ESendOptionsStatusTracking *mopts;
+ ESendOptionsStatusTracking *copts;
+ ESendOptionsStatusTracking *topts;
} ESendOptionsData;
@@ -106,5 +111,5 @@ ESendOptionsDialog *e_sendoptions_dialog_new (void);
void e_sendoptions_set_need_general_options (ESendOptionsDialog *sod, gboolean needed);
gboolean e_sendoptions_get_need_general_options (ESendOptionsDialog *sod);
gboolean e_sendoptions_dialog_run (ESendOptionsDialog *sod, GtkWidget *parent, Item_type type);
-
+gboolean e_sendoptions_set_global (ESendOptionsDialog *sod, gboolean set);
#endif
generated by cgit (git 2.34.1) at 2024-11-17 07:04:34 +0800