mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-21 22:24:07 +01:00
updated descriptions in notification settings
This commit is contained in:
parent
6f4f66b9d0
commit
8661c83312
3 changed files with 16 additions and 36 deletions
|
@ -162,7 +162,7 @@ void SettingsDialog::addTabs()
|
||||||
this->ui_.tabContainer->addSpacing(16);
|
this->ui_.tabContainer->addSpacing(16);
|
||||||
this->addTab([]{return new KeyboardSettingsPage;}, "Keybindings", ":/settings/keybinds.svg");
|
this->addTab([]{return new KeyboardSettingsPage;}, "Keybindings", ":/settings/keybinds.svg");
|
||||||
this->addTab([]{return new ModerationPage;}, "Moderation", ":/settings/moderation.svg", SettingsTabId::Moderation);
|
this->addTab([]{return new ModerationPage;}, "Moderation", ":/settings/moderation.svg", SettingsTabId::Moderation);
|
||||||
this->addTab([]{return new NotificationPage;}, "Notifications", ":/settings/notification2.svg");
|
this->addTab([]{return new NotificationPage;}, "Live Notifications", ":/settings/notification2.svg");
|
||||||
this->addTab([]{return new ExternalToolsPage;}, "External tools", ":/settings/externaltools.svg");
|
this->addTab([]{return new ExternalToolsPage;}, "External tools", ":/settings/externaltools.svg");
|
||||||
this->ui_.tabContainer->addStretch(1);
|
this->ui_.tabContainer->addStretch(1);
|
||||||
this->addTab([]{return new AboutPage;}, "About", ":/settings/about.svg", SettingsTabId(), Qt::AlignBottom);
|
this->addTab([]{return new AboutPage;}, "About", ":/settings/about.svg", SettingsTabId(), Qt::AlignBottom);
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define OPEN_IN_BROWSER "Open in browser"
|
#define OPEN_IN_BROWSER "Open stream in browser"
|
||||||
#define OPEN_PLAYER_IN_BROWSER "Open player in browser"
|
#define OPEN_PLAYER_IN_BROWSER "Open player in browser"
|
||||||
#define OPEN_IN_STREAMLINK "Open in streamlink"
|
#define OPEN_IN_STREAMLINK "Open in streamlink"
|
||||||
#define DONT_OPEN "Don't open"
|
#define DONT_OPEN "Don't open"
|
||||||
|
|
|
@ -29,18 +29,22 @@ NotificationPage::NotificationPage()
|
||||||
{
|
{
|
||||||
auto settings = tabs.appendTab(new QVBoxLayout, "Options");
|
auto settings = tabs.appendTab(new QVBoxLayout, "Options");
|
||||||
{
|
{
|
||||||
settings.emplace<QLabel>("Enable for selected channels");
|
settings.emplace<QLabel>("You can be informed when certain "
|
||||||
|
"channels go live. You can be "
|
||||||
|
"informed in multiple ways:");
|
||||||
|
|
||||||
settings.append(this->createCheckBox(
|
settings.append(this->createCheckBox(
|
||||||
"Flash taskbar", getSettings()->notificationFlashTaskbar));
|
"Flash taskbar", getSettings()->notificationFlashTaskbar));
|
||||||
settings.append(this->createCheckBox(
|
settings.append(this->createCheckBox(
|
||||||
"Play sound", getSettings()->notificationPlaySound));
|
"Play sound", getSettings()->notificationPlaySound));
|
||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
settings.append(
|
settings.append(this->createCheckBox(
|
||||||
this->createCheckBox("Enable toasts (Windows 8 or later)",
|
"Show notification", getSettings()->notificationToast));
|
||||||
getSettings()->notificationToast));
|
|
||||||
auto openIn = settings.emplace<QHBoxLayout>().withoutMargin();
|
auto openIn = settings.emplace<QHBoxLayout>().withoutMargin();
|
||||||
{
|
{
|
||||||
openIn.emplace<QLabel>("Open stream from Toast: ")
|
openIn
|
||||||
|
.emplace<QLabel>(
|
||||||
|
"Action when clicking on a notification: ")
|
||||||
->setSizePolicy(QSizePolicy::Maximum,
|
->setSizePolicy(QSizePolicy::Maximum,
|
||||||
QSizePolicy::Preferred);
|
QSizePolicy::Preferred);
|
||||||
|
|
||||||
|
@ -77,8 +81,12 @@ NotificationPage::NotificationPage()
|
||||||
settings->addStretch(1);
|
settings->addStretch(1);
|
||||||
}
|
}
|
||||||
auto twitchChannels =
|
auto twitchChannels =
|
||||||
tabs.appendTab(new QVBoxLayout, "Channel going live");
|
tabs.appendTab(new QVBoxLayout, "Selected Channels");
|
||||||
{
|
{
|
||||||
|
twitchChannels.emplace<QLabel>(
|
||||||
|
"These are the channels for which you will be informed "
|
||||||
|
"when they go live:");
|
||||||
|
|
||||||
EditableModelView *view =
|
EditableModelView *view =
|
||||||
twitchChannels
|
twitchChannels
|
||||||
.emplace<EditableModelView>(
|
.emplace<EditableModelView>(
|
||||||
|
@ -103,34 +111,6 @@ NotificationPage::NotificationPage()
|
||||||
.append("channel");
|
.append("channel");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
/*
|
|
||||||
auto mixerChannels = tabs.appendTab(new QVBoxLayout, "Mixer");
|
|
||||||
{
|
|
||||||
EditableModelView *view =
|
|
||||||
mixerChannels
|
|
||||||
.emplace<EditableModelView>(
|
|
||||||
getApp()->notifications->createModel(
|
|
||||||
nullptr, Platform::Mixer))
|
|
||||||
.getElement();
|
|
||||||
view->setTitles({"Mixer channels"});
|
|
||||||
|
|
||||||
view->getTableView()->horizontalHeader()->setSectionResizeMode(
|
|
||||||
QHeaderView::Fixed);
|
|
||||||
view->getTableView()->horizontalHeader()->setSectionResizeMode(
|
|
||||||
0, QHeaderView::Stretch);
|
|
||||||
|
|
||||||
QTimer::singleShot(1, [view] {
|
|
||||||
view->getTableView()->resizeColumnsToContents();
|
|
||||||
view->getTableView()->setColumnWidth(0, 200);
|
|
||||||
});
|
|
||||||
|
|
||||||
view->addButtonPressed.connect([] {
|
|
||||||
getApp()
|
|
||||||
->notifications->channelMap[Platform::Mixer]
|
|
||||||
.appendItem("channel");
|
|
||||||
});
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue