noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'Ch2Usercard' of https://github.com/TranRed/chatterino2 into Ch2Usercard

Browse source
This commit is contained in:
TranRed 2019-09-08 12:05:46 +02:00
commit 21f65b716d
3 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -636,16 +636,6 @@ void Split::showViewerList()
viewerDock->activateWindow(); viewerDock->activateWindow();
} }
void Split::openSubPage()
{
ChannelPtr channel = this->getChannel();
if (auto twitchChannel = dynamic_cast<TwitchChannel *>(channel.get()))
{
QDesktopServices::openUrl(twitchChannel->subscriptionUrl());
}
}
void Split::copyToClipboard() void Split::copyToClipboard()
{ {
QApplication::clipboard()->setText(this->view_->getSelectedText()); QApplication::clipboard()->setText(this->view_->getSelectedText());

1
src/widgets/splits/Split.hpp
View file

@ -129,7 +129,6 @@ public slots:
void copyToClipboard(); void copyToClipboard();
void showSearch(); void showSearch();
void showViewerList(); void showViewerList();
void openSubPage();
void reloadChannelAndSubscriberEmotes(); void reloadChannelAndSubscriberEmotes();
}; };

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

@ -284,12 +284,9 @@ std::unique_ptr<QMenu> SplitHeader::createMainMenu()
// sub menu // sub menu
auto moreMenu = new QMenu("More", this); auto moreMenu = new QMenu("More", this);
moreMenu->addAction("Show viewer list", this->split_, moreMenu->addAction("Show viewer list", this->split_,
&Split::showViewerList); &Split::showViewerList);
moreMenu->addAction("Subscribe", this->split_, &Split::openSubPage);
auto action = new QAction(this); auto action = new QAction(this);
action->setText("Notify when live"); action->setText("Notify when live");
action->setCheckable(true); action->setCheckable(true);