This commit is contained in:
love-code-yeyixiao 2024-07-02 20:00:29 +08:00
parent 57947197b6
commit a0f825edb4
4 changed files with 229 additions and 214 deletions

View File

@ -48,7 +48,7 @@
<enum>QTabWidget::North</enum> <enum>QTabWidget::North</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>5</number>
</property> </property>
<widget class="QWidget" name="tabGeneral"> <widget class="QWidget" name="tabGeneral">
<attribute name="title"> <attribute name="title">
@ -1951,225 +1951,228 @@ Unlike the preview channel, it does not include untested, potentially breaking,
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTabWidget" name="tabsAdvanced"> <widget class="QTabWidget" name="tabsAdvanced">
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="tabSandbox"> <widget class="QWidget" name="tabSandbox">
<attribute name="title"> <attribute name="title">
<string>Sandboxie Config</string> <string>Sandboxie Config</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_20"> <layout class="QGridLayout" name="gridLayout_18">
<item row="0" column="0"> <item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_18"> <widget class="QLabel" name="lblBoxRoot">
<item row="11" column="4"> <property name="font">
<spacer name="horizontalSpacer_5"> <font>
<property name="orientation"> <weight>75</weight>
<enum>Qt::Horizontal</enum> <bold>true</bold>
</property> <kerning>true</kerning>
<property name="sizeHint" stdset="0"> </font>
<size> </property>
<width>40</width> <property name="text">
<height>20</height> <string>Sandbox default</string>
</size> </property>
</property> </widget>
</spacer> </item>
</item> <item row="1" column="0">
<item row="11" column="2"> <widget class="QLabel" name="label_7">
<spacer name="verticalSpacer_2"> <property name="text">
<property name="orientation"> <string>Default sandbox:</string>
<enum>Qt::Vertical</enum> </property>
</property> <property name="alignment">
<property name="sizeHint" stdset="0"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<size> </property>
<width>20</width> </widget>
<height>40</height> </item>
</size> <item row="1" column="2">
</property> <widget class="QComboBox" name="cmbDefault"/>
</spacer> </item>
</item> <item row="1" column="5">
<item row="3" column="0" colspan="2"> <widget class="QCheckBox" name="chkAutoRoot">
<widget class="QLabel" name="label_16"> <property name="text">
<property name="text"> <string>Portable root folder</string>
<string>Sandbox &lt;a href=&quot;sbie://docs/keyrootpath&quot;&gt;registry root&lt;/a&gt;: </string> </property>
</property> </widget>
<property name="alignment"> </item>
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <item row="2" column="0" colspan="2">
</property> <widget class="QLabel" name="label_15">
<property name="openExternalLinks"> <property name="text">
<bool>true</bool> <string>Sandbox &lt;a href=&quot;sbie://docs/filerootpath&quot;&gt;file system root&lt;/a&gt;: </string>
</property> </property>
</widget> <property name="alignment">
</item> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<item row="0" column="0"> </property>
<widget class="QLabel" name="lblBoxRoot"> <property name="openExternalLinks">
<property name="font"> <bool>true</bool>
<font> </property>
<weight>75</weight> </widget>
<bold>true</bold> </item>
<kerning>true</kerning> <item row="2" column="2" colspan="2">
</font> <widget class="QLineEdit" name="fileRoot"/>
</property> </item>
<property name="text"> <item row="2" column="6">
<string>Sandbox default</string> <widget class="QPushButton" name="btnBrowse">
</property> <property name="maximumSize">
</widget> <size>
</item> <width>23</width>
<item row="1" column="2" colspan="2"> <height>16777215</height>
<widget class="QComboBox" name="cmbDefault"/> </size>
</item> </property>
<item row="4" column="2" colspan="5"> <property name="text">
<widget class="QLineEdit" name="ipcRoot"/> <string>...</string>
</item> </property>
<item row="2" column="0" colspan="2"> </widget>
<widget class="QLabel" name="label_15"> </item>
<property name="text"> <item row="3" column="0" colspan="2">
<string>Sandbox &lt;a href=&quot;sbie://docs/filerootpath&quot;&gt;file system root&lt;/a&gt;: </string> <widget class="QLabel" name="label_16">
</property> <property name="text">
<property name="alignment"> <string>Sandbox &lt;a href=&quot;sbie://docs/keyrootpath&quot;&gt;registry root&lt;/a&gt;: </string>
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property>
</property> <property name="alignment">
<property name="openExternalLinks"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<bool>true</bool> </property>
</property> <property name="openExternalLinks">
</widget> <bool>true</bool>
</item> </property>
<item row="5" column="2"> </widget>
<spacer name="horizontalSpacer_12"> </item>
<property name="orientation"> <item row="3" column="2" colspan="2">
<enum>Qt::Horizontal</enum> <widget class="QLineEdit" name="regRoot"/>
</property> </item>
<property name="sizeHint" stdset="0"> <item row="4" column="0">
<size> <widget class="QLabel" name="label_17">
<width>40</width> <property name="text">
<height>20</height> <string>Sandbox &lt;a href=&quot;sbie://docs/ipcrootpath&quot;&gt;ipc root&lt;/a&gt;: </string>
</size> </property>
</property> <property name="alignment">
</spacer> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</item> </property>
<item row="1" column="0" colspan="2"> <property name="openExternalLinks">
<widget class="QLabel" name="label_7"> <bool>true</bool>
<property name="text"> </property>
<string>Default sandbox:</string> </widget>
</property> </item>
<property name="alignment"> <item row="4" column="2" colspan="2">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <widget class="QLineEdit" name="ipcRoot"/>
</property> </item>
</widget> <item row="5" column="0" colspan="2">
</item> <widget class="QLabel" name="lblBoxFeatures">
<item row="7" column="1" colspan="6"> <property name="font">
<widget class="QCheckBox" name="chkObjCb"> <font>
<property name="text"> <weight>75</weight>
<string>Activate Kernel Mode Object Filtering</string> <bold>true</bold>
</property> <kerning>true</kerning>
</widget> </font>
</item> </property>
<item row="5" column="0" colspan="2"> <property name="text">
<widget class="QLabel" name="lblBoxFeatures"> <string>Sandboxing features</string>
<property name="font"> </property>
<font> </widget>
<weight>75</weight> </item>
<bold>true</bold> <item row="5" column="2">
<kerning>true</kerning> <spacer name="horizontalSpacer_12">
</font> <property name="orientation">
</property> <enum>Qt::Horizontal</enum>
<property name="text"> </property>
<string>Sandboxing features</string> <property name="sizeHint" stdset="0">
</property> <size>
</widget> <width>108</width>
</item> <height>20</height>
<item row="11" column="3"> </size>
<spacer name="horizontalSpacer_15"> </property>
<property name="orientation"> </spacer>
<enum>Qt::Horizontal</enum> </item>
</property> <item row="6" column="1" colspan="4">
<property name="sizeHint" stdset="0"> <widget class="QCheckBox" name="chkWFP">
<size> <property name="text">
<width>40</width> <string>Use Windows Filtering Platform to restrict network access</string>
<height>20</height> </property>
</size> </widget>
</property> </item>
</spacer> <item row="7" column="1" colspan="3">
</item> <widget class="QCheckBox" name="chkObjCb">
<item row="8" column="1" colspan="6"> <property name="text">
<widget class="QCheckBox" name="chkWin32k"> <string>Activate Kernel Mode Object Filtering</string>
<property name="text"> </property>
<string>Hook selected Win32k system calls to enable GPU acceleration (experimental)</string> </widget>
</property> </item>
</widget> <item row="8" column="1" colspan="5">
</item> <widget class="QCheckBox" name="chkWin32k">
<item row="9" column="1" colspan="6"> <property name="text">
<widget class="QCheckBox" name="chkSbieLogon"> <string>Hook selected Win32k system calls to enable GPU acceleration (experimental)</string>
<property name="text"> </property>
<string>Use a Sandboxie login instead of an anonymous token</string> </widget>
</property> </item>
</widget> <item row="9" column="1" colspan="3">
</item> <widget class="QCheckBox" name="chkSbieLogon">
<item row="2" column="2" colspan="5"> <property name="text">
<widget class="QLineEdit" name="fileRoot"/> <string>Use a Sandboxie login instead of an anonymous token</string>
</item> </property>
<item row="1" column="5" colspan="2"> </widget>
<widget class="QCheckBox" name="chkAutoRoot"> </item>
<property name="text"> <item row="10" column="1" colspan="4">
<string>Portable root folder</string> <widget class="QCheckBox" name="chkSbieAll">
</property> <property name="text">
</widget> <string>Add &quot;Sandboxie\All Sandboxes&quot; group to the sandboxed token (experimental)</string>
</item> </property>
<item row="4" column="0" colspan="2"> </widget>
<widget class="QLabel" name="label_17"> </item>
<property name="text"> <item row="11" column="1" colspan="4">
<string>Sandbox &lt;a href=&quot;sbie://docs/ipcrootpath&quot;&gt;ipc root&lt;/a&gt;: </string> <widget class="QCheckBox" name="chkImproveGame">
</property> <property name="text">
<property name="alignment"> <string>Enhance the 3D gaming experience by releasing some system calls.</string>
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property>
</property> </widget>
<property name="openExternalLinks"> </item>
<bool>true</bool> <item row="12" column="1">
</property> <spacer name="horizontalSpacer_4">
</widget> <property name="orientation">
</item> <enum>Qt::Horizontal</enum>
<item row="11" column="1"> </property>
<spacer name="horizontalSpacer_4"> <property name="sizeHint" stdset="0">
<property name="orientation"> <size>
<enum>Qt::Horizontal</enum> <width>108</width>
</property> <height>20</height>
<property name="sizeHint" stdset="0"> </size>
<size> </property>
<width>40</width> </spacer>
<height>20</height> </item>
</size> <item row="12" column="2">
</property> <spacer name="verticalSpacer_2">
</spacer> <property name="orientation">
</item> <enum>Qt::Vertical</enum>
<item row="3" column="2" colspan="5"> </property>
<widget class="QLineEdit" name="regRoot"/> <property name="sizeHint" stdset="0">
</item> <size>
<item row="2" column="7"> <width>20</width>
<widget class="QPushButton" name="btnBrowse"> <height>139</height>
<property name="maximumSize"> </size>
<size> </property>
<width>23</width> </spacer>
<height>16777215</height> </item>
</size> <item row="12" column="3">
</property> <spacer name="horizontalSpacer_15">
<property name="text"> <property name="orientation">
<string>...</string> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> <property name="sizeHint" stdset="0">
</item> <size>
<item row="6" column="1" colspan="6"> <width>107</width>
<widget class="QCheckBox" name="chkWFP"> <height>20</height>
<property name="text"> </size>
<string>Use Windows Filtering Platform to restrict network access</string> </property>
</property> </spacer>
</widget> </item>
</item> <item row="12" column="4">
<item row="10" column="1" colspan="6"> <spacer name="horizontalSpacer_5">
<widget class="QCheckBox" name="chkSbieAll"> <property name="orientation">
<property name="text"> <enum>Qt::Horizontal</enum>
<string>Add &quot;Sandboxie\All Sandboxes&quot; group to the sandboxed token (experimental)</string> </property>
</property> <property name="sizeHint" stdset="0">
</widget> <size>
</item> <width>108</width>
</layout> <height>20</height>
</size>
</property>
</spacer>
</item> </item>
</layout> </layout>
</widget> </widget>

View File

@ -427,6 +427,7 @@ CSettingsWindow::CSettingsWindow(QWidget* parent)
connect(ui.chkWin32k, SIGNAL(stateChanged(int)), this, SLOT(OnGeneralChanged())); connect(ui.chkWin32k, SIGNAL(stateChanged(int)), this, SLOT(OnGeneralChanged()));
connect(ui.chkSbieLogon, SIGNAL(stateChanged(int)), this, SLOT(OnGeneralChanged())); connect(ui.chkSbieLogon, SIGNAL(stateChanged(int)), this, SLOT(OnGeneralChanged()));
connect(ui.chkSbieAll, SIGNAL(stateChanged(int)), this, SLOT(OnGeneralChanged())); connect(ui.chkSbieAll, SIGNAL(stateChanged(int)), this, SLOT(OnGeneralChanged()));
connect(ui.chkImproveGame, SIGNAL(stateChanged(int)), this, SLOT(OnGeneralChanged()));
m_GeneralChanged = false; m_GeneralChanged = false;
connect(ui.chkWatchConfig, SIGNAL(stateChanged(int)), this, SLOT(OnOptChanged())); // not sbie ini connect(ui.chkWatchConfig, SIGNAL(stateChanged(int)), this, SLOT(OnOptChanged())); // not sbie ini
@ -1011,6 +1012,7 @@ void CSettingsWindow::LoadSettings()
ui.chkWin32k->setChecked(theAPI->GetGlobalSettings()->GetBool("EnableWin32kHooks", true)); ui.chkWin32k->setChecked(theAPI->GetGlobalSettings()->GetBool("EnableWin32kHooks", true));
ui.chkSbieLogon->setChecked(theAPI->GetGlobalSettings()->GetBool("SandboxieLogon", false)); ui.chkSbieLogon->setChecked(theAPI->GetGlobalSettings()->GetBool("SandboxieLogon", false));
ui.chkSbieAll->setChecked(theAPI->GetGlobalSettings()->GetBool("SandboxieAllGroup", false)); ui.chkSbieAll->setChecked(theAPI->GetGlobalSettings()->GetBool("SandboxieAllGroup", false));
ui.chkImproveGame->setChecked(theAPI->GetGlobalSettings()->GetBool("Improve3DGameRate", false));
ui.chkAdminOnly->setChecked(theAPI->GetGlobalSettings()->GetBool("EditAdminOnly", false)); ui.chkAdminOnly->setChecked(theAPI->GetGlobalSettings()->GetBool("EditAdminOnly", false));
ui.chkAdminOnly->setEnabled(IsAdminUser()); ui.chkAdminOnly->setEnabled(IsAdminUser());
@ -1063,6 +1065,7 @@ void CSettingsWindow::LoadSettings()
ui.chkWin32k->setEnabled(false); ui.chkWin32k->setEnabled(false);
ui.chkSbieLogon->setEnabled(false); ui.chkSbieLogon->setEnabled(false);
ui.chkSbieAll->setEnabled(false); ui.chkSbieAll->setEnabled(false);
ui.chkImproveGame->setEnabled(false);
ui.regRoot->setEnabled(false); ui.regRoot->setEnabled(false);
ui.ipcRoot->setEnabled(false); ui.ipcRoot->setEnabled(false);
ui.chkRamDisk->setEnabled(false); ui.chkRamDisk->setEnabled(false);
@ -1713,6 +1716,7 @@ void CSettingsWindow::SaveSettings()
WriteAdvancedCheck(ui.chkWin32k, "EnableWin32kHooks", "", "n"); WriteAdvancedCheck(ui.chkWin32k, "EnableWin32kHooks", "", "n");
WriteAdvancedCheck(ui.chkSbieLogon, "SandboxieLogon", "y", ""); WriteAdvancedCheck(ui.chkSbieLogon, "SandboxieLogon", "y", "");
WriteAdvancedCheck(ui.chkSbieAll, "SandboxieAllGroup", "y", ""); WriteAdvancedCheck(ui.chkSbieAll, "SandboxieAllGroup", "y", "");
WriteAdvancedCheck(ui.chkImproveGame, "Improve3DGameRate", "y", "");
if (m_FeaturesChanged) { if (m_FeaturesChanged) {
m_FeaturesChanged = false; m_FeaturesChanged = false;

View File

@ -135,6 +135,8 @@ bool CSetupWizard::ShowWizard(int iOldLevel)
{ {
if (wizard.field("editAdminOnly").toBool()) if (wizard.field("editAdminOnly").toBool())
theAPI->GetGlobalSettings()->SetText("EditAdminOnly", "y"); theAPI->GetGlobalSettings()->SetText("EditAdminOnly", "y");
if (wizard.field("improveGame").toBool())
theAPI->GetGlobalSettings()->SetText("Improve3DGameRate", "y");
} }
theConf->SetValue("Options/WizardLevel", SETUP_LVL_CURRENT); theConf->SetValue("Options/WizardLevel", SETUP_LVL_CURRENT);
@ -530,6 +532,11 @@ CShellPage::CShellPage(QWidget *parent)
layout->addWidget(m_pEditOnlyAdmin); layout->addWidget(m_pEditOnlyAdmin);
registerField("editAdminOnly", m_pEditOnlyAdmin); registerField("editAdminOnly", m_pEditOnlyAdmin);
m_pImproveGame = new QCheckBox(tr("Enhance the 3D gaming experience by releasing some system calls."));
m_pImproveGame->setChecked(false);
layout->addWidget(m_pImproveGame);
registerField("improveGame", m_pImproveGame);
setLayout(layout); setLayout(layout);
} }

View File

@ -123,6 +123,7 @@ private:
QCheckBox *m_pContecxtMenu; QCheckBox *m_pContecxtMenu;
QCheckBox *m_pBrowserIcon; QCheckBox *m_pBrowserIcon;
QCheckBox* m_pEditOnlyAdmin; QCheckBox* m_pEditOnlyAdmin;
QCheckBox* m_pImproveGame;
}; };
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////