noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/chatterino/Chatterino2

Browse source
This commit is contained in:
fourtf 2020-08-22 15:29:06 +02:00
parent 459e483c62 b98c0c2a44
commit 17b26ef59c
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/widgets/settingspages/ExternalToolsPage.cpp
View file

@ -77,20 +77,24 @@ ExternalToolsPage::ExternalToolsPage()
} }
{ {
auto group = layout.emplace<QGroupBox>("Custom URI Scheme"); auto group = layout.emplace<QGroupBox>("Custom stream player");
auto groupLayout = group.setLayoutType<QFormLayout>(); auto groupLayout = group.setLayoutType<QFormLayout>();
const auto description = new QLabel( const auto description = new QLabel(
"You can open video streams directly in any video player that " "You can open Twitch streams directly in any video player that "
"has built-in Twitch support and has own URI Scheme.\nE.g.: " "has built-in Twitch support and has own URI Scheme.\nE.g.: "
"IINA for macOS and Potplayer (with extension) for Windows."); "IINA for macOS and Potplayer (with extension) for "
"Windows.\n\nWith this value set, you will get the option to "
"\"Open in custom player\" when "
"right-clicking a channel header.");
description->setWordWrap(true); description->setWordWrap(true);
description->setStyleSheet("color: #bbb"); description->setStyleSheet("color: #bbb");
groupLayout->setWidget(0, QFormLayout::SpanningRole, description); groupLayout->setWidget(0, QFormLayout::SpanningRole, description);
groupLayout->addRow("URI Scheme:", this->createLineEdit( auto lineEdit = this->createLineEdit(getSettings()->customURIScheme);
getSettings()->customURIScheme)); lineEdit->setPlaceholderText("custom-player-scheme://");
groupLayout->addRow("Custom stream player URI Scheme:", lineEdit);
} }
{ {

3
src/widgets/splits/Split.cpp
View file

@ -575,11 +575,12 @@ void Split::openInStreamlink()
void Split::openWithCustomScheme() void Split::openWithCustomScheme()
{ {
const auto scheme = getSettings()->customURIScheme.getValue(); QString scheme = getSettings()->customURIScheme.getValue();
if (scheme.isEmpty()) if (scheme.isEmpty())
{ {
return; return;
} }
const auto channel = this->getChannel().get(); const auto channel = this->getChannel().get();
if (const auto twitchChannel = dynamic_cast<TwitchChannel *>(channel)) if (const auto twitchChannel = dynamic_cast<TwitchChannel *>(channel))

2
src/widgets/splits/SplitHeader.cpp
View file

@ -311,7 +311,7 @@ std::unique_ptr<QMenu> SplitHeader::createMainMenu()
if (!getSettings()->customURIScheme.getValue().isEmpty()) if (!getSettings()->customURIScheme.getValue().isEmpty())
{ {
menu->addAction("Open with URI Scheme", this->split_, menu->addAction("Open in custom player", this->split_,
&Split::openWithCustomScheme); &Split::openWithCustomScheme);
} }
menu->addSeparator(); menu->addSeparator();