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

Merge branch 'sandboxie-plus:master' into master

This commit is contained in:
Sepcnt 2023-08-25 16:16:15 +08:00 committed by GitHub
parent c229f2b1d9 94c3f5e35b
commit 5831d576a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -4,6 +4,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [1.11.1 / 5.66.1] - 2023-08-??
### Changed
- changed the new optin layout to now be the default for non vintage views (can be changed back in the settings)
## [1.11.0 / 5.66.0] - 2023-08-25 ## [1.11.0 / 5.66.0] - 2023-08-25
### Added ### Added

4
Sandboxie/common/my_version.h
View File

@ -21,8 +21,8 @@
#ifndef _MY_VERSION_H #ifndef _MY_VERSION_H
#define _MY_VERSION_H #define _MY_VERSION_H
#define MY_VERSION_BINARY 5,66,0 #define MY_VERSION_BINARY 5,66,1
#define MY_VERSION_STRING "5.66.0" #define MY_VERSION_STRING "5.66.1"
#define MY_ABI_VERSION 0x56500 #define MY_ABI_VERSION 0x56500
// These #defines are used by either Resource Compiler or NSIS installer // These #defines are used by either Resource Compiler or NSIS installer

2
SandboxiePlus/SandMan/Windows/OptionsWindow.cpp
View File

@ -257,7 +257,7 @@ COptionsWindow::COptionsWindow(const QSharedPointer<CSbieIni>& pBox, const QStri
int iViewMode = theConf->GetInt("Options/ViewMode", 1); int iViewMode = theConf->GetInt("Options/ViewMode", 1);
int iOptionLayout = theConf->GetInt("Options/NewConfigLayout", 2); int iOptionLayout = theConf->GetInt("Options/NewConfigLayout", 2);
if (iOptionLayout == 2) if (iOptionLayout == 2)
iOptionLayout = 0;// iViewMode != 2 ? 1 : 0; iOptionLayout = iViewMode != 2 ? 1 : 0;
if ((QGuiApplication::queryKeyboardModifiers() & Qt::AltModifier) != 0) if ((QGuiApplication::queryKeyboardModifiers() & Qt::AltModifier) != 0)
iOptionLayout = !iOptionLayout; iOptionLayout = !iOptionLayout;

2
SandboxiePlus/version.h
View File

@ -2,7 +2,7 @@
#define VERSION_MJR 1 #define VERSION_MJR 1
#define VERSION_MIN 11 #define VERSION_MIN 11
#define VERSION_REV 0 #define VERSION_REV 1
#define VERSION_UPD 0 #define VERSION_UPD 0
#ifndef STR #ifndef STR