From 0a69a49fc37b671f94645216a519801d16aa83c7 Mon Sep 17 00:00:00 2001 From: Rodney Dawes Date: Fri, 2 Jul 2004 16:38:18 +0000 Subject: Get the label for the calendar list header also (init_widgets): Set the 2004-07-02 Rodney Dawes * gui/dialogs/url-editor-dialog.c (get_widgets): Get the label for the calendar list header also (init_widgets): Set the border widths for the dialog's vbox and action area to be more compliant with the HIG Set the mnemonic widget for the calendar label, to the Source Selector Remove the unneeded settings for the scrolled window, these are in the glade xml for the widget Set the icon list on the correct dialog widget, not the settings dialog * gui/dialogs/url-editor-dialog.h: Add the calendar_list_label widget here so we can access it * gui/dialogs/url-editor-dialog.glade: Change the dialog's layout to be HIG compliant and fix some strings to do the same Add mnemonics to all the labels that are associated with widgets svn path=/trunk/; revision=26564 --- calendar/ChangeLog | 19 ++ calendar/gui/dialogs/url-editor-dialog.c | 16 +- calendar/gui/dialogs/url-editor-dialog.glade | 400 +++++++++++++++------------ calendar/gui/dialogs/url-editor-dialog.h | 1 + 4 files changed, 255 insertions(+), 181 deletions(-) (limited to 'calendar') diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 036b8a1caf..43dca27fa5 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,22 @@ +2004-07-02 Rodney Dawes + + * gui/dialogs/url-editor-dialog.c (get_widgets): + Get the label for the calendar list header also + (init_widgets): Set the border widths for the dialog's vbox and + action area to be more compliant with the HIG + Set the mnemonic widget for the calendar label, to the Source Selector + Remove the unneeded settings for the scrolled window, these are in the + glade xml for the widget + Set the icon list on the correct dialog widget, not the settings dialog + + * gui/dialogs/url-editor-dialog.h: + Add the calendar_list_label widget here so we can access it + + * gui/dialogs/url-editor-dialog.glade: + Change the dialog's layout to be HIG compliant and fix some strings + to do the same + Add mnemonics to all the labels that are associated with widgets + 2004-06-29 Sivaiah Nallagatla * gui/e-tasks.c (e_tasks_add_todo_source) diff --git a/calendar/gui/dialogs/url-editor-dialog.c b/calendar/gui/dialogs/url-editor-dialog.c index f937170f95..a6972e4ef3 100644 --- a/calendar/gui/dialogs/url-editor-dialog.c +++ b/calendar/gui/dialogs/url-editor-dialog.c @@ -161,6 +161,7 @@ get_widgets (UrlDialogData *data) #define GW(name) glade_xml_get_widget (data->xml, name) data->url_editor = GW ("url_editor"); + data->calendar_list_label = GW ("calendar_list_label"); data->url_dialog = GW ("fb_dialog"); data->url_entry = GTK_ENTRY (GW ("url_entry")); data->daily = GW ("daily"); @@ -176,6 +177,7 @@ get_widgets (UrlDialogData *data) #undef GW return (data ->url_editor + && data->calendar_list_label && data->url_entry && data->daily && data->weekly @@ -221,6 +223,10 @@ init_widgets (UrlDialogData *url_dlg_data) GList *icon_list; GSList *p; + gtk_widget_ensure_style (url_dlg_data->url_editor); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (url_dlg_data->url_editor)->vbox), 0); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (url_dlg_data->url_editor)->action_area), 12); + g_signal_connect (url_dlg_data->url_entry, "changed", G_CALLBACK (url_editor_dialog_fb_url_changed), url_dlg_data); @@ -280,17 +286,15 @@ init_widgets (UrlDialogData *url_dlg_data) G_CALLBACK (selection_changed_callback), url_dlg_data); + gtk_label_set_mnemonic_widget (GTK_LABEL (url_dlg_data->calendar_list_label), + selector); gtk_widget_show (selector); gtk_container_add (GTK_CONTAINER (url_dlg_data->scrolled_window), selector); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (url_dlg_data->scrolled_window), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (url_dlg_data->scrolled_window), - GTK_SHADOW_IN); - + icon_list = e_icon_factory_get_icon_list ("stock_calendar"); if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (url_dlg_data->url_dialog), icon_list); + gtk_window_set_icon_list (GTK_WINDOW (url_dlg_data->url_editor), icon_list); g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); g_list_free (icon_list); } diff --git a/calendar/gui/dialogs/url-editor-dialog.glade b/calendar/gui/dialogs/url-editor-dialog.glade index 3685e69bd1..2415a78059 100644 --- a/calendar/gui/dialogs/url-editor-dialog.glade +++ b/calendar/gui/dialogs/url-editor-dialog.glade @@ -5,21 +5,27 @@ - 12 True Free/Busy Editor GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE + GTK_WIN_POS_CENTER_ON_PARENT False + 380 + 508 True False - True + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + False True False - 18 + 0 @@ -35,6 +41,7 @@ gtk-cancel True GTK_RELIEF_NORMAL + True -6 @@ -48,6 +55,7 @@ gtk-ok True GTK_RELIEF_NORMAL + True -5 @@ -61,73 +69,46 @@ - + + 12 True False - 6 + 12 - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - - - 6 - True - False - 6 - - - - True - URL: - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + <b>Publishing _Location</b> + True + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + url_entry + + + 0 + False + False + + - - - True - True - True - True - 0 - - True - * - False - - - 0 - True - True - - - - + + + True + False + 12 - + True - Free/Busy Publishing Location + False - False + True GTK_JUSTIFY_LEFT False False @@ -137,38 +118,100 @@ 0 - label_item + 0 + False + False + + + + + + True + True + True + True + 0 + + True + * + False + + + 0 + True + True - 6 + 0 + True + True + + + + + + True + <b>Publishing Frequency</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 False False - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 12 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - 6 True False - 0 + 6 True True - Daily + _Daily True GTK_RELIEF_NORMAL + True False False True @@ -184,9 +227,10 @@ True True - Weekly + _Weekly True GTK_RELIEF_NORMAL + True False False True @@ -203,9 +247,10 @@ True True - User Publishes + _Manual True GTK_RELIEF_NORMAL + True False False True @@ -218,12 +263,51 @@ + + 0 + True + True + + + + 0 + True + True + + + + + + True + <b>Free/Busy C_alendars</b> + True + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 12 - + True - Publishing Frequency + False False GTK_JUSTIFY_LEFT @@ -235,36 +319,11 @@ 0 - label_item + 0 + False + False - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 6 - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN @@ -280,12 +339,51 @@ + + 0 + True + True + + + + 0 + True + True + + + + + + True + <b>Authentication</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 12 - + True - Calendars selected for publishing + False False GTK_JUSTIFY_LEFT @@ -297,39 +395,26 @@ 0 - label_item + 0 + False + False - - - 0 - False - False - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - 6 True - 2 - 3 + 3 + 2 False 6 - 6 + 12 True - Login name: - False + _Username: + True False GTK_JUSTIFY_LEFT False @@ -338,6 +423,7 @@ 0.5 0 0 + username_entry 0 @@ -352,8 +438,8 @@ True - Password: - False + _Password: + True False GTK_JUSTIFY_LEFT False @@ -362,6 +448,7 @@ 0.5 0 0 + password_entry 0 @@ -419,72 +506,35 @@ True True - Remember password + _Remember password True GTK_RELIEF_NORMAL + True False False True - 2 - 3 - 1 - 2 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 2 - 3 - 0 - 1 + 0 + 2 + 2 + 3 fill - - - - - True - Authentication Credentials for HTTP Server - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True 0 - False - False + True + True diff --git a/calendar/gui/dialogs/url-editor-dialog.h b/calendar/gui/dialogs/url-editor-dialog.h index a769ef6b80..12930f45cd 100644 --- a/calendar/gui/dialogs/url-editor-dialog.h +++ b/calendar/gui/dialogs/url-editor-dialog.h @@ -48,6 +48,7 @@ struct _UrlDialogData { GtkWidget *weekly; GtkWidget *user_publish; + GtkWidget *calendar_list_label; GtkWidget *scrolled_window; GtkEntry *username_entry; -- cgit v1.2.3