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

3738

This commit is contained in:
DavidXanatos 2024-04-20 14:43:30 +02:00
parent cc63194b5f
commit 0c58926ee7
8 changed files with 180 additions and 109 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/).
- added mechanism to terminate stuck sandboxed processes from the driver
- added Make the trigger list editable [#3742](https://github.com/sandboxie-plus/Sandboxie/issues/3742)
- added Optionally extend the screenshot protection to the UI [#3739](https://github.com/sandboxie-plus/Sandboxie/issues/3739)
- added a button to edit local/custom templates [#3738](https://github.com/sandboxie-plus/Sandboxie/issues/3738)
### Changed
- improved Avast template [#3777](https://github.com/sandboxie-plus/Sandboxie/pull/3777)

172
SandboxiePlus/SandMan/Forms/OptionsWindow.ui
View File

@ -4753,9 +4753,100 @@ instead of &quot;*&quot;.</string>
</property>
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_3">
<item row="1" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Filter Categories</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="6" column="4">
<widget class="QToolButton" name="btnDelTemplate">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>23</height>
</size>
</property>
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
<item row="2" column="0" rowspan="6" colspan="4">
<widget class="QTreeWidget" name="treeTemplates">
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
</property>
<property name="sortingEnabled">
<bool>true</bool>
</property>
<column>
<property name="text">
<string>Category</string>
</property>
</column>
<column>
<property name="text">
<string>Name</string>
</property>
</column>
</widget>
</item>
<item row="2" column="4">
<widget class="QToolButton" name="btnAddTemplate">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>23</height>
</size>
</property>
<property name="text">
<string>Add Template</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="cmbCategories"/>
</item>
<item row="1" column="2">
<widget class="QLabel" name="label_15">
<property name="text">
<string>Text Filter</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QLineEdit" name="txtTemplates"/>
</item>
<item row="4" column="4">
<widget class="QToolButton" name="btnOpenTemplate">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Open Template</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="4">
<widget class="QLabel" name="label_13">
<property name="text">
@ -4779,83 +4870,18 @@ instead of &quot;*&quot;.</string>
</property>
</spacer>
</item>
<item row="1" column="2">
<widget class="QLabel" name="label_15">
<property name="text">
<string>Text Filter</string>
<item row="5" column="4">
<spacer name="verticalSpacer_42">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QLineEdit" name="txtTemplates"/>
</item>
<item row="2" column="4">
<widget class="QToolButton" name="btnAddTemplate">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>23</height>
<width>20</width>
<height>40</height>
</size>
</property>
<property name="text">
<string>Add Template</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Filter Categories</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="0" rowspan="4" colspan="4">
<widget class="QTreeWidget" name="treeTemplates">
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
</property>
<property name="sortingEnabled">
<bool>true</bool>
</property>
<column>
<property name="text">
<string>Category</string>
</property>
</column>
<column>
<property name="text">
<string>Name</string>
</property>
</column>
</widget>
</item>
<item row="4" column="4">
<widget class="QToolButton" name="btnDelTemplate">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>23</height>
</size>
</property>
<property name="text">
<string>Remove</string>
</property>
</widget>
</spacer>
</item>
</layout>
</item>

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

@ -2528,22 +2528,36 @@ Unlike the preview channel, it does not include untested, potentially breaking,
</property>
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_25">
<item row="4" column="2">
<widget class="QToolButton" name="btnDelTemplate">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<item row="1" column="1">
<widget class="QLineEdit" name="txtTemplates"/>
</item>
<item row="3" column="2">
<spacer name="verticalSpacer_20">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="minimumSize">
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>23</height>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_18">
<property name="text">
<string>Remove</string>
<string>Text Filter</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_10">
<property name="text">
<string>This list contains user created custom templates for sandbox options</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
@ -2566,30 +2580,20 @@ Unlike the preview channel, it does not include untested, potentially breaking,
</property>
</widget>
</item>
<item row="3" column="2">
<spacer name="verticalSpacer_20">
<property name="orientation">
<enum>Qt::Vertical</enum>
<item row="4" column="2">
<widget class="QToolButton" name="btnOpenTemplate">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_18">
<property name="text">
<string>Text Filter</string>
<string>Open Template</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="txtTemplates"/>
</item>
<item row="2" column="0" rowspan="3" colspan="2">
<item row="2" column="0" rowspan="5" colspan="2">
<widget class="QTreeWidget" name="treeTemplates">
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
@ -2601,16 +2605,38 @@ Unlike the preview channel, it does not include untested, potentially breaking,
</column>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_10">
<property name="text">
<string>This list contains user created custom templates for sandbox options</string>
<item row="6" column="2">
<widget class="QToolButton" name="btnDelTemplate">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="wordWrap">
<bool>true</bool>
<property name="minimumSize">
<size>
<width>0</width>
<height>23</height>
</size>
</property>
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
<item row="5" column="2">
<spacer name="verticalSpacer_17">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>

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

@ -217,6 +217,13 @@ void COptionsWindow::OnTemplateWizard()
}
}
void COptionsWindow::OnOpenTemplate()
{
QTreeWidgetItem* pItem = ui.treeTemplates->currentItem();
if (pItem)
OnTemplateDoubleClicked(pItem, 0);
}
void COptionsWindow::OnDelTemplates()
{
if (QMessageBox("Sandboxie-Plus", tr("Do you really want to delete the selected local template(s)?"), QMessageBox::Question, QMessageBox::Yes, QMessageBox::No | QMessageBox::Default | QMessageBox::Escape, QMessageBox::NoButton, this).exec() != QMessageBox::Yes)

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

@ -543,6 +543,7 @@ COptionsWindow::COptionsWindow(const QSharedPointer<CSbieIni>& pBox, const QStri
pTmplBtnMenu->addAction(tr("Add %1 Template").arg(CTemplateWizard::GetTemplateLabel((CTemplateWizard::ETemplateType)i)), this, SLOT(OnTemplateWizard()))->setData(i);
ui.btnAddTemplate->setPopupMode(QToolButton::MenuButtonPopup);
ui.btnAddTemplate->setMenu(pTmplBtnMenu);
connect(ui.btnOpenTemplate, SIGNAL(clicked(bool)), this, SLOT(OnOpenTemplate()));
connect(ui.btnDelTemplate, SIGNAL(clicked(bool)), this, SLOT(OnDelTemplates()));
connect(ui.chkScreenReaders, SIGNAL(clicked(bool)), this, SLOT(OnScreenReaders()));
//

1
SandboxiePlus/SandMan/Windows/OptionsWindow.h
View File

@ -217,6 +217,7 @@ private slots:
void OnTemplateDoubleClicked(QTreeWidgetItem* pItem, int Column);
void OnAddTemplates();
void OnTemplateWizard();
void OnOpenTemplate();
void OnDelTemplates();
void OnFolderChanged();
void OnScreenReaders();

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

@ -477,6 +477,7 @@ CSettingsWindow::CSettingsWindow(QWidget* parent)
pTmplBtnMenu->addAction(tr("Add %1 Template").arg(CTemplateWizard::GetTemplateLabel((CTemplateWizard::ETemplateType)i)), this, SLOT(OnTemplateWizard()))->setData(i);
ui.btnAddTemplate->setPopupMode(QToolButton::MenuButtonPopup);
ui.btnAddTemplate->setMenu(pTmplBtnMenu);
connect(ui.btnOpenTemplate, SIGNAL(clicked(bool)), this, SLOT(OnOpenTemplate()));
connect(ui.btnDelTemplate, SIGNAL(clicked(bool)), this, SLOT(OnDelTemplates()));
//
@ -2239,6 +2240,13 @@ void CSettingsWindow::OnTemplateWizard()
}
}
void CSettingsWindow::OnOpenTemplate()
{
QTreeWidgetItem* pItem = ui.treeTemplates->currentItem();
if (pItem)
OnTemplateDoubleClicked(pItem, 0);
}
void CSettingsWindow::OnDelTemplates()
{
if (QMessageBox("Sandboxie-Plus", tr("Do you really want to delete the selected local template(s)?"), QMessageBox::Question, QMessageBox::Yes, QMessageBox::No | QMessageBox::Default | QMessageBox::Escape, QMessageBox::NoButton, this).exec() != QMessageBox::Yes)

1
SandboxiePlus/SandMan/Windows/SettingsWindow.h
View File

@ -120,6 +120,7 @@ private slots:
void OnFilterTemplates() { LoadTemplates(); }
void OnAddTemplates();
void OnTemplateWizard();
void OnOpenTemplate();
void OnDelTemplates();
void SetIniEdit(bool bEnable);