Skip to content
Browse files

Move Lock Screen to the Leave submenu (#210)

  • Loading branch information...
1 parent 190a66a commit 92aa653f5ed546207e2f4dc017f6064a08d33ac8 @jleclanche jleclanche committed Apr 6, 2012
Showing with 2 additions and 3 deletions.
  1. +2 −3 razorqt-panel/plugin-mainmenu/razormainmenu.cpp
View
5 razorqt-panel/plugin-mainmenu/razormainmenu.cpp
@@ -71,7 +71,7 @@ RazorMainMenu::RazorMainMenu(const RazorPanelPluginStartInfo* startInfo, QWidget
mPowerManager->setParentWidget(panel());
mScreenSaver = new ScreenSaver(this);
-
+
mShortcut = new QxtGlobalShortcut(this);
connect(mShortcut, SIGNAL(activated()), this, SLOT(showHideMenu()));
@@ -197,10 +197,9 @@ void RazorMainMenu::buildMenu(bool lazyInit)
menu->addSeparator();
QMenu* leaveMenu = menu->addMenu(XdgIcon::fromTheme("system-shutdown"), tr("Leave"));
+ leaveMenu->addActions(mScreenSaver->availableActions());
leaveMenu->addActions(mPowerManager->availableActions());
- menu->addActions(mScreenSaver->availableActions());
-
QMenu *oldMenu = mMenu;
mMenu = menu;
delete oldMenu;

4 comments on commit 92aa653

@amoskvin
Razor-qt member

Please put it back. It's very inconvenient to have to navigate into a submenu for something so often-used.

@jleclanche
Razor-qt member

"often-used" is very relative; a lot more people use logout than lock screen, and that's already in a submenu.

Design-wise, it's a lot better off in that submenu - especially since we should have a "change user" item. See #210.
Should also get rid of that extraneous "Leave the system" in razor submenu.

What we need to do:

  • An advanced menu plugin more in the style of Windows 7/KDE
  • Add "lock screen", "logout" and "switch user" actions to razor-runner
  • Add a keybind daemon so we can bind an action to lock screen.
@amoskvin
Razor-qt member
@jleclanche
Razor-qt member

Ok, reverted, but let's discuss this on irc when possible.

Please sign in to comment.
Something went wrong with that request. Please try again.