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

1.3.1

This commit is contained in:
DavidXanatos 2022-08-15 19:32:38 +02:00
parent 4eabea68ac
commit 15a45e1d3f
4 changed files with 98 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
SandboxiePlus/MiscHelpers/Common/SettingsWidgets.cpp
View File

@ -79,9 +79,14 @@ void CProxyEdit::OnType(int Index)
CConfigDialog::CConfigDialog(QWidget* parent)
: QDialog(parent)
{
m_pTabs = NULL;
m_pStack = NULL;
m_pSearch = NULL;
m_pTree = NULL;
m_SearchI = m_SearchJ = m_SearchP = 0;
m_LastFound = NULL;
}
QWidget* CConfigDialog::ConvertToTree(QTabWidget* pTabWidget)
@ -96,10 +101,7 @@ QWidget* CConfigDialog::ConvertToTree(QTabWidget* pTabWidget)
m_pTree->setStyle(pStyle);
connect(m_pTree, SIGNAL(itemClicked(QTreeWidgetItem*, int)), this, SLOT(OnItemClicked(QTreeWidgetItem*, int)));
m_pSearch = new QLineEdit();
m_pSearch->setPlaceholderText(tr("Search Option"));
QObject::connect(m_pSearch, SIGNAL(returnPressed()), this, SLOT(OnSearchOption()));
m_SearchI = m_SearchJ = m_SearchP = 0;
m_LastFound = NULL;
pLayout->addWidget(m_pSearch, 0, 0);
pLayout->addWidget(m_pTree, 1, 0);
m_pStack = new QStackedLayout();
@ -112,8 +114,8 @@ QWidget* CConfigDialog::ConvertToTree(QTabWidget* pTabWidget)
pItem->setData(1, Qt::UserRole, k);
pItem->setIcon(0, pTabWidget->tabIcon(i));
QGridLayout* pGrid = qobject_cast<QGridLayout*>(pTabWidget->widget(i)->layout());
QTabWidget* pTabs = pGrid ? qobject_cast<QTabWidget*>(pGrid->itemAt(0)->widget()) : NULL;
if (!pTabs) {
QTabWidget* pSubTabs = pGrid ? qobject_cast<QTabWidget*>(pGrid->itemAt(0)->widget()) : NULL;
if (!pSubTabs) {
pItem->setData(0, Qt::UserRole, m_pStack->count());
m_pStack->addWidget(pTabWidget->widget(i--));
}
@ -121,11 +123,11 @@ QWidget* CConfigDialog::ConvertToTree(QTabWidget* pTabWidget)
//pItem->setData(0, Qt::UserRole, -1);
//pItem->setFlags(pItem->flags() & ~Qt::ItemIsSelectable);
pItem->setData(0, Qt::UserRole, m_pStack->count()); // take the first tab for the parent entry
for (int j = 0; j < pTabs->count(); j++) {
QTreeWidgetItem* pSubItem = new QTreeWidgetItem(QStringList() << pTabs->tabText(j));
for (int j = 0; j < pSubTabs->count(); j++) {
QTreeWidgetItem* pSubItem = new QTreeWidgetItem(QStringList() << pSubTabs->tabText(j));
pItem->addChild(pSubItem);
pSubItem->setData(0, Qt::UserRole, m_pStack->count());
m_pStack->addWidget(pTabs->widget(j--));
m_pStack->addWidget(pSubTabs->widget(j--));
}
}
}
@ -136,6 +138,19 @@ QWidget* CConfigDialog::ConvertToTree(QTabWidget* pTabWidget)
return pAltView;
}
void CConfigDialog::OnItemClicked(QTreeWidgetItem* pItem, int Column)
{
int Index = pItem->data(0, Qt::UserRole).toInt();
if (Index != -1)
m_pStack->setCurrentIndex(Index);
QTreeWidgetItem* pRootItem = pItem;
while (pRootItem->parent()) pRootItem = pRootItem->parent();
int RootIndex = pRootItem->data(1, Qt::UserRole).toInt();
if (m_iCurrentTab != RootIndex)
OnTab(RootIndex);
}
template <class T>
bool CConfigDialog__CompareText(T pWidget, const QString& Text) {
QString Str = pWidget->text();
@ -165,7 +180,7 @@ QWidget* CConfigDialog__SearchWidget(QWidget* pParent, const QString& Text, int&
return NULL;
}
QWidget* CConfigDialog__SearchOption(QTreeWidget* pTree, QStackedLayout* pStack, const QString& Text, int& I, int& J, int& Pos)
QWidget* CConfigDialog__SearchTree(QTreeWidget* pTree, QStackedLayout* pStack, const QString& Text, int& I, int& J, int& Pos)
{
for (; I < pTree->topLevelItemCount(); I++) {
QTreeWidgetItem* pItem = pTree->topLevelItem(I);
@ -188,6 +203,38 @@ QWidget* CConfigDialog__SearchOption(QTreeWidget* pTree, QStackedLayout* pStack,
return NULL;
}
QWidget* CConfigDialog__SearchTabs(QTabWidget* pTabWidget, const QString& Text, int& I, int& J, int& Pos)
{
for (; I < pTabWidget->count(); I++) {
QGridLayout* pGrid = qobject_cast<QGridLayout*>(pTabWidget->widget(I)->layout());
QTabWidget* pSubTabs = pGrid ? qobject_cast<QTabWidget*>(pGrid->itemAt(0)->widget()) : NULL;
if (!pSubTabs) {
QWidget* parent = pTabWidget->widget(I);
if (QWidget* pWidget = CConfigDialog__SearchWidget(parent, Text, Pos))
return pWidget;
}
else {
for (; J < pSubTabs->count(); J++) {
QWidget* parent = pSubTabs->widget(J);
if (QWidget* pWidget = CConfigDialog__SearchWidget(parent, Text, Pos))
return pWidget;
}
J = 0;
}
}
I = 0;
return NULL;
}
QWidget* CConfigDialog::AddConfigSearch(QTabWidget* pTabs)
{
m_pTabs = pTabs;
m_pSearch = new QLineEdit();
QObject::connect(m_pSearch, SIGNAL(returnPressed()), this, SLOT(OnSearchOption()));
m_pSearch->setMaximumWidth(150);
return m_pSearch;
}
void CConfigDialog::OnSearchOption()
{
QString Text = m_pSearch->text().toLower();
@ -198,21 +245,35 @@ void CConfigDialog::OnSearchOption()
m_LastFound->setGraphicsEffect(NULL);
}
QWidget* pWidget = CConfigDialog__SearchOption(m_pTree, m_pStack, Text, m_SearchI, m_SearchJ, m_SearchP);
QWidget* pWidget = NULL;
if (m_pTree) {
pWidget = CConfigDialog__SearchTree(m_pTree, m_pStack, Text, m_SearchI, m_SearchJ, m_SearchP);
if (pWidget) {
QTreeWidgetItem* pItem = m_pTree->topLevelItem(m_SearchI);
if (pItem && pItem->childCount() > 0)
pItem = pItem->child(m_SearchJ);
if (!pItem) return;
//m_pTree->setItemSelected(pItem, true);
m_pTree->setCurrentItem(pItem, 0);
OnItemClicked(pItem, 0);
}
}
else if(m_pTabs) {
pWidget = CConfigDialog__SearchTabs(m_pTabs, Text, m_SearchI, m_SearchJ, m_SearchP);
if (pWidget) {
QGridLayout* pGrid = qobject_cast<QGridLayout*>(m_pTabs->widget(m_SearchI)->layout());
QTabWidget* pSubTabs = pGrid ? qobject_cast<QTabWidget*>(pGrid->itemAt(0)->widget()) : NULL;
m_pTabs->setCurrentIndex(m_SearchI);
if (pSubTabs) pSubTabs->setCurrentIndex(m_SearchJ);
}
}
if (!pWidget) {
QApplication::beep();
return;
}
m_SearchP++; // move index to the next for the next search
QTreeWidgetItem* pItem = m_pTree->topLevelItem(m_SearchI);
if (pItem && pItem->childCount() > 0)
pItem = pItem->child(m_SearchJ);
if (!pItem) return;
//m_pTree->setItemSelected(pItem, true);
m_pTree->setCurrentItem(pItem, 0);
OnItemClicked(pItem, 0);
m_LastFound = pWidget;
//QPalette palette = m_LastFound->palette();
//palette.setColor(QPalette::Button, Qt::red);
@ -226,15 +287,3 @@ void CConfigDialog::OnSearchOption()
m_LastFound->setGraphicsEffect(neon);
}
void CConfigDialog::OnItemClicked(QTreeWidgetItem* pItem, int Column)
{
int Index = pItem->data(0, Qt::UserRole).toInt();
if (Index != -1)
m_pStack->setCurrentIndex(Index);
QTreeWidgetItem* pRootItem = pItem;
while (pRootItem->parent()) pRootItem = pRootItem->parent();
int RootIndex = pRootItem->data(1, Qt::UserRole).toInt();
if (m_iCurrentTab != RootIndex)
OnTab(RootIndex);
}

8
SandboxiePlus/MiscHelpers/Common/SettingsWidgets.h
View File

@ -443,15 +443,21 @@ public slots:
protected:
QWidget* ConvertToTree(QTabWidget* pTabs);
QWidget* AddConfigSearch(QTabWidget* pTabs);
virtual void OnTab(int iTabID) = 0;
QTabWidget* m_pTabs;
QStackedLayout* m_pStack;
QLineEdit* m_pSearch;
QTreeWidget* m_pTree;
int m_iCurrentTab;
private:
int m_SearchI;
int m_SearchJ;
int m_SearchP;
QWidget* m_LastFound;
};

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

@ -353,12 +353,13 @@ COptionsWindow::COptionsWindow(const QSharedPointer<CSbieIni>& pBox, const QStri
if (iOptionTree)
OnSetTree();
else {
QAction* pSetTree = new QAction();
connect(pSetTree, SIGNAL(triggered()), this, SLOT(OnSetTree()));
pSetTree->setShortcut(QKeySequence("Ctrl+F"));
pSetTree->setShortcutContext(Qt::WidgetWithChildrenShortcut);
this->addAction(pSetTree);
QWidget* pSearch = AddConfigSearch(ui.tabs);
ui.horizontalLayout->insertWidget(0, pSearch);
QTimer::singleShot(0, [this]() {
m_pSearch->setMaximumWidth(m_pTabs->tabBar()->width());
});
}
m_pSearch->setPlaceholderText(tr("Search Options"));
}
void COptionsWindow::OnSetTree()

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

@ -268,12 +268,13 @@ CSettingsWindow::CSettingsWindow(QWidget* parent)
if (iOptionTree)
OnSetTree();
else {
QAction* pSetTree = new QAction();
connect(pSetTree, SIGNAL(triggered()), this, SLOT(OnSetTree()));
pSetTree->setShortcut(QKeySequence("Ctrl+F"));
pSetTree->setShortcutContext(Qt::WidgetWithChildrenShortcut);
this->addAction(pSetTree);
QWidget* pSearch = AddConfigSearch(ui.tabs);
ui.horizontalLayout->insertWidget(0, pSearch);
QTimer::singleShot(0, [this]() {
m_pSearch->setMaximumWidth(m_pTabs->tabBar()->width());
});
}
m_pSearch->setPlaceholderText(tr("Search Settings"));
}
void CSettingsWindow::OnSetTree()