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

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

View file

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

View file

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

View file

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