aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Moore <moorekou@gmail.com>2016-05-20 12:12:39 -0400
committerKen Moore <moorekou@gmail.com>2016-05-20 12:12:39 -0400
commit1c5fe8db4ac7412bebfb3410262c0a244a92be49 (patch)
tree435eb646f7775614b38065e8aa409eb1c882f646
parentMerge pull request #225 from HenryHu/master (diff)
downloadlumina-1c5fe8db4ac7412bebfb3410262c0a244a92be49.tar.gz
lumina-1c5fe8db4ac7412bebfb3410262c0a244a92be49.tar.bz2
lumina-1c5fe8db4ac7412bebfb3410262c0a244a92be49.zip
Have the lock button in the start menu use the "LaunchItem()" functio so the menu is closed right away.
-rw-r--r--src-qt5/core/lumina-desktop/LSession.cpp1
-rw-r--r--src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp3
2 files changed, 3 insertions, 1 deletions
diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp
index 7050384f..a6821ed7 100644
--- a/src-qt5/core/lumina-desktop/LSession.cpp
+++ b/src-qt5/core/lumina-desktop/LSession.cpp
@@ -378,6 +378,7 @@ void LSession::checkUserFiles(){
//Save the current version of the session to the settings file (for next time)
sessionsettings->setValue("DesktopVersion", this->applicationVersion());
}
+
/*int oldversion = VersionStringToNumber(OVS);
int nversion = VersionStringToNumber(this->applicationVersion());
bool newversion = ( oldversion < VersionStringToNumber(this->applicationVersion()) ); //increasing version number
diff --git a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp
index 1d22632a..019f0d12 100644
--- a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp
+++ b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp
@@ -490,7 +490,8 @@ void StartMenu::on_tool_launch_deskinfo_clicked(){
//Logout Buttons
void StartMenu::on_tool_lock_clicked(){
- QProcess::startDetached("xscreensaver-command -lock");
+ //QProcess::startDetached("xscreensaver-command -lock");
+ LaunchItem("xscreensaver-command -lock",false);
}
void StartMenu::on_tool_logout_clicked(){
bgstack15