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

Small fixes for the last PR

Browse source
This commit is contained in:
fourtf 2018-07-05 22:55:06 +02:00
parent 086ae010b1
commit 314c15bb87
4 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/widgets/dialogs/LastRunCrashDialog.cpp
View file

@ -16,8 +16,6 @@ LastRunCrashDialog::LastRunCrashDialog()
this->setWindowFlag(Qt::WindowContextHelpButtonHint, false); this->setWindowFlag(Qt::WindowContextHelpButtonHint, false);
this->setWindowTitle("Chatterino"); this->setWindowTitle("Chatterino");
auto &updateManager = Updates::getInstance();
auto layout = LayoutCreator<LastRunCrashDialog>(this).setLayoutType<QVBoxLayout>(); auto layout = LayoutCreator<LastRunCrashDialog>(this).setLayoutType<QVBoxLayout>();
layout.emplace<QLabel>( layout.emplace<QLabel>(

2
src/widgets/dialogs/LogsPopup.cpp
View file

@ -20,7 +20,6 @@ LogsPopup::LogsPopup()
void LogsPopup::initLayout() void LogsPopup::initLayout()
{ {
{
QVBoxLayout *layout = new QVBoxLayout(this); QVBoxLayout *layout = new QVBoxLayout(this);
layout->setMargin(0); layout->setMargin(0);
@ -28,7 +27,6 @@ void LogsPopup::initLayout()
layout->addWidget(this->channelView_); layout->addWidget(this->channelView_);
this->setLayout(layout); this->setLayout(layout);
}
} }
void LogsPopup::setInfo(ChannelPtr channel, QString userName) void LogsPopup::setInfo(ChannelPtr channel, QString userName)

6
src/widgets/dialogs/UserInfoPopup.cpp
View file

@ -69,8 +69,8 @@ UserInfoPopup::UserInfoPopup()
user.emplace<QCheckBox>("Follow").assign(&this->ui_.follow); user.emplace<QCheckBox>("Follow").assign(&this->ui_.follow);
user.emplace<QCheckBox>("Ignore").assign(&this->ui_.ignore); user.emplace<QCheckBox>("Ignore").assign(&this->ui_.ignore);
user.emplace<QCheckBox>("Ignore highlights").assign(&this->ui_.ignoreHighlights); user.emplace<QCheckBox>("Ignore highlights").assign(&this->ui_.ignoreHighlights);
auto viewLogs = user.emplace<RippleEffectLabel>(this).assign(&this->ui_.viewLogs); auto viewLogs = user.emplace<RippleEffectLabel2>(this);
this->ui_.viewLogs->getLabel().setText("Logs"); viewLogs->getLabel().setText("Logs");
auto mod = user.emplace<RippleEffectButton>(this); auto mod = user.emplace<RippleEffectButton>(this);
mod->setPixmap(app->resources->buttons.mod); mod->setPixmap(app->resources->buttons.mod);
@ -81,7 +81,7 @@ UserInfoPopup::UserInfoPopup()
user->addStretch(1); user->addStretch(1);
QObject::connect(viewLogs.getElement(), &RippleEffectLabel::clicked, [this] { QObject::connect(viewLogs.getElement(), &RippleEffectButton::clicked, [this] {
auto logs = new LogsPopup(); auto logs = new LogsPopup();
logs->setInfo(this->channel_, this->userName_); logs->setInfo(this->channel_, this->userName_);
logs->setAttribute(Qt::WA_DeleteOnClose); logs->setAttribute(Qt::WA_DeleteOnClose);

2
src/widgets/dialogs/UserInfoPopup.hpp
View file

@ -42,7 +42,7 @@ private:
struct { struct {
RippleEffectButton *avatarButton = nullptr; RippleEffectButton *avatarButton = nullptr;
RippleEffectLabel *viewLogs = nullptr; // RippleEffectLabel2 *viewLogs = nullptr;
Label *nameLabel = nullptr; Label *nameLabel = nullptr;
Label *viewCountLabel = nullptr; Label *viewCountLabel = nullptr;