fix(screensaver): preview screensaver

Description: 屏保预览

Log: 无

src/lock-backend/dbusupperinterface.cpp

@@ -314,6 +314,30 @@ void DbusUpperInterface::onShowBlankScreensaver()
 }
 
 void DbusUpperInterface::ShowScreensaver()
+{
+    if(m_procLockDialog.state() != QProcess::NotRunning){
+        if(!lockState){
+             emitLockState(true);
+        }
+        QDBusMessage message;
+        message = QDBusMessage::createSignal(SS_DBUS_PATH,
+                                             SS_DBUS_INTERFACE,
+                                             "SecondRunParam");
+        message<<"Screensaver";
+        QDBusConnection::sessionBus().send(message);
+        return ;
+    }
+
+    qDebug() << "only show screensaver";
+    lockState = false;
+    QString cmd = QString("/usr/bin/ukui-screensaver-dialog --screensaver");
+    qDebug() << cmd;
+
+    m_procLockDialog.start(cmd);
+    emitLockState(true);
+}
+
+void DbusUpperInterface::LockScreensaver()
 {
     if(m_procLockDialog.state() != QProcess::NotRunning){
         if(!lockState){
@@ -958,7 +982,7 @@ void DbusUpperInterface::onLogin1ReqLock()
     QJsonObject retObj;
     retObj["CmdId"] = LOCK_CMD_ID_LOGIN1_REQ_LOCK;
     SendUpdateInfoSig(QString(QJsonDocument(retObj).toJson()));
-    //ShowScreensaver();
+    //LockScreensaver();
     //调用屏保会导致在两个已登录用户切锁屏，会出现屏保界面，因此改为调用锁屏
     Lock();
 }

src/lock-backend/dbusupperinterface.h

@@ -106,6 +106,11 @@ public:
      *
      */
     void ShowScreensaver();
+    /**
+     * @brief 显示锁屏和屏保
+     *
+     */
+    void LockScreensaver();
     /**
      * @brief 获取信息
      *

src/screensaver/screensaver.cpp

@@ -132,6 +132,7 @@ Screensaver::Screensaver(bool isscreensaver,QWidget *parent):
     screenLabel->setText(tr("Picture does not exist"));
     screenLabel->adjustSize();
     screenLabel->hide();
+    m_strPreViewTrans = tr("View");
 }
 
 Screensaver::~Screensaver()
@@ -1097,7 +1098,7 @@ void Screensaver::setPreviewText(bool bVisible)
         myPreviewLabel->setAlignment(Qt::AlignCenter);
     }
 	
-    myPreviewLabel->setText(tr("View"));
+    myPreviewLabel->setText(m_strPreViewTrans);
     myPreviewLabel->adjustSize();
     
     myPreviewLabel->setVisible(bVisible);  

src/screensaver/screensaver.h

@@ -182,6 +182,7 @@ private:
     int m_videoSize;
     int m_videoWidth;
     int m_videoHeight;
+    QString m_strPreViewTrans;
 
 protected:
     void paintEvent(QPaintEvent *event);

src/widgets/fullbackgroundwidget.cpp

@@ -216,6 +216,8 @@ void FullBackgroundWidget::onSecondRunParam(const QString &str)
         onShowBlankScreensaver(1000,false);
     }else if(str == "SessionIdle"){
         onShowSessionIdle();
+    } else if(str == "Screensaver"){
+        onShowScreensaver();
     }
 }