MenuDaemon: re-order window menuitems (#1084)

This commit is contained in:
Daniel Foré 2021-03-22 16:28:15 -07:00 committed by GitHub
parent 00d5c73faa
commit 1f6889ffbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -190,15 +190,18 @@ namespace Gala {
});
window_menu = new Gtk.Menu ();
window_menu.append (hide);
window_menu.append (maximize);
window_menu.append (move);
window_menu.append (resize);
window_menu.append (screenshot);
window_menu.append (new Gtk.SeparatorMenuItem ());
window_menu.append (always_on_top);
window_menu.append (on_visible_workspace);
window_menu.append (move_left);
window_menu.append (move_right);
window_menu.append (screenshot);
window_menu.append (new Gtk.SeparatorMenuItem ());
window_menu.append (move);
window_menu.append (resize);
window_menu.append (maximize);
window_menu.append (new Gtk.SeparatorMenuItem ());
window_menu.append (hide);
window_menu.append (close);
window_menu.show_all ();
}
@ -251,13 +254,13 @@ namespace Gala {
SignalHandler.unblock (always_on_top, always_on_top_sid);
SignalHandler.unblock (on_visible_workspace, on_visible_workspace_sid);
move_right.visible = !on_visible_workspace.active;
if (move_right.visible) {
move_right.sensitive = !on_visible_workspace.active;
if (move_right.sensitive) {
move_right_accellabel.accel_string = keybind_settings.get_strv ("move-to-workspace-right")[0];
}
move_left.visible = !on_visible_workspace.active;
if (move_left.visible) {
move_left.sensitive = !on_visible_workspace.active;
if (move_left.sensitive) {
move_left_accellabel.accel_string = keybind_settings.get_strv ("move-to-workspace-left")[0];
}
@ -296,7 +299,7 @@ namespace Gala {
message_dialog.destroy ();
}
});
var display_settings = new Gtk.MenuItem.with_label (_("Display Settings…"));
display_settings.activate.connect (() => {
try {
@ -313,7 +316,7 @@ namespace Gala {
message_dialog.destroy ();
}
});
var system_settings = new Gtk.MenuItem.with_label (_("System Settings…"));
system_settings.activate.connect (() => {
try {
@ -330,13 +333,11 @@ namespace Gala {
message_dialog.destroy ();
}
});
var separator = new Gtk.SeparatorMenuItem ();
desktop_menu = new Gtk.Menu ();
desktop_menu.append (change_wallpaper);
desktop_menu.append (display_settings);
desktop_menu.append (separator);
desktop_menu.append (new Gtk.SeparatorMenuItem ());
desktop_menu.append (system_settings);
desktop_menu.show_all ();
}