From 35fa0af87cb6a9c9cdf8668114524f1009f7e93d Mon Sep 17 00:00:00 2001 From: DavidXanatos Date: Thu, 15 Dec 2022 14:45:37 +0100 Subject: [PATCH] 1.6.1b --- SandboxiePlus/SandMan/Forms/SettingsWindow.ui | 218 +++++++++--------- .../SandMan/Resources/Actions/Editor.png | Bin 0 -> 1559 bytes SandboxiePlus/SandMan/Resources/SandMan.qrc | 1 + SandboxiePlus/SandMan/SandMan.cpp | 6 +- SandboxiePlus/SandMan/Views/SbieView.cpp | 2 +- .../SandMan/Windows/OptionsWindow.cpp | 2 +- .../SandMan/Windows/SettingsWindow.cpp | 6 +- 7 files changed, 118 insertions(+), 117 deletions(-) create mode 100644 SandboxiePlus/SandMan/Resources/Actions/Editor.png diff --git a/SandboxiePlus/SandMan/Forms/SettingsWindow.ui b/SandboxiePlus/SandMan/Forms/SettingsWindow.ui index 208df9bb..180c4799 100644 --- a/SandboxiePlus/SandMan/Forms/SettingsWindow.ui +++ b/SandboxiePlus/SandMan/Forms/SettingsWindow.ui @@ -54,6 +54,26 @@ + + + + This option also enables asynchronous operation when needed and suspends updates. + + + Suppress pop-up notifications when in game / presentation mode + + + + + + + Show recoverable files as notifications + + + + + + @@ -64,36 +84,32 @@ - - - - Show first recovery window when emptying sandboxes - - - - - - - Show the Recovery Window as Always on Top - - - - + Run box operations asynchronously whenever possible (like content deletion) - - + + - Count and display the disk space occupied by each sandbox + Show the Recovery Window as Always on Top - - + + + + Qt::Vertical + + + + 20 + 40 + + + @@ -108,19 +124,6 @@ - - - - - true - true - - - - Recovery Options - - - @@ -131,20 +134,7 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - - + Qt::Horizontal @@ -157,24 +147,20 @@ - - - - Show Notifications for relevant log Messages + + + + + true + true + - - false + + Recovery Options - - - - Show recoverable files as notifications - - - - + @@ -188,17 +174,27 @@ - - + + - Watch Sandboxie.ini for changes + Show Notifications for relevant log Messages + + + false - - + + - Suppress pop-up notifications when in game / presentation mode + Show first recovery window when emptying sandboxes + + + + + + + Count and display the disk space occupied by each sandbox @@ -730,9 +726,6 @@ Advanced Config - - - @@ -945,12 +938,39 @@ - Config Protection + Sandboxie Config - + + + + Change Password + + + + + + + Password must be entered in order to make changes + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + @@ -964,52 +984,32 @@ - - - Clear password when main window becomes hidden - - - - - - - Only Administrator user accounts can make changes - - - - Only Administrator user accounts can use Pause Forcing Programs command - - - - Password must be entered in order to make changes - - - - - - - Change Password - - - - - - Qt::Vertical + + + Clear password when main window becomes hidden - - - 20 - 40 - + + + + + + Only Administrator user accounts can make changes - + + + + + + Watch Sandboxie.ini for changes + + diff --git a/SandboxiePlus/SandMan/Resources/Actions/Editor.png b/SandboxiePlus/SandMan/Resources/Actions/Editor.png new file mode 100644 index 0000000000000000000000000000000000000000..1377a60e05ee75831d135f8ffdc1eae4837e46c1 GIT binary patch literal 1559 zcmV+y2I%>TP)|} zCd3udm}mk)(4C25;>Lvu5MoRqE_CI_pN-)!Y!oC)K&X(Ch9-snP_ZJNQp^0@39%=U|^YSCrU8LTnbG zS9Ivx{rVN=DD5TE@>jC&fyC1%emb-K+@%2kKyN1f>P!8%Rsnz{V0dgI{_T1eAoAljW4gj#_sf}NCZ5x{+2@rr2KmPpS@aPx-VCAxKO# zy1tGGAOR2&^oZ`vMWc}(BI+Sv^YE$RTL2E%^O2QWL|9Km0D#VR!>O#!b^|5|0udn| zZ$d0;0_{jza~239Lb9#R-T=g#8bN@glWa?v4;6sXmQdDd>p4EMB0@x(34_qRs0**X zxEZ;80gF=|mNCML<a;hfWE~NZ zYBv<{fc3?3kp~3UGs_(-2Z6E(RMUkAh*BNpS#`_Y4-f_jvxGcAs5(p#?y~?19ui)S zKvs2(55i5CdLV3Kv3~;t0!R>vDj?LIt`;pt#|H?fOo9R;Wn~1MT3~`Gaj;q~c>tC& zz+#ssZ8?T#W@j-vJ^`DOt&f{xP8wO`HuE@+TY4440x5tena~-diyBu$wy zD*s1bh>wV<28eJsm#^7Z-2CRx7Tuf~df1S#nk z2oS4090zq>cdu?d&q~z^!Sl#c!F**@9uyFulySV61~na14uL*FaNiQSH;wlhgjb{F zgJ1&z6{!~IyI?DwuWXcj5Cj0S$U?(vi1Eqmcbpn<91I==mDvChQqwo?aC~G%WLao- z=8@2!7@-J?7DbUzmS`yq}#3rJsURNlFG6#W;E-kW!GkQGKOxYTNIj-C~QUcWb&<|u-G;i$2I zv}BA!Q`i1zCx}e|?%#WEspLR7lFP0-3|#(?OwP-^%*+2?{sq@9qFMea>R002ov JPDHLkV1faj&gK9B literal 0 HcmV?d00001 diff --git a/SandboxiePlus/SandMan/Resources/SandMan.qrc b/SandboxiePlus/SandMan/Resources/SandMan.qrc index 4bc653a4..5407751b 100644 --- a/SandboxiePlus/SandMan/Resources/SandMan.qrc +++ b/SandboxiePlus/SandMan/Resources/SandMan.qrc @@ -135,6 +135,7 @@ Actions/Folder.png Actions/BFance.png Actions/Shield16.png + Actions/Editor.png Boxes/sandbox-b-empty.png diff --git a/SandboxiePlus/SandMan/SandMan.cpp b/SandboxiePlus/SandMan/SandMan.cpp index 6537b807..42da5964 100644 --- a/SandboxiePlus/SandMan/SandMan.cpp +++ b/SandboxiePlus/SandMan/SandMan.cpp @@ -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(); SB_STATUS Status = pBoxEx->DeleteContentAsync(DeleteShapshots); diff --git a/SandboxiePlus/SandMan/Views/SbieView.cpp b/SandboxiePlus/SandMan/Views/SbieView.cpp index 3c8c44bc..b7e47688 100644 --- a/SandboxiePlus/SandMan/Views/SbieView.cpp +++ b/SandboxiePlus/SandMan/Views/SbieView.cpp @@ -1327,7 +1327,7 @@ void CSbieView::OnSandBoxAction(QAction* Action, const QList& SandB foreach(const CSandBoxPtr &pBox, SandBoxes) { - if (theConf->GetBool("Options/UseAsyncBoxOps", false)) + if (theConf->GetBool("Options/UseAsyncBoxOps", false) || theGUI->IsSilentMode()) { auto pBoxEx = pBox.objectCast(); SB_STATUS Status = pBoxEx->DeleteContentAsync(DeleteShapshots); diff --git a/SandboxiePlus/SandMan/Windows/OptionsWindow.cpp b/SandboxiePlus/SandMan/Windows/OptionsWindow.cpp index b9be6a53..87b53199 100644 --- a/SandboxiePlus/SandMan/Windows/OptionsWindow.cpp +++ b/SandboxiePlus/SandMan/Windows/OptionsWindow.cpp @@ -173,7 +173,7 @@ COptionsWindow::COptionsWindow(const QSharedPointer& 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")); diff --git a/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp b/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp index befec71a..67987e91 100644 --- a/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp +++ b/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp @@ -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)