From 2d65eecce3915efa8fd2f5abee32b3daafc3abb2 Mon Sep 17 00:00:00 2001 From: Martin Rotter <rotter@praktik.cz> Date: Fri, 21 Jul 2017 12:28:37 +0200 Subject: [PATCH] Better tabwidget adblock look. --- src/gui/treewidget.h | 3 ++- src/network-web/adblock/adblockdialog.cpp | 10 +++------- src/network-web/adblock/adblockdialog.ui | 3 --- src/network-web/adblock/adblocktreewidget.cpp | 2 ++ 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/gui/treewidget.h b/src/gui/treewidget.h index 5ebdd69d7..9ba5ff841 100755 --- a/src/gui/treewidget.h +++ b/src/gui/treewidget.h @@ -35,7 +35,8 @@ class TreeWidget : public QTreeWidget { } void setDefaultItemShowMode(ItemShowMode mode) { m_showMode = mode; - } + } + QList<QTreeWidgetItem*> allItems(); bool appendToParentItem(const QString& parentText, QTreeWidgetItem* item); diff --git a/src/network-web/adblock/adblockdialog.cpp b/src/network-web/adblock/adblockdialog.cpp index 9a3eea7ac..ec439c1c3 100755 --- a/src/network-web/adblock/adblockdialog.cpp +++ b/src/network-web/adblock/adblockdialog.cpp @@ -37,16 +37,12 @@ AdBlockDialog::AdBlockDialog(QWidget* parent) : QDialog(parent), m_ui(new Ui::AdBlockDialog), m_manager(AdBlockManager::instance()), m_currentTreeWidget(0), m_currentSubscription(0), m_loaded(false) { - setAttribute(Qt::WA_DeleteOnClose); - setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog | Qt::WindowSystemMenuHint); - setWindowIcon(qApp->icons()->miscIcon(ADBLOCK_ICON_ACTIVE)); - m_ui->setupUi(this); m_ui->m_cbEnable->setChecked(m_manager->isEnabled()); -#if defined(Q_OS_MACOS) - m_ui->m_tabSubscriptions->setDocumentMode(false); -#endif + setAttribute(Qt::WA_DeleteOnClose); + setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog | Qt::WindowSystemMenuHint); + setWindowIcon(qApp->icons()->miscIcon(ADBLOCK_ICON_ACTIVE)); QPushButton* btn_options = m_ui->m_buttonBox->addButton(QDialogButtonBox::FirstButton); btn_options->setText(tr("Options")); diff --git a/src/network-web/adblock/adblockdialog.ui b/src/network-web/adblock/adblockdialog.ui index 22dd3b248..8511fd65b 100755 --- a/src/network-web/adblock/adblockdialog.ui +++ b/src/network-web/adblock/adblockdialog.ui @@ -32,9 +32,6 @@ <property name="currentIndex"> <number>-1</number> </property> - <property name="documentMode"> - <bool>true</bool> - </property> </widget> </item> <item> diff --git a/src/network-web/adblock/adblocktreewidget.cpp b/src/network-web/adblock/adblocktreewidget.cpp index 821ed2813..d224b59d4 100755 --- a/src/network-web/adblock/adblocktreewidget.cpp +++ b/src/network-web/adblock/adblocktreewidget.cpp @@ -34,6 +34,8 @@ AdBlockTreeWidget::AdBlockTreeWidget(AdBlockSubscription* subscription, QWidget* setHeaderHidden(true); setAlternatingRowColors(true); setLayoutDirection(Qt::LeftToRight); + setIndentation(5); + connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuRequested(QPoint))); connect(this, SIGNAL(itemChanged(QTreeWidgetItem*, int)), this, SLOT(itemChanged(QTreeWidgetItem*))); connect(m_subscription, SIGNAL(subscriptionUpdated()), this, SLOT(subscriptionUpdated()));