This commit is contained in:
DavidXanatos 2022-12-15 14:45:37 +01:00
parent 8d7ea48a9a
commit 35fa0af87c
7 changed files with 118 additions and 117 deletions

View File

@ -54,6 +54,26 @@
<layout class="QGridLayout" name="gridLayout_9">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_8">
<item row="6" column="1">
<widget class="QCheckBox" name="chkSilentMode">
<property name="toolTip">
<string>This option also enables asynchronous operation when needed and suspends updates.</string>
</property>
<property name="text">
<string>Suppress pop-up notifications when in game / presentation mode</string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QCheckBox" name="chkNotifyRecovery">
<property name="text">
<string>Show recoverable files as notifications</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="uiLang"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_19">
<property name="text">
@ -64,36 +84,32 @@
</property>
</widget>
</item>
<item row="11" column="1" colspan="2">
<widget class="QCheckBox" name="chkShowRecovery">
<property name="text">
<string>Show first recovery window when emptying sandboxes</string>
</property>
</widget>
</item>
<item row="12" column="1">
<widget class="QCheckBox" name="chkRecoveryTop">
<property name="text">
<string>Show the Recovery Window as Always on Top</string>
</property>
</widget>
</item>
<item row="3" column="1">
<item row="5" column="1">
<widget class="QCheckBox" name="chkAsyncBoxOps">
<property name="text">
<string>Run box operations asynchronously whenever possible (like content deletion)</string>
</property>
</widget>
</item>
<item row="4" column="1" colspan="2">
<widget class="QCheckBox" name="chkMonitorSize">
<item row="11" column="1">
<widget class="QCheckBox" name="chkRecoveryTop">
<property name="text">
<string>Count and display the disk space occupied by each sandbox</string>
<string>Show the Recovery Window as Always on Top</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="uiLang"/>
<item row="12" column="1">
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<widget class="QLabel" name="lblGeneral">
@ -108,19 +124,6 @@
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="lblRecovery">
<property name="font">
<font>
<bold>true</bold>
<kerning>true</kerning>
</font>
</property>
<property name="text">
<string>Recovery Options</string>
</property>
</widget>
</item>
<item row="2" column="1" colspan="2">
<widget class="QCheckBox" name="chkSandboxUrls">
<property name="text">
@ -131,20 +134,7 @@
</property>
</widget>
</item>
<item row="13" column="1">
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="13" column="2">
<item row="12" column="2">
<spacer name="horizontalSpacer_8">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@ -157,24 +147,20 @@
</property>
</spacer>
</item>
<item row="8" column="1" colspan="2">
<widget class="QCheckBox" name="chkNotifications">
<property name="text">
<string>Show Notifications for relevant log Messages</string>
<item row="8" column="0">
<widget class="QLabel" name="lblRecovery">
<property name="font">
<font>
<bold>true</bold>
<kerning>true</kerning>
</font>
</property>
<property name="checked">
<bool>false</bool>
<property name="text">
<string>Recovery Options</string>
</property>
</widget>
</item>
<item row="10" column="1">
<widget class="QCheckBox" name="chkNotifyRecovery">
<property name="text">
<string>Show recoverable files as notifications</string>
</property>
</widget>
</item>
<item row="6" column="1" colspan="3">
<item row="4" column="1" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QCheckBox" name="chkPanic">
@ -188,17 +174,27 @@
</item>
</layout>
</item>
<item row="5" column="1">
<widget class="QCheckBox" name="chkWatchConfig">
<item row="7" column="1" colspan="2">
<widget class="QCheckBox" name="chkNotifications">
<property name="text">
<string>Watch Sandboxie.ini for changes</string>
<string>Show Notifications for relevant log Messages</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QCheckBox" name="chkSilentMode">
<item row="10" column="1" colspan="2">
<widget class="QCheckBox" name="chkShowRecovery">
<property name="text">
<string>Suppress pop-up notifications when in game / presentation mode</string>
<string>Show first recovery window when emptying sandboxes</string>
</property>
</widget>
</item>
<item row="3" column="1" colspan="2">
<widget class="QCheckBox" name="chkMonitorSize">
<property name="text">
<string>Count and display the disk space occupied by each sandbox</string>
</property>
</widget>
</item>
@ -730,9 +726,6 @@
<string>Advanced Config</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_6">
<item row="1" column="0">
<layout class="QGridLayout" name="gridLayout_5"/>
</item>
<item row="0" column="0">
<widget class="QTabWidget" name="tabsAdvanced">
<property name="currentIndex">
@ -945,12 +938,39 @@
</widget>
<widget class="QWidget" name="tabLock">
<attribute name="title">
<string>Config Protection</string>
<string>Sandboxie Config</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_21">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_19">
<item row="0" column="0" colspan="2">
<item row="3" column="2">
<widget class="QPushButton" name="btnSetPassword">
<property name="text">
<string>Change Password</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="chkPassRequired">
<property name="text">
<string>Password must be entered in order to make changes</string>
</property>
</widget>
</item>
<item row="6" column="1">
<spacer name="verticalSpacer_7">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0" colspan="2">
<widget class="QLabel" name="lblProtection">
<property name="font">
<font>
@ -964,52 +984,32 @@
</widget>
</item>
<item row="4" column="1">
<widget class="QCheckBox" name="chkClearPass">
<property name="text">
<string>Clear password when main window becomes hidden</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="chkAdminOnly">
<property name="text">
<string>Only Administrator user accounts can make changes</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="chkAdminOnlyFP">
<property name="text">
<string>Only Administrator user accounts can use Pause Forcing Programs command</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="chkPassRequired">
<property name="text">
<string>Password must be entered in order to make changes</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QPushButton" name="btnSetPassword">
<property name="text">
<string>Change Password</string>
</property>
</widget>
</item>
<item row="5" column="1">
<spacer name="verticalSpacer_7">
<property name="orientation">
<enum>Qt::Vertical</enum>
<widget class="QCheckBox" name="chkClearPass">
<property name="text">
<string>Clear password when main window becomes hidden</string>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="chkAdminOnly">
<property name="text">
<string>Only Administrator user accounts can make changes</string>
</property>
</spacer>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="chkWatchConfig">
<property name="text">
<string>Watch Sandboxie.ini for changes</string>
</property>
</widget>
</item>
</layout>
</item>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@ -135,6 +135,7 @@
<file>Actions/Folder.png</file>
<file>Actions/BFance.png</file>
<file>Actions/Shield16.png</file>
<file>Actions/Editor.png</file>
</qresource>
<qresource prefix="/Boxes">
<file alias="Empty3">Boxes/sandbox-b-empty.png</file>

View File

@ -568,7 +568,7 @@ void CSandMan::CreateMenus(bool bAdvanced)
m_pMenuResetGUI->setShortcutContext(Qt::WidgetWithChildrenShortcut);
this->addAction(m_pMenuResetGUI);
m_pMenuOptions->addSeparator();
m_pEditIni = m_pMenuOptions->addAction(CSandMan::GetIcon("EditIni"), tr("Edit ini file"), this, SLOT(OnEditIni()));
m_pEditIni = m_pMenuOptions->addAction(CSandMan::GetIcon("Editor"), tr("Edit ini file"), this, SLOT(OnEditIni()));
m_pReloadIni = m_pMenuOptions->addAction(CSandMan::GetIcon("ReloadIni"), tr("Reload ini file"), this, SLOT(OnReloadIni()));
CreateHelpMenu(bAdvanced);
@ -688,7 +688,7 @@ void CSandMan::CreateOldMenus()
m_pMenuOptions->addSeparator();
QAction* m_pConfigLock = m_pMenuOptions->addAction(CSandMan::GetIcon("Lock"), tr("Lock Configuration"), this, SLOT(OnSettingsAction()));
m_pConfigLock->setData(CSettingsWindow::eConfigLock);
m_pEditIni = m_pMenuOptions->addAction(CSandMan::GetIcon("EditIni"), tr("Edit ini file"), this, SLOT(OnEditIni()));
m_pEditIni = m_pMenuOptions->addAction(CSandMan::GetIcon("Editor"), tr("Edit ini file"), this, SLOT(OnEditIni()));
m_pReloadIni = m_pMenuOptions->addAction(CSandMan::GetIcon("ReloadIni"), tr("Reload ini file"), this, SLOT(OnReloadIni()));
CreateHelpMenu(false);
@ -1672,7 +1672,7 @@ void CSandMan::OnBoxClosed(const CSandBoxPtr& pBox)
if(theConf->GetBool("Options/AutoBoxOpsNotify", false))
OnLogMessage(tr("Auto deleting content of %1").arg(pBox->GetName()), true);
if (theConf->GetBool("Options/UseAsyncBoxOps", false))
if (theConf->GetBool("Options/UseAsyncBoxOps", false) || IsSilentMode())
{
auto pBoxEx = pBox.objectCast<CSandBoxPlus>();
SB_STATUS Status = pBoxEx->DeleteContentAsync(DeleteShapshots);

View File

@ -1327,7 +1327,7 @@ void CSbieView::OnSandBoxAction(QAction* Action, const QList<CSandBoxPtr>& SandB
foreach(const CSandBoxPtr &pBox, SandBoxes)
{
if (theConf->GetBool("Options/UseAsyncBoxOps", false))
if (theConf->GetBool("Options/UseAsyncBoxOps", false) || theGUI->IsSilentMode())
{
auto pBoxEx = pBox.objectCast<CSandBoxPlus>();
SB_STATUS Status = pBoxEx->DeleteContentAsync(DeleteShapshots);

View File

@ -173,7 +173,7 @@ COptionsWindow::COptionsWindow(const QSharedPointer<CSbieIni>& pBox, const QStri
ui.tabs->setTabIcon(9, CSandMan::GetIcon("Settings"));
ui.tabs->setTabIcon(10, CSandMan::GetIcon("Advanced"));
ui.tabs->setTabIcon(11, CSandMan::GetIcon("Template"));
ui.tabs->setTabIcon(12, CSandMan::GetIcon("EditIni"));
ui.tabs->setTabIcon(12, CSandMan::GetIcon("Editor"));
ui.tabsGeneral->setTabIcon(0, CSandMan::GetIcon("Box"));
ui.tabsGeneral->setTabIcon(1, CSandMan::GetIcon("File"));

View File

@ -145,14 +145,14 @@ CSettingsWindow::CSettingsWindow(QWidget* parent)
ui.tabs->setTabIcon(3, CSandMan::GetIcon("Advanced"));
ui.tabs->setTabIcon(4, CSandMan::GetIcon("Alarm"));
ui.tabs->setTabIcon(5, CSandMan::GetIcon("Compatibility"));
ui.tabs->setTabIcon(6, CSandMan::GetIcon("EditIni"));
ui.tabs->setTabIcon(6, CSandMan::GetIcon("Editor"));
ui.tabs->setTabIcon(7, CSandMan::GetIcon("Support"));
ui.tabsGUI->setTabIcon(0, CSandMan::GetIcon("Design"));
ui.tabsGUI->setTabIcon(0, CSandMan::GetIcon("GUI"));
ui.tabsGUI->setTabIcon(1, CSandMan::GetIcon("Run"));
ui.tabsAdvanced->setTabIcon(0, CSandMan::GetIcon("Options"));
ui.tabsAdvanced->setTabIcon(1, CSandMan::GetIcon("Lock"));
ui.tabsAdvanced->setTabIcon(1, CSandMan::GetIcon("EditIni"));
int size = 16.0;
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)