chatterino2
Code Issues

renamed IgnoreUsersPage to IgnoresPage

Browse Source
This commit is contained in:
fourtf
2018-07-05 16:22:25 +02:00
parent d925704aa9
commit 1da23e5e91
5 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/dialogs/SettingsDialog.cpp
+2 -2
View File
@@ -11,7 +11,7 @@
#include "widgets/settingspages/ExternalToolsPage.hpp"
#include "widgets/settingspages/FeelPage.hpp"
#include "widgets/settingspages/HighlightingPage.hpp"
#include "widgets/settingspages/IgnoreusersPage.hpp"
#include "widgets/settingspages/IgnorePage.hpp"
#include "widgets/settingspages/KeyboardSettingsPage.hpp"
#include "widgets/settingspages/LogsPage.hpp"
#include "widgets/settingspages/LookPage.hpp"
@@ -90,7 +90,7 @@ void SettingsDialog::addTabs()
this->addTab(new CommandPage);
// this->addTab(new EmotesPage);
this->addTab(new HighlightingPage);
this->addTab(new IgnoreUsersPage);
this->addTab(new IgnoresPage);
this->ui_.tabContainer->addSpacing(16);
src/widgets/settingspages/HighlightingPage.cpp
+28 -28
View File
@@ -43,13 +43,13 @@ HighlightingPage::HighlightingPage()
auto tabs = layout.emplace<QTabWidget>();
{
// HIGHLIGHTS
auto highlights = tabs.appendTab(new QVBoxLayout, "Highlights");
auto highlights = tabs.appendTab(new QVBoxLayout, "Phrases");
{
EditableModelView *view =
highlights.emplace<EditableModelView>(app->highlights->createModel(nullptr))
.getElement();
view->setTitles({"Pattern", "Flash taskbar", "Play sound", "Regex"});
view->setTitles({"Pattern", "Flash\ntaskbar", "Play\nsound", "Enable\nregex"});
view->getTableView()->horizontalHeader()->setSectionResizeMode(QHeaderView::Fixed);
view->getTableView()->horizontalHeader()->setSectionResizeMode(
0, QHeaderView::Stretch);
@@ -66,37 +66,13 @@ HighlightingPage::HighlightingPage()
});
}
auto disabledUsers = tabs.appendTab(new QVBoxLayout, "Disabled Users");
{
EditableModelView *view =
disabledUsers
.emplace<EditableModelView>(app->highlights->createBlacklistModel(nullptr))
.getElement();
view->setTitles({"Pattern", "Regex"});
view->getTableView()->horizontalHeader()->setSectionResizeMode(QHeaderView::Fixed);
view->getTableView()->horizontalHeader()->setSectionResizeMode(
0, QHeaderView::Stretch);
// fourtf: make class extrend BaseWidget and add this to dpiChanged
QTimer::singleShot(1, [view] {
view->getTableView()->resizeColumnsToContents();
view->getTableView()->setColumnWidth(0, 200);
});
view->addButtonPressed.connect([] {
getApp()->highlights->blacklistedUsers.appendItem(
HighlightBlacklistUser{"blacklisted user", false});
});
}
auto pingUsers = tabs.appendTab(new QVBoxLayout, "Highlight on message");
auto pingUsers = tabs.appendTab(new QVBoxLayout, "Users");
{
EditableModelView *view =
pingUsers.emplace<EditableModelView>(app->highlights->createUserModel(nullptr))
.getElement();
view->setTitles({"Username", "Flash taskbar", "Play sound", "Regex"});
view->setTitles({"Username", "Flash\ntaskbar", "Play\nsound", "Enable\nregex"});
view->getTableView()->horizontalHeader()->setSectionResizeMode(QHeaderView::Fixed);
view->getTableView()->horizontalHeader()->setSectionResizeMode(
0, QHeaderView::Stretch);
@@ -112,6 +88,30 @@ HighlightingPage::HighlightingPage()
HighlightPhrase{"highlighted user", true, false, false});
});
}
auto disabledUsers = tabs.appendTab(new QVBoxLayout, "Excluded Users");
{
EditableModelView *view =
disabledUsers
.emplace<EditableModelView>(app->highlights->createBlacklistModel(nullptr))
.getElement();
view->setTitles({"Pattern", "Enable\nregex"});
view->getTableView()->horizontalHeader()->setSectionResizeMode(QHeaderView::Fixed);
view->getTableView()->horizontalHeader()->setSectionResizeMode(
0, QHeaderView::Stretch);
// fourtf: make class extrend BaseWidget and add this to dpiChanged
QTimer::singleShot(1, [view] {
view->getTableView()->resizeColumnsToContents();
view->getTableView()->setColumnWidth(0, 200);
});
view->addButtonPressed.connect([] {
getApp()->highlights->blacklistedUsers.appendItem(
HighlightBlacklistUser{"blacklisted user", false});
});
}
}
// MISC
src/widgets/settingspages/IgnoreusersPage.hpp → src/widgets/settingspages/IgnorePage.hpp
+2 -2
View File
@@ -6,10 +6,10 @@
namespace chatterino {
class IgnoreUsersPage : public SettingsPage
class IgnoresPage : public SettingsPage
{
public:
IgnoreUsersPage();
IgnoresPage();
void onShow() final;
src/widgets/settingspages/IgnoreusersPage.cpp → src/widgets/settingspages/IgnoresPage.cpp
+4 -4
View File
@@ -1,4 +1,4 @@
#include "IgnoreusersPage.hpp"
#include "IgnorePage.hpp"
#include "Application.hpp"
#include "controllers/accounts/AccountController.hpp"
@@ -23,12 +23,12 @@
namespace chatterino {
IgnoreUsersPage::IgnoreUsersPage()
IgnoresPage::IgnoresPage()
: SettingsPage("Ignores", "")
{
auto app = getApp();
LayoutCreator<IgnoreUsersPage> layoutCreator(this);
LayoutCreator<IgnoresPage> layoutCreator(this);
auto layout = layoutCreator.setLayoutType<QVBoxLayout>();
// auto group = layout.emplace<QGroupBox>("Ignored users").setLayoutType<QVBoxLayout>();
@@ -85,7 +85,7 @@ IgnoreUsersPage::IgnoreUsersPage()
label->setStyleSheet("color: #BBB");
}
void IgnoreUsersPage::onShow()
void IgnoresPage::onShow()
{
auto app = getApp();