creates common texts for opening streams

Texts for opening streams were used in multiple locations. Created a file to store GUI texts like this and replaced were applicable
This commit is contained in:
TranRed
2019-04-27 10:12:51 +02:00
committed by pajlada
parent 01082b123f
commit f76df80575
6 changed files with 43 additions and 27 deletions
+10
View File
@@ -0,0 +1,10 @@
#ifndef COMMONTEXTS_HPP
#define COMMONTEXTS_HPP
#define OPEN_IN_BROWSER "Open in browser"
#define OPEN_PLAYER_IN_BROWSER "Open in player in browser"
#define OPEN_IN_STREAMLINK "Open in streamlink"
#define DONT_OPEN "Don't open"
#endif // COMMONTEXTS_HPP
+13 -13
View File
@@ -5,6 +5,7 @@
#include "controllers/notifications/NotificationModel.hpp"
#include "singletons/Settings.hpp"
#include "util/LayoutCreator.hpp"
#include "widgets/helper/CommonTexts.hpp"
#include "widgets/helper/EditableModelView.hpp"
#include <QCheckBox>
@@ -17,10 +18,6 @@
#include <QTableView>
#include <QTimer>
#define TOAST_REACTIONS \
"in browser", "player in browser", "in streamlink", "don't open"
namespace chatterino {
NotificationPage::NotificationPage()
@@ -43,17 +40,20 @@ NotificationPage::NotificationPage()
settings.append(
this->createCheckBox("Enable toasts (Windows 8 or later)",
getSettings()->notificationToast));
auto openIn =
settings.emplace<QHBoxLayout>().withoutMargin();
auto openIn = settings.emplace<QHBoxLayout>().withoutMargin();
{
openIn.emplace<QLabel>("Open stream from Toast: ")->setSizePolicy(
QSizePolicy::Maximum, QSizePolicy::Preferred);
openIn.append(
this->createComboBox({TOAST_REACTIONS},
getSettings()->openFromToast))->setSizePolicy(
QSizePolicy::Maximum, QSizePolicy::Preferred);
openIn.emplace<QLabel>("Open stream from Toast: ")
->setSizePolicy(QSizePolicy::Maximum,
QSizePolicy::Preferred);
openIn
.append(this->createComboBox(
{OPEN_IN_BROWSER, OPEN_PLAYER_IN_BROWSER,
OPEN_IN_STREAMLINK, DONT_OPEN},
getSettings()->openFromToast))
->setSizePolicy(QSizePolicy::Maximum,
QSizePolicy::Preferred);
}
openIn->setContentsMargins(40,0,0,0);
openIn->setContentsMargins(40, 0, 0, 0);
openIn->setSizeConstraint(QLayout::SetMaximumSize);
#endif
auto customSound =
+4 -4
View File
@@ -15,6 +15,7 @@
#include "widgets/Label.hpp"
#include "widgets/TooltipWidget.hpp"
#include "widgets/dialogs/SettingsDialog.hpp"
#include "widgets/helper/CommonTexts.hpp"
#include "widgets/helper/EffectLabel.hpp"
#include "widgets/splits/Split.hpp"
#include "widgets/splits/SplitContainer.hpp"
@@ -268,13 +269,12 @@ std::unique_ptr<QMenu> SplitHeader::createMainMenu()
});
#endif
menu->addAction("Open in browser", this->split_, &Split::openInBrowser);
menu->addAction(OPEN_IN_BROWSER, this->split_, &Split::openInBrowser);
#ifndef USEWEBENGINE
menu->addAction("Open player in browser", this->split_,
menu->addAction(OPEN_PLAYER_IN_BROWSER, this->split_,
&Split::openBrowserPlayer);
#endif
menu->addAction("Open in streamlink", this->split_,
&Split::openInStreamlink);
menu->addAction(OPEN_IN_STREAMLINK, this->split_, &Split::openInStreamlink);
menu->addSeparator();
// sub menu