diff --git a/src/providers/ffz/FfzEmotes.cpp b/src/providers/ffz/FfzEmotes.cpp index a718eb705..54efde13e 100644 --- a/src/providers/ffz/FfzEmotes.cpp +++ b/src/providers/ffz/FfzEmotes.cpp @@ -147,7 +147,7 @@ void FfzEmotes::loadEmotes() void FfzEmotes::loadChannel(const QString &channelName, std::function callback) { - log("[FFZEmotes] Reload FFZ Channel Emotes for channel %s\n", channelName); + log("[FFZEmotes] Reload FFZ Channel Emotes for channel {}\n", channelName); NetworkRequest request("https://api.frankerfacez.com/v1/room/" + channelName); diff --git a/src/widgets/settingspages/KeyboardSettingsPage.cpp b/src/widgets/settingspages/KeyboardSettingsPage.cpp index 14090e112..4cdb17c99 100644 --- a/src/widgets/settingspages/KeyboardSettingsPage.cpp +++ b/src/widgets/settingspages/KeyboardSettingsPage.cpp @@ -42,6 +42,7 @@ KeyboardSettingsPage::KeyboardSettingsPage() form->addRow(new QLabel("Ctrl + F"), new QLabel("Search in current channel")); form->addRow(new QLabel("Ctrl + E"), new QLabel("Open Emote menu")); + form->addRow(new QLabel("Ctrl + P"), new QLabel("Open Settings menu")); } } // namespace chatterino diff --git a/src/widgets/splits/Split.hpp b/src/widgets/splits/Split.hpp index d9499b9b2..9571c74da 100644 --- a/src/widgets/splits/Split.hpp +++ b/src/widgets/splits/Split.hpp @@ -94,6 +94,12 @@ private: SplitContainer *container_; IndirectChannel channel_; + bool moderationMode_{}; + bool isTopRightSplit_{}; + + bool isMouseOver_{}; + bool isDragging_{}; + QVBoxLayout *vbox_; SplitHeader *header_; ChannelView *view_; @@ -102,12 +108,6 @@ private: NullablePtr selectChannelDialog_; - bool moderationMode_{}; - bool isTopRightSplit_{}; - - bool isMouseOver_{}; - bool isDragging_{}; - pajlada::Signals::Connection channelIDChangedConnection_; pajlada::Signals::Connection usermodeChangedConnection_; pajlada::Signals::Connection roomModeChangedConnection_; diff --git a/src/widgets/splits/SplitHeader.cpp b/src/widgets/splits/SplitHeader.cpp index 3d41eab16..255b41590 100644 --- a/src/widgets/splits/SplitHeader.cpp +++ b/src/widgets/splits/SplitHeader.cpp @@ -230,7 +230,8 @@ std::unique_ptr SplitHeader::createMainMenu() menu->addSeparator(); menu->addAction("Reload channel emotes", this, SLOT(reloadChannelEmotes())); - menu->addAction("Reload subscriber emotes", this, SLOT(reloadSubscriberEmotes())); + menu->addAction("Reload subscriber emotes", this, + SLOT(reloadSubscriberEmotes())); menu->addAction("Reconnect", this, SLOT(reconnect())); menu->addAction("Clear messages", this->split_, &Split::clear); // menu->addSeparator();