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

List:       kde-commits
Subject:    [kdepim] messageviewer/adblock: improve++
From:       Montel Laurent <montel () kde ! org>
Date:       2013-10-01 19:02:09
Message-ID: E1VR5Cz-00016S-J0 () scm ! kde ! org
[Download RAW message or body]

Git commit 7ff2741c91b3bd18a05e0bd68e0d9d00245b1415 by Montel Laurent.
Committed on 01/10/2013 at 19:01.
Pushed by mlaurent into branch 'master'.

improve++

M  +41   -0    messageviewer/adblock/adblockblockableitemswidget.cpp
M  +6    -0    messageviewer/adblock/adblockblockableitemswidget.h
M  +0    -1    messageviewer/adblock/adblockcreatefilterdialog.cpp

http://commits.kde.org/kdepim/7ff2741c91b3bd18a05e0bd68e0d9d00245b1415

diff --git a/messageviewer/adblock/adblockblockableitemswidget.cpp \
b/messageviewer/adblock/adblockblockableitemswidget.cpp index aa08a97..a1f5c7c 100644
--- a/messageviewer/adblock/adblockblockableitemswidget.cpp
+++ b/messageviewer/adblock/adblockblockableitemswidget.cpp
@@ -90,6 +90,21 @@ QString \
AdBlockBlockableItemsWidget::elementTypeToI18n(AdBlockBlockableItemsWidg  case \
AdBlockBlockableItemsWidget::Script:  result = i18n("Script");
         break;
+    case AdBlockBlockableItemsWidget::StyleSheet:
+        result = i18n("Stylesheet");
+        break;
+    case AdBlockBlockableItemsWidget::Font:
+        result = i18n("Font");
+        break;
+    case AdBlockBlockableItemsWidget::Frame:
+        result = i18n("Frame");
+        break;
+    case AdBlockBlockableItemsWidget::XmlRequest:
+        result = i18n("XML Request");
+        break;
+    case AdBlockBlockableItemsWidget::Object:
+        result = i18n("Object");
+        break;
     case AdBlockBlockableItemsWidget::None:
     default:
         result = i18n("Unknown");
@@ -107,6 +122,21 @@ QString \
AdBlockBlockableItemsWidget::elementType(AdBlockBlockableItemsWidget::Ty  case \
AdBlockBlockableItemsWidget::Script:  result = QLatin1String("script");
         break;
+    case AdBlockBlockableItemsWidget::StyleSheet:
+        result = QLatin1String("stylesheet");
+        break;
+    case AdBlockBlockableItemsWidget::Font:
+        result = QLatin1String("font");
+        break;
+    case AdBlockBlockableItemsWidget::Frame:
+        result = QLatin1String("frame");
+        break;
+    case AdBlockBlockableItemsWidget::XmlRequest:
+        result = QLatin1String("xmlhttprequest");
+        break;
+    case AdBlockBlockableItemsWidget::Object:
+        result = QLatin1String("other");
+        break;
     case AdBlockBlockableItemsWidget::None:
     default:
         qDebug()<<" unknown type "<<type;
@@ -142,6 +172,8 @@ void \
AdBlockBlockableItemsWidget::customContextMenuRequested(const QPoint &)  
     KMenu menu;
     menu.addAction(i18n("Copy url"),this,SLOT(slotCopyItem()));
+    if (!item->text(FilterValue).isEmpty())
+        menu.addAction(i18n("Copy filter"),this,SLOT(slotCopyFilterItem()));
     menu.addAction(i18n("Block item..."),this,SLOT(slotBlockItem()));
     menu.addSeparator();
     menu.addAction(i18n("Open"), this, SLOT(slotOpenItem()));
@@ -152,6 +184,15 @@ void \
AdBlockBlockableItemsWidget::customContextMenuRequested(const QPoint &)  \
menu.exec(QCursor::pos());  }
 
+void AdBlockBlockableItemsWidget::slotCopyFilterItem()
+{
+    QTreeWidgetItem *item = mListItems->currentItem();
+    if (!item)
+        return;
+    QClipboard *cb = QApplication::clipboard();
+    cb->setText(item->text(FilterValue), QClipboard::Clipboard);
+}
+
 void AdBlockBlockableItemsWidget::slotOpenItem()
 {
     QTreeWidgetItem *item = mListItems->currentItem();
diff --git a/messageviewer/adblock/adblockblockableitemswidget.h \
b/messageviewer/adblock/adblockblockableitemswidget.h index 5f0a27c..dfb4c48 100644
--- a/messageviewer/adblock/adblockblockableitemswidget.h
+++ b/messageviewer/adblock/adblockblockableitemswidget.h
@@ -32,6 +32,11 @@ public:
         None = 0,
         Image,
         Script,
+        StyleSheet,
+        Font,
+        Frame,
+        XmlRequest,
+        Object,
 
         MaxTypeElement
     };
@@ -48,6 +53,7 @@ private Q_SLOTS:
     void slotCopyItem();
     void slotBlockItem();
     void slotOpenItem();
+    void slotCopyFilterItem();
     void customContextMenuRequested(const QPoint &);
     void slotRemoveFilter();
 
diff --git a/messageviewer/adblock/adblockcreatefilterdialog.cpp \
b/messageviewer/adblock/adblockcreatefilterdialog.cpp index c9a9b5e..a91bf0f 100644
--- a/messageviewer/adblock/adblockcreatefilterdialog.cpp
+++ b/messageviewer/adblock/adblockcreatefilterdialog.cpp
@@ -115,7 +115,6 @@ void AdBlockCreateFilterDialog::slotUpdateFilter()
     for (int i = 0; i < numberOfElement; ++i) {
         QListWidgetItem *item = mUi->applyListElement->item(i);
         if ((item->checkState() == Qt::Checked) && (item->flags() & \
                Qt::ItemIsEnabled)) {
-            qDebug()<<" "<<item->text();
             pattern += QLatin1Char(',') + \
AdBlockBlockableItemsWidget::elementType(static_cast<AdBlockBlockableItemsWidget::TypeElement>(item->data(ElementValue).toInt()));
  }
     }


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