From 23432e616db3047950b270dbda70bf6781807876 Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Tue, 21 Dec 2010 15:59:55 +0100 Subject: [PATCH] BluetoothStatus: move the sendto item to the bottom Kill one separator by merging all global actions items at the end of the menu, which ends up divided in three sections: status, devices and actions. https://bugzilla.gnome.org/show_bug.cgi?id=637690 --- js/ui/status/bluetooth.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js index 9b8fa0d1c..f2cfa8fba 100644 --- a/js/ui/status/bluetooth.js +++ b/js/ui/status/bluetooth.js @@ -65,16 +65,15 @@ Indicator.prototype = { this.menu.addMenuItem(this._discoverable); this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); - this._fullMenuItems = [new PopupMenu.PopupMenuItem(_("Send Files to Device...")), - new PopupMenu.PopupSeparatorMenuItem(), - new PopupMenu.PopupSeparatorMenuItem(), + this._fullMenuItems = [new PopupMenu.PopupSeparatorMenuItem(), + new PopupMenu.PopupMenuItem(_("Send Files to Device...")), new PopupMenu.PopupMenuItem(_("Setup a New Device..."))]; - this._deviceSep = this._fullMenuItems[1]; // hidden if no device exists + this._deviceSep = this._fullMenuItems[0]; // hidden if no device exists - this._fullMenuItems[0].connect('activate', function() { + this._fullMenuItems[1].connect('activate', function() { GLib.spawn_command_line_async('bluetooth-sendto'); }); - this._fullMenuItems[3].connect('activate', function() { + this._fullMenuItems[2].connect('activate', function() { GLib.spawn_command_line_async('bluetooth-wizard'); }); @@ -83,7 +82,7 @@ Indicator.prototype = { this.menu.addMenuItem(item); } - this._deviceItemPosition = 5; + this._deviceItemPosition = 3; this._deviceItems = []; this._applet.connect('devices-changed', Lang.bind(this, this._updateDevices)); this._updateDevices();