From 60ae6c56db55ea84c59ad1e589a0ff54abc057e1 Mon Sep 17 00:00:00 2001 From: Janne Koschinski Date: Wed, 20 Dec 2017 01:17:49 +0100 Subject: [PATCH] Fix an issue where the table headers were invisible --- .../corehighlightsettingspage.cpp | 38 ++++++++++--------- .../settingspages/corehighlightsettingspage.h | 3 +- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/qtui/settingspages/corehighlightsettingspage.cpp b/src/qtui/settingspages/corehighlightsettingspage.cpp index 7bedc00d..debf0c13 100644 --- a/src/qtui/settingspages/corehighlightsettingspage.cpp +++ b/src/qtui/settingspages/corehighlightsettingspage.cpp @@ -33,9 +33,9 @@ CoreHighlightSettingsPage::CoreHighlightSettingsPage(QWidget *parent) setupRuleTable(ui.highlightTable); setupRuleTable(ui.ignoredTable); - ui.highlightNicksComboBox->addItem(tr("All Nicks from Identity"), HighlightRuleManager::AllNicks); - ui.highlightNicksComboBox->addItem(tr("Current Nick"), HighlightRuleManager::CurrentNick); - ui.highlightNicksComboBox->addItem(tr("None"), HighlightRuleManager::NoNick); + ui.highlightNicksComboBox->addItem(tr("All Nicks from Identity"), QVariant(HighlightRuleManager::AllNicks)); + ui.highlightNicksComboBox->addItem(tr("Current Nick"), QVariant(HighlightRuleManager::CurrentNick)); + ui.highlightNicksComboBox->addItem(tr("None"), QVariant(HighlightRuleManager::NoNick)); connect(ui.highlightAdd, SIGNAL(clicked(bool)), this, SLOT(addNewHighlightRow())); connect(ui.highlightRemove, SIGNAL(clicked(bool)), this, SLOT(removeSelectedHighlightRows())); @@ -80,19 +80,19 @@ void CoreHighlightSettingsPage::setupRuleTable(QTableWidget *table) const table->verticalHeader()->hide(); table->setShowGrid(false); - table->horizontalHeaderItem(RegExColumn)->setToolTip( + table->horizontalHeaderItem(CoreHighlightSettingsPage::RegExColumn)->setToolTip( tr("RegEx: This option determines if the highlight rule should be interpreted as a regular expression or just as a keyword.")); - table->horizontalHeaderItem(RegExColumn)->setWhatsThis( + table->horizontalHeaderItem(CoreHighlightSettingsPage::RegExColumn)->setWhatsThis( tr("RegEx: This option determines if the highlight rule should be interpreted as a regular expression or just as a keyword.")); - table->horizontalHeaderItem(CsColumn)->setToolTip( + table->horizontalHeaderItem(CoreHighlightSettingsPage::CsColumn)->setToolTip( tr("CS: This option determines if the highlight rule should be interpreted case sensitive.")); - table->horizontalHeaderItem(CsColumn)->setWhatsThis( + table->horizontalHeaderItem(CoreHighlightSettingsPage::CsColumn)->setWhatsThis( tr("CS: This option determines if the highlight rule should be interpreted case sensitive.")); - table->horizontalHeaderItem(ChanColumn)->setToolTip( + table->horizontalHeaderItem(CoreHighlightSettingsPage::ChanColumn)->setToolTip( tr("Channel: This regular expression determines for which channels the highlight rule works. Leave blank to match any channel. Put ! in the beginning to negate. Case insensitive.")); - table->horizontalHeaderItem(ChanColumn)->setWhatsThis( + table->horizontalHeaderItem(CoreHighlightSettingsPage::ChanColumn)->setWhatsThis( tr("Channel: This regular expression determines for which channels the highlight rule works. Leave blank to match any channel. Put ! in the beginning to negate. Case insensitive.")); #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) @@ -102,11 +102,11 @@ void CoreHighlightSettingsPage::setupRuleTable(QTableWidget *table) const table->horizontalHeader()->setResizeMode(CoreHighlightSettingsPage::CsColumn, QHeaderView::ResizeToContents); table->horizontalHeader()->setResizeMode(CoreHighlightSettingsPage::ChanColumn, QHeaderView::ResizeToContents); #else - table->horizontalHeader()->setSectionResizeMode(EnableColumn, QHeaderView::ResizeToContents); - table->horizontalHeader()->setSectionResizeMode(NameColumn, QHeaderView::Stretch); - table->horizontalHeader()->setSectionResizeMode(RegExColumn, QHeaderView::ResizeToContents); - table->horizontalHeader()->setSectionResizeMode(CsColumn, QHeaderView::ResizeToContents); - table->horizontalHeader()->setSectionResizeMode(ChanColumn, QHeaderView::ResizeToContents); + table->horizontalHeader()->setSectionResizeMode(CoreHighlightSettingsPage::EnableColumn, QHeaderView::ResizeToContents); + table->horizontalHeader()->setSectionResizeMode(CoreHighlightSettingsPage::NameColumn, QHeaderView::Stretch); + table->horizontalHeader()->setSectionResizeMode(CoreHighlightSettingsPage::RegExColumn, QHeaderView::ResizeToContents); + table->horizontalHeader()->setSectionResizeMode(CoreHighlightSettingsPage::CsColumn, QHeaderView::ResizeToContents); + table->horizontalHeader()->setSectionResizeMode(CoreHighlightSettingsPage::ChanColumn, QHeaderView::ResizeToContents); #endif } @@ -131,8 +131,8 @@ bool CoreHighlightSettingsPage::hasDefaults() const void CoreHighlightSettingsPage::defaults() { - ui.highlightNicksComboBox->setCurrentIndex(ui.highlightNicksComboBox - ->findData(QVariant(HighlightRuleManager::HighlightNickType::CurrentNick))); + int defaultIndex = ui.highlightNicksComboBox->findData(QVariant(HighlightRuleManager::HighlightNickType::CurrentNick)); + ui.highlightNicksComboBox->setCurrentIndex(defaultIndex); ui.nicksCaseSensitive->setChecked(false); emptyHighlightTable(); emptyIgnoredTable(); @@ -292,7 +292,7 @@ void CoreHighlightSettingsPage::emptyHighlightTable() if (ui.highlightTable->rowCount() != highlightList.size()) { qDebug() << "something is wrong: ui.highlight and highlightList don't have the same size!"; } - ui.highlightTable->clear(); + ui.highlightTable->clearContents(); highlightList.clear(); } @@ -302,7 +302,7 @@ void CoreHighlightSettingsPage::emptyIgnoredTable() if (ui.ignoredTable->rowCount() != ignoredList.size()) { qDebug() << "something is wrong: ui.highlight and highlightList don't have the same size!"; } - ui.ignoredTable->clear(); + ui.ignoredTable->clearContents(); ignoredList.clear(); } @@ -408,6 +408,8 @@ void CoreHighlightSettingsPage::load() setChangedState(false); _initialized = true; + } else { + defaults(); } } diff --git a/src/qtui/settingspages/corehighlightsettingspage.h b/src/qtui/settingspages/corehighlightsettingspage.h index 9ef0bc21..393f31ad 100644 --- a/src/qtui/settingspages/corehighlightsettingspage.h +++ b/src/qtui/settingspages/corehighlightsettingspage.h @@ -24,10 +24,9 @@ #include #include #include -#include #include "settingspage.h" -#include "ui_highlightsettingspage.h" +#include "ui_corehighlightsettingspage.h" class CoreHighlightSettingsPage : public SettingsPage { -- 2.20.1