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' of https://github.com/fourtf/idontknowcppplsdontjudge

Browse source
This commit is contained in:
fourtf 2017-01-16 15:11:51 +01:00
commit d7f98030e1
3 changed files with 24 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
chatwidgetheader.cpp
View file

@ -36,28 +36,28 @@ ChatWidgetHeader::ChatWidgetHeader()
QObject::connect(&leftLabel, &ChatWidgetHeaderButton::clicked, this, QObject::connect(&leftLabel, &ChatWidgetHeaderButton::clicked, this,
&ChatWidgetHeader::leftButtonClicked); &ChatWidgetHeader::leftButtonClicked);
leftMenu.addAction("Add new split", this, &ChatWidgetHeader::menuAddSplit, // leftMenu.addAction("Add new split", this, &ChatWidgetHeader::menuAddSplit,
QKeySequence(tr("Ctrl+T"))); // QKeySequence(tr("Ctrl+T")));
leftMenu.addAction("Close split", this, &ChatWidgetHeader::menuCloseSplit, // leftMenu.addAction("Close split", this, &ChatWidgetHeader::menuCloseSplit,
QKeySequence(tr("Ctrl+W"))); // QKeySequence(tr("Ctrl+W")));
leftMenu.addAction("Move split", this, &ChatWidgetHeader::menuMoveSplit); // leftMenu.addAction("Move split", this, &ChatWidgetHeader::menuMoveSplit);
leftMenu.addSeparator(); // leftMenu.addSeparator();
leftMenu.addAction("Change channel", this, // leftMenu.addAction("Change channel", this,
&ChatWidgetHeader::menuChangeChannel, // &ChatWidgetHeader::menuChangeChannel,
QKeySequence(tr("Ctrl+R"))); // QKeySequence(tr("Ctrl+R")));
leftMenu.addAction("Clear chat", this, &ChatWidgetHeader::menuClearChat); // leftMenu.addAction("Clear chat", this, &ChatWidgetHeader::menuClearChat);
leftMenu.addAction("Open channel", this, // leftMenu.addAction("Open channel", this,
&ChatWidgetHeader::menuOpenChannel); // &ChatWidgetHeader::menuOpenChannel);
leftMenu.addAction("Open pop-out player", this, // leftMenu.addAction("Open pop-out player", this,
&ChatWidgetHeader::menuPopupPlayer); // &ChatWidgetHeader::menuPopupPlayer);
leftMenu.addSeparator(); // leftMenu.addSeparator();
leftMenu.addAction("Reload channel emotes", this, // leftMenu.addAction("Reload channel emotes", this,
&ChatWidgetHeader::menuReloadChannelEmotes); // &ChatWidgetHeader::menuReloadChannelEmotes);
leftMenu.addAction("Manual reconnect", this, // leftMenu.addAction("Manual reconnect", this,
&ChatWidgetHeader::menuManualReconnect); // &ChatWidgetHeader::menuManualReconnect);
leftMenu.addSeparator(); // leftMenu.addSeparator();
leftMenu.addAction("Show changelog", this, // leftMenu.addAction("Show changelog", this,
&ChatWidgetHeader::menuShowChangelog); // &ChatWidgetHeader::menuShowChangelog);
// middle // middle
middleLabel.setAlignment(Qt::AlignCenter); middleLabel.setAlignment(Qt::AlignCenter);

5
ircmanager.cpp
View file

@ -157,7 +157,7 @@ IrcManager::disconnect()
void void
IrcManager::messageReceived(IrcMessage *message) IrcManager::messageReceived(IrcMessage *message)
{ {
qInfo(message->command().toStdString().c_str()); // qInfo(message->command().toStdString().c_str());
// if (message->command() == "") // if (message->command() == "")
} }
@ -165,9 +165,8 @@ IrcManager::messageReceived(IrcMessage *message)
void void
IrcManager::privateMessageReceived(IrcPrivateMessage *message) IrcManager::privateMessageReceived(IrcPrivateMessage *message)
{ {
qInfo(message->content().toStdString().c_str()); // qInfo(message->content().toStdString().c_str());
qInfo(message->target().toStdString().c_str());
auto c = Channels::getChannel(message->target().mid(1)); auto c = Channels::getChannel(message->target().mid(1));
if (c != NULL) { if (c != NULL) {

2
message.cpp
View file

@ -572,8 +572,6 @@ Message::layout(int width, bool enableEmoteMargins)
alignParts(); alignParts();
qInfo("words: %d, parts: %d", m_words.size(), parts->size());
auto tmp = m_wordParts; auto tmp = m_wordParts;
m_wordParts = parts; m_wordParts = parts;
delete tmp; delete tmp;