Extensive work on Adblock.

CMakeLists.txt

@@ -431,8 +431,6 @@ set(APP_SOURCES
   src/network-web/adblock/adblocktreewidget.cpp
   src/network-web/adblock/followredirectreply.cpp
 
-
-
   # MAIN sources.
   src/main.cpp
 )
@@ -526,8 +524,6 @@ set(APP_HEADERS
   src/network-web/adblock/adblockicon.h
   src/network-web/adblock/adblockmanager.h
   src/network-web/adblock/adblockmatcher.h
-  src/network-web/adblock/adblockrule.h
-  src/network-web/adblock/adblocksearchtree.h
   src/network-web/adblock/adblocksubscription.h
   src/network-web/adblock/adblocktreewidget.h
   src/network-web/adblock/followredirectreply.h

src/gui/formmain.cpp

@@ -35,6 +35,7 @@
 #include "gui/statusbar.h"
 #include "gui/feedmessageviewer.h"
 #include "gui/formupdate.h"
+#include "gui/plaintoolbutton.h"
 #include "gui/formimportexport.h"
 #include "gui/formbackupdatabasesettings.h"
 #include "gui/formrestoredatabasesettings.h"

src/gui/plaintoolbutton.cpp

@@ -39,8 +39,9 @@ void PlainToolButton::paintEvent(QPaintEvent *e) {
   // Set padding.
   rect.adjust(m_padding, m_padding, -m_padding, -m_padding);
 
+
   // Paint the icon.
-  if (underMouse()) {
+  if (underMouse() || isChecked()) {
     p.setOpacity(0.7);
   }
 
@@ -53,7 +54,11 @@ int PlainToolButton::padding() const {
 
 void PlainToolButton::setPadding(int padding) {
   m_padding = padding;
-
+  repaint();
+}
+
+void PlainToolButton::setChecked(bool checked) {
+  QToolButton::setChecked(checked);
   repaint();
 }
 

src/gui/plaintoolbutton.h

@@ -33,6 +33,9 @@ class PlainToolButton : public QToolButton {
     int padding() const;
     void setPadding(int padding);
 
+  public slots:
+    void setChecked(bool checked);
+
   protected:
     // Custom look.
     void paintEvent(QPaintEvent *e);

src/gui/statusbar.cpp

@@ -19,6 +19,8 @@
 
 #include "gui/formmain.h"
 #include "gui/tabwidget.h"
+#include "gui/plaintoolbutton.h"
+#include "network-web/adblock/adblockicon.h"
 #include "miscellaneous/iconfactory.h"
 
 #include <QToolButton>
@@ -31,11 +33,10 @@ StatusBar::StatusBar(QWidget *parent) : QStatusBar(parent) {
   setSizeGripEnabled(false);
   setContentsMargins(0, 0, 0, 0);
 
-    adblockIcon_ = new AdBlockIcon(this);
+  m_adblockIcon = new AdBlockIcon(this);
 
   // Initializations of widgets for status bar.
-  m_fullscreenSwitcher = new QToolButton(this);
+  m_fullscreenSwitcher = new PlainToolButton(this);
-  m_fullscreenSwitcher->setAutoRaise(true);
   m_fullscreenSwitcher->setCheckable(true);
   m_fullscreenSwitcher->setIcon(qApp->icons()->fromTheme("view-fullscreen"));
   m_fullscreenSwitcher->setText(tr("Fullscreen mode"));
@@ -68,22 +69,18 @@ StatusBar::StatusBar(QWidget *parent) : QStatusBar(parent) {
   addPermanentWidget(m_barProgressFeeds);
   addPermanentWidget(m_lblProgressDownload);
   addPermanentWidget(m_barProgressDownload);
+  addPermanentWidget(m_adblockIcon);
   addPermanentWidget(m_fullscreenSwitcher);
-  addPermanentWidget(adblockIcon_);
 }
 
 StatusBar::~StatusBar() {
   qDebug("Destroying StatusBar instance.");
 }
 
-void StatusBar::displayDownloadManager() {
-  qApp->mainForm()->tabWidget()->showDownloadManager();
-}
-
 bool StatusBar::eventFilter(QObject *watched, QEvent *event) {
   if (watched == m_lblProgressDownload || watched == m_barProgressDownload) {
     if (event->type() == QEvent::MouseButtonPress) {
-      displayDownloadManager();
+      qApp->mainForm()->tabWidget()->showDownloadManager();
     }
   }
 

src/gui/statusbar.h

@@ -20,12 +20,11 @@
 
 #include <QStatusBar>
 
-#include <adblock/adblockicon.h>
-
 
 class QProgressBar;
-class QToolButton;
+class PlainToolButton;
 class QLabel;
+class AdBlockIcon;
 
 class StatusBar : public QStatusBar {
     Q_OBJECT
@@ -35,11 +34,13 @@ class StatusBar : public QStatusBar {
     explicit StatusBar(QWidget *parent = 0);
     virtual ~StatusBar();
 
-    inline QToolButton *fullscreenSwitcher() const {
+    inline PlainToolButton *fullscreenSwitcher() const {
       return m_fullscreenSwitcher;
     }
 
-      AdBlockIcon *adBlockIcon() { return adblockIcon_; }
+    inline AdBlockIcon *adBlockIcon() {
+      return m_adblockIcon;
+    }
 
   public slots:
     // Progress bar operations
@@ -49,8 +50,6 @@ class StatusBar : public QStatusBar {
     void showProgressDownload(int progress, const QString &tooltip);
     void clearProgressDownload();
 
-    void displayDownloadManager();
-
   protected:
     bool eventFilter(QObject *watched, QEvent *event);
 
@@ -59,8 +58,8 @@ class StatusBar : public QStatusBar {
     QLabel *m_lblProgressFeeds;
     QProgressBar *m_barProgressDownload;
     QLabel *m_lblProgressDownload;
-    QToolButton *m_fullscreenSwitcher;
+    PlainToolButton *m_fullscreenSwitcher;
-    AdBlockIcon* adblockIcon_;
+    AdBlockIcon* m_adblockIcon;
 };
 
 #endif // STATUSBAR_H

src/network-web/adblock/adblockdialog.cpp

@@ -89,6 +89,10 @@ AdBlockDialog::AdBlockDialog(QWidget* parent)
   buttonBox->setFocus();
 }
 
+AdBlockDialog::~AdBlockDialog() {
+  qDebug("Destroying AdBlockDialog instance.");
+}
+
 void AdBlockDialog::showRule(const AdBlockRule* rule) const
 {
   AdBlockSubscription* subscription = rule->subscription();
@@ -210,7 +214,7 @@ void AdBlockDialog::load()
 
   m_loaded = true;
 
-  QTimer::singleShot(50, this, SLOT(loadSubscriptions()));
+  QTimer::singleShot(100, this, SLOT(loadSubscriptions()));
 }
 
 void AdBlockDialog::closeEvent(QCloseEvent* ev)

src/network-web/adblock/adblockdialog.h

@@ -50,6 +50,7 @@ class AdBlockDialog : public QWidget, public Ui_AdBlockDialog
 
   public:
     explicit AdBlockDialog(QWidget* parent = 0);
+    virtual ~AdBlockDialog();
 
     void showRule(const AdBlockRule* rule) const;
 

src/network-web/adblock/adblockdialog.ui

@@ -57,7 +57,16 @@
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <property name="margin">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
        <number>0</number>
       </property>
       <item row="4" column="0" colspan="2">
@@ -67,10 +76,6 @@
           <property name="text">
            <string>Options</string>
           </property>
-          <property name="icon">
-           <iconset resource="../../QuiteRSS.qrc">
-            <normaloff>:/images/images/adblock.png</normaloff>:/images/images/adblock.png</iconset>
-          </property>
          </widget>
         </item>
         <item>
@@ -129,7 +134,7 @@
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="standardButtons">
-        <set>QDialogButtonBox::Ok</set>
+        <set>QDialogButtonBox::Close</set>
        </property>
       </widget>
      </item>
@@ -137,9 +142,7 @@
    </item>
   </layout>
  </widget>
- <resources>
+ <resources/>
-  <include location="../../QuiteRSS.qrc"/>
- </resources>
  <connections>
   <connection>
    <sender>adblockCheckBox</sender>
@@ -157,5 +160,21 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>clicked(QAbstractButton*)</signal>
+   <receiver>AdBlockDialog</receiver>
+   <slot>close()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>434</x>
+     <y>440</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>272</x>
+     <y>230</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>

src/network-web/adblock/adblockicon.cpp

@@ -32,16 +32,18 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * ============================================================ */
-#include "adblockicon.h"
+#include "network-web/adblock/adblockicon.h"
-#include "adblockrule.h"
+
-#include "adblockmanager.h"
+#include "network-web/adblock/adblockrule.h"
-#include "adblocksubscription.h"
+#include "network-web/adblock/adblockmanager.h"
-#include "webpage.h"
+#include "network-web/adblock/adblocksubscription.h"
+#include "network-web/webpage.h"
+#include "network-web/webbrowser.h"
 
 #include "miscellaneous/application.h"
+#include "gui/plaintoolbutton.h"
 #include "gui/formmain.h"
 #include "gui/tabwidget.h"
-#include "network-web/webbrowser.h"
 
 #include <QMenu>
 #include <QMouseEvent>
@@ -50,27 +52,13 @@
 
 
 AdBlockIcon::AdBlockIcon(QWidget *window, QWidget *parent)
-  : QToolButton(parent)
+  : PlainToolButton(parent), m_window(window), m_menuAction(0), m_flashTimer(0), m_timerTicks(0), m_enabled(false) {
-  , m_window(window)
+  setToolTip(tr("Adblock lets you block unwanted content on web pages."));
-  , m_menuAction(0)
-  , m_flashTimer(0)
-  , m_timerTicks(0)
-  , m_enabled(false)
-{
-  setFocusPolicy(Qt::NoFocus);
-  setStyleSheet("QToolButton { border: none; padding: 0px; }");
 
   connect(this, SIGNAL(clicked(QPoint)), this, SLOT(showMenu(QPoint)));
   connect(AdBlockManager::instance(), SIGNAL(enabledChanged(bool)), this, SLOT(setEnabled(bool)));
 }
 
-void AdBlockIcon::retranslateStrings()
-{
-  setToolTip(tr("AdBlock lets you block unwanted content on web pages"));
-
-  AdBlockManager::instance()->customList()->retranslateStrings();
-}
-
 void AdBlockIcon::popupBlocked(const QString &ruleString, const QUrl &url)
 {
   int index = ruleString.lastIndexOf(QLatin1String(" ("));
@@ -119,9 +107,10 @@ QAction* AdBlockIcon::menuAction()
 
 void AdBlockIcon::createMenu(QMenu *menu)
 {
-  if (!menu) {
+  if (menu == NULL) {
     menu = qobject_cast<QMenu*>(sender());
-    if (!menu) {
+
+    if (menu == NULL) {
       return;
     }
   }
@@ -134,7 +123,7 @@ void AdBlockIcon::createMenu(QMenu* menu)
   WebPage* page = qApp->mainForm()->tabWidget()->widget(qApp->mainForm()->tabWidget()->currentIndex())->webBrowser()->view()->page();
   const QUrl pageUrl = page->mainFrame()->url();
 
-  menu->addAction(tr("Show AdBlock &Settings"), manager, SLOT(showDialog()));
+  menu->addAction(tr("Show Adblock &settings"), manager, SLOT(showDialog()));
   menu->addSeparator();
 
   if (!pageUrl.host().isEmpty() && m_enabled && manager->canRunOnScheme(pageUrl.scheme())) {
@@ -244,10 +233,10 @@ void AdBlockIcon::stopAnimation()
 void AdBlockIcon::setEnabled(bool enabled)
 {
   if (enabled) {
-    setIcon(QIcon(":images/images/adblock.png"));
+    setIcon(qApp->icons()->fromTheme("web-adblock"));
   }
   else {
-    setIcon(QIcon(":images/images/adblock-disabled.png"));
+    setIcon(qApp->icons()->fromTheme("web-adblock-disabled"));
   }
 
   m_enabled = enabled;

src/network-web/adblock/adblockicon.h

@@ -35,31 +35,26 @@
 #ifndef ADBLOCKICON_H
 #define ADBLOCKICON_H
 
-#include <QToolButton>
+#include "gui/plaintoolbutton.h"
 
-#include "adblockrule.h"
 
 class QMenu;
 class QUrl;
-class MainWindow;
+class AdBlockRule;
 
-class AdBlockIcon : public QToolButton
+class AdBlockIcon : public PlainToolButton {
-{
     Q_OBJECT
   public:
+    // Constructors.
     explicit AdBlockIcon(QWidget *window, QWidget *parent = 0);
-  ~AdBlockIcon();
+    virtual ~AdBlockIcon();
 
-  void retranslateStrings();
     void popupBlocked(const QString &ruleString, const QUrl &url);
     QAction *menuAction();
 
-signals:
-  void clicked(QPoint);
-
   public slots:
     void setEnabled(bool enabled);
-  void createMenu(QMenu* menu = 0);
+    void createMenu(QMenu *menu = NULL);
 
   private slots:
     void showMenu(const QPoint &pos);
@@ -68,9 +63,13 @@ private slots:
     void animateIcon();
     void stopAnimation();
 
-private:
+  protected:
     void mouseReleaseEvent(QMouseEvent *event);
 
+  signals:
+    void clicked(QPoint);
+
+  private:
     QWidget *m_window;
     QAction* m_menuAction;
 

src/network-web/adblock/adblockmanager.cpp

@@ -43,6 +43,7 @@
 #include "miscellaneous/application.h"
 #include "miscellaneous/settings.h"
 #include "network-web/silentnetworkaccessmanager.h"
+#include "gui/formmain.h"
 
 #include <QDateTime>
 #include <QTextStream>
@@ -445,8 +446,14 @@ AdBlockSubscription* AdBlockManager::subscriptionByName(const QString &name) con
   return 0;
 }
 
-AdBlockDialog* AdBlockManager::showDialog()
+AdBlockDialog *AdBlockManager::showDialog() {
-{
+  QPointer<AdBlockDialog> form_pointer = new AdBlockDialog();
+  form_pointer.data()->show();
+  form_pointer.data()->raise();
+  form_pointer.data()->activateWindow();
+  form_pointer.data()->setAttribute(Qt::WA_DeleteOnClose, true);
+  return form_pointer.data();
+  /*
   if (!m_adBlockDialog) {
     m_adBlockDialog = new AdBlockDialog;
   }
@@ -455,7 +462,7 @@ AdBlockDialog* AdBlockManager::showDialog()
   m_adBlockDialog.data()->raise();
   m_adBlockDialog.data()->activateWindow();
 
-  return m_adBlockDialog.data();
+  return m_adBlockDialog.data();*/
 }
 
 void AdBlockManager::showRule()

src/network-web/adblock/adblockmanager.h

@@ -114,7 +114,6 @@ signals:
   public slots:
     void setEnabled(bool enabled);
     void showRule();
-
     void updateAllSubscriptions();
 
     AdBlockDialog *showDialog();

src/network-web/adblock/adblocksubscription.cpp

@@ -327,18 +327,12 @@ AdBlockSubscription::~AdBlockSubscription()
 
 // AdBlockCustomList
 
-AdBlockCustomList::AdBlockCustomList(QObject* parent)
+AdBlockCustomList::AdBlockCustomList(QObject* parent) : AdBlockSubscription(tr("Custom rules"), parent) {
-  : AdBlockSubscription(tr("Custom Rules"), parent)
+  setTitle(tr("Custom rules"));
-{
   // TODO
   setFilePath(qApp->homeFolderPath() + "/adblock/customlist.txt");
 }
 
-void AdBlockCustomList::retranslateStrings()
-{
-  setTitle(tr("Custom Rules"));
-}
-
 void AdBlockCustomList::loadSubscription(const QStringList &disabledRules)
 {
   // DuckDuckGo ad whitelist rules

src/network-web/adblock/adblocksubscription.h

@@ -139,8 +139,6 @@ class AdBlockCustomList : public AdBlockSubscription
   public:
     explicit AdBlockCustomList(QObject* parent = 0);
 
-  void retranslateStrings();
-
     void loadSubscription(const QStringList &disabledRules);
     void saveSubscription();