projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump version for release 0.14-rc2
[quassel.git]
/
src
/
qtui
/
settingspages
/
highlightsettingspage.h
diff --git
a/src/qtui/settingspages/highlightsettingspage.h
b/src/qtui/settingspages/highlightsettingspage.h
index
87ff64b
..
6fe7c97
100644
(file)
--- a/
src/qtui/settingspages/highlightsettingspage.h
+++ b/
src/qtui/settingspages/highlightsettingspage.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-20
16
by the Quassel Project *
+ * Copyright (C) 2005-20
20
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-21,10
+21,11
@@
#ifndef _HIGHLIGHTSETTINGSPAGE_H_
#define _HIGHLIGHTSETTINGSPAGE_H_
#ifndef _HIGHLIGHTSETTINGSPAGE_H_
#define _HIGHLIGHTSETTINGSPAGE_H_
-#include <QVariantList>
#include <QTableWidgetItem>
#include <QTableWidgetItem>
+#include <QVariantList>
#include "settingspage.h"
#include "settingspage.h"
+
#include "ui_highlightsettingspage.h"
class HighlightSettingsPage : public SettingsPage
#include "ui_highlightsettingspage.h"
class HighlightSettingsPage : public SettingsPage
@@
-32,23
+33,31
@@
class HighlightSettingsPage : public SettingsPage
Q_OBJECT
public:
Q_OBJECT
public:
- HighlightSettingsPage(QWidget
*parent = 0
);
+ HighlightSettingsPage(QWidget
* parent = nullptr
);
- bool hasDefaults() const;
-
- bool isSelectable() const override;
+ bool hasDefaults() const override;
public slots:
public slots:
- void save();
- void load();
- void defaults();
+ void save()
override
;
+ void load()
override
;
+ void defaults()
override
;
private slots:
void widgetHasChanged();
private slots:
void widgetHasChanged();
- void addNewRow(QString name = tr("highlight rule"), bool regex = false, bool cs = false, bool enable = true, QString chanName = "", bool self = false);
+ void addNewRow(QString name = tr("highlight rule"),
+ bool regex = false,
+ bool cs = false,
+ bool enable = true,
+ QString chanName = "",
+ bool self = false);
void removeSelectedRows();
void removeSelectedRows();
- void selectRow(QTableWidgetItem *item);
- void tableChanged(QTableWidgetItem *item);
+ void selectRow(QTableWidgetItem* item);
+ void tableChanged(QTableWidgetItem* item);
+
+ /**
+ * Event handler for Local Highlights Details button
+ */
+ void on_localHighlightsDetails_clicked();
private:
Ui::HighlightSettingsPage ui;
private:
Ui::HighlightSettingsPage ui;
@@
-57,11
+66,12
@@
private:
// regex: bool
// name: QString
// enable: bool
// regex: bool
// name: QString
// enable: bool
- enum column {
- NameColumn = 0,
- RegExColumn = 1,
- CsColumn = 2,
- EnableColumn = 3,
+ enum column
+ {
+ EnableColumn = 0,
+ NameColumn = 1,
+ RegExColumn = 2,
+ CsColumn = 3,
ChanColumn = 4,
ColumnCount = 5
};
ChanColumn = 4,
ColumnCount = 5
};
@@
-71,5
+81,4
@@
private:
bool testHasChanged();
};
bool testHasChanged();
};
-
#endif
#endif