[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim-addons/Applications/16.08] plugins/webengineurlinterceptor/adblock/lib/widgets: Fix layout. 
From:       Montel Laurent <montel () kde ! org>
Date:       2016-07-28 11:58:17
Message-ID: E1bSjxB-0003nG-S2 () code ! kde ! org
[Download RAW message or body]

Git commit 0918c785f8d364b537f7bce19daaad7b08a4bc51 by Montel Laurent.
Committed on 28/07/2016 at 11:57.
Pushed by mlaurent into branch 'Applications/16.08'.

Fix layout. Add method to save filter

M  +8    -7    plugins/webengineurlinterceptor/adblock/lib/widgets/adblockblockableitemsdialog.cpp
 M  +5    -0    plugins/webengineurlinterceptor/adblock/lib/widgets/adblockblockableitemswidget.cpp
 M  +1    -0    plugins/webengineurlinterceptor/adblock/lib/widgets/adblockblockableitemswidget.h


http://commits.kde.org/kdepim-addons/0918c785f8d364b537f7bce19daaad7b08a4bc51

diff --git a/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockblockableitemsdialog.cpp \
b/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockblockableitemsdialog.cpp \
                index afe41c1..01bb1ee 100644
--- a/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockblockableitemsdialog.cpp
                
+++ b/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockblockableitemsdialog.cpp
 @@ -33,19 +33,20 @@ AdBlockBlockableItemsDialog::AdBlockBlockableItemsDialog(QWidget \
*parent)  : QDialog(parent)
 {
     setWindowTitle(i18n("Blockable Items"));
-    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | \
QDialogButtonBox::Cancel); +
+    QVBoxLayout *mainLayout = new QVBoxLayout(this);
+
+    mBlockableItems = new AdBlockBlockableItemsWidget(this);
+    mBlockableItems->setObjectName(QStringLiteral("blockableitemswidget"));
+
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | \
QDialogButtonBox::Cancel, this);  \
                buttonBox->setObjectName(QStringLiteral("buttonbox"));
-    QVBoxLayout *mainLayout = new QVBoxLayout;
-    setLayout(mainLayout);
     QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
     okButton->setDefault(true);
     okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
     connect(buttonBox, &QDialogButtonBox::accepted, this, \
                &AdBlockBlockableItemsDialog::accept);
     connect(buttonBox, &QDialogButtonBox::rejected, this, \
&AdBlockBlockableItemsDialog::reject);  
-    mBlockableItems = new AdBlockBlockableItemsWidget;
-    mBlockableItems->setObjectName(QStringLiteral("blockableitemswidget"));
-
     mainLayout->addWidget(mBlockableItems);
     mainLayout->addWidget(buttonBox);
     readConfig();
@@ -58,7 +59,7 @@ AdBlockBlockableItemsDialog::~AdBlockBlockableItemsDialog()
 
 void AdBlockBlockableItemsDialog::saveFilters()
 {
-    //FIXME mBlockableItems->saveFilters();
+    mBlockableItems->saveFilters();
 }
 
 void AdBlockBlockableItemsDialog::setAdblockResult(const \
                QVector<AdBlock::AdBlockResult> &result)
diff --git a/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockblockableitemswidget.cpp \
b/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockblockableitemswidget.cpp \
                index 2b53854..169d4cb 100644
--- a/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockblockableitemswidget.cpp
                
+++ b/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockblockableitemswidget.cpp
 @@ -93,6 +93,11 @@ void AdBlockBlockableItemsWidget::setAdblockResult(const \
QVector<AdBlockResult>  \
mListItems->setShowDefaultText(mListItems->model()->rowCount() == 0);  }
 
+void AdBlockBlockableItemsWidget::saveFilters()
+{
+    //TODO
+}
+
 void AdBlockBlockableItemsWidget::customContextMenuRequested(const QPoint &)
 {
     QTreeWidgetItem *item = mListItems->currentItem();
diff --git a/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockblockableitemswidget.h \
b/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockblockableitemswidget.h \
                index 831490c..aa6c580 100644
--- a/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockblockableitemswidget.h
                
+++ b/plugins/webengineurlinterceptor/adblock/lib/widgets/adblockblockableitemswidget.h
 @@ -52,6 +52,7 @@ public:
     ~AdBlockBlockableItemsWidget();
 
     void setAdblockResult(const QVector<AdBlock::AdBlockResult> &result);
+    void saveFilters();
 
     static QString elementType(AdBlockBlockableItemsWidget::TypeElement type);
     static QString elementTypeToI18n(AdBlockBlockableItemsWidget::TypeElement type);


[prev in list] [next in list] [prev in thread] [next in thread]