From fd6e9b75700544aec9ce03e5380e7385f4cce4f8 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Fri, 9 Feb 2001 00:48:07 +0000 Subject: fill in new classification stuff properly (get_widgets): load new class. 2001-02-08 JP Rosevear * gui/dialogs/task-editor.c (fill_widgets): fill in new classification stuff properly (get_widgets): load new class. widgets (init_widgets): if the class. widgets change, mark the dialog dirty (dialog_to_comp_object): set the comp class. from the new widgets * gui/dialogs/task-editor-dialog.glade: Make more consistent, fixing bugs 1247 and 1249 * gui/dialogs/task-editor.c (fill_widgets): * gui/event-editor-dialog.glade: Gui tidying * gui/event-editor.c: Remove old alarm cruft * cal-util/cal-component.c (cal_component_set_url): Don't try and write an empty string as a property svn path=/trunk/; revision=8132 --- calendar/gui/dialogs/task-editor-dialog.glade | 561 +++--- calendar/gui/dialogs/task-editor-dialog.glade.h | 11 +- calendar/gui/dialogs/task-editor.c | 69 +- calendar/gui/dialogs/task-page.glade | 561 +++--- calendar/gui/event-editor-dialog.glade | 2116 +++++++++++------------ calendar/gui/event-editor-dialog.glade.h | 5 +- calendar/gui/event-editor.c | 23 +- 7 files changed, 1716 insertions(+), 1630 deletions(-) (limited to 'calendar/gui') diff --git a/calendar/gui/dialogs/task-editor-dialog.glade b/calendar/gui/dialogs/task-editor-dialog.glade index 98fc85ecf0..03ab29c376 100644 --- a/calendar/gui/dialogs/task-editor-dialog.glade +++ b/calendar/gui/dialogs/task-editor-dialog.glade @@ -37,11 +37,6 @@ 2 2 False - - 0 - True - True - GtkVBox @@ -67,7 +62,7 @@ GtkLabel label3 - + GTK_JUSTIFY_CENTER False 0.5 @@ -117,20 +112,146 @@ - GtkHSeparator - hseparator1 + GtkFrame + frame2 + + 0 + GTK_SHADOW_ETCHED_IN 0 False True + + + GtkHBox + hbox4 + 4 + False + 0 + + + GtkTable + table1 + 2 + 2 + False + 2 + 4 + + 0 + False + True + + + + GtkLabel + label6 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label5 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + Custom + due-date + task_editor_create_date_edit + 0 + 0 + Sun, 10 Sep 2000 17:32:18 GMT + + 1 + 2 + 0 + 1 + 0 + 0 + True + False + False + False + True + False + + + + + Custom + start-date + task_editor_create_date_edit + 0 + 0 + Sun, 10 Sep 2000 17:33:31 GMT + + 1 + 2 + 1 + 2 + 0 + 0 + True + False + False + False + True + False + + + + - GtkHBox - hbox4 - False - 0 + GtkScrolledWindow + scrolledwindow1 + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS 0 False @@ -138,68 +259,136 @@ - GtkTable - table1 - 2 - 4 + GtkText + description + 80 + True + True + + + + + + GtkFrame + frame23 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + False + True + + + + GtkHBox + hbox3 + 4 False - 2 - 4 - - 0 - False - True - + 4 GtkLabel - label6 - + label7 + GTK_JUSTIFY_CENTER False - 0 + 0.5 0.5 0 0 + status - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False + 0 + False + False + + + + + GtkOptionMenu + status + True + Not Started +In Progress +Completed +Cancelled + + 0 + + 0 + False + False GtkLabel - label5 - + label8 + GTK_JUSTIFY_CENTER False - 0 + 0.5 0.5 0 0 + priority - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False + 0 + False + False + + + + + GtkOptionMenu + priority + True + High +Normal +Low +Undefined + + 0 + + 0 + False + False + + + + + GtkLabel + label18 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + classification + + 0 + False + False + + + + + GtkOptionMenu + classification + True + None +Public +Private +Confidential + + 0 + + 0 + False + False @@ -215,18 +404,9 @@ 0 percent-complete - 2 - 3 - 0 - 1 - 0 - 0 - False - False - False - False - False - False + 0 + False + False @@ -248,84 +428,20 @@ 10 10 - 3 - 4 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - - Custom - due-date - task_editor_create_date_edit - 0 - 0 - Sun, 10 Sep 2000 17:32:18 GMT - - 1 - 2 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - - Custom - start-date - task_editor_create_date_edit - 0 - 0 - Sun, 10 Sep 2000 17:33:31 GMT - - 1 - 2 - 1 - 2 - 0 - 0 - True - False - False - False - True - False + 0 + True + True - GtkHSeparator - hseparator2 - - 0 - False - True - - - - - GtkHBox - hbox3 - False - 4 + GtkFrame + frame24 + + 0 + GTK_SHADOW_ETCHED_IN 0 False @@ -333,131 +449,56 @@ - GtkLabel - label7 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - status - - 0 - False - False - - - - - GtkOptionMenu - status - True - Not Started -In Progress -Completed -Cancelled - - 0 - - 0 - False - False - - - - - GtkLabel - label8 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - priority - - 0 - False - False - - - - - GtkOptionMenu - priority - True - High -Normal -Low -Undefined - - 0 - - 0 - False - False - - - - - GtkLabel - label18 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - classification - - 0 - False - False - - + GtkHBox + hbox6 + 2 + False + 4 - - GtkOptionMenu - classification - True - None -Public -Private -Confidential - - 0 - - 0 - False - False - - - + + GtkRadioButton + classification-public + True + + True + True + classification_radio_group + + 0 + False + False + + - - GtkScrolledWindow - scrolledwindow1 - 150 - GTK_POLICY_NEVER - GTK_POLICY_ALWAYS - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - 0 - True - True - + + GtkRadioButton + classification-private + True + + False + True + classification_radio_group + + 0 + False + False + + - - GtkText - description - True - True - + + GtkRadioButton + classification-confidential + True + + False + True + classification_radio_group + + 0 + False + False + + @@ -468,7 +509,7 @@ Confidential 2 0 - False + True True diff --git a/calendar/gui/dialogs/task-editor-dialog.glade.h b/calendar/gui/dialogs/task-editor-dialog.glade.h index bf568eb358..83a555473c 100644 --- a/calendar/gui/dialogs/task-editor-dialog.glade.h +++ b/calendar/gui/dialogs/task-editor-dialog.glade.h @@ -4,11 +4,11 @@ * DO NOT compile it as part of your application. */ -gchar *s = N_("task-editor-dialog"); -gchar *s = N_("Su_mmary"); +gchar *s = N_("Su_mmary:"); +gchar *s = N_("Date & Time"); gchar *s = N_("Sta_rt Date:"); gchar *s = N_("_Due Date:"); -gchar *s = N_("% Comp_lete:"); +gchar *s = N_("Progress"); gchar *s = N_("_Status:"); gchar *s = N_("Not Started\n" "In Progress\n" @@ -27,6 +27,11 @@ gchar *s = N_("None\n" "Private\n" "Confidential\n" ""); +gchar *s = N_("% Comp_lete:"); +gchar *s = N_("Classification"); +gchar *s = N_("Pu_blic"); +gchar *s = N_("Pri_vate"); +gchar *s = N_("_Confidential"); gchar *s = N_("_Contacts..."); gchar *s = N_("Ca_tegories..."); gchar *s = N_("Task"); diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index 936da0f8db..64e73e30f5 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -75,10 +75,13 @@ typedef struct { GtkWidget *status; GtkWidget *priority; - GtkWidget *classification; GtkWidget *description; + GtkWidget *classification_public; + GtkWidget *classification_private; + GtkWidget *classification_confidential; + GtkWidget *contacts; GtkWidget *categories_btn; GtkWidget *categories; @@ -118,14 +121,12 @@ static const int priority_map[] = { }; static const int classification_map[] = { - CAL_COMPONENT_CLASS_NONE, CAL_COMPONENT_CLASS_PUBLIC, CAL_COMPONENT_CLASS_PRIVATE, CAL_COMPONENT_CLASS_CONFIDENTIAL, -1 }; - static void task_editor_class_init (TaskEditorClass *class); static void task_editor_init (TaskEditor *tedit); static void tedit_apply_event_cb (GtkWidget *widget, gint page_num, gpointer data); @@ -161,6 +162,7 @@ static void field_changed (GtkWidget *widget, static void task_editor_set_changed (TaskEditor *tedit, gboolean changed); static gboolean prompt_to_save_changes (TaskEditor *tedit); +static CalComponentClassification classification_get (GtkWidget *widget); static void categories_clicked (GtkWidget *button, TaskEditor *editor); @@ -370,10 +372,13 @@ get_widgets (TaskEditor *tedit) priv->status = GW ("status"); priv->priority = GW ("priority"); - priv->classification = GW ("classification"); priv->description = GW ("description"); + priv->classification_public = GW ("classification-public"); + priv->classification_private = GW ("classification-private"); + priv->classification_confidential = GW ("classification-confidential"); + priv->contacts = GW ("contacts"); priv->categories_btn = GW ("categories-button"); priv->categories = GW ("categories"); @@ -390,12 +395,14 @@ get_widgets (TaskEditor *tedit) && priv->percent_complete && priv->status && priv->priority - && priv->classification + && priv->classification_public + && priv->classification_private + && priv->classification_confidential && priv->description && priv->contacts && priv->categories_btn && priv->categories - && priv->completed_date + && priv->completed_date && priv->url); } @@ -422,6 +429,19 @@ init_widgets (TaskEditor *tedit) "value_changed", GTK_SIGNAL_FUNC (percent_complete_changed), tedit); + /* Classification */ + gtk_signal_connect (GTK_OBJECT (priv->description), "changed", + GTK_SIGNAL_FUNC (field_changed), tedit); + gtk_signal_connect (GTK_OBJECT (priv->classification_public), + "toggled", + GTK_SIGNAL_FUNC (field_changed), tedit); + gtk_signal_connect (GTK_OBJECT (priv->classification_private), + "toggled", + GTK_SIGNAL_FUNC (field_changed), tedit); + gtk_signal_connect (GTK_OBJECT (priv->classification_confidential), + "toggled", + GTK_SIGNAL_FUNC (field_changed), tedit); + /* Connect the default signal handler to use to make sure the "changed" field gets set whenever a field is changed. */ gtk_signal_connect (GTK_OBJECT (priv->summary), "changed", @@ -433,9 +453,6 @@ init_widgets (TaskEditor *tedit) gtk_signal_connect (GTK_OBJECT (GTK_OPTION_MENU (priv->priority)->menu), "deactivate", GTK_SIGNAL_FUNC (field_changed), tedit); - gtk_signal_connect (GTK_OBJECT (GTK_OPTION_MENU (priv->classification)->menu), - "deactivate", - GTK_SIGNAL_FUNC (field_changed), tedit); gtk_signal_connect (GTK_OBJECT (priv->description), "changed", GTK_SIGNAL_FUNC (field_changed), tedit); gtk_signal_connect (GTK_OBJECT (priv->contacts), "changed", @@ -735,8 +752,8 @@ fill_widgets (TaskEditor *tedit) TaskEditorPrivate *priv; CalComponentText text; CalComponentDateTime d; + CalComponentClassification cl; struct icaltimetype *completed; - CalComponentClassification classification; GSList *l; time_t t; int *priority_value, *percent; @@ -836,9 +853,23 @@ fill_widgets (TaskEditor *tedit) /* Classification. */ - cal_component_get_classification (priv->comp, &classification); - e_dialog_option_menu_set (priv->classification, classification, - classification_map); + cal_component_get_classification (priv->comp, &cl); + + switch (cl) { + case CAL_COMPONENT_CLASS_PUBLIC: + e_dialog_radio_set (priv->classification_public, CAL_COMPONENT_CLASS_PUBLIC, + classification_map); + case CAL_COMPONENT_CLASS_PRIVATE: + e_dialog_radio_set (priv->classification_public, CAL_COMPONENT_CLASS_PRIVATE, + classification_map); + case CAL_COMPONENT_CLASS_CONFIDENTIAL: + e_dialog_radio_set (priv->classification_public, CAL_COMPONENT_CLASS_CONFIDENTIAL, + classification_map); + default: + /* What do do? We can't g_assert_not_reached() since it is a + * value from an external file. + */ + } /* Categories */ cal_component_get_categories (priv->comp, &categories); @@ -885,7 +916,6 @@ dialog_to_comp_object (TaskEditor *tedit) icalproperty_status status; TaskEditorPriority priority; int priority_value, percent; - CalComponentClassification classification; char *url, *cat; char *str; @@ -977,9 +1007,7 @@ dialog_to_comp_object (TaskEditor *tedit) cal_component_set_priority (comp, &priority_value); /* Classification. */ - classification = e_dialog_option_menu_get (priv->classification, - classification_map); - cal_component_set_classification (comp, classification); + cal_component_set_classification (comp, classification_get (priv->classification_public)); /* Categories */ cat = e_dialog_editable_get (priv->categories); @@ -1150,6 +1178,13 @@ percent_complete_changed (GtkAdjustment *adj, priv->ignore_callbacks = FALSE; } +/* Decode the radio button group for classifications */ +static CalComponentClassification +classification_get (GtkWidget *widget) +{ + return e_dialog_radio_get (widget, classification_map); +} + /* This is called when all fields except those handled above (status, percent complete & completed date) are changed. It just sets the "changed" flag. */ diff --git a/calendar/gui/dialogs/task-page.glade b/calendar/gui/dialogs/task-page.glade index 98fc85ecf0..03ab29c376 100644 --- a/calendar/gui/dialogs/task-page.glade +++ b/calendar/gui/dialogs/task-page.glade @@ -37,11 +37,6 @@ 2 2 False - - 0 - True - True - GtkVBox @@ -67,7 +62,7 @@ GtkLabel label3 - + GTK_JUSTIFY_CENTER False 0.5 @@ -117,20 +112,146 @@ - GtkHSeparator - hseparator1 + GtkFrame + frame2 + + 0 + GTK_SHADOW_ETCHED_IN 0 False True + + + GtkHBox + hbox4 + 4 + False + 0 + + + GtkTable + table1 + 2 + 2 + False + 2 + 4 + + 0 + False + True + + + + GtkLabel + label6 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label5 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + Custom + due-date + task_editor_create_date_edit + 0 + 0 + Sun, 10 Sep 2000 17:32:18 GMT + + 1 + 2 + 0 + 1 + 0 + 0 + True + False + False + False + True + False + + + + + Custom + start-date + task_editor_create_date_edit + 0 + 0 + Sun, 10 Sep 2000 17:33:31 GMT + + 1 + 2 + 1 + 2 + 0 + 0 + True + False + False + False + True + False + + + + - GtkHBox - hbox4 - False - 0 + GtkScrolledWindow + scrolledwindow1 + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS 0 False @@ -138,68 +259,136 @@ - GtkTable - table1 - 2 - 4 + GtkText + description + 80 + True + True + + + + + + GtkFrame + frame23 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + False + True + + + + GtkHBox + hbox3 + 4 False - 2 - 4 - - 0 - False - True - + 4 GtkLabel - label6 - + label7 + GTK_JUSTIFY_CENTER False - 0 + 0.5 0.5 0 0 + status - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False + 0 + False + False + + + + + GtkOptionMenu + status + True + Not Started +In Progress +Completed +Cancelled + + 0 + + 0 + False + False GtkLabel - label5 - + label8 + GTK_JUSTIFY_CENTER False - 0 + 0.5 0.5 0 0 + priority - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False + 0 + False + False + + + + + GtkOptionMenu + priority + True + High +Normal +Low +Undefined + + 0 + + 0 + False + False + + + + + GtkLabel + label18 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + classification + + 0 + False + False + + + + + GtkOptionMenu + classification + True + None +Public +Private +Confidential + + 0 + + 0 + False + False @@ -215,18 +404,9 @@ 0 percent-complete - 2 - 3 - 0 - 1 - 0 - 0 - False - False - False - False - False - False + 0 + False + False @@ -248,84 +428,20 @@ 10 10 - 3 - 4 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - - Custom - due-date - task_editor_create_date_edit - 0 - 0 - Sun, 10 Sep 2000 17:32:18 GMT - - 1 - 2 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - - Custom - start-date - task_editor_create_date_edit - 0 - 0 - Sun, 10 Sep 2000 17:33:31 GMT - - 1 - 2 - 1 - 2 - 0 - 0 - True - False - False - False - True - False + 0 + True + True - GtkHSeparator - hseparator2 - - 0 - False - True - - - - - GtkHBox - hbox3 - False - 4 + GtkFrame + frame24 + + 0 + GTK_SHADOW_ETCHED_IN 0 False @@ -333,131 +449,56 @@ - GtkLabel - label7 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - status - - 0 - False - False - - - - - GtkOptionMenu - status - True - Not Started -In Progress -Completed -Cancelled - - 0 - - 0 - False - False - - - - - GtkLabel - label8 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - priority - - 0 - False - False - - - - - GtkOptionMenu - priority - True - High -Normal -Low -Undefined - - 0 - - 0 - False - False - - - - - GtkLabel - label18 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - classification - - 0 - False - False - - + GtkHBox + hbox6 + 2 + False + 4 - - GtkOptionMenu - classification - True - None -Public -Private -Confidential - - 0 - - 0 - False - False - - - + + GtkRadioButton + classification-public + True + + True + True + classification_radio_group + + 0 + False + False + + - - GtkScrolledWindow - scrolledwindow1 - 150 - GTK_POLICY_NEVER - GTK_POLICY_ALWAYS - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - 0 - True - True - + + GtkRadioButton + classification-private + True + + False + True + classification_radio_group + + 0 + False + False + + - - GtkText - description - True - True - + + GtkRadioButton + classification-confidential + True + + False + True + classification_radio_group + + 0 + False + False + + @@ -468,7 +509,7 @@ Confidential 2 0 - False + True True diff --git a/calendar/gui/event-editor-dialog.glade b/calendar/gui/event-editor-dialog.glade index 8e8ea8dc9f..10fdcfe54e 100644 --- a/calendar/gui/event-editor-dialog.glade +++ b/calendar/gui/event-editor-dialog.glade @@ -18,75 +18,134 @@ - GnomeApp + GnomePropertyBox event-editor-dialog False - event-editor-dialog - GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False False - True + False False - True - GnomeDock - GnomeApp:dock - dock2 - True - - 0 - True - True - + GtkNotebook + GnomeDock:contents + notebook1 + 2 + True + True + True + GTK_POS_TOP + False + 2 + 2 + False - GtkNotebook - GnomeDock:contents - dialog-contents - 2 - True - True - True - GTK_POS_TOP - False - 2 - 2 - False + GtkVBox + vbox51 + 4 + False + 6 - GtkVBox - vbox2 - 4 + GtkTable + table11 + 1 + 2 False - 6 + 4 + 4 + + 0 + False + True + + + + GtkLabel + label56 + + GTK_JUSTIFY_CENTER + False + 7.45058e-09 + 0.5 + 0 + 0 + general-summary + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkEntry + general-summary + True + True + True + 0 + + + 1 + 2 + 0 + 1 + 0 + 0 + True + False + False + False + True + False + + + + + + GtkFrame + frame31 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + False + False + GtkTable - table5 - 1 - 2 + table12 + 4 + 2 + 3 False 4 4 - - 0 - False - True - GtkLabel - label13 - + label57 + GTK_JUSTIFY_CENTER False - 7.45058e-09 + 0 0.5 0 0 - general-summary 0 1 @@ -104,21 +163,46 @@ - GtkEntry - general-summary + GtkLabel + label58 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkCheckButton + all-day-event True - True - True - 0 - + + False + True - 1 - 2 + 2 + 3 0 1 0 0 - True + False False False False @@ -126,524 +210,803 @@ False - - - - GtkFrame - frame4 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - False - False - - GtkTable - table3 - 4 - 2 - 3 - False - 4 - 4 - - - GtkLabel - label15 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 + Custom + start-time + make_date_edit + + + 0 + 0 + Tue, 16 May 2000 19:11:05 GMT + + 1 + 2 + 0 + 1 0 0 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - + False + True + False + False + False + True + + - - GtkLabel - label16 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 + + Custom + end-time + make_date_edit + 0 + 0 + Tue, 16 May 2000 19:11:10 GMT + + 1 + 2 + 1 + 2 0 0 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - - GtkCheckButton - all-day-event - True - - False - True - - 2 - 3 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - Custom - start-time - make_date_edit - - - 0 - 0 - Tue, 16 May 2000 19:11:05 GMT - - 1 - 2 - 0 - 1 - 0 - 0 - False - True - False - False - False - True - - - - - Custom - end-time - make_date_edit - 0 - 0 - Tue, 16 May 2000 19:11:10 GMT - - 1 - 2 - 1 - 2 - 0 - 0 - False - True - False - False - False - True - - + False + True + False + False + False + True + + - - GtkScrolledWindow - scrolledwindow3 - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - 0 - True - True - - - - GtkText - description - True - True - - - + + GtkScrolledWindow + scrolledwindow12 + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS + + 0 + True + True + - GtkFrame - frame5 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - False - False - - - - GtkHBox - hbox6 - 2 - False - 4 - - - GtkRadioButton - classification-public - True - - True - True - classification_radio_group - - 0 - False - False - - - - - GtkRadioButton - classification-private - True - - False - True - classification_radio_group - - 0 - False - False - - - - - GtkRadioButton - classification-confidential - True - - False - True - classification_radio_group - - 0 - False - False - - - + GtkText + description + True + True + + + + + GtkFrame + frame32 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + False + False + GtkHBox - hbox49 + hbox52 + 2 False - 2 - - 0 - False - True - + 4 - GtkButton - categories-button + GtkRadioButton + classification-public True + + True + True + classification_radio_group 0 False False - - - GtkLabel - label51 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 4 - 0 - - - - - GtkEntry - contacts - True - True - True - 0 - - - 0 - True - True - - GtkButton - categories-button + GtkRadioButton + classification-private True + + False + True + classification_radio_group 0 False False - - - GtkLabel - label52 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 4 - 0 - - GtkEntry - categories + GtkRadioButton + classification-confidential True - True - True - 0 - + + False + True + classification_radio_group 0 - True - True + False + False - GtkLabel - Notebook:tab - label11 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkVBox - vbox49 - 4 + GtkHBox + hbox53 False - 4 + 2 + + 0 + False + True + - GtkFrame - frame29 - - 0 - GTK_SHADOW_ETCHED_IN + GtkButton + contacts-button + True 0 False - True + False - GtkTable - table10 - 4 - 2 - 2 - False - 2 - 2 + GtkLabel + label59 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 4 + 0 + + - - GtkLabel - label53 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 + + GtkEntry + contacts + True + True + True + 0 + + + 0 + True + True + + + + + GtkButton + categories-button + True + + 0 + False + False + + + + GtkLabel + label60 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 4 + 0 + + + + + GtkEntry + categories + True + True + True + 0 + + + 0 + True + True + + + + + + + GtkLabel + Notebook:tab + label61 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkVBox + vbox52 + 4 + False + 4 + + + GtkFrame + frame33 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + False + True + + + + GtkTable + table13 + 4 + 2 + 2 + False + 2 + 2 + + + GtkLabel + label62 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + reminder-summary + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label63 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkEntry + reminder-summary + True + True + True + 0 + + + 1 + 2 + 0 + 1 + 0 + 0 + True + False + True + False + True + False + + + + + GtkAlignment + reminder-starting-data + 0 + 0.5 + 0 + 0 + + 1 + 2 + 1 + 2 0 0 - reminder-summary + False + False + False + False + True + True + + + + Custom + reminder-starting-date + make_date_edit + 0 + 0 + Fri, 22 Sep 2000 20:51:38 GMT + + + + + + + GtkFrame + frame34 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + + + + GtkVBox + vbox53 + 4 + False + 4 + + + GtkHBox + hbox54 + False + 4 + + 0 + False + True + + + + GtkOptionMenu + reminder-action + True + Show a dialog +Play a sound +Send an email +Run a program + + 0 - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False + 0 + False + False - GtkLabel - label54 - - GTK_JUSTIFY_CENTER + GtkSpinButton + reminder-interval-value + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False False - 0 - 0.5 - 0 - 0 + 1 + 0 + 100 + 1 + 10 + 10 - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False + 0 + False + True - GtkEntry - reminder-summary + GtkOptionMenu + reminder-value-units True - True - True - 0 - + minute(s) +hour(s) +day(s) + + 0 - 1 - 2 - 0 - 1 - 0 - 0 - True - False - True - False - True - False + 0 + False + False - GtkAlignment - alignment38 - 0 - 0.5 - 0 - 0 + GtkOptionMenu + reminder-relative + True + before +after + + 0 + + 0 + False + False + + + + + GtkOptionMenu + reminder-time + True + start of appointment +end of appointment + + 0 + + 0 + False + False + + + + + GtkButton + button9 + True + + + 0 + False + False + + + + + + GtkHBox + hbox55 + False + 0 + + 0 + True + True + + + + GtkScrolledWindow + scrolledwindow13 + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS + + 0 + True + True + + + + GtkCList + reminder-list + True + 1 + 80 + GTK_SELECTION_BROWSE + False + GTK_SHADOW_IN + + + GtkLabel + CList:title + label64 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + + + GtkVButtonBox + vbuttonbox2 + GTK_BUTTONBOX_START + 10 + 85 + 27 + 7 + 0 - 1 - 2 - 1 - 2 - 0 - 0 - False - False - False - False - True - True + 0 + False + False - Custom - reminder-starting-date - make_date_edit - 0 - 0 - Fri, 22 Sep 2000 20:51:38 GMT + GtkButton + reminder-add + True + True + + + + + GtkButton + reminder-delete + True + True + + + + + + GtkLabel + Notebook:tab + label65 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkVBox + vbox54 + 4 + False + 4 + + + GtkFrame + frame35 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + False + False + + + + GtkTable + table14 + 4 + 2 + 2 + False + 2 + 2 + + + GtkLabel + label66 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + recurrence-summary + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label67 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkEntry + recurrence-summary + True + True + True + 0 + + + 1 + 2 + 0 + 1 + 0 + 0 + True + False + True + False + True + False + + + + + GtkAlignment + alignment40 + 0 + 0.5 + 0 + 0 + + 1 + 2 + 1 + 2 + 0 + 0 + False + False + False + False + True + True + + + + Custom + recurrence-starting-date + make_date_edit + 0 + 0 + Fri, 22 Sep 2000 20:51:38 GMT + + + + + + + GtkVBox + vbox55 + False + 4 + + 0 + True + True + GtkFrame - frame30 - + frame36 + 0 GTK_SHADOW_ETCHED_IN 0 - True - True + False + False GtkVBox - vbox50 + vbox56 + 4 False 4 GtkHBox - hbox51 + hbox56 False 4 0 False - True + False - GtkOptionMenu - reminder-action + GtkRadioButton + recurrence-none True - Show a dialog -Play a sound -Send an email -Run a program - - 0 + + False + True + recurrence-radio 0 False @@ -652,37 +1015,13 @@ Run a program - GtkSpinButton - reminder-interval-value + GtkRadioButton + recurrence-simple True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 1 - 0 - 100 - 1 - 10 - 10 - - 0 - False - True - - - - - GtkOptionMenu - reminder-value-units - True - minute(s) -hour(s) -day(s) - - 0 + + False + True + recurrence-radio 0 False @@ -691,40 +1030,13 @@ day(s) - GtkOptionMenu - reminder-relative + GtkRadioButton + recurrence-custom True - before -after - - 0 - - 0 - False - False - - - - - GtkOptionMenu - reminder-time - True - start of appointment -end of appointment - - 0 - - 0 - False - False - - - - - GtkButton - button3 - True - + + False + True + recurrence-radio 0 False @@ -735,245 +1047,160 @@ end of appointment GtkHBox - hbox50 + hbox57 False 0 0 - True - True + False + False - GtkScrolledWindow - scrolledwindow11 - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS + GtkHBox + recurrence-params + False + 2 0 - True - True + False + False - GtkCList - reminder-list - True - 1 - 80 - GTK_SELECTION_BROWSE - False - GTK_SHADOW_IN + GtkLabel + label68 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkSpinButton + recurrence-interval-value + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 1 + 1 + 10000 + 1 + 10 + 10 + + 0 + False + False + + + + + GtkOptionMenu + recurrence-interval-unit + True + day(s) +week(s) +month(s) +year(s) + + 0 + + 0 + False + False + + + + + GtkAlignment + recurrence-special + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + Placeholder + + + + + GtkOptionMenu + recurrence-ending-menu + True + for +until +forever + + 0 + + 0 + False + False + + + + + GtkAlignment + recurrence-ending-special + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + - GtkLabel - CList:title - label55 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 + Placeholder - GtkVButtonBox - vbuttonbox1 - GTK_BUTTONBOX_START - 10 - 85 - 27 - 7 - 0 + GtkAlignment + recurrence-custom-warning-bin + 0 + 0.5 + 1 + 1 0 - False - False + True + True - GtkButton - reminder-add - True - True - - - - - GtkButton - reminder-delete - True - True - + Placeholder - - - - GtkLabel - Notebook:tab - label42 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkVBox - vbox41 - 4 - False - 4 - - - GtkFrame - frame26 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - False - False - - - - GtkTable - table9 - 4 - 2 - 2 - False - 2 - 2 - - - GtkLabel - label44 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - recurrence-summary - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label45 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - - GtkEntry - recurrence-summary - True - True - True - 0 - - - 1 - 2 - 0 - 1 - 0 - 0 - True - False - True - False - True - False - - - - - GtkAlignment - alignment37 - 0 - 0.5 - 0 - 0 - - 1 - 2 - 1 - 2 - 0 - 0 - False - False - False - False - True - True - - - - Custom - recurrence-starting-date - make_date_edit - 0 - 0 - Fri, 22 Sep 2000 20:51:38 GMT - - - - - GtkVBox - vbox43 + GtkHBox + hbox59 False 4 @@ -984,26 +1211,26 @@ end of appointment GtkFrame - frame28 - + frame37 + 0 GTK_SHADOW_ETCHED_IN 0 - False - False + True + True - GtkVBox - vbox47 + GtkHBox + hbox60 4 False 4 - GtkHBox - hbox47 + GtkVBox + vbox57 False 4 @@ -1013,13 +1240,10 @@ end of appointment - GtkRadioButton - recurrence-none + GtkButton + recurrence-exception-add True - - False - True - recurrence-radio + 0 False @@ -1028,13 +1252,10 @@ end of appointment - GtkRadioButton - recurrence-simple + GtkButton + recurrence-exception-modify True - - False - True - recurrence-radio + 0 False @@ -1043,13 +1264,10 @@ end of appointment - GtkRadioButton - recurrence-custom + GtkButton + recurrence-exception-delete True - - False - True - recurrence-radio + 0 False @@ -1059,144 +1277,37 @@ end of appointment - GtkHBox - hbox48 + GtkVBox + vbox58 False - 0 + 4 0 - False - False + True + True - GtkHBox - recurrence-params - False - 2 + Custom + recurrence-exception-date + make_date_edit + 0 + 0 + Tue, 16 May 2000 01:42:29 GMT 0 False False - - - GtkLabel - label46 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkSpinButton - recurrence-interval-value - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 1 - 1 - 10000 - 1 - 10 - 10 - - 0 - False - False - - - - - GtkOptionMenu - recurrence-interval-unit - True - day(s) -week(s) -month(s) -year(s) - - 0 - - 0 - False - False - - - - - GtkAlignment - recurrence-special - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - Placeholder - - - - - GtkOptionMenu - recurrence-ending-menu - True - for -until -forever - - 0 - - 0 - False - False - - - - - GtkAlignment - recurrence-ending-special - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - Placeholder - - - GtkAlignment - recurrence-custom-warning-bin - 0 - 0.5 - 1 - 1 + GtkScrolledWindow + scrolledwindow14 + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS 0 True @@ -1204,7 +1315,27 @@ forever - Placeholder + GtkCList + recurrence-exception-list + True + 1 + 80 + GTK_SELECTION_BROWSE + False + GTK_SHADOW_IN + + + GtkLabel + CList:title + label69 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + @@ -1212,211 +1343,66 @@ forever - GtkHBox - hbox45 + GtkVBox + vbox59 False - 4 + 0 0 - True - True + False + False - GtkFrame - frame24 - - 0 - GTK_SHADOW_ETCHED_IN + GtkLabel + label70 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 0 - True - True + False + False - - - GtkHBox - hbox46 - 4 - False - 4 - - - GtkVBox - vbox44 - False - 4 - - 0 - False - False - - - - GtkButton - recurrence-exception-add - True - - - 0 - False - False - - - - - GtkButton - recurrence-exception-modify - True - - - 0 - False - False - - - - - GtkButton - recurrence-exception-delete - True - - - 0 - False - False - - - - - - GtkVBox - vbox45 - False - 4 - - 0 - True - True - - - - Custom - recurrence-exception-date - make_date_edit - 0 - 0 - Tue, 16 May 2000 01:42:29 GMT - - 0 - False - False - - - - - GtkScrolledWindow - scrolledwindow10 - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - 0 - True - True - - - - GtkCList - recurrence-exception-list - True - 1 - 80 - GTK_SELECTION_BROWSE - False - GTK_SHADOW_IN - - - GtkLabel - CList:title - label49 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - - - GtkVBox - vbox48 - False - 0 + GtkAlignment + recurrence-preview-bin + 0 + 0 + 1 + 1 0 - False - False + True + True - GtkLabel - label50 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkAlignment - recurrence-preview-bin - 0 - 0 - 1 - 1 - - 0 - True - True - - - - Placeholder - + Placeholder + - - GtkLabel - Notebook:tab - label43 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - + + GtkLabel + Notebook:tab + label71 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 diff --git a/calendar/gui/event-editor-dialog.glade.h b/calendar/gui/event-editor-dialog.glade.h index 82296cb106..f4008b76e5 100644 --- a/calendar/gui/event-editor-dialog.glade.h +++ b/calendar/gui/event-editor-dialog.glade.h @@ -4,9 +4,8 @@ * DO NOT compile it as part of your application. */ -gchar *s = N_("event-editor-dialog"); gchar *s = N_("Su_mmary:"); -gchar *s = N_("Time"); +gchar *s = N_("Date & Time"); gchar *s = N_("_Start time:"); gchar *s = N_("_End time:"); gchar *s = N_("A_ll day event"); @@ -14,7 +13,7 @@ gchar *s = N_("Classification"); gchar *s = N_("Pu_blic"); gchar *s = N_("Pri_vate"); gchar *s = N_("_Confidential"); -gchar *s = N_("_Contacts"); +gchar *s = N_("_Contacts..."); gchar *s = N_("Ca_tegories..."); gchar *s = N_("Appointment"); gchar *s = N_("Appointment Basics"); diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c index 51dc50d90c..47ef3efa6e 100644 --- a/calendar/gui/event-editor.c +++ b/calendar/gui/event-editor.c @@ -1229,7 +1229,7 @@ init_widgets (EventEditor *ee) * field gets set whenever a field is changed. */ - /* General Page. */ + /* Appointment Page */ gtk_signal_connect (GTK_OBJECT (priv->general_summary), "changed", GTK_SIGNAL_FUNC (field_changed), ee); gtk_signal_connect (GTK_OBJECT (priv->description), "changed", @@ -1255,27 +1255,6 @@ static const int classification_map[] = { -1 }; -#if 0 -static const int alarm_unit_map[] = { - ALARM_MINUTES, - ALARM_HOURS, - ALARM_DAYS, - -1 -}; - -static void -alarm_unit_set (GtkWidget *widget, enum AlarmUnit unit) -{ - e_dialog_option_menu_set (widget, unit, alarm_unit_map); -} - -static enum AlarmUnit -alarm_unit_get (GtkWidget *widget) -{ - return e_dialog_option_menu_get (widget, alarm_unit_map); -} -#endif - static const int month_pos_map[] = { 0, 1, 2, 3, 4, -1 }; static const int weekday_map[] = { 0, 1, 2, 3, 4, 5, 6, -1 }; -- cgit v1.2.3