diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6cee020e..adc1866a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,10 +14,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [1.0.22 / 5.55.22] - 2022-05-xx
+### Added
+- added auto update download and silent install option to sandman.exe
### Fixed
- fixed sandman crash issue [#1846](https://github.com/sandboxie-plus/Sandboxie/issues/1846)
- fixed issue with windows server 2022 build 20348
+- fixed translation switching issues [#1852](https://github.com/sandboxie-plus/Sandboxie/issues/1852)
+
+
diff --git a/Sandboxie/common/my_version.h b/Sandboxie/common/my_version.h
index d5fc84d8..aff092cd 100644
--- a/Sandboxie/common/my_version.h
+++ b/Sandboxie/common/my_version.h
@@ -21,8 +21,8 @@
#ifndef _MY_VERSION_H
#define _MY_VERSION_H
-#define MY_VERSION_BINARY 5,55,21
-#define MY_VERSION_STRING "5.55.21"
+#define MY_VERSION_BINARY 5,55,22
+#define MY_VERSION_STRING "5.55.22"
#define MY_VERSION_COMPAT "5.55.0" // this refers to the driver ABI compatibility
// These #defines are used by either Resource Compiler or NSIS installer
diff --git a/SandboxiePlus/SandMan/Forms/SettingsWindow.ui b/SandboxiePlus/SandMan/Forms/SettingsWindow.ui
index 46de31e1..e6f1d321 100644
--- a/SandboxiePlus/SandMan/Forms/SettingsWindow.ui
+++ b/SandboxiePlus/SandMan/Forms/SettingsWindow.ui
@@ -54,114 +54,7 @@
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Watch Sandboxie.ini for changes
-
-
-
- -
-
-
- Show recoverable files as notifications
-
-
-
- -
-
-
- UI Language:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- Show first recovery window when emptying sandboxes
-
-
-
- -
-
-
- Use Dark Theme (fully applied after a restart)
-
-
- true
-
-
-
- -
-
-
- Restart required (!)
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
-
-
-
- -
-
-
- -
-
-
- Show Notifications for relevant log Messages
-
-
- false
-
-
-
- -
-
-
- Open urls from this ui sandboxed
-
-
- true
-
-
-
- -
-
-
- Run box operations asynchronously whenever possible (like content deletion)
-
-
-
- -
+
-
-
@@ -175,6 +68,117 @@
+ -
+
+
+ Run box operations asynchronously whenever possible (like content deletion)
+
+
+
+ -
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ Show first recovery window when emptying sandboxes
+
+
+
+ -
+
+
+ Use Dark Theme (fully applied after a restart)
+
+
+ true
+
+
+
+ -
+
+
+ Watch Sandboxie.ini for changes
+
+
+
+ -
+
+
+ Show Notifications for relevant log Messages
+
+
+ false
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Show recoverable files as notifications
+
+
+
+ -
+
+
+ UI Language:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ Open urls from this ui sandboxed
+
+
+ true
+
+
+
+ -
+
+
+
+ 75
+ true
+ true
+
+
+
+ General Options
+
+
+
@@ -845,25 +849,12 @@
0
- -
-
-
-
-
-
- :/HelpingHand.png
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
-
-
16777215
- 60
+ 73
@@ -872,36 +863,13 @@
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Supporters of the Sandboxie-Plus project receive a <a href="https://sandboxie-plus.com/go.php?to=sbie-cert">supporter certificate</a>. It's like a license key but for awesome people using open source software. :-)
-
-
- true
-
-
-
- -
Install updates automatically
- -
+
-
Qt::Vertical
@@ -914,38 +882,13 @@
- -
-
-
-
- 75
- true
- true
-
-
+
-
+
- Support Settings
+ Supporters of the Sandboxie-Plus project receive a <a href="https://sandboxie-plus.com/go.php?to=sbie-cert">supporter certificate</a>. It's like a license key but for awesome people using open source software. :-)
-
-
- -
-
-
-
- 75
- true
- true
-
-
-
- This supporter certificate has expired, please <a href="sbie://update/cert">get an updated certificate</a>.
-
-
-
- -
-
-
- Check periodically for updates of Sandboxie-Plus
+
+ true
@@ -968,13 +911,81 @@
- -
+
-
+
+
+
+ 75
+ true
+ true
+
+
+
+ This supporter certificate has expired, please <a href="sbie://update/cert">get an updated certificate</a>.
+
+
+
+ -
+
+
+
+ 75
+ true
+ true
+
+
+
+ Support Settings
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
In the future, don't notify about certificate expiration
+ -
+
+
+
+
+
+ :/HelpingHand.png
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+
+ -
+
+
+ Check periodically for updates of Sandboxie-Plus
+
+
+
+ -
+
+
+ Download Updates automatically
+
+
+
diff --git a/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp b/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp
index 84b79869..81678720 100644
--- a/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp
+++ b/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp
@@ -338,6 +338,8 @@ void CSettingsWindow::LoadSettings()
UpdateCert();
ui.chkAutoUpdate->setCheckState(CSettingsWindow__Int2Chk(theConf->GetInt("Options/CheckForUpdates", 2)));
+ ui.chkAutoDownload->setCheckState(CSettingsWindow__Int2Chk(theConf->GetInt("Options/DownloadUpdates", 1)));
+ //ui.chkAutoInstall->setCheckState(CSettingsWindow__Int2Chk(theConf->GetInt("Options/InstallUpdates", 0)));
ui.chkAutoInstall->setVisible(false); // todo implement smart auto updater
ui.chkNoCheck->setChecked(theConf->GetBool("Options/NoSupportCheck", false));
@@ -615,6 +617,8 @@ void CSettingsWindow::SaveSettings()
}
theConf->SetValue("Options/CheckForUpdates", CSettingsWindow__Chk2Int(ui.chkAutoUpdate->checkState()));
+ theConf->SetValue("Options/DownloadUpdates", CSettingsWindow__Chk2Int(ui.chkAutoDownload->checkState()));
+ //theConf->SetValue("Options/InstallUpdates", CSettingsWindow__Chk2Int(ui.chkAutoInstall->checkState()));
theConf->SetValue("Options/NoSupportCheck", ui.chkNoCheck->isChecked());
diff --git a/SandboxiePlus/version.h b/SandboxiePlus/version.h
index da7b62e8..7eaa4deb 100644
--- a/SandboxiePlus/version.h
+++ b/SandboxiePlus/version.h
@@ -2,7 +2,7 @@
#define VERSION_MJR 1
#define VERSION_MIN 0
-#define VERSION_REV 21
+#define VERSION_REV 22
#define VERSION_UPD 0
#ifndef STR