From d793077b915031c32c8cec4a1e7261702df8179a Mon Sep 17 00:00:00 2001 From: Mathieu Bridon Date: Fri, 21 Dec 2012 22:54:20 +0100 Subject: [PATCH] dateMenu: Move the "Open Calendar" entry The design calls for it to be in the left column rather than the right one. https://bugzilla.gnome.org/show_bug.cgi?id=644390 --- js/ui/dateMenu.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js index bf8244365..7d027da2c 100644 --- a/js/ui/dateMenu.js +++ b/js/ui/dateMenu.js @@ -84,12 +84,17 @@ const DateMenuButton = new Lang.Class({ })); vbox.add(this._calendar.actor); + let separator = new PopupMenu.PopupSeparatorMenuItem(); + separator.setColumnWidths(1); + vbox.add(separator.actor, {y_align: St.Align.END, expand: true, y_fill: false}); + + this._openCalendarItem = new PopupMenu.PopupMenuItem(_("Open Calendar")); + this._openCalendarItem.connect('activate', Lang.bind(this, this._onOpenCalendarActivate)); + this._openCalendarItem.actor.can_focus = false; + vbox.add(this._openCalendarItem.actor, {y_align: St.Align.END, expand: true, y_fill: false}); + item = this.menu.addSettingsAction(_("Date and Time Settings"), 'gnome-datetime-panel.desktop'); if (item) { - let separator = new PopupMenu.PopupSeparatorMenuItem(); - separator.setColumnWidths(1); - vbox.add(separator.actor, {y_align: St.Align.END, expand: true, y_fill: false}); - item.actor.show_on_set_parent = false; item.actor.can_focus = false; item.actor.reparent(vbox); @@ -109,11 +114,6 @@ const DateMenuButton = new Lang.Class({ // Event list vbox.add(this._eventList.actor, { expand: true }); - this._openCalendarItem = new PopupMenu.PopupMenuItem(_("Open Calendar")); - this._openCalendarItem.connect('activate', Lang.bind(this, this._onOpenCalendarActivate)); - this._openCalendarItem.actor.can_focus = false; - vbox.add(this._openCalendarItem.actor, {y_align: St.Align.END, expand: true, y_fill: false}); - // Whenever the menu is opened, select today this.menu.connect('open-state-changed', Lang.bind(this, function(menu, isOpen) { if (isOpen) {