fixed switch channel popup

This commit is contained in:
daniel
2017-01-16 18:42:32 -05:00
parent 91e3976a09
commit 670d25342d
5 changed files with 10 additions and 7 deletions
+2 -2
View File
@@ -58,8 +58,8 @@ ChatWidgetHeader::ChatWidgetHeader(ChatWidget *parent)
// middle // middle
m_middleLabel.setAlignment(Qt::AlignCenter); m_middleLabel.setAlignment(Qt::AlignCenter);
QObject::connect(&m_middleLabel, &m_middleLabel.mouseDoubleClickEvent, this, QObject::connect(&m_middleLabel, SIGNAL(mouseDoubleClickEvent(QMouseEvent)), this,
&mouseDoubleClickEvent); SLOT(mouseDoubleClickEvent));
// right // right
m_rightLabel.setMinimumWidth(height()); m_rightLabel.setMinimumWidth(height());
+1 -1
View File
@@ -2,7 +2,7 @@
#include "resources.h" #include "resources.h"
QString Emotes::m_twitchEmoteTemplate( QString Emotes::m_twitchEmoteTemplate(
"http://static-cdn.jtvnw.net/emoticons/v1/{id}/{scale}.0"); "https://static-cdn.jtvnw.net/emoticons/v1/{id}/{scale}.0");
ConcurrentMap<QString, TwitchEmoteValue *> Emotes::m_twitchEmotes; ConcurrentMap<QString, TwitchEmoteValue *> Emotes::m_twitchEmotes;
ConcurrentMap<QString, LazyLoadedImage *> Emotes::m_bttvEmotes; ConcurrentMap<QString, LazyLoadedImage *> Emotes::m_bttvEmotes;
+1 -1
View File
@@ -176,7 +176,7 @@ IrcManager::partChannel(const QString &channel)
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() == "")
} }
+5 -3
View File
@@ -15,9 +15,9 @@ TextInputDialog::TextInputDialog(QWidget *parent)
m_buttonBox.addWidget(&m_okButton); m_buttonBox.addWidget(&m_okButton);
m_buttonBox.addWidget(&m_cancelButton); m_buttonBox.addWidget(&m_cancelButton);
QObject::connect(&m_okButton, &m_okButton.clicked, this, &okButtonClicked); QObject::connect(&m_okButton, SIGNAL(clicked()), this, SLOT(okButtonClicked()));
QObject::connect(&m_cancelButton, &m_cancelButton.clicked, this, QObject::connect(&m_cancelButton, SIGNAL(clicked()), this,
&cancelButtonClicked); SLOT(cancelButtonClicked()));
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
@@ -29,10 +29,12 @@ void
TextInputDialog::okButtonClicked() TextInputDialog::okButtonClicked()
{ {
accept(); accept();
close();
} }
void void
TextInputDialog::cancelButtonClicked() TextInputDialog::cancelButtonClicked()
{ {
reject(); reject();
close();
} }
+1
View File
@@ -34,6 +34,7 @@ private:
QPushButton m_okButton; QPushButton m_okButton;
QPushButton m_cancelButton; QPushButton m_cancelButton;
private slots:
void okButtonClicked(); void okButtonClicked();
void cancelButtonClicked(); void cancelButtonClicked();
}; };