projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix an issue where empty elements were shown in the highlight list
[quassel.git]
/
src
/
qtui
/
settingspages
/
corehighlightsettingspage.cpp
diff --git
a/src/qtui/settingspages/corehighlightsettingspage.cpp
b/src/qtui/settingspages/corehighlightsettingspage.cpp
index
d8eaa9f
..
242c318
100644
(file)
--- a/
src/qtui/settingspages/corehighlightsettingspage.cpp
+++ b/
src/qtui/settingspages/corehighlightsettingspage.cpp
@@
-26,7
+26,7
@@
#include "qtui.h"
CoreHighlightSettingsPage::CoreHighlightSettingsPage(QWidget *parent)
#include "qtui.h"
CoreHighlightSettingsPage::CoreHighlightSettingsPage(QWidget *parent)
- : SettingsPage(tr("Interface"), tr("
Core-Sid
e Highlights"), parent)
+ : SettingsPage(tr("Interface"), tr("
Remot
e Highlights"), parent)
{
ui.setupUi(this);
{
ui.setupUi(this);
@@
-308,7
+308,9
@@
void CoreHighlightSettingsPage::emptyHighlightTable()
if (ui.highlightTable->rowCount() != highlightList.size()) {
qDebug() << "something is wrong: ui.highlight and highlightList don't have the same size!";
}
if (ui.highlightTable->rowCount() != highlightList.size()) {
qDebug() << "something is wrong: ui.highlight and highlightList don't have the same size!";
}
- ui.highlightTable->clearContents();
+ while (ui.highlightTable->rowCount()) {
+ ui.highlightTable->removeRow(0);
+ }
highlightList.clear();
}
highlightList.clear();
}
@@
-318,7
+320,9
@@
void CoreHighlightSettingsPage::emptyIgnoredTable()
if (ui.ignoredTable->rowCount() != ignoredList.size()) {
qDebug() << "something is wrong: ui.highlight and highlightList don't have the same size!";
}
if (ui.ignoredTable->rowCount() != ignoredList.size()) {
qDebug() << "something is wrong: ui.highlight and highlightList don't have the same size!";
}
- ui.ignoredTable->clearContents();
+ while (ui.ignoredTable->rowCount()) {
+ ui.ignoredTable->removeRow(0);
+ }
ignoredList.clear();
}
ignoredList.clear();
}
@@
-496,3
+500,7
@@
void CoreHighlightSettingsPage::importRules() {
setChangedState(false);
load();
}
setChangedState(false);
load();
}
+
+bool CoreHighlightSettingsPage::isSelectable() const {
+ return Client::isConnected() && Client::isCoreFeatureEnabled(Quassel::Feature::CoreSideHighlights);
+}