mirrors/Sandboxie
mirrors
/
Sandboxie
mirror of https://github.com/sandboxie-plus/Sandboxie.git
1
0
Fork 0
Code Releases Activity

Fix comment problem.

This commit is contained in:
love-code-yeyixiao 2024-03-02 10:55:48 +08:00
parent 741b320733
commit 2d1ecd074d
3 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SandboxiePlus/SandMan/Forms/SettingsWindow.ui
View File

@ -233,11 +233,7 @@
<item> <item>
<widget class="QCheckBox" name="chkCheckDelete"> <widget class="QCheckBox" name="chkCheckDelete">
<property name="text"> <property name="text">
<<<<<<< HEAD
<string>Don't check sandboxes' auto-delete status when Sandman starts.</string>
=======
<string>Check sandboxes' auto-delete status when Sandman starts</string> <string>Check sandboxes' auto-delete status when Sandman starts</string>
>>>>>>> cbb2b8660f0ba5f1e56841d78292bf64f7931de4
</property> </property>
</widget> </widget>
</item> </item>

23
SandboxiePlus/SandMan/SandMan.cpp
View File

@ -304,29 +304,6 @@ CSandMan::CSandMan(QWidget *parent)
} }
} }
/*if (theConf->GetBool("Options/CheckAutoDelete", false)) {
for (auto& box : theAPI->GetAllBoxes().toStdMap()) {
CSandBoxPtr pBox = box.second;
if (box.second->GetActiveProcessCount() == 0) {
if (!pBox->GetBool("NeverDelete", false))
{
if (pBox->GetBool("AutoDelete", false))
{
bool DeleteSnapshots = false;
// if this box auto deletes first show the recovry dialog with the option to abort deletion
//if (!theGUI->OpenRecovery(pBox, DeleteSnapshots, true)) // unless no files are found than continue silently
// return;
if (theConf->GetBool("Options/AutoBoxOpsNotify", false))
OnLogMessage(tr("Auto deleting content of %1").arg(pBox->GetName()), true);
DeleteBoxContent(pBox, eAuto, DeleteSnapshots);
}
}
}
}
}*/
m_uTimerID = startTimer(1000); m_uTimerID = startTimer(1000);
bool bAutoRun = QApplication::arguments().contains("-autorun"); bool bAutoRun = QApplication::arguments().contains("-autorun");

7
SandboxiePlus/SandMan/Windows/SettingsWindow.cpp
View File

@ -909,6 +909,7 @@ void CSettingsWindow::LoadSettings()
ui.chkSandboxUrls->setCheckState(CSettingsWindow__Int2Chk(theConf->GetInt("Options/OpenUrlsSandboxed", 2))); ui.chkSandboxUrls->setCheckState(CSettingsWindow__Int2Chk(theConf->GetInt("Options/OpenUrlsSandboxed", 2)));
ui.chkShowRecovery->setChecked(theConf->GetBool("Options/ShowRecovery", false)); ui.chkShowRecovery->setChecked(theConf->GetBool("Options/ShowRecovery", false));
ui.chkCheckDelete->setChecked(!theConf->GetBool("Options/CleanUpOnStart", false));
ui.chkNotifyRecovery->setChecked(!theConf->GetBool("Options/InstantRecovery", true)); ui.chkNotifyRecovery->setChecked(!theConf->GetBool("Options/InstantRecovery", true));
ui.chkRecoveryTop->setChecked(theConf->GetBool("Options/RecoveryOnTop", true)); ui.chkRecoveryTop->setChecked(theConf->GetBool("Options/RecoveryOnTop", true));
ui.chkAsyncBoxOps->setChecked(theConf->GetBool("Options/UseAsyncBoxOps", false)); ui.chkAsyncBoxOps->setChecked(theConf->GetBool("Options/UseAsyncBoxOps", false));
@ -925,8 +926,6 @@ void CSettingsWindow::LoadSettings()
ui.chkSuspend->setChecked(theConf->GetBool("Options/EnableSuspendKey", false)); ui.chkSuspend->setChecked(theConf->GetBool("Options/EnableSuspendKey", false));
ui.keySuspend->setKeySequence(QKeySequence(theConf->GetString("Options/SuspendKeySequence", "Ctrl+Pause"))); ui.keySuspend->setKeySequence(QKeySequence(theConf->GetString("Options/SuspendKeySequence", "Ctrl+Pause")));
ui.chkCheckDelete->setChecked(!theConf->GetBool("Options/CleanUpOnStart", false));
ui.chkMonitorSize->setChecked(theConf->GetBool("Options/WatchBoxSize", false)); ui.chkMonitorSize->setChecked(theConf->GetBool("Options/WatchBoxSize", false));
ui.chkWatchConfig->setChecked(theConf->GetBool("Options/WatchIni", true)); ui.chkWatchConfig->setChecked(theConf->GetBool("Options/WatchIni", true));
@ -1561,11 +1560,7 @@ void CSettingsWindow::SaveSettings()
theConf->SetValue("Options/EnableSuspendKey", ui.chkSuspend->isChecked()); theConf->SetValue("Options/EnableSuspendKey", ui.chkSuspend->isChecked());
theConf->SetValue("Options/SuspendKeySequence", ui.keySuspend->keySequence().toString()); theConf->SetValue("Options/SuspendKeySequence", ui.keySuspend->keySequence().toString());
<<<<<<< HEAD
theConf->SetValue("Options/CleanUpOnStart", !ui.chkCheckDelete->isChecked()); theConf->SetValue("Options/CleanUpOnStart", !ui.chkCheckDelete->isChecked());
=======
theConf->SetValue("Options/CheckAutoDelete", ui.chkCheckDelete->isChecked());
>>>>>>> cbb2b8660f0ba5f1e56841d78292bf64f7931de4
theConf->SetValue("Options/WatchBoxSize", ui.chkMonitorSize->isChecked()); theConf->SetValue("Options/WatchBoxSize", ui.chkMonitorSize->isChecked());