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

1.7.1

This commit is contained in:
DavidXanatos 2023-01-29 15:12:01 +01:00
parent a89d87badc
commit de0d807340
14 changed files with 113 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -17,6 +17,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- DropAdminRights can now be configured per process [#2293](https://github.com/sandboxie-plus/Sandboxie/issues/2293)
- added self removing boxes [#1936](https://github.com/sandboxie-plus/Sandboxie/issues/1936)
- added Ctrl+F search filter to the box picker dialog, this allows quickly to find a particular box
- added menu options to edit the templates.ini and the sansboxie-plus.ini
### Changed

2
SandboxiePlus/MiscHelpers/Common/Settings.h
View File

@ -140,7 +140,7 @@ public:
const bool IsWritable() {QMutexLocker Locker(&m_Mutex); return m_pConf->isWritable();}
const void Sync() {QMutexLocker Locker(&m_Mutex); m_pConf->sync();}
const void Sync() {QMutexLocker Locker(&m_Mutex); m_ValueCache.clear(); m_pConf->sync();}
protected:
QMutex m_Mutex;

BIN
SandboxiePlus/SandMan/Resources/Actions/Editor2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
SandboxiePlus/SandMan/Resources/Actions/Editor3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
SandboxiePlus/SandMan/Resources/Actions/Editor4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
SandboxiePlus/SandMan/Resources/Actions/Expand.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
SandboxiePlus/SandMan/Resources/Actions/Files.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
SandboxiePlus/SandMan/Resources/Actions/Folder.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 559 B

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
SandboxiePlus/SandMan/Resources/Actions/Folders.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
SandboxiePlus/SandMan/Resources/Actions/SystemShield.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

5
SandboxiePlus/SandMan/Resources/SandMan.qrc
View File

@ -139,6 +139,11 @@
<file>Actions/USB.png</file>
<file>Actions/SystemShield.png</file>
<file>Actions/AdminShield.png</file>
<file>Actions/Files.png</file>
<file>Actions/Editor4.png</file>
<file>Actions/Editor3.png</file>
<file>Actions/Editor2.png</file>
<file>Actions/Folders.png</file>
</qresource>
<qresource prefix="/Boxes">
<file alias="Empty3">Boxes/sandbox-b-empty.png</file>

113
SandboxiePlus/SandMan/SandMan.cpp
View File

@ -439,16 +439,16 @@ void CSandMan::CreateHelpMenu(bool bAdvanced)
{
m_pMenuHelp = m_pMenuBar->addMenu(tr("&Help"));
//m_pMenuHelp->addAction(tr("Support Sandboxie-Plus on Patreon"), this, SLOT(OnHelp()));
m_pSupport = m_pMenuHelp->addAction(tr("Support Sandboxie-Plus with Donations"), this, SLOT(OnHelp()));
//m_pSupport = m_pMenuHelp->addAction(tr("Support Sandboxie-Plus with Donations"), this, SLOT(OnHelp()));
//if (!bAdvanced) {
// m_pMenuHelp->removeAction(m_pSupport);
// m_pMenuBar->addAction(m_pSupport);
//}
m_pContribution = m_pMenuHelp->addAction(tr("Contribute to Sandboxie-Plus"), this, SLOT(OnHelp()));
m_pContribution = m_pMenuHelp->addAction(CSandMan::GetIcon("Support"), tr("Contribute to Sandboxie-Plus"), this, SLOT(OnHelp()));
m_pManual = m_pMenuHelp->addAction(tr("Online Documentation"), this, SLOT(OnHelp()));
m_pForum = m_pMenuHelp->addAction(tr("Visit Support Forum"), this, SLOT(OnHelp()));
m_pMenuHelp->addSeparator();
m_pUpdate = m_pMenuHelp->addAction(tr("Check for Updates"), this, SLOT(CheckForUpdates()));
m_pUpdate = m_pMenuHelp->addAction(CSandMan::GetIcon("Update"), tr("Check for Updates"), this, SLOT(CheckForUpdates()));
m_pMenuHelp->addSeparator();
m_pAboutQt = m_pMenuHelp->addAction(tr("About the Qt Framework"), this, SLOT(OnAbout()));
m_pAbout = m_pMenuHelp->addAction(CSandMan::GetIcon("IconFull", 2), tr("About Sandboxie-Plus"), this, SLOT(OnAbout()));
@ -526,7 +526,7 @@ void CSandMan::CreateMenus(bool bAdvanced)
}
m_pMenuView->addSeparator();
m_pMenuBrowse = m_pMenuView->addAction(CSandMan::GetIcon("Folder"), tr("Show File Panel"), this, SLOT(OnProcView()));
m_pMenuBrowse = m_pMenuView->addAction(CSandMan::GetIcon("Explore"), tr("Show File Panel"), this, SLOT(OnProcView()));
m_pMenuBrowse->setCheckable(true);
m_pMenuBrowse->setShortcut(QKeySequence("Ctrl+D"));
m_pMenuBrowse->setShortcutContext(Qt::WidgetWithChildrenShortcut);
@ -575,8 +575,13 @@ void CSandMan::CreateMenus(bool bAdvanced)
m_pMenuResetGUI->setShortcutContext(Qt::WidgetWithChildrenShortcut);
this->addAction(m_pMenuResetGUI);
m_pMenuOptions->addSeparator();
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()));
m_pEditIni = m_pMenuOptions->addAction(CSandMan::GetIcon("Editor"), tr("Edit Sandboxie.ini"), this, SLOT(OnEditIni()));
m_pEditIni->setProperty("ini", "sbie");
m_pEditIni2 = m_pMenuOptions->addAction(CSandMan::GetIcon("Editor2"), tr("Edit Templates.ini"), this, SLOT(OnEditIni()));
m_pEditIni2->setProperty("ini", "tmpl");
m_pEditIni3 = m_pMenuOptions->addAction(CSandMan::GetIcon("Editor4"), tr("Edit Sandboxie-Plus.ini"), this, SLOT(OnEditIni()));
m_pEditIni3->setProperty("ini", "plus");
m_pReloadIni = m_pMenuOptions->addAction(CSandMan::GetIcon("ReloadIni"), tr("Reload configuration"), this, SLOT(OnReloadIni()));
CreateHelpMenu(bAdvanced);
@ -696,8 +701,13 @@ 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("Editor"), tr("Edit ini file"), this, SLOT(OnEditIni()));
m_pReloadIni = m_pMenuOptions->addAction(CSandMan::GetIcon("ReloadIni"), tr("Reload ini file"), this, SLOT(OnReloadIni()));
m_pEditIni = m_pMenuOptions->addAction(CSandMan::GetIcon("Editor"), tr("Edit Sandboxie.ini"), this, SLOT(OnEditIni()));
m_pEditIni->setProperty("ini", "sbie");
m_pEditIni2 = m_pMenuOptions->addAction(CSandMan::GetIcon("Editor2"), tr("Edit Templates.ini"), this, SLOT(OnEditIni()));
m_pEditIni2->setProperty("ini", "tmpl");
m_pEditIni3 = m_pMenuOptions->addAction(CSandMan::GetIcon("Editor4"), tr("Edit Sandboxie-Plus.ini"), this, SLOT(OnEditIni()));
m_pEditIni3->setProperty("ini", "plus");
m_pReloadIni = m_pMenuOptions->addAction(CSandMan::GetIcon("ReloadIni"), tr("Reload configuration"), this, SLOT(OnReloadIni()));
CreateHelpMenu(false);
@ -745,7 +755,20 @@ void CSandMan::CreateToolBar()
m_pToolBar->addSeparator();
m_pToolBar->addAction(m_pMenuBrowse);
m_pToolBar->addSeparator();
/*m_pEditButton = new QToolButton();
m_pEditButton->setIcon(m_pEditIni->icon());
m_pEditButton->setText(m_pEditIni->text());
m_pEditButton->setPopupMode(QToolButton::MenuButtonPopup);
QMenu* pEditBtnMenu = new QMenu(m_pEditButton);
pEditBtnMenu->addAction(m_pEditIni2->icon(), m_pEditIni2->text(), this, SLOT(OnEditIni2()));
pEditBtnMenu->addAction(m_pEditIni3->icon(), m_pEditIni3->text(), this, SLOT(OnEditIni3()));
m_pEditButton->setMenu(pEditBtnMenu);
//QObject::connect(m_pEditButton, SIGNAL(triggered(QAction*)), , SLOT());
QObject::connect(m_pEditButton, SIGNAL(clicked(bool)), this, SLOT(OnEditIni()));
m_pToolBar->addWidget(m_pEditButton);*/
m_pToolBar->addAction(m_pEditIni);
m_pToolBar->addSeparator();
m_pToolBar->addAction(m_pEnableMonitoring);
//m_pToolBar->addSeparator();
@ -1872,7 +1895,7 @@ void CSandMan::UpdateState()
{
bool isConnected = theAPI->IsConnected();
m_pSupport->setVisible(g_Certificate.isEmpty());
//m_pSupport->setVisible(g_Certificate.isEmpty());
m_pTrayIcon->setIcon(GetTrayIcon(isConnected));
m_pTrayIcon->setToolTip(GetTrayText(isConnected));
@ -1893,6 +1916,7 @@ void CSandMan::UpdateState()
//m_pKeepTerminated->setEnabled(isConnected);
m_pEditIni->setEnabled(isConnected);
m_pEditIni2->setEnabled(isConnected);
m_pReloadIni->setEnabled(isConnected);
if(m_pEnableMonitoring) m_pEnableMonitoring->setEnabled(isConnected);
}
@ -2670,6 +2694,7 @@ void CSandMan::OnResetMsgs()
theConf->SetValue("Options/CheckForUpdates", 2);
theConf->SetValue("Options/NoEditInfo", true);
theConf->SetValue("Options/NoEditWarn", true);
theConf->SetValue("Options/BoxedExplorerInfo", true);
theConf->SetValue("Options/ExplorerInfo", true);
@ -2721,27 +2746,53 @@ void CSandMan::OnResetGUI()
void CSandMan::OnEditIni()
{
if (theConf->GetBool("Options/NoEditInfo", true))
{
bool State = false;
CCheckableMessageBox::question(this, "Sandboxie-Plus",
theConf->GetBool("Options/WatchIni", true)
? tr("The changes will be applied automatically whenever the file gets saved.")
: tr("The changes will be applied automatically as soon as the editor is closed.")
, tr("Don't show this message again."), &State, QDialogButtonBox::Ok, QDialogButtonBox::Ok, QMessageBox::Information);
if (State)
theConf->SetValue("Options/NoEditInfo", false);
}
QString ini = ((QAction*)sender())->property("ini").toString();
std::wstring Editor = theConf->GetString("Options/Editor", "notepad.exe").toStdWString();
std::wstring IniPath = theAPI->GetIniPath().toStdWString();
std::wstring IniPath;
bool bPlus;
if (bPlus = (ini == "plus"))
{
IniPath = QString(theConf->GetConfigDir() + "/Sandboxie-Plus.ini").replace("/", "\\").toStdWString();
}
else if (ini == "tmpl")
{
IniPath = (theAPI->GetSbiePath() + "\\Templates.ini").toStdWString();
if (theConf->GetBool("Options/NoEditWarn", true)) {
bool State = false;
CCheckableMessageBox::question(this, "Sandboxie-Plus",
tr("You are about to edit the Templates.ini, thsi is generally not recommeded.\n"
"This file is part of Sandboxie and all changed done to it will be reverted next time Sandboxie is updated.")
, tr("Don't show this message again."), &State, QDialogButtonBox::Ok, QDialogButtonBox::Ok, QMessageBox::Warning);
if (State)
theConf->SetValue("Options/NoEditWarn", false);
}
}
else //if (ini == "sbie")
{
IniPath = theAPI->GetIniPath().toStdWString();
if (theConf->GetBool("Options/NoEditInfo", true)) {
bool State = false;
CCheckableMessageBox::question(this, "Sandboxie-Plus",
theConf->GetBool("Options/WatchIni", true)
? tr("The changes will be applied automatically whenever the file gets saved.")
: tr("The changes will be applied automatically as soon as the editor is closed.")
, tr("Don't show this message again."), &State, QDialogButtonBox::Ok, QDialogButtonBox::Ok, QMessageBox::Information);
if (State)
theConf->SetValue("Options/NoEditInfo", false);
}
}
SHELLEXECUTEINFO si = { 0 };
si.cbSize = sizeof(SHELLEXECUTEINFO);
si.fMask = SEE_MASK_NOCLOSEPROCESS;
si.hwnd = NULL;
si.lpVerb = L"runas";
si.lpVerb = bPlus ? NULL : L"runas"; // plus ini does nto require admin privileges
si.lpFile = Editor.c_str();
si.lpParameters = IniPath.c_str();
si.lpDirectory = NULL;
@ -2751,15 +2802,18 @@ void CSandMan::OnEditIni()
//WaitForSingleObject(si.hProcess, INFINITE);
//CloseHandle(si.hProcess);
if (theConf->GetBool("Options/WatchIni", true))
if (!bPlus && theConf->GetBool("Options/WatchIni", true))
return; // if the ini is watched don't double reload
QWinEventNotifier* processFinishedNotifier = new QWinEventNotifier(si.hProcess);
processFinishedNotifier->setEnabled(true);
connect(processFinishedNotifier, &QWinEventNotifier::activated, this, [processFinishedNotifier, this, si]() {
connect(processFinishedNotifier, &QWinEventNotifier::activated, this, [processFinishedNotifier, this, si, bPlus]() {
processFinishedNotifier->setEnabled(false);
processFinishedNotifier->deleteLater();
this->OnReloadIni();
if (bPlus)
theConf->Sync();
else
this->OnReloadIni();
CloseHandle(si.hProcess);
});
}
@ -3149,9 +3203,10 @@ void CSandMan::LoadLanguage(const QString& Lang, const QString& Module, int Inde
void CSandMan::OnHelp()
{
if (sender() == m_pSupport)
QDesktopServices::openUrl(QUrl("https://sandboxie-plus.com/go.php?to=donate"));
else if (sender() == m_pContribution)
//if (sender() == m_pSupport)
// QDesktopServices::openUrl(QUrl("https://sandboxie-plus.com/go.php?to=donate"));
//else
if (sender() == m_pContribution)
QDesktopServices::openUrl(QUrl("https://sandboxie-plus.com/go.php?to=sbie-contribute"));
else if (sender() == m_pManual)
QDesktopServices::openUrl(QUrl("https://sandboxie-plus.com/go.php?to=sbie-docs"));

5
SandboxiePlus/SandMan/SandMan.h
View File

@ -326,6 +326,7 @@ private:
QAction* m_pCleanUpTrace;
QAction* m_pCleanUpRecovery;
QToolButton* m_pCleanUpButton;
//QToolButton* m_pEditButton;
QAction* m_pKeepTerminated;
QAction* m_pShowAllSessions;
QAction* m_pArrangeGroups;
@ -335,6 +336,8 @@ private:
QAction* m_pMenuResetMsgs;
QAction* m_pMenuResetGUI;
QAction* m_pEditIni;
QAction* m_pEditIni2;
QAction* m_pEditIni3;
QAction* m_pReloadIni;
QAction* m_pEnableMonitoring;
@ -342,7 +345,7 @@ private:
QLabel* m_pLabel;
QMenu* m_pMenuHelp;
QAction* m_pSupport;
//QAction* m_pSupport;
QAction* m_pContribution;
QAction* m_pForum;
QAction* m_pManual;

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

@ -272,9 +272,25 @@ COptionsWindow::COptionsWindow(const QSharedPointer<CSbieIni>& pBox, const QStri
delete ui.tabsRecovery;
ui.gridLayout_24->setContentsMargins(0, 0, 0, 0);
QWidget* pWidget = new QWidget();
QGridLayout* pLayout = new QGridLayout(pWidget);
// move recovery to general
ui.tabsGeneral->insertTab(2, ui.tabs->widget(6), ui.tabs->tabText(6));
ui.tabsGeneral->setTabIcon(2, CSandMan::GetIcon("Recover"));
//ui.tabsGeneral->insertTab(2, ui.tabs->widget(6), ui.tabs->tabText(6));
//ui.tabsGeneral->setTabIcon(2, CSandMan::GetIcon("Recover"));
// collect file options on a new fils tab
QTabWidget* pTabWidget = new QTabWidget();
pLayout->addWidget(pTabWidget, 0, 0);
ui.tabs->insertTab(1, pWidget, tr("File Options"));
ui.tabs->setTabIcon(1, CSandMan::GetIcon("Folder"));
pTabWidget->addTab(ui.tabsGeneral->widget(1), ui.tabsGeneral->tabText(1));
pTabWidget->setTabIcon(0, CSandMan::GetIcon("Files"));
pTabWidget->addTab(ui.tabsGeneral->widget(1), ui.tabsGeneral->tabText(1));
pTabWidget->setTabIcon(1, CSandMan::GetIcon("Move"));
pTabWidget->addTab(ui.tabs->widget(7), ui.tabs->tabText(7));
pTabWidget->setTabIcon(2, CSandMan::GetIcon("Recover"));
// move grouping to program tab
ui.tabsForce->insertTab(0, ui.tabGroups, tr("Grouping"));