chatterino2
Code Issues

reworked commands settings page

Browse Source
This commit is contained in:
fourtf
2018-04-27 01:11:09 +02:00
parent e23ce31e05
commit 49069beed7
11 changed files with 221 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/settingspages/appearancepage.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ AppearancePage::AppearancePage()
form->addRow("Theme color:", this->createThemeColorChanger());
form->addRow("Font:", this->createFontChanger());
form->addRow("Tabs:", this->createCheckBox(TAB_X, settings.hideTabX));
form->addRow("Tabs:", this->createCheckBox(TAB_X, settings.showTabCloseButton));
#ifndef USEWINSDK
form->addRow("", this->createCheckBox(TAB_PREF, settings.hidePreferencesButton));
form->addRow("", this->createCheckBox(TAB_USER, settings.hideUserButton));
src/widgets/settingspages/commandpage.cpp
+79 -7
View File
@@ -1,17 +1,20 @@
#include "commandpage.hpp"
#include <QLabel>
#include <QPushButton>
#include <QStandardItemModel>
#include <QTableView>
#include <QTextEdit>
#include "singletons/commandmanager.hpp"
#include "util/layoutcreator.hpp"
#include "util/standarditemhelper.hpp"
//#include "widgets/helper/comboboxitemdelegate.hpp"
// clang-format off
#define TEXT "One command per line.\n"\
"\"/cmd example command\" will print \"example command\" when you type /cmd in chat.\n"\
"{1} will be replaced with the first word you type after then command, {2} with the second and so on.\n"\
"{1+} will be replaced with first word and everything after, {2+} with everything after the second word and so on\n"\
"Duplicate commands will be ignored."
#define TEXT "{1} => first word, {2} => second word, ...\n"\
"{1+} => first word and after, {2+} => second word and after, ...\n"\
"{{1} => {1}"
// clang-format on
namespace chatterino {
@@ -21,12 +24,81 @@ namespace settingspages {
CommandPage::CommandPage()
: SettingsPage("Commands", ":/images/commands.svg")
{
auto &settings = singletons::SettingManager::getInstance();
util::LayoutCreator<CommandPage> layoutCreator(this);
auto layout = layoutCreator.emplace<QVBoxLayout>().withoutMargin();
layout.emplace<QLabel>(TEXT)->setWordWrap(true);
QTableView *view = *layout.emplace<QTableView>();
QStandardItemModel *model = new QStandardItemModel(0, 2, view);
layout.append(this->getCommandsTextEdit());
view->setModel(model);
model->setHeaderData(0, Qt::Horizontal, "Trigger");
model->setHeaderData(1, Qt::Horizontal, "Command");
view->setSelectionMode(QAbstractItemView::ExtendedSelection);
view->setSelectionBehavior(QAbstractItemView::SelectRows);
view->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
for (const QString &string : singletons::CommandManager::getInstance().getCommands()) {
int index = string.indexOf(' ');
if (index == -1) {
model->appendRow({util::stringItem(string), util::stringItem("")});
} else {
model->appendRow(
{util::stringItem(string.mid(0, index)), util::stringItem(string.mid(index + 1))});
}
}
QObject::connect(
model, &QStandardItemModel::dataChanged,
[model](const QModelIndex &topLeft, const QModelIndex &bottomRight,
const QVector<int> &roles) {
QStringList list;
for (int i = 0; i < model->rowCount(); i++) {
QString command = model->item(i, 0)->data(Qt::EditRole).toString();
// int index = command.indexOf(' ');
// if (index != -1) {
// command = command.mid(index);
// }
list.append(command + " " + model->item(i, 1)->data(Qt::EditRole).toString());
}
singletons::CommandManager::getInstance().setCommands(list);
});
auto buttons = layout.emplace<QHBoxLayout>().withoutMargin();
{
auto add = buttons.emplace<QPushButton>("Add");
QObject::connect(*add, &QPushButton::clicked, [model, view] {
model->appendRow({util::stringItem("/command"), util::stringItem("")});
view->scrollToBottom();
});
auto remove = buttons.emplace<QPushButton>("Remove");
QObject::connect(*remove, &QPushButton::clicked, [view, model] {
std::vector<int> indices;
for (const QModelIndex &index : view->selectionModel()->selectedRows(0)) {
indices.push_back(index.row());
}
std::sort(indices.begin(), indices.end());
for (int i = indices.size() - 1; i >= 0; i--) {
model->removeRow(indices[i]);
}
});
buttons->addStretch(1);
}
layout.append(this->createCheckBox("Also match the trigger at the end of the message",
settings.allowCommandsAtEnd));
QLabel *text = *layout.emplace<QLabel>(TEXT);
text->setWordWrap(true);
text->setStyleSheet("color: #bbb");
// ---- end of layout
this->commandsEditTimer.setSingleShot(true);
src/widgets/settingspages/highlightingpage.cpp
+20 -17
View File
@@ -32,7 +32,7 @@ HighlightingPage::HighlightingPage()
auto layout = layoutCreator.emplace<QVBoxLayout>().withoutMargin();
{
// GENERAL
layout.append(this->createCheckBox(ENABLE_HIGHLIGHTS, settings.enableHighlights));
// layout.append(this->createCheckBox(ENABLE_HIGHLIGHTS, settings.enableHighlights));
// TABS
auto tabs = layout.emplace<QTabWidget>();
@@ -77,7 +77,7 @@ HighlightingPage::HighlightingPage()
view->setColumnWidth(0, 250);
});
auto buttons = highlights.emplace<QHBoxLayout>();
auto buttons = highlights.emplace<QHBoxLayout>().withoutMargin();
QObject::connect(model, &QStandardItemModel::dataChanged,
[model](const QModelIndex &topLeft, const QModelIndex &bottomRight,
@@ -126,28 +126,31 @@ HighlightingPage::HighlightingPage()
model->removeRow(indices[i]);
}
});
buttons->addStretch(1);
view->hideColumn(3);
}
// DISABLED USERS
auto disabledUsers = tabs.appendTab(new QVBoxLayout, "Disabled Users");
{
auto text = disabledUsers.emplace<QTextEdit>().getElement();
// auto disabledUsers = tabs.appendTab(new QVBoxLayout, "Disabled Users");
// {
// auto text = disabledUsers.emplace<QTextEdit>().getElement();
QObject::connect(text, &QTextEdit::textChanged, this,
[this] { this->disabledUsersChangedTimer.start(200); });
// QObject::connect(text, &QTextEdit::textChanged, this,
// [this] { this->disabledUsersChangedTimer.start(200); });
QObject::connect(
&this->disabledUsersChangedTimer, &QTimer::timeout, this, [text, &settings]() {
QStringList list = text->toPlainText().split("\n", QString::SkipEmptyParts);
list.removeDuplicates();
settings.highlightUserBlacklist = list.join("\n") + "\n";
});
// QObject::connect(
// &this->disabledUsersChangedTimer, &QTimer::timeout, this, [text, &settings]()
// {
// QStringList list = text->toPlainText().split("\n",
// QString::SkipEmptyParts); list.removeDuplicates();
// settings.highlightUserBlacklist = list.join("\n") + "\n";
// });
settings.highlightUserBlacklist.connect([=](const QString &str, auto) {
text->setPlainText(str); //
});
}
// settings.highlightUserBlacklist.connect([=](const QString &str, auto) {
// text->setPlainText(str); //
// });
// }
}
// MISC
src/widgets/settingspages/ignoreuserspage.cpp
+16 -5
View File
@@ -25,19 +25,24 @@ IgnoreUsersPage::IgnoreUsersPage()
util::LayoutCreator<IgnoreUsersPage> layoutCreator(this);
auto layout = layoutCreator.setLayoutType<QVBoxLayout>();
auto group = layout.emplace<QGroupBox>("Ignored users").setLayoutType<QVBoxLayout>();
// auto group = layout.emplace<QGroupBox>("Ignored users").setLayoutType<QVBoxLayout>();
auto tabs = layout.emplace<QTabWidget>();
tabs->setStyleSheet("color: #000");
// users
auto users = tabs.appendTab(new QVBoxLayout, "Users");
{
group.append(
users.append(
this->createCheckBox("Enable twitch ignored users", settings.enableTwitchIgnoredUsers));
auto anyways = group.emplace<QHBoxLayout>().withoutMargin();
auto anyways = users.emplace<QHBoxLayout>().withoutMargin();
{
anyways.emplace<QLabel>("Show anyways if:");
anyways.emplace<QComboBox>();
anyways->addStretch(1);
}
auto addremove = group.emplace<QHBoxLayout>().withoutMargin();
auto addremove = users.emplace<QHBoxLayout>().withoutMargin();
{
auto add = addremove.emplace<QPushButton>("Ignore user");
auto remove = addremove.emplace<QPushButton>("Unignore User");
@@ -46,10 +51,16 @@ IgnoreUsersPage::IgnoreUsersPage()
addremove->addStretch(1);
}
auto userList = group.emplace<QListView>();
auto userList = users.emplace<QListView>();
UNUSED(userList); // TODO: Fill this list in with ignored users
}
// messages
auto messages = tabs.appendTab(new QVBoxLayout, "Messages");
{
messages.emplace<QLabel>("wip");
}
auto label = layout.emplace<QLabel>(INFO);
label->setWordWrap(true);
label->setStyleSheet("color: #BBB");