Plugins: fix "Always shown" checkbox popup not being respected #54

Author: KangLin

Plugins/WakeOnLan/OperateWakeOnLan.cpp

@@ -163,37 +163,6 @@ const QString COperateWakeOnLan::Name()
 
 int COperateWakeOnLan::Start()
 {
-#if defined(Q_OS_UNIX)
-    if(!RabbitCommon::CTools::HasAdministratorPrivilege()
-        && m_pParameterPlugin->GetPromptAdministratorPrivilege())
-    {
-        static bool bShow = false;
-        if(!bShow) {
-            bShow = true;
-            int nRet = 0;
-            QMessageBox msg(
-                QMessageBox::Warning, tr("Warning"),
-                tr("There are no administrator privileges, "
-                   "and some functions(Get mac address) are restricted. "
-                   "Please restart the program with administrative privileges."),
-                QMessageBox::Yes | QMessageBox::No);
-            msg.setCheckBox(new QCheckBox(tr("Always shown"), &msg));
-            msg.checkBox()->setChecked(
-                m_pParameterPlugin->GetPromptAdministratorPrivilege());
-            nRet = msg.exec();
-            if(QMessageBox::Yes == nRet) {
-                RabbitCommon::CTools::Instance()->StartWithAdministratorPrivilege(true);
-            }
-            if(m_pParameterPlugin->GetPromptAdministratorPrivilege()
-                != msg.checkBox()->isChecked()) {
-                m_pParameterPlugin->SetPromptAdministratorPrivilege(
-                    msg.checkBox()->isChecked());
-                // TODO: save settings
-                //SaveSettings();
-            }
-        }
-    }
-#endif
     emit sigRunning();
     return 0;
 }

Src/Manager.cpp

@@ -48,8 +48,53 @@ CManager::CManager(QObject *parent, QString szFile) : QObject(parent)
     m_pParameter = new CParameterPlugin();
     if(m_pParameter) {
         LoadSettings(m_szSettingsFile);
+
+        bool bReboot = true;
+        QString szSnap;
+        QString szFlatpak;
+#if QT_VERSION > QT_VERSION_CHECK(6, 0, 0) && defined(Q_OS_WIN)
+        szSnap = qEnvironmentVariable("SNAP");
+        szFlatpak = qEnvironmentVariable("FLATPAK_ID");
+#else
+        szSnap = QString::fromLocal8Bit(qgetenv("SNAP"));
+        szFlatpak = QString::fromLocal8Bit(qgetenv("FLATPAK_ID"));
+#endif
+        if(!szSnap.isEmpty() || !szFlatpak.isEmpty())
+            bReboot = false;
+        if(bReboot && !RabbitCommon::CTools::Instance()->HasAdministratorPrivilege()
+            && m_pParameter->GetPromptAdministratorPrivilege())
+        {
+            int nRet = 0;
+            QString szMsg;
+            szMsg = tr("The programe is not administrator privilege.\n"
+                       "Some features are limited.\n");
+#if defined(Q_OS_WIN)
+            szMsg += tr("Eg: Can not disable system shortcuts(eg: Ctrl+Alt+del).") + "\n";
+#else
+            szMsg += tr("Eg: Can not use the wake on LAN feature.") + "\n";
+#endif
+            szMsg += tr("Restart program by administrator?");
+            QMessageBox msg(QMessageBox::Warning, tr("Warning"), szMsg,
+                QMessageBox::Yes | QMessageBox::No);
+            msg.setCheckBox(new QCheckBox(tr("Always shown"), &msg));
+            msg.checkBox()->setCheckable(true);
+            msg.checkBox()->setChecked(
+                m_pParameter->GetPromptAdministratorPrivilege());
+            nRet = msg.exec();
+
+            m_pParameter->SetPromptAdministratorPrivilege(
+                msg.checkBox()->isChecked());
+            SaveSettings(m_szSettingsFile);
+
+            if(QMessageBox::Yes == nRet) {
+                RabbitCommon::CTools::Instance()->StartWithAdministratorPrivilege(true);
+                return;
+            }
+        }
+
         check = connect(m_pParameter, SIGNAL(sigNativeWindowRecieveKeyboard()),
                         this, SLOT(slotNativeWindowRecieveKeyboard()));
+        Q_ASSERT(check);
         m_pHook = CHook::GetHook(m_pParameter, this);
         if(m_pHook)
             m_pHook->RegisterKeyboard();

Src/ParameterCompone/ParameterPlugin.cpp

@@ -1,11 +1,13 @@
 // Author: Kang Lin <kl222@126.com>
+
+#include "RabbitCommonTools.h"
 #include "ParameterPlugin.h"
 
 CParameterPlugin::CParameterPlugin(QObject *parent)
     : CParameter(parent)
     , m_bNativeWindowReceiveKeyboard(false)
     , m_bEnableLocalInputMethod(false)
-    , m_bPromptAdministratorPrivilege(true)
+    , m_bPromptAdministratorPrivilege(!RabbitCommon::CTools::Instance()->HasAdministratorPrivilege())
     , m_bEnableSystemUserToUser(true)
     , m_bSavePassword(false)
     , m_PromptType(PromptType::First)