fix: the power button cannot trigger shutdown

修复 Super+L 锁屏时，电源键无法出发关机

Log: 修复 Super+L 锁屏时，电源键无法出发关机
PMS: bug-289177

Author: zsien

src/session-widgets/lockcontent.cpp

@@ -107,6 +107,7 @@ void LockContent::initUI()
 
 void LockContent::initConnections()
 {
+    connect(m_model, &SessionBaseModel::onRequirePowerAction, this, &LockContent::onRequirePowerAction);
     connect(m_model, &SessionBaseModel::currentUserChanged, this, &LockContent::onCurrentUserChanged);
     connect(m_controlWidget, &ControlWidget::requestSwitchUser, this, [ = ] (std::shared_ptr<User> user) {
         Q_EMIT requestEndAuthentication(m_model->currentUser()->name(), AT_All);
@@ -350,6 +351,8 @@ void LockContent::pushShutdownFrame()
 {
     //设置关机选项界面大小为中间区域的大小,并移动到左上角，避免显示后出现移动现象
     m_shutdownFrame.reset(new ShutdownWidget(this));
+    connect(m_shutdownFrame.get(), &ShutdownWidget::onRequirePowerAction, this, &LockContent::onRequirePowerAction);
+
     m_shutdownFrame->setAccessibleName("ShutdownFrame");
     m_shutdownFrame->setModel(m_model);
     m_shutdownFrame->move(0, 0);
@@ -675,3 +678,27 @@ void LockContent::keyPressEvent(QKeyEvent *event)
         break;
     }
 }
+
+void LockContent::onRequirePowerAction(SessionBaseModel::PowerAction powerAction, bool needConfirm)
+{
+    //锁屏或关机模式时，需要确认是否关机或检查是否有阻止关机
+    if (m_model->appType() == Lock) {
+        switch (powerAction) {
+        case SessionBaseModel::PowerAction::RequireShutdown:
+        case SessionBaseModel::PowerAction::RequireRestart:
+        case SessionBaseModel::PowerAction::RequireSwitchSystem:
+        case SessionBaseModel::PowerAction::RequireLogout:
+        case SessionBaseModel::PowerAction::RequireSuspend:
+        case SessionBaseModel::PowerAction::RequireHibernate:
+            m_model->setIsCheckedInhibit(false);
+            emit m_model->shutdownInhibit(powerAction, needConfirm);
+            break;
+        default:
+            m_model->setPowerAction(powerAction);
+            break;
+        }
+    } else {
+        //登录模式直接操作
+        m_model->setPowerAction(powerAction);
+    }
+}

src/session-widgets/lockcontent.h

@@ -63,6 +63,7 @@ public slots:
     void setMPRISEnable(const bool state);
     void onNewConnection();
     void onDisConnect();
+    void onRequirePowerAction(SessionBaseModel::PowerAction powerAction, bool needConfirm);
 
 protected:
     void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE;

src/widgets/shutdownwidget.cpp

@@ -56,32 +56,32 @@ void ShutdownWidget::initConnect()
 {
     connect(m_requireRestartButton, &RoundItemButton::clicked, this, [ = ] {
         m_currentSelectedBtn = m_requireRestartButton;
-        onRequirePowerAction(SessionBaseModel::PowerAction::RequireRestart, false);
+        emit onRequirePowerAction(SessionBaseModel::PowerAction::RequireRestart, false);
     });
     connect(m_requireShutdownButton, &RoundItemButton::clicked, this, [ = ] {
         m_currentSelectedBtn = m_requireShutdownButton;
-        onRequirePowerAction(SessionBaseModel::PowerAction::RequireShutdown, false);
+        emit onRequirePowerAction(SessionBaseModel::PowerAction::RequireShutdown, false);
     });
     connect(m_requireSuspendButton, &RoundItemButton::clicked, this, [ = ] {
         m_currentSelectedBtn = m_requireSuspendButton;
-        onRequirePowerAction(SessionBaseModel::PowerAction::RequireSuspend, false);
+        emit onRequirePowerAction(SessionBaseModel::PowerAction::RequireSuspend, false);
     });
     connect(m_requireHibernateButton, &RoundItemButton::clicked, this, [ = ] {
         m_currentSelectedBtn = m_requireHibernateButton;
-        onRequirePowerAction(SessionBaseModel::PowerAction::RequireHibernate, false);
+        emit onRequirePowerAction(SessionBaseModel::PowerAction::RequireHibernate, false);
     });
     connect(m_requireLockButton, &RoundItemButton::clicked, this, [ = ] {
         m_currentSelectedBtn = m_requireLockButton;
-        onRequirePowerAction(SessionBaseModel::PowerAction::RequireLock, false);
+        emit onRequirePowerAction(SessionBaseModel::PowerAction::RequireLock, false);
     });
     connect(m_requireSwitchUserBtn, &RoundItemButton::clicked, this, [ = ] {
         m_currentSelectedBtn = m_requireSwitchUserBtn;
-        onRequirePowerAction(SessionBaseModel::PowerAction::RequireSwitchUser, false);
+        emit onRequirePowerAction(SessionBaseModel::PowerAction::RequireSwitchUser, false);
     });
     if (m_requireSwitchSystemBtn) {
         connect(m_requireSwitchSystemBtn, &RoundItemButton::clicked, this, [ = ] {
             m_currentSelectedBtn = m_requireSwitchSystemBtn;
-            onRequirePowerAction(SessionBaseModel::PowerAction::RequireSwitchSystem, false);
+            emit onRequirePowerAction(SessionBaseModel::PowerAction::RequireSwitchSystem, false);
         });
     }
     connect(m_requireLogoutButton, &RoundItemButton::clicked, this, [ = ] {
@@ -470,30 +470,6 @@ void ShutdownWidget::recoveryLayout()
     setFocusPolicy(Qt::StrongFocus);
 }
 
-void ShutdownWidget::onRequirePowerAction(SessionBaseModel::PowerAction powerAction, bool needConfirm)
-{
-    //锁屏或关机模式时，需要确认是否关机或检查是否有阻止关机
-    if (m_model->appType() == Lock) {
-        switch (powerAction) {
-        case SessionBaseModel::PowerAction::RequireShutdown:
-        case SessionBaseModel::PowerAction::RequireRestart:
-        case SessionBaseModel::PowerAction::RequireSwitchSystem:
-        case SessionBaseModel::PowerAction::RequireLogout:
-        case SessionBaseModel::PowerAction::RequireSuspend:
-        case SessionBaseModel::PowerAction::RequireHibernate:
-            m_model->setIsCheckedInhibit(false);
-            emit m_model->shutdownInhibit(powerAction, needConfirm);
-            break;
-        default:
-            m_model->setPowerAction(powerAction);
-            break;
-        }
-    } else {
-        //登录模式直接操作
-        m_model->setPowerAction(powerAction);
-    }
-}
-
 void ShutdownWidget::setUserSwitchEnable(bool enable)
 {
     //接收到用户列表变更信号号,记录切换用户是否允许可见,再根据当前是锁屏还是关机设置切换按钮可见状态
@@ -589,8 +565,6 @@ void ShutdownWidget::setModel(SessionBaseModel *const model)
 {
     m_model = model;
 
-    connect(model, &SessionBaseModel::onRequirePowerAction, this, &ShutdownWidget::onRequirePowerAction);
-
     connect(model, &SessionBaseModel::onHasSwapChanged, this, &ShutdownWidget::enableHibernateBtn);
     enableHibernateBtn(model->hasSwap());
 

src/widgets/shutdownwidget.h

@@ -41,11 +41,13 @@ public slots:
     void rightKeySwitch();
     void runSystemMonitor();
     void recoveryLayout();
-    void onRequirePowerAction(SessionBaseModel::PowerAction powerAction, bool needConfirm);
     void setUserSwitchEnable(bool enable);
     void onEnable(const QString &gsettingsName, bool enable);
     void updateLocale(std::shared_ptr<User> user);
 
+signals:
+    void onRequirePowerAction(SessionBaseModel::PowerAction powerAction, bool needConfirm);
+
 protected:
     bool eventFilter(QObject *watched, QEvent *event) override;
     void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;