From 5eacf8007cc94d9f3120b3b0f109ac421c23a990 Mon Sep 17 00:00:00 2001
From: love-code-yeyixiao <188240888@qq.com>
Date: Sun, 3 Mar 2024 14:38:15 +0800
Subject: [PATCH] Complete the UI.

---
 SandboxiePlus/SandMan/Forms/OptionsWindow.ui  | 65 ++++++++++---------
 .../SandMan/Windows/OptionsAdvanced.cpp       |  1 +
 .../SandMan/Windows/OptionsGeneral.cpp        |  3 +
 3 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/SandboxiePlus/SandMan/Forms/OptionsWindow.ui b/SandboxiePlus/SandMan/Forms/OptionsWindow.ui
index a67f1bf9..583a6933 100644
--- a/SandboxiePlus/SandMan/Forms/OptionsWindow.ui
+++ b/SandboxiePlus/SandMan/Forms/OptionsWindow.ui
@@ -765,7 +765,21 @@
                </property>
               </widget>
              </item>
-             <item row="9" column="1">
+             <item row="9" column="2">
+              <widget class="QCheckBox" name="chkOpenCredentials">
+               <property name="text">
+                <string>Open Windows Credentials Store (user mode)</string>
+               </property>
+              </widget>
+             </item>
+             <item row="10" column="1" colspan="2">
+              <widget class="QCheckBox" name="chkCloseClipBoard">
+               <property name="text">
+                <string>Block read access to the clipboard</string>
+               </property>
+              </widget>
+             </item>
+             <item row="11" column="1">
               <widget class="QLabel" name="label_39">
                <property name="minimumSize">
                 <size>
@@ -784,35 +798,35 @@
                </property>
               </widget>
              </item>
-             <item row="9" column="2">
-              <widget class="QCheckBox" name="chkOpenCredentials">
-               <property name="text">
-                <string>Open Windows Credentials Store (user mode)</string>
-               </property>
-              </widget>
-             </item>
-             <item row="10" column="1" colspan="2">
-              <widget class="QCheckBox" name="chkCloseClipBoard">
-               <property name="text">
-                <string>Block read access to the clipboard</string>
-               </property>
-              </widget>
-             </item>
-             <item row="11" column="1" colspan="2">
+             <item row="12" column="1" colspan="2">
               <widget class="QCheckBox" name="chkVmRead">
                <property name="text">
                 <string>Allow to read memory of unsandboxed processes (not recommended)</string>
                </property>
               </widget>
              </item>
-             <item row="12" column="2">
+             <item row="13" column="2">
               <widget class="QCheckBox" name="chkVmReadNotify">
                <property name="text">
                 <string>Issue message 2111 when a process access is denied</string>
                </property>
               </widget>
              </item>
-             <item row="13" column="0" rowspan="2">
+             <item row="14" column="1" colspan="2">
+              <widget class="QCheckBox" name="chkBlockCapture">
+               <property name="text">
+                <string>Prevents an in-sandbox process from performing cross-sandbox window image manipulation.</string>
+               </property>
+              </widget>
+             </item>
+             <item row="15" column="2">
+              <widget class="QLabel" name="label_19">
+               <property name="text">
+                <string>(for example, screenshots) </string>
+               </property>
+              </widget>
+             </item>
+             <item row="16" column="0">
               <spacer name="verticalSpacer_12">
                <property name="orientation">
                 <enum>Qt::Vertical</enum>
@@ -825,21 +839,14 @@
                </property>
               </spacer>
              </item>
-             <item row="13" column="1" colspan="2">
-              <widget class="QCheckBox" name="chkBlockCapture">
+             <item row="16" column="1" colspan="2">
+              <widget class="QCheckBox" name="chkProtectPower">
                <property name="text">
-                <string>Prevents an in-sandbox process from performing cross-sandbox window image manipulation.</string>
+                <string>Prevents processes in the sandbox from interfering with power operation</string>
                </property>
               </widget>
              </item>
-             <item row="14" column="2">
-              <widget class="QLabel" name="label_19">
-               <property name="text">
-                <string>(for example, screenshots) </string>
-               </property>
-              </widget>
-             </item>
-             <item row="15" column="2">
+             <item row="17" column="2">
               <spacer name="horizontalSpacer_5">
                <property name="orientation">
                 <enum>Qt::Horizontal</enum>
diff --git a/SandboxiePlus/SandMan/Windows/OptionsAdvanced.cpp b/SandboxiePlus/SandMan/Windows/OptionsAdvanced.cpp
index 0fb4278f..3bfd5316 100644
--- a/SandboxiePlus/SandMan/Windows/OptionsAdvanced.cpp
+++ b/SandboxiePlus/SandMan/Windows/OptionsAdvanced.cpp
@@ -522,6 +522,7 @@ void COptionsWindow::UpdateBoxIsolation()
 	ui.chkVmRead->setEnabled(!ui.chkNoSecurityIsolation->isChecked());
 
 	ui.chkBlockCapture->setEnabled(!ui.chkNoSecurityIsolation->isChecked());
+	ui.chkProtectPower->setEnabled(!ui.chkNoSecurityIsolation->isChecked());
 
 	ui.chkCloseForBox->setEnabled(!ui.chkNoSecurityIsolation->isChecked());
 	ui.chkNoOpenForBox->setEnabled(!ui.chkNoSecurityIsolation->isChecked());
diff --git a/SandboxiePlus/SandMan/Windows/OptionsGeneral.cpp b/SandboxiePlus/SandMan/Windows/OptionsGeneral.cpp
index 9c0b5b03..c88ae557 100644
--- a/SandboxiePlus/SandMan/Windows/OptionsGeneral.cpp
+++ b/SandboxiePlus/SandMan/Windows/OptionsGeneral.cpp
@@ -167,6 +167,7 @@ void COptionsWindow::CreateGeneral()
 	connect(ui.chkOpenCredentials, SIGNAL(clicked(bool)), this, SLOT(OnGeneralChanged()));
 	connect(ui.chkCloseClipBoard, SIGNAL(clicked(bool)), this, SLOT(OnGeneralChanged()));
 	connect(ui.chkBlockCapture, SIGNAL(clicked(bool)), this, SLOT(OnGeneralChanged()));
+	connect(ui.chkProtectPower, SIGNAL(clicked(bool)), this, SLOT(OnGeneralChanged()));
 	connect(ui.chkVmRead, SIGNAL(clicked(bool)), this, SLOT(OnVmRead()));
 	connect(ui.chkVmReadNotify, SIGNAL(clicked(bool)), this, SLOT(OnGeneralChanged()));
 	//connect(ui.chkOpenSmartCard, SIGNAL(clicked(bool)), this, SLOT(OnGeneralChanged()));
@@ -284,6 +285,7 @@ void COptionsWindow::LoadGeneral()
 	ui.chkOpenCredentials->setChecked(!ui.chkOpenCredentials->isEnabled() || m_pBox->GetBool("OpenCredentials", false));
 	ui.chkCloseClipBoard->setChecked(!m_pBox->GetBool("OpenClipboard", true));
 	ui.chkBlockCapture->setChecked(m_pBox->GetBool("IsBlockCapture", false));
+	ui.chkProtectPower->setChecked(m_pBox->GetBool("BlockInterferePower", false));
 	ui.chkVmReadNotify->setChecked(m_pBox->GetBool("NotifyProcessAccessDenied", false));
 	//ui.chkOpenSmartCard->setChecked(m_pBox->GetBool("OpenSmartCard", true));
 	//ui.chkOpenBluetooth->setChecked(m_pBox->GetBool("OpenBluetooth", false));
@@ -419,6 +421,7 @@ void COptionsWindow::SaveGeneral()
 		WriteAdvancedCheck(ui.chkOpenCredentials, "OpenCredentials", "y", "");
 	WriteAdvancedCheck(ui.chkCloseClipBoard, "OpenClipboard", "n", "");
 	WriteAdvancedCheck(ui.chkBlockCapture, "IsBlockCapture", "y", "n");
+	WriteAdvancedCheck(ui.chkProtectPower, "BlockInterferePower", "y", "n");
 	WriteAdvancedCheck(ui.chkVmReadNotify, "NotifyProcessAccessDenied", "y", "");
 	//WriteAdvancedCheck(ui.chkOpenSmartCard, "OpenSmartCard", "", "n");
 	//WriteAdvancedCheck(ui.chkOpenBluetooth, "OpenBluetooth", "y", "");