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
This commit is contained in:
Giovanni Campagna 2010-12-21 15:59:55 +01:00
parent 7d44c666ff
commit 23432e616d

View File

@ -65,16 +65,15 @@ Indicator.prototype = {
this.menu.addMenuItem(this._discoverable); this.menu.addMenuItem(this._discoverable);
this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
this._fullMenuItems = [new PopupMenu.PopupMenuItem(_("Send Files to Device...")), this._fullMenuItems = [new PopupMenu.PopupSeparatorMenuItem(),
new PopupMenu.PopupSeparatorMenuItem(), new PopupMenu.PopupMenuItem(_("Send Files to Device...")),
new PopupMenu.PopupSeparatorMenuItem(),
new PopupMenu.PopupMenuItem(_("Setup a New 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'); 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'); GLib.spawn_command_line_async('bluetooth-wizard');
}); });
@ -83,7 +82,7 @@ Indicator.prototype = {
this.menu.addMenuItem(item); this.menu.addMenuItem(item);
} }
this._deviceItemPosition = 5; this._deviceItemPosition = 3;
this._deviceItems = []; this._deviceItems = [];
this._applet.connect('devices-changed', Lang.bind(this, this._updateDevices)); this._applet.connect('devices-changed', Lang.bind(this, this._updateDevices));
this._updateDevices(); this._updateDevices();