noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

potential fix for stuff

Browse source
This commit is contained in:
Rasmus Karlsson 2017-01-15 17:12:19 +01:00
parent 801e7b8a1e
commit bbcbc4e3d7
2 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
chatwidgetheader.cpp
View file

@ -33,30 +33,31 @@ ChatWidgetHeader::ChatWidgetHeader()
leftLabel.label().setText(
"<img src=':/images/tool_moreCollapser_off16.png' />");
QObject::connect(&leftLabel, ChatWidgetHeaderButton::clicked, this,
leftButtonClicked);
QObject::connect(&leftLabel, &ChatWidgetHeaderButton::clicked, this,
&ChatWidgetHeader::leftButtonClicked);
leftMenu.addAction("Add new split", this, ChatWidgetHeader::menuAddSplit,
leftMenu.addAction("Add new split", this, &ChatWidgetHeader::menuAddSplit,
QKeySequence(tr("Ctrl+T")));
leftMenu.addAction("Close split", this, ChatWidgetHeader::menuCloseSplit,
leftMenu.addAction("Close split", this, &ChatWidgetHeader::menuCloseSplit,
QKeySequence(tr("Ctrl+W")));
leftMenu.addAction("Move split", this, ChatWidgetHeader::menuMoveSplit);
leftMenu.addAction("Move split", this, &ChatWidgetHeader::menuMoveSplit);
leftMenu.addSeparator();
leftMenu.addAction("Change channel", this,
ChatWidgetHeader::menuChangeChannel,
&ChatWidgetHeader::menuChangeChannel,
QKeySequence(tr("Ctrl+R")));
leftMenu.addAction("Clear chat", this, ChatWidgetHeader::menuClearChat);
leftMenu.addAction("Open channel", this, ChatWidgetHeader::menuOpenChannel);
leftMenu.addAction("Clear chat", this, &ChatWidgetHeader::menuClearChat);
leftMenu.addAction("Open channel", this,
&ChatWidgetHeader::menuOpenChannel);
leftMenu.addAction("Open pop-out player", this,
ChatWidgetHeader::menuPopupPlayer);
&ChatWidgetHeader::menuPopupPlayer);
leftMenu.addSeparator();
leftMenu.addAction("Reload channel emotes", this,
ChatWidgetHeader::menuReloadChannelEmotes);
&ChatWidgetHeader::menuReloadChannelEmotes);
leftMenu.addAction("Manual reconnect", this,
ChatWidgetHeader::menuManualReconnect);
&ChatWidgetHeader::menuManualReconnect);
leftMenu.addSeparator();
leftMenu.addAction("Show changelog", this,
ChatWidgetHeader::menuShowChangelog);
&ChatWidgetHeader::menuShowChangelog);
// middle
middleLabel.setAlignment(Qt::AlignCenter);

8
chatwidgetheaderbutton.cpp
View file

@ -18,10 +18,10 @@ ChatWidgetHeaderButton::ChatWidgetHeaderButton()
hbox.addWidget(&m_label);
hbox.addSpacing(6);
QObject::connect(&m_label, ChatWidgetHeaderButtonLabel::mouseUp, this,
labelMouseUp);
QObject::connect(&m_label, ChatWidgetHeaderButtonLabel::mouseDown, this,
labelMouseDown);
QObject::connect(&m_label, &ChatWidgetHeaderButtonLabel::mouseUp, this,
&ChatWidgetHeaderButton::labelMouseUp);
QObject::connect(&m_label, &ChatWidgetHeaderButtonLabel::mouseDown, this,
&ChatWidgetHeaderButton::labelMouseDown);
}
void