X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fcorehighlightsettingspage.h;h=07a1cb181d043ddf2bf0581aa0e81ee162561877;hb=6f10483c9fe74a9464d7bf9eea53ef83c3403e23;hp=03681e3c1e6f72410e84e50987871b5e8f4cd35a;hpb=d4b81a6d777de45611034b26bd89973d19e60c96;p=quassel.git

diff --git a/src/qtui/settingspages/corehighlightsettingspage.h b/src/qtui/settingspages/corehighlightsettingspage.h
index 03681e3c..07a1cb18 100644
--- a/src/qtui/settingspages/corehighlightsettingspage.h
+++ b/src/qtui/settingspages/corehighlightsettingspage.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2020 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,8 +20,8 @@
 
 #pragma once
 
-#include <QVariantList>
 #include <QTableWidgetItem>
+#include <QVariantList>
 
 #include "highlightrulemanager.h"
 #include "settingspage.h"
@@ -33,7 +33,7 @@ class CoreHighlightSettingsPage : public SettingsPage
     Q_OBJECT
 
 public:
-    explicit CoreHighlightSettingsPage(QWidget *parent = nullptr);
+    explicit CoreHighlightSettingsPage(QWidget* parent = nullptr);
 
     bool hasDefaults() const override;
 
@@ -46,21 +46,41 @@ public slots:
     void revert();
     void clientConnected();
 
+signals:
+    /**
+     * Signals the local highlight settings have been changed as part of cleaning up after
+     * importing the rules locally.
+     *
+     * @see CoreHighlightSettingsPage::importRules()
+     */
+    void localHighlightsChanged();
+
 private slots:
     void coreConnectionStateChanged(bool state);
     void widgetHasChanged();
-    void addNewHighlightRow(bool enable = true, int id = -1, const QString &name = tr("highlight rule"), bool regex = false,
-                            bool cs = false, const QString &sender = "", const QString &chanName = "",
+    void addNewHighlightRow(bool enable = true,
+                            int id = -1,
+                            const QString& name = tr("highlight rule"),
+                            bool regex = false,
+                            bool cs = false,
+                            const QString& sender = "",
+                            const QString& chanName = "",
                             bool self = false);
-    void addNewIgnoredRow(bool enable = true, int id = -1, const QString &name = tr("highlight rule"), bool regex = false,
-                          bool cs = false, const QString &sender = "", const QString &chanName = "", bool self = false);
+    void addNewIgnoredRow(bool enable = true,
+                          int id = -1,
+                          const QString& name = tr("highlight rule"),
+                          bool regex = false,
+                          bool cs = false,
+                          const QString& sender = "",
+                          const QString& chanName = "",
+                          bool self = false);
     void removeSelectedHighlightRows();
     void removeSelectedIgnoredRows();
     void highlightNicksChanged(int index);
-    void selectHighlightRow(QTableWidgetItem *item);
-    void selectIgnoredRow(QTableWidgetItem *item);
-    void highlightTableChanged(QTableWidgetItem *item);
-    void ignoredTableChanged(QTableWidgetItem *item);
+    void selectHighlightRow(QTableWidgetItem* item);
+    void selectIgnoredRow(QTableWidgetItem* item);
+    void highlightTableChanged(QTableWidgetItem* item);
+    void ignoredTableChanged(QTableWidgetItem* item);
 
     /** Import local Highlight rules into the Core Highlight rules
      *
@@ -79,7 +99,8 @@ private:
     HighlightRuleManager::HighlightRuleList highlightList;
     HighlightRuleManager::HighlightRuleList ignoredList;
 
-    enum column {
+    enum column
+    {
         EnableColumn = 0,
         NameColumn = 1,
         RegExColumn = 2,
@@ -92,7 +113,7 @@ private:
     void emptyHighlightTable();
     void emptyIgnoredTable();
 
-    void setupRuleTable(QTableWidget *highlightTable) const;
+    void setupRuleTable(QTableWidget* highlightTable) const;
 
     /**
      * Get tooltip for the specified rule table column
@@ -112,8 +133,8 @@ private:
      * @param senderWidget  Sender name
      * @param chanWidget    Channel name
      */
-    void setupTableTooltips(QWidget *enableWidget, QWidget *nameWidget, QWidget *regExWidget,
-                            QWidget *csWidget, QWidget *senderWidget, QWidget *chanWidget) const;
+    void setupTableTooltips(
+        QWidget* enableWidget, QWidget* nameWidget, QWidget* regExWidget, QWidget* csWidget, QWidget* senderWidget, QWidget* chanWidget) const;
 
     /**
      * Setup tooltips and "What's this?" prompts for table entries
@@ -125,9 +146,12 @@ private:
      * @param senderWidget  Sender name
      * @param chanWidget    Channel name
      */
-    void setupTableTooltips(QTableWidgetItem *enableWidget, QTableWidgetItem *nameWidget,
-                            QTableWidgetItem *regExWidget, QTableWidgetItem *csWidget,
-                            QTableWidgetItem *senderWidget, QTableWidgetItem *chanWidget) const;
+    void setupTableTooltips(QTableWidgetItem* enableWidget,
+                            QTableWidgetItem* nameWidget,
+                            QTableWidgetItem* regExWidget,
+                            QTableWidgetItem* csWidget,
+                            QTableWidgetItem* senderWidget,
+                            QTableWidgetItem* chanWidget) const;
 
     /** Update the UI to show core support for highlights
      *