Merge remote-tracking branch 'upstream/master' into deskEditor

1 files changed, 12 insertions, 0 deletions

diff --git a/lumina-desktop/SystemWindow.cpp b/lumina-desktop/SystemWindow.cpp
index 0540a5d9..02de54b9 100644
--- a/lumina-desktop/SystemWindow.cpp
+++ b/lumina-desktop/SystemWindow.cpp
@@ -17,19 +17,23 @@ SystemWindow::SystemWindow() : QDialog(), ui(new Ui::SystemWindow){
   ui->tool_logout->setIcon( LXDG::findIcon("system-log-out","") );
   ui->tool_restart->setIcon( LXDG::findIcon("system-reboot","") );
   ui->tool_shutdown->setIcon( LXDG::findIcon("system-shutdown","") );
+  ui->tool_suspend->setIcon( LXDG::findIcon("system-suspend","") );
   ui->push_cancel->setIcon( LXDG::findIcon("dialog-cancel","") );
   ui->push_lock->setIcon( LXDG::findIcon("system-lock-screen","") );
   //Connect the signals/slots
   connect(ui->tool_logout, SIGNAL(clicked()), this, SLOT(sysLogout()) );
   connect(ui->tool_restart, SIGNAL(clicked()), this, SLOT(sysRestart()) );
   connect(ui->tool_shutdown, SIGNAL(clicked()), this, SLOT(sysShutdown()) );
+  connect(ui->tool_suspend, SIGNAL(clicked()), this, SLOT(sysSuspend()) );
   connect(ui->push_cancel, SIGNAL(clicked()), this, SLOT(sysCancel()) );
   connect(ui->push_lock, SIGNAL(clicked()), this, SLOT(sysLock()) );
   //Disable the shutdown/restart buttons if necessary
   if( !LOS::userHasShutdownAccess() ){
     ui->tool_restart->setEnabled(false);
     ui->tool_shutdown->setEnabled(false);
+   
   }
+  ui->tool_suspend->setVisible(LOS::systemCanSuspend());
   //Center this window on the screen
   QPoint center = QApplication::desktop()->screenGeometry(QCursor::pos()).center(); //get the center of the current screen
   this->move(center.x() - this->width()/2, center.y() - this->height()/2);
@@ -55,6 +59,14 @@ void SystemWindow::sysShutdown(){
   this->close();
 }
 
+void SystemWindow::sysSuspend(){
+  //Make sure to lock the system first (otherwise anybody can access it again)
+  LUtils::runCmd("xscreensaver-command -lock");
+  //Now suspend the system
+  LOS::systemSuspend();
+  this->close();
+}
+
 void SystemWindow::sysLock(){
   qDebug() << "Locking the desktop...";
   QProcess::startDetached("xscreensaver-command -lock");