diff options
| author | Federico Mena Quintero <federico@novell.com> | 2010-04-18 06:51:51 +0800 |
|---|---|---|
| committer | Federico Mena Quintero <federico@novell.com> | 2010-04-18 07:01:07 +0800 |
| commit | 7645d2107480743d6310a7a77401eec6f90e8c3d (patch) | |
| tree | 18c33432dc6960bc505b02905b2f2fb886d54a47 | |
| parent | d8f3b21dbad75ba3704266f154061e8cf3b9539a (diff) | |
| download | gsoc2013-evolution-7645d2107480743d6310a7a77401eec6f90e8c3d.tar gsoc2013-evolution-7645d2107480743d6310a7a77401eec6f90e8c3d.tar.gz gsoc2013-evolution-7645d2107480743d6310a7a77401eec6f90e8c3d.tar.bz2 gsoc2013-evolution-7645d2107480743d6310a7a77401eec6f90e8c3d.tar.lz gsoc2013-evolution-7645d2107480743d6310a7a77401eec6f90e8c3d.tar.xz gsoc2013-evolution-7645d2107480743d6310a7a77401eec6f90e8c3d.tar.zst gsoc2013-evolution-7645d2107480743d6310a7a77401eec6f90e8c3d.zip | |
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 <federico@novell.com>
| -rw-r--r-- | calendar/gui/dialogs/cal-prefs-dialog.c | 2 | ||||
| -rw-r--r-- | calendar/gui/dialogs/cal-prefs-dialog.h | 2 | ||||
| -rw-r--r-- | calendar/gui/dialogs/cal-prefs-dialog.ui | 23 |
3 files changed, 5 insertions, 22 deletions
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"); diff --git a/calendar/gui/dialogs/cal-prefs-dialog.h b/calendar/gui/dialogs/cal-prefs-dialog.h index 14011d8403..1ae585a0e8 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.h +++ b/calendar/gui/dialogs/cal-prefs-dialog.h @@ -79,8 +79,6 @@ struct _CalendarPrefsDialog { GtkWidget *time_divisions; GtkWidget *show_end_times; GtkWidget *compress_weekend; - GtkWidget *dnav_show_week_no; - GtkWidget *dview_show_week_no; GtkWidget *month_scroll_by_week; GtkWidget *tasks_hide_completed; GtkWidget *tasks_hide_completed_interval; diff --git a/calendar/gui/dialogs/cal-prefs-dialog.ui b/calendar/gui/dialogs/cal-prefs-dialog.ui index 469006a5eb..75f0b25e09 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.ui +++ b/calendar/gui/dialogs/cal-prefs-dialog.ui @@ -963,8 +963,8 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="dnav_show_week_no"> - <property name="label" translatable="yes">Show week _numbers in date navigator</property> + <object class="GtkCheckButton" id="show_week_numbers"> + <property name="label" translatable="yes">Show week _numbers</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -978,21 +978,6 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="dview_show_week_no"> - <property name="label" translatable="yes">Show week n_umber in Day and Work Week View</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">4</property> - </packing> - </child> - <child> <object class="GtkCheckButton" id="month_scroll_by_week"> <property name="label" translatable="yes">Sc_roll Month View by a week</property> <property name="visible">True</property> @@ -1004,7 +989,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">5</property> + <property name="position">4</property> </packing> </child> </object> @@ -1441,8 +1426,8 @@ </object> <object class="GtkSizeGroup" id="day_begins_ends_sizegroup"> <widgets> - <widget name="day_end_label"/> <widget name="day_start_label"/> + <widget name="day_end_label"/> </widgets> </object> </interface> |