chore: bump deprecated cutoff to Qt 6.4.3 (#6169)
This commit is contained in:
nerix
@@ -382,26 +382,29 @@ std::unique_ptr<QMenu> SplitHeader::createMainMenu()
|
||||
const auto &h = getApp()->getHotkeys();
|
||||
auto menu = std::make_unique<QMenu>();
|
||||
menu->addAction(
|
||||
"Change channel", this->split_, &Split::changeChannel,
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "changeChannel"));
|
||||
menu->addAction("Close", this->split_, &Split::deleteFromContainer,
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "delete"));
|
||||
"Change channel",
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "changeChannel"),
|
||||
this->split_, &Split::changeChannel);
|
||||
menu->addAction("Close",
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "delete"),
|
||||
this->split_, &Split::deleteFromContainer);
|
||||
menu->addSeparator();
|
||||
menu->addAction(
|
||||
"Popup", this->split_, &Split::popup,
|
||||
h->getDisplaySequence(HotkeyCategory::Window, "popup", {{"split"}}));
|
||||
"Popup",
|
||||
h->getDisplaySequence(HotkeyCategory::Window, "popup", {{"split"}}),
|
||||
this->split_, &Split::popup);
|
||||
menu->addAction(
|
||||
"Popup overlay", this->split_, &Split::showOverlayWindow,
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "popupOverlay"));
|
||||
menu->addAction(
|
||||
"Search", this->split_,
|
||||
[this] {
|
||||
this->split_->showSearch(true);
|
||||
},
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "showSearch"));
|
||||
menu->addAction(
|
||||
"Set filters", this->split_, &Split::setFiltersDialog,
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "pickFilters"));
|
||||
"Popup overlay",
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "popupOverlay"),
|
||||
this->split_, &Split::showOverlayWindow);
|
||||
menu->addAction("Search",
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "showSearch"),
|
||||
this->split_, [this] {
|
||||
this->split_->showSearch(true);
|
||||
});
|
||||
menu->addAction("Set filters",
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "pickFilters"),
|
||||
this->split_, &Split::setFiltersDialog);
|
||||
menu->addSeparator();
|
||||
|
||||
auto *twitchChannel =
|
||||
@@ -410,38 +413,41 @@ std::unique_ptr<QMenu> SplitHeader::createMainMenu()
|
||||
if (twitchChannel)
|
||||
{
|
||||
menu->addAction(
|
||||
OPEN_IN_BROWSER, this->split_, &Split::openInBrowser,
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "openInBrowser"));
|
||||
menu->addAction(OPEN_PLAYER_IN_BROWSER, this->split_,
|
||||
&Split::openBrowserPlayer,
|
||||
h->getDisplaySequence(HotkeyCategory::Split,
|
||||
"openPlayerInBrowser"));
|
||||
OPEN_IN_BROWSER,
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "openInBrowser"),
|
||||
this->split_, &Split::openInBrowser);
|
||||
menu->addAction(
|
||||
OPEN_IN_STREAMLINK, this->split_, &Split::openInStreamlink,
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "openInStreamlink"));
|
||||
OPEN_PLAYER_IN_BROWSER,
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "openPlayerInBrowser"),
|
||||
this->split_, &Split::openBrowserPlayer);
|
||||
menu->addAction(
|
||||
OPEN_IN_STREAMLINK,
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "openInStreamlink"),
|
||||
this->split_, &Split::openInStreamlink);
|
||||
|
||||
if (!getSettings()->customURIScheme.getValue().isEmpty())
|
||||
{
|
||||
menu->addAction("Open in custom player", this->split_,
|
||||
&Split::openWithCustomScheme,
|
||||
menu->addAction("Open in custom player",
|
||||
h->getDisplaySequence(HotkeyCategory::Split,
|
||||
"openInCustomPlayer"));
|
||||
"openInCustomPlayer"),
|
||||
this->split_, &Split::openWithCustomScheme);
|
||||
}
|
||||
|
||||
if (this->split_->getChannel()->hasModRights())
|
||||
{
|
||||
menu->addAction(
|
||||
OPEN_MOD_VIEW_IN_BROWSER, this->split_,
|
||||
&Split::openModViewInBrowser,
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "openModView"));
|
||||
OPEN_MOD_VIEW_IN_BROWSER,
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "openModView"),
|
||||
this->split_, &Split::openModViewInBrowser);
|
||||
}
|
||||
|
||||
menu->addAction(
|
||||
"Create a clip", this->split_,
|
||||
"Create a clip",
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "createClip"),
|
||||
this->split_,
|
||||
[twitchChannel] {
|
||||
twitchChannel->createClip();
|
||||
},
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "createClip"))
|
||||
})
|
||||
->setVisible(twitchChannel->isLive());
|
||||
|
||||
menu->addSeparator();
|
||||
@@ -450,9 +456,9 @@ std::unique_ptr<QMenu> SplitHeader::createMainMenu()
|
||||
if (this->split_->getChannel()->getType() == Channel::Type::TwitchWhispers)
|
||||
{
|
||||
menu->addAction(
|
||||
OPEN_WHISPERS_IN_BROWSER, this->split_,
|
||||
&Split::openWhispersInBrowser,
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "openInBrowser"));
|
||||
OPEN_WHISPERS_IN_BROWSER,
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "openInBrowser"),
|
||||
this->split_, &Split::openWhispersInBrowser);
|
||||
menu->addSeparator();
|
||||
}
|
||||
|
||||
@@ -460,8 +466,9 @@ std::unique_ptr<QMenu> SplitHeader::createMainMenu()
|
||||
if (this->split_->getChannel()->canReconnect())
|
||||
{
|
||||
menu->addAction(
|
||||
"Reconnect", this, SLOT(reconnect()),
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "reconnect"));
|
||||
"Reconnect",
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "reconnect"), this,
|
||||
&SplitHeader::reconnect);
|
||||
}
|
||||
|
||||
if (twitchChannel)
|
||||
@@ -472,12 +479,12 @@ std::unique_ptr<QMenu> SplitHeader::createMainMenu()
|
||||
"reloadEmotes", {{"channel"}});
|
||||
auto subSeq = h->getDisplaySequence(HotkeyCategory::Split,
|
||||
"reloadEmotes", {{"subscriber"}});
|
||||
menu->addAction("Reload channel emotes", this,
|
||||
SLOT(reloadChannelEmotes()),
|
||||
channelSeq.isEmpty() ? bothSeq : channelSeq);
|
||||
menu->addAction("Reload subscriber emotes", this,
|
||||
SLOT(reloadSubscriberEmotes()),
|
||||
subSeq.isEmpty() ? bothSeq : subSeq);
|
||||
menu->addAction("Reload channel emotes",
|
||||
channelSeq.isEmpty() ? bothSeq : channelSeq, this,
|
||||
&SplitHeader::reloadChannelEmotes);
|
||||
menu->addAction("Reload subscriber emotes",
|
||||
subSeq.isEmpty() ? bothSeq : subSeq, this,
|
||||
&SplitHeader::reloadSubscriberEmotes);
|
||||
}
|
||||
|
||||
menu->addSeparator();
|
||||
@@ -505,11 +512,9 @@ std::unique_ptr<QMenu> SplitHeader::createMainMenu()
|
||||
// this makes a full std::optional<> with an empty vector inside
|
||||
}
|
||||
moreMenu->addAction(
|
||||
"Toggle moderation mode", this->split_,
|
||||
[this]() {
|
||||
"Toggle moderation mode", modModeSeq, this->split_, [this]() {
|
||||
this->split_->setModerationMode(!this->split_->getModerationMode());
|
||||
},
|
||||
modModeSeq);
|
||||
});
|
||||
|
||||
if (this->split_->getChannel()->getType() == Channel::Type::TwitchMentions)
|
||||
{
|
||||
@@ -533,13 +538,15 @@ std::unique_ptr<QMenu> SplitHeader::createMainMenu()
|
||||
if (twitchChannel->hasModRights())
|
||||
{
|
||||
moreMenu->addAction(
|
||||
"Show chatter list", this->split_, &Split::showChatterList,
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "openViewerList"));
|
||||
"Show chatter list",
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "openViewerList"),
|
||||
this->split_, &Split::showChatterList);
|
||||
}
|
||||
|
||||
moreMenu->addAction("Subscribe", this->split_, &Split::openSubPage,
|
||||
moreMenu->addAction("Subscribe",
|
||||
h->getDisplaySequence(HotkeyCategory::Split,
|
||||
"openSubscriptionPage"));
|
||||
"openSubscriptionPage"),
|
||||
this->split_, &Split::openSubPage);
|
||||
|
||||
{
|
||||
auto *action = new QAction(this);
|
||||
@@ -603,8 +610,9 @@ std::unique_ptr<QMenu> SplitHeader::createMainMenu()
|
||||
|
||||
moreMenu->addSeparator();
|
||||
moreMenu->addAction(
|
||||
"Clear messages", this->split_, &Split::clear,
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "clearMessages"));
|
||||
"Clear messages",
|
||||
h->getDisplaySequence(HotkeyCategory::Split, "clearMessages"),
|
||||
this->split_, &Split::clear);
|
||||
// moreMenu->addSeparator();
|
||||
// moreMenu->addAction("Show changelog", this,
|
||||
// SLOT(moreMenuShowChangelog()));
|
||||
|
||||
Reference in New Issue
Block a user