diff --git a/SandboxiePlus/SandMan/Forms/BoxImageWindow.ui b/SandboxiePlus/SandMan/Forms/BoxImageWindow.ui
index 6478717a..e89dfc44 100644
--- a/SandboxiePlus/SandMan/Forms/BoxImageWindow.ui
+++ b/SandboxiePlus/SandMan/Forms/BoxImageWindow.ui
@@ -7,7 +7,7 @@
0
0
518
- 268
+ 307
@@ -25,148 +25,151 @@
Form
-
+
-
-
-
-
-
-
-
- 0
- 0
-
-
-
- kilobytes
-
-
-
- -
-
-
- QLineEdit::Password
-
-
-
- -
-
-
- QLineEdit::Password
-
-
-
- -
-
-
- Protect Box Root from access by unsandboxed processes
-
-
- true
-
-
-
- -
-
-
-
- 100
- 16777215
-
-
-
-
- -
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
- -
-
-
- -
-
-
- QLineEdit::Password
-
-
-
- -
-
-
- TextLabel
-
-
-
- -
-
-
- Show Password
-
-
-
- -
-
-
- Enter Password
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- New Password
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- Repeat Password
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- Disk Image Size
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- Encryption Cipher
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- TextLabel
-
-
- true
-
-
-
-
+
+
+ TextLabel
+
+
+
+ -
+
+
+ TextLabel
+
+
+ true
+
+
+
+ -
+
+
+ Enter Password
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ QLineEdit::Password
+
+
+
+ -
+
+
+ New Password
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ QLineEdit::Password
+
+
+
+ -
+
+
+ Repeat Password
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ QLineEdit::Password
+
+
+
+ -
+
+
+ Show Password
+
+
+
+ -
+
+
+ Disk Image Size
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 100
+ 16777215
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ kilobytes
+
+
+
+ -
+
+
+ Encryption Cipher
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ -
+
+
+ Protect Box Root from access by unsandboxed processes
+
+
+ true
+
+
+
+ -
+
+
+ Lock the box when all processes stop.
+
+
+
+ -
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
diff --git a/SandboxiePlus/SandMan/SandMan.cpp b/SandboxiePlus/SandMan/SandMan.cpp
index 75638726..3aa6ab10 100644
--- a/SandboxiePlus/SandMan/SandMan.cpp
+++ b/SandboxiePlus/SandMan/SandMan.cpp
@@ -1718,7 +1718,7 @@ SB_STATUS CSandMan::ImBoxMount(const CSandBoxPtr& pBox, bool bAutoUnmount)
CBoxImageWindow window(CBoxImageWindow::eMount, this);
if (theGUI->SafeExec(&window) != 1)
return SB_ERR(SB_Canceled);
- return pBox->ImBoxMount(window.GetPassword(), window.UseProtection(), bAutoUnmount);
+ return pBox->ImBoxMount(window.GetPassword(), window.UseProtection(), window.AutoUnMount());
}
void CSandMan::dropEvent(QDropEvent* e)
diff --git a/SandboxiePlus/SandMan/Windows/BoxImageWindow.cpp b/SandboxiePlus/SandMan/Windows/BoxImageWindow.cpp
index 4ec93e33..05b3a6d4 100644
--- a/SandboxiePlus/SandMan/Windows/BoxImageWindow.cpp
+++ b/SandboxiePlus/SandMan/Windows/BoxImageWindow.cpp
@@ -93,8 +93,10 @@ CBoxImageWindow::CBoxImageWindow(EAction Action, QWidget *parent)
ui.cmbCipher->addItem("Serpent-AES", 5);
ui.cmbCipher->addItem("AES-Twofish-Serpent", 6);
- if (m_Action != eMount)
+ if (m_Action != eMount) {
ui.chkProtect->setVisible(false);
+ ui.chkAutoLock->setVisible(false);
+ }
//restoreGeometry(theConf->GetBlob("BoxImageWindow/Window_Geometry"));
}
@@ -158,4 +160,4 @@ void CBoxImageWindow::CheckPassword()
}
accept();
-}
\ No newline at end of file
+}
diff --git a/SandboxiePlus/SandMan/Windows/BoxImageWindow.h b/SandboxiePlus/SandMan/Windows/BoxImageWindow.h
index 3b699146..341d415e 100644
--- a/SandboxiePlus/SandMan/Windows/BoxImageWindow.h
+++ b/SandboxiePlus/SandMan/Windows/BoxImageWindow.h
@@ -25,6 +25,7 @@ public:
void SetImageSize(quint64 uSize) const { return ui.txtImageSize->setText(QString::number(uSize / 1024)); }
quint64 GetImageSize() const { return ui.txtImageSize->text().toULongLong() * 1024; }
bool UseProtection() const { return ui.chkProtect->isChecked(); }
+ bool AutoUnMount() const { return ui.chkAutoLock->isChecked(); }
private slots:
void OnShowPassword();