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 'master' into apa-flashtaskbar

Browse source
This commit is contained in:
apa420 2018-10-06 18:24:07 +02:00 committed by GitHub
commit 1937e69830
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/providers/ffz/FfzEmotes.cpp
View file

@ -147,7 +147,7 @@ void FfzEmotes::loadEmotes()
void FfzEmotes::loadChannel(const QString &channelName, void FfzEmotes::loadChannel(const QString &channelName,
std::function<void(EmoteMap &&)> callback) std::function<void(EmoteMap &&)> 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/" + NetworkRequest request("https://api.frankerfacez.com/v1/room/" +
channelName); channelName);

1
src/widgets/settingspages/KeyboardSettingsPage.cpp
View file

@ -42,6 +42,7 @@ KeyboardSettingsPage::KeyboardSettingsPage()
form->addRow(new QLabel("Ctrl + F"), form->addRow(new QLabel("Ctrl + F"),
new QLabel("Search in current channel")); new QLabel("Search in current channel"));
form->addRow(new QLabel("Ctrl + E"), new QLabel("Open Emote menu")); form->addRow(new QLabel("Ctrl + E"), new QLabel("Open Emote menu"));
form->addRow(new QLabel("Ctrl + P"), new QLabel("Open Settings menu"));
} }
} // namespace chatterino } // namespace chatterino

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

@ -94,6 +94,12 @@ private:
SplitContainer *container_; SplitContainer *container_;
IndirectChannel channel_; IndirectChannel channel_;
bool moderationMode_{};
bool isTopRightSplit_{};
bool isMouseOver_{};
bool isDragging_{};
QVBoxLayout *vbox_; QVBoxLayout *vbox_;
SplitHeader *header_; SplitHeader *header_;
ChannelView *view_; ChannelView *view_;
@ -102,12 +108,6 @@ private:
NullablePtr<SelectChannelDialog> selectChannelDialog_; NullablePtr<SelectChannelDialog> selectChannelDialog_;
bool moderationMode_{};
bool isTopRightSplit_{};
bool isMouseOver_{};
bool isDragging_{};
pajlada::Signals::Connection channelIDChangedConnection_; pajlada::Signals::Connection channelIDChangedConnection_;
pajlada::Signals::Connection usermodeChangedConnection_; pajlada::Signals::Connection usermodeChangedConnection_;
pajlada::Signals::Connection roomModeChangedConnection_; pajlada::Signals::Connection roomModeChangedConnection_;

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

@ -230,7 +230,8 @@ std::unique_ptr<QMenu> SplitHeader::createMainMenu()
menu->addSeparator(); menu->addSeparator();
menu->addAction("Reload channel emotes", this, SLOT(reloadChannelEmotes())); 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("Reconnect", this, SLOT(reconnect()));
menu->addAction("Clear messages", this->split_, &Split::clear); menu->addAction("Clear messages", this->split_, &Split::clear);
// menu->addSeparator(); // menu->addSeparator();