Skip to content
This repository has been archived by the owner on Dec 17, 2017. It is now read-only.

Commit

Permalink
Move Lock Screen to the Leave submenu (#210)
Browse files Browse the repository at this point in the history
  • Loading branch information
Jerome Leclanche committed Apr 6, 2012
1 parent 190a66a commit 92aa653
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions razorqt-panel/plugin-mainmenu/razormainmenu.cpp
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ RazorMainMenu::RazorMainMenu(const RazorPanelPluginStartInfo* startInfo, QWidget
mPowerManager->setParentWidget(panel()); mPowerManager->setParentWidget(panel());


mScreenSaver = new ScreenSaver(this); mScreenSaver = new ScreenSaver(this);

mShortcut = new QxtGlobalShortcut(this); mShortcut = new QxtGlobalShortcut(this);
connect(mShortcut, SIGNAL(activated()), this, SLOT(showHideMenu())); connect(mShortcut, SIGNAL(activated()), this, SLOT(showHideMenu()));


Expand Down Expand Up @@ -197,10 +197,9 @@ void RazorMainMenu::buildMenu(bool lazyInit)
menu->addSeparator(); menu->addSeparator();


QMenu* leaveMenu = menu->addMenu(XdgIcon::fromTheme("system-shutdown"), tr("Leave")); QMenu* leaveMenu = menu->addMenu(XdgIcon::fromTheme("system-shutdown"), tr("Leave"));
leaveMenu->addActions(mScreenSaver->availableActions());
leaveMenu->addActions(mPowerManager->availableActions()); leaveMenu->addActions(mPowerManager->availableActions());


menu->addActions(mScreenSaver->availableActions());

QMenu *oldMenu = mMenu; QMenu *oldMenu = mMenu;
mMenu = menu; mMenu = menu;
delete oldMenu; delete oldMenu;
Expand Down

4 comments on commit 92aa653

@amoskvin
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@jleclanche
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"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
Copy link
Member

@amoskvin amoskvin commented on 92aa653 Apr 6, 2012 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jleclanche
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Please sign in to comment.