diff options
-rw-r--r-- | calendar/ChangeLog | 17 | ||||
-rw-r--r-- | calendar/gui/dialogs/event-page.c | 16 | ||||
-rw-r--r-- | calendar/gui/dialogs/event-page.glade | 18 | ||||
-rw-r--r-- | calendar/gui/dialogs/task-page.c | 14 | ||||
-rw-r--r-- | calendar/gui/dialogs/task-page.glade | 8 |
5 files changed, 43 insertions, 30 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 60b9a8101d..170543aa0e 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,20 @@ +2005-01-07 Rodrigo Moya <rodrigo@novell.com> + + * gui/dialogs/event-page.glade: + * gui/dialogs/task-page.glade: put a name to the 'Send options' frame. + + * gui/dialogs/event-page.c (event_page_init): initialize reference to + the 'Send options' frame. + (get_widgets): get the 'Send options' frame from the .glade file. + (event_page_hide_options): just hide the frame. + (event_page_show_options): just show the frame. + + * gui/dialogs/task-page.c (task_page_init): initialize reference to the + 'Send options' frame. + (get_widgets): get the 'Send options' frame from the .glade file. + (task_page_hide_options): just hide the frame. + (task_page_show_options): just show the frame. + 2005-01-06 David Trowbridge <trowbrds@cs.colorado.edu> * gui/e-cal-event[hc]: initial import of ECalEvent targets diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index cfd1642e8b..b421d6ee95 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -87,7 +87,7 @@ struct _EventPagePrivate { GtkWidget *source_selector; - GtkWidget *sendoptions_label; + GtkWidget *sendoptions_frame; GtkWidget *sendoptions_button; EAlarmList *alarm_list_store; @@ -170,7 +170,7 @@ event_page_init (EventPage *epage) priv->alarm_custom = NULL; priv->categories_btn = NULL; priv->categories = NULL; - priv->sendoptions_label = NULL; + priv->sendoptions_frame = NULL; priv->sendoptions_button = NULL; priv->sod = NULL; @@ -642,9 +642,8 @@ event_page_hide_options (EventPage *page) { g_return_if_fail (IS_EVENT_PAGE (page)); - gtk_widget_hide (page->priv->sendoptions_label); - gtk_widget_hide (page->priv->sendoptions_button); - + gtk_widget_hide (page->priv->sendoptions_frame); + page->priv->sendoptions_shown = FALSE; } @@ -653,8 +652,7 @@ event_page_show_options (EventPage *page) { g_return_if_fail (IS_EVENT_PAGE (page)); - gtk_widget_show (page->priv->sendoptions_label); - gtk_widget_show (page->priv->sendoptions_button); + gtk_widget_show (page->priv->sendoptions_frame); if (e_cal_get_static_capability (COMP_EDITOR_PAGE (page)->client, CAL_STATIC_CAPABILITY_NO_GEN_OPTIONS)) e_sendoptions_set_need_general_options (page->priv->sod, FALSE); @@ -1174,7 +1172,7 @@ get_widgets (EventPage *epage) priv->source_selector = GW ("source"); - priv->sendoptions_label = GW ("send-options-label"); + priv->sendoptions_frame = GW ("send-options-frame"); priv->sendoptions_button = GW ("send-options-button"); #undef GW @@ -1195,7 +1193,7 @@ get_widgets (EventPage *epage) && priv->alarm_custom && priv->categories_btn && priv->categories - && priv->sendoptions_label + && priv->sendoptions_frame && priv->sendoptions_button); } diff --git a/calendar/gui/dialogs/event-page.glade b/calendar/gui/dialogs/event-page.glade index 0d734d5c50..1cd9f17183 100644 --- a/calendar/gui/dialogs/event-page.glade +++ b/calendar/gui/dialogs/event-page.glade @@ -89,7 +89,7 @@ <property name="justify">GTK_JUSTIFY_CENTER</property> <property name="wrap">False</property> <property name="selectable">False</property> - <property name="xalign">7.45058e-09</property> + <property name="xalign">7.45058015283e-09</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> @@ -114,7 +114,7 @@ <property name="max_length">0</property> <property name="text" translatable="yes"></property> <property name="has_frame">True</property> - <property name="invisible_char" translatable="yes">*</property> + <property name="invisible_char">*</property> <property name="activates_default">False</property> </widget> <packing> @@ -135,7 +135,7 @@ <property name="justify">GTK_JUSTIFY_CENTER</property> <property name="wrap">False</property> <property name="selectable">False</property> - <property name="xalign">7.45058e-09</property> + <property name="xalign">7.45058015283e-09</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> @@ -160,7 +160,7 @@ <property name="max_length">0</property> <property name="text" translatable="yes"></property> <property name="has_frame">True</property> - <property name="invisible_char" translatable="yes">*</property> + <property name="invisible_char">*</property> <property name="activates_default">False</property> </widget> <packing> @@ -222,7 +222,7 @@ <property name="justify">GTK_JUSTIFY_CENTER</property> <property name="wrap">False</property> <property name="selectable">False</property> - <property name="xalign">7.45058e-09</property> + <property name="xalign">7.45058015283e-09</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> @@ -361,7 +361,7 @@ <property name="max_length">0</property> <property name="text" translatable="yes"></property> <property name="has_frame">True</property> - <property name="invisible_char" translatable="yes">*</property> + <property name="invisible_char">*</property> <property name="activates_default">False</property> </widget> <packing> @@ -382,7 +382,7 @@ <property name="justify">GTK_JUSTIFY_CENTER</property> <property name="wrap">False</property> <property name="selectable">False</property> - <property name="xalign">7.45058e-09</property> + <property name="xalign">7.45058015283e-09</property> <property name="yalign">0</property> <property name="xpad">0</property> <property name="ypad">0</property> @@ -833,7 +833,7 @@ </child> <child> - <widget class="GtkFrame" id="frame1"> + <widget class="GtkFrame" id="send-options-frame"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="label_yalign">0.5</property> @@ -845,7 +845,7 @@ <property name="visible">True</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> - <property name="xscale">0.06</property> + <property name="xscale">0.0599999986589</property> <property name="yscale">1</property> <property name="top_padding">0</property> <property name="bottom_padding">0</property> diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index bea294bcf4..f1fd4fea1b 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -73,7 +73,7 @@ struct _TaskPagePrivate { GtkWidget *categories; GtkWidget *source_selector; - GtkWidget *sendoptions_label; + GtkWidget *sendoptions_frame; GtkWidget *sendoptions_button; gboolean updating; @@ -146,7 +146,7 @@ task_page_init (TaskPage *tpage) priv->classification = NULL; priv->categories_btn = NULL; priv->categories = NULL; - priv->sendoptions_label = NULL; + priv->sendoptions_frame = NULL; priv->sendoptions_button = NULL; priv->sendoptions_shown = FALSE; priv->sod = NULL; @@ -274,8 +274,7 @@ task_page_hide_options (TaskPage *page) { g_return_if_fail (IS_TASK_PAGE (page)); - gtk_widget_hide (page->priv->sendoptions_label); - gtk_widget_hide (page->priv->sendoptions_button); + gtk_widget_hide (page->priv->sendoptions_frame); page->priv->sendoptions_shown = FALSE; @@ -285,8 +284,7 @@ task_page_show_options (TaskPage *page) { g_return_if_fail (IS_TASK_PAGE (page)); - gtk_widget_show (page->priv->sendoptions_label); - gtk_widget_show (page->priv->sendoptions_button); + gtk_widget_show (page->priv->sendoptions_frame); if (e_cal_get_static_capability (COMP_EDITOR_PAGE (page)->client, CAL_STATIC_CAPABILITY_NO_GEN_OPTIONS)) e_sendoptions_set_need_general_options (page->priv->sod, FALSE); @@ -701,7 +699,7 @@ get_widgets (TaskPage *tpage) priv->source_selector = GW ("source"); - priv->sendoptions_label = GW ("send-options-label"); + priv->sendoptions_frame = GW ("send-options-frame"); priv->sendoptions_button = GW ("send-options-button"); #undef GW @@ -716,7 +714,7 @@ get_widgets (TaskPage *tpage) && priv->description && priv->categories_btn && priv->categories - && priv->sendoptions_label + && priv->sendoptions_frame && priv->sendoptions_button); } diff --git a/calendar/gui/dialogs/task-page.glade b/calendar/gui/dialogs/task-page.glade index 41acaff16d..c40a4ee4de 100644 --- a/calendar/gui/dialogs/task-page.glade +++ b/calendar/gui/dialogs/task-page.glade @@ -89,7 +89,7 @@ <property name="max_length">0</property> <property name="text" translatable="yes"></property> <property name="has_frame">True</property> - <property name="invisible_char" translatable="yes">*</property> + <property name="invisible_char">*</property> <property name="activates_default">False</property> </widget> <packing> @@ -274,7 +274,7 @@ <property name="max_length">0</property> <property name="text" translatable="yes"></property> <property name="has_frame">True</property> - <property name="invisible_char" translatable="yes">*</property> + <property name="invisible_char">*</property> <property name="activates_default">False</property> <accessibility> <atkproperty name="AtkObject::accessible_name" translatable="yes">Categories</atkproperty> @@ -589,7 +589,7 @@ </child> <child> - <widget class="GtkFrame" id="frame1"> + <widget class="GtkFrame" id="send-options-frame"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="label_yalign">0.5</property> @@ -601,7 +601,7 @@ <property name="visible">True</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> - <property name="xscale">0.11</property> + <property name="xscale">0.109999999404</property> <property name="yscale">1</property> <property name="top_padding">0</property> <property name="bottom_padding">0</property> |