diff options
| -rw-r--r-- | calendar/gui/apps_evolution_calendar.schemas.in | 8 | ||||
| -rw-r--r-- | calendar/gui/calendar-config-keys.h | 4 | ||||
| -rw-r--r-- | calendar/gui/dialogs/cal-prefs-dialog.c | 6 | ||||
| -rw-r--r-- | modules/calendar/e-cal-config-view.c | 2 | ||||
| -rw-r--r-- | modules/calendar/e-cal-shell-settings.c | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/calendar/gui/apps_evolution_calendar.schemas.in b/calendar/gui/apps_evolution_calendar.schemas.in index f75c877b06..fb36e5b45b 100644 --- a/calendar/gui/apps_evolution_calendar.schemas.in +++ b/calendar/gui/apps_evolution_calendar.schemas.in @@ -678,14 +678,14 @@ </schema> <schema> - <key>/schemas/apps/evolution/calendar/display/day_view_show_week_number</key> - <applyto>/apps/evolution/calendar/display/day_view_show_week_number</applyto> + <key>/schemas/apps/evolution/calendar/display/show_week_numbers</key> + <applyto>/apps/evolution/calendar/display/show_week_numbers</applyto> <owner>evolution-calendar</owner> <type>bool</type> <default>false</default> <locale name="C"> - <short>Show week number in Day and Work Week View</short> - <long>Whether to show week number in the Day and Work Week View.</long> + <short>Show week numbers in Day View, Work Week View, and Date Navigator</short> + <long>Whether to show week numbers in various places in the Calendar.</long> </locale> </schema> diff --git a/calendar/gui/calendar-config-keys.h b/calendar/gui/calendar-config-keys.h index 9afa8dc7e4..cdff354859 100644 --- a/calendar/gui/calendar-config-keys.h +++ b/calendar/gui/calendar-config-keys.h @@ -53,13 +53,13 @@ G_BEGIN_DECLS #define CALENDAR_CONFIG_COMPRESS_WEEKEND CALENDAR_CONFIG_PREFIX "/display/compress_weekend" #define CALENDAR_CONFIG_SHOW_EVENT_END CALENDAR_CONFIG_PREFIX "/display/show_event_end" #define CALENDAR_CONFIG_WORKING_DAYS CALENDAR_CONFIG_PREFIX "/display/working_days" -#define CALENDAR_CONFIG_DV_WEEK_NUMBER CALENDAR_CONFIG_PREFIX "/display/day_view_show_week_number" +#define CALENDAR_CONFIG_SHOW_WEEK_NUMBERS CALENDAR_CONFIG_PREFIX "/display/show_week_numbers" #define CALENDAR_CONFIG_DAY_SECOND_ZONE CALENDAR_CONFIG_PREFIX "/display/day_second_zone" #define CALENDAR_CONFIG_DAY_SECOND_ZONES_LIST CALENDAR_CONFIG_PREFIX "/display/day_second_zones" #define CALENDAR_CONFIG_DAY_SECOND_ZONES_MAX CALENDAR_CONFIG_PREFIX "/display/day_second_zones_max" /* Date navigator settings */ -#define CALENDAR_CONFIG_DN_SHOW_WEEK_NUMBERS CALENDAR_CONFIG_PREFIX "/date_navigator/show_week_numbers" +#define CALENDAR_CONFIG_DN_SHOW_WEEK_NUMBERS CALENDAR_CONFIG_PREFIX "/date_navigator/show_week_numbers" /* FMQ: remove */ /* Task display settings */ #define CALENDAR_CONFIG_TASKS_SELECTED_TASKS CALENDAR_CONFIG_PREFIX "/tasks/selected_tasks" 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"); diff --git a/modules/calendar/e-cal-config-view.c b/modules/calendar/e-cal-config-view.c index 9783723a4e..e543bf6c56 100644 --- a/modules/calendar/e-cal-config-view.c +++ b/modules/calendar/e-cal-config-view.c @@ -43,7 +43,7 @@ cal_config_view_constructed (GObject *object) if (E_IS_DAY_VIEW (extensible)) { e_binding_new ( - shell_settings, "cal-day-view-show-week-numbers", + shell_settings, "cal-show-week-numbers", E_DAY_VIEW (extensible)->week_number_label, "visible"); e_binding_new ( diff --git a/modules/calendar/e-cal-shell-settings.c b/modules/calendar/e-cal-shell-settings.c index 3852de0a52..c2814dd3b1 100644 --- a/modules/calendar/e-cal-shell-settings.c +++ b/modules/calendar/e-cal-shell-settings.c @@ -491,8 +491,8 @@ e_cal_shell_backend_init_settings (EShell *shell) "/apps/evolution/calendar/prompts/confirm_purge"); e_shell_settings_install_property_for_key ( - "cal-day-view-show-week-numbers", - "/apps/evolution/calendar/display/day_view_show_week_number"); + "cal-show-week-numbers", + "/apps/evolution/calendar/display/show_week_numbers"); e_shell_settings_install_property_for_key ( "cal-free-busy-template", |