From 61749c2f98eb15145791a2bc715e94317cdfd565 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Thu, 15 Apr 2010 16:16:44 -0500 Subject: Hide some calendar preferences in Express mode Signed-off-by: Federico Mena Quintero --- calendar/gui/dialogs/cal-prefs-dialog.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'calendar/gui/dialogs/cal-prefs-dialog.c') diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index 5baf22306c..7596133f78 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -36,6 +36,7 @@ #include "e-util/e-datetime-format.h" #include "e-util/e-dialog-widgets.h" #include "e-util/e-util-private.h" +#include "shell/e-shell-utils.h" #include #include @@ -785,6 +786,9 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs, e_datetime_format_add_setup_widget (table, 0, "calendar", "table", DTFormatKindDateTime, _("Time and date:")); e_datetime_format_add_setup_widget (table, 1, "calendar", "table", DTFormatKindDate, _("Date only:")); + /* Hide senseless preferences when running in Express mode */ + e_shell_hide_widgets_for_express_mode (shell, prefs->builder, "/apps/evolution/calendar/express_preferences_hidden"); + show_config (prefs); /* FIXME: weakref? */ setup_changes (prefs); -- cgit v1.2.3 From 1adc67f9fdf7b19170c4acef7728aa3f70cdf948 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Fri, 16 Apr 2010 13:52:32 -0500 Subject: Hook up the calendar's preferences in a sensible place The code evolved so that the toplevel preferences were inserted at a random point in the "make the preferences" function; we now move them to a standalone section for clarity. Signed-off-by: Federico Mena Quintero --- calendar/gui/dialogs/cal-prefs-dialog.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'calendar/gui/dialogs/cal-prefs-dialog.c') diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index 7596133f78..f8ea87a4ff 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -776,10 +776,6 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs, e_mutual_binding_new ( shell_settings, "cal-free-busy-template", widget, "text"); - target = e_cal_config_target_new_prefs (ec, prefs->gconf); - e_config_set_target ((EConfig *)ec, (EConfigTarget *) target); - toplevel = e_config_create_widget ((EConfig *)ec); - gtk_container_add (GTK_CONTAINER (prefs), toplevel); /* date/time format */ table = e_builder_get_widget (prefs->builder, "datetime_format_table"); @@ -789,6 +785,13 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs, /* Hide senseless preferences when running in Express mode */ e_shell_hide_widgets_for_express_mode (shell, prefs->builder, "/apps/evolution/calendar/express_preferences_hidden"); + /* Hook up and add the toplevel widget */ + + target = e_cal_config_target_new_prefs (ec, prefs->gconf); + e_config_set_target ((EConfig *)ec, (EConfigTarget *) target); + toplevel = e_config_create_widget ((EConfig *)ec); + gtk_container_add (GTK_CONTAINER (prefs), toplevel); + show_config (prefs); /* FIXME: weakref? */ setup_changes (prefs); -- cgit v1.2.3 From 287cb76b70650be2d10ee437a6920f87f4cbff8a Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Sat, 17 Apr 2010 16:39:49 -0500 Subject: Hack the row spacing of a single-row table The table for the Time preferences in the calendar's General preferences page, when Evo runs in Express mode, has only a single row of visible widgets; all the other rows are hidden in Express mode. However, GTK+ 2.20 and earlier will include row spacings even for empty rows in GtkTable (or those that only have invisible widgets). Since that table has only a single visible row in Express mode, we hack its row spacing to be 0 so that we don't get any extra spacing in that case. Signed-off-by: Federico Mena Quintero --- calendar/gui/dialogs/cal-prefs-dialog.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'calendar/gui/dialogs/cal-prefs-dialog.c') diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index f8ea87a4ff..ae50ab9543 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -785,6 +785,17 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs, /* Hide senseless preferences when running in Express mode */ e_shell_hide_widgets_for_express_mode (shell, prefs->builder, "/apps/evolution/calendar/express_preferences_hidden"); + /* HACK: GTK+ 2.18 and 2.20 has a GtkTable which includes row/column spacing even for empty rows/columns. + * When Evo runs in Express mode, we hide all the rows in the Time section of the calendar's General + * preferences page. However, due to that behavior in GTK+, we get a lot of extra spacing in that + * section. Since we know that in Express mode we only leave a single row visible, we'll make the + * table's row spacing equal to 0 in that case. + */ + if (e_shell_get_express_mode (shell)) { + widget = e_builder_get_widget (prefs->builder, "time"); + gtk_table_set_row_spacings (GTK_TABLE (widget), 0); + } + /* Hook up and add the toplevel widget */ target = e_cal_config_target_new_prefs (ec, prefs->gconf); -- cgit v1.2.3 From 85fb57b9d8ec476dc8e75d10ae5481f4270dd9f2 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Sat, 17 Apr 2010 17:15:26 -0500 Subject: Use a single /apps/evolution/calendar/display/show_week_numbers We have two preferences for showing week numbers in various places. We will combine these to be a single preference. This change replaces /apps/evolution/calendar/display/day_view_show_week_number with a general /apps/evolution/calendar/display/show_week_numbers. We'll deal with the other preference in subsequent commits. Signed-off-by: Federico Mena Quintero --- calendar/gui/dialogs/cal-prefs-dialog.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'calendar/gui/dialogs/cal-prefs-dialog.c') diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index ae50ab9543..839374b464 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -735,14 +735,14 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs, shell_settings, "cal-compress-weekend", widget, "active"); - widget = e_builder_get_widget (prefs->builder, "dnav_show_week_no"); + widget = e_builder_get_widget (prefs->builder, "dnav_show_week_no"); /* FMQ: remove */ e_mutual_binding_new ( shell_settings, "cal-show-week-numbers", widget, "active"); - widget = e_builder_get_widget (prefs->builder, "dview_show_week_no"); + widget = e_builder_get_widget (prefs->builder, "dview_show_week_no"); /* FMQ: rename */ e_mutual_binding_new ( - shell_settings, "cal-day-view-show-week-numbers", + shell_settings, "cal-show-week-numbers", widget, "active"); prefs->month_scroll_by_week = e_builder_get_widget (prefs->builder, "month_scroll_by_week"); -- cgit v1.2.3 From d8f3b21dbad75ba3704266f154061e8cf3b9539a Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Sat, 17 Apr 2010 17:43:45 -0500 Subject: Remove /apps/evolution/calendar/date_navigator/show_week_numbers Signed-off-by: Federico Mena Quintero --- calendar/gui/dialogs/cal-prefs-dialog.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'calendar/gui/dialogs/cal-prefs-dialog.c') diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index 839374b464..00f381da44 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -735,11 +735,6 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs, shell_settings, "cal-compress-weekend", widget, "active"); - widget = e_builder_get_widget (prefs->builder, "dnav_show_week_no"); /* FMQ: remove */ - e_mutual_binding_new ( - shell_settings, "cal-show-week-numbers", - widget, "active"); - widget = e_builder_get_widget (prefs->builder, "dview_show_week_no"); /* FMQ: rename */ e_mutual_binding_new ( shell_settings, "cal-show-week-numbers", -- cgit v1.2.3 From 7645d2107480743d6310a7a77401eec6f90e8c3d Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Sat, 17 Apr 2010 17:51:51 -0500 Subject: Combine the preferences widgets for week numbers We had "Show week number in Day and Work Week View" and "Show week numbers in date navigator"; now we only have "Show week numbers". Signed-off-by: Federico Mena Quintero --- calendar/gui/dialogs/cal-prefs-dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'calendar/gui/dialogs/cal-prefs-dialog.c') diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index 00f381da44..e778b6cbcd 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -735,7 +735,7 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs, shell_settings, "cal-compress-weekend", widget, "active"); - widget = e_builder_get_widget (prefs->builder, "dview_show_week_no"); /* FMQ: rename */ + widget = e_builder_get_widget (prefs->builder, "show_week_numbers"); e_mutual_binding_new ( shell_settings, "cal-show-week-numbers", widget, "active"); -- cgit v1.2.3 From 0b07840e26f7c793939ec8226695ffca19aa1bfb Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Mon, 26 Apr 2010 18:13:24 -0500 Subject: Don't use gconf to store the names of widgets to hide That was just for development. Now we hardcode the lists of widgets. Signed-off-by: Federico Mena Quintero --- calendar/gui/dialogs/cal-prefs-dialog.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'calendar/gui/dialogs/cal-prefs-dialog.c') diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index e778b6cbcd..21675b4a0d 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -778,7 +778,16 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs, e_datetime_format_add_setup_widget (table, 1, "calendar", "table", DTFormatKindDate, _("Date only:")); /* Hide senseless preferences when running in Express mode */ - e_shell_hide_widgets_for_express_mode (shell, prefs->builder, "/apps/evolution/calendar/express_preferences_hidden"); + e_shell_hide_widgets_for_express_mode (shell, prefs->builder, + "label_second_zone", + "hbox_second_zone", + "timezone", + "timezone_label", + "hbox_use_system_timezone", + "hbox_time_divisions", + "show_end_times", + "month_scroll_by_week", + NULL); /* HACK: GTK+ 2.18 and 2.20 has a GtkTable which includes row/column spacing even for empty rows/columns. * When Evo runs in Express mode, we hide all the rows in the Time section of the calendar's General -- cgit v1.2.3 From 53dd5f199f5e15f16c632606e616e51be886f345 Mon Sep 17 00:00:00 2001 From: Gert Michael Kulyk Date: Thu, 20 May 2010 21:16:19 +0200 Subject: Bug #616889 - Force 24h format for locales not supporting 12h format --- calendar/gui/dialogs/cal-prefs-dialog.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'calendar/gui/dialogs/cal-prefs-dialog.c') diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index 5baf22306c..35b946137f 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -599,6 +599,11 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs, locale_supports_12_hour_format = calendar_config_locale_supports_12_hour_format (); + /* Force 24 hour format for locales which don't support 12 hour format */ + if (!locale_supports_12_hour_format + && !e_shell_settings_get_boolean (shell_settings, "cal-use-24-hour-format")) + e_shell_settings_set_boolean (shell_settings, "cal-use-24-hour-format", TRUE); + /* Make sure our custom widget classes are registered with * GType before we load the GtkBuilder definition file. */ E_TYPE_DATE_EDIT; -- cgit v1.2.3 From 96538878911586a9e9ca26b81e1916c04e538980 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 25 May 2010 10:15:32 -0400 Subject: Coding style and whitespace cleanup. --- calendar/gui/dialogs/cal-prefs-dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'calendar/gui/dialogs/cal-prefs-dialog.c') diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index e925838e58..f6ba176d00 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -806,7 +806,7 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs, } /* Hook up and add the toplevel widget */ - + target = e_cal_config_target_new_prefs (ec, prefs->gconf); e_config_set_target ((EConfig *)ec, (EConfigTarget *) target); toplevel = e_config_create_widget ((EConfig *)ec); -- cgit v1.2.3