chatterino2
Code Issues

moved resources out of Application

Browse Source
This commit is contained in:
fourtf
2019-09-22 10:53:39 +02:00
parent da4714944d
commit 456065f508
13 changed files with 75 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/dialogs/UserInfoPopup.cpp
+5 -5
View File
@@ -32,7 +32,7 @@ namespace {
{
auto label = box.emplace<Label>().assign(assign);
auto button = box.emplace<Button>();
button->setPixmap(getApp()->resources->buttons.copyDark);
button->setPixmap(getResources().buttons.copyDark);
button->setScaleIndependantSize(18, 18);
button->setDim(Button::Dim::Lots);
QObject::connect(button.getElement(), &Button::leftClicked,
@@ -111,10 +111,10 @@ UserInfoPopup::UserInfoPopup()
usercard->getLabel().setText("Usercard");
auto mod = user.emplace<Button>(this);
mod->setPixmap(app->resources->buttons.mod);
mod->setPixmap(getResources().buttons.mod);
mod->setScaleIndependantSize(30, 30);
auto unmod = user.emplace<Button>(this);
unmod->setPixmap(app->resources->buttons.unmod);
unmod->setPixmap(getResources().buttons.unmod);
unmod->setScaleIndependantSize(30, 30);
user->addStretch(1);
@@ -575,7 +575,7 @@ UserInfoPopup::TimeoutWidget::TimeoutWidget()
}
};
addButton(Unban, "unban", getApp()->resources->buttons.unban);
addButton(Unban, "unban", getResources().buttons.unban);
addTimeouts("sec", {{"1", 1}});
addTimeouts("min", {
@@ -596,7 +596,7 @@ UserInfoPopup::TimeoutWidget::TimeoutWidget()
{"2", 2 * 60 * 60 * 24 * 7},
});
addButton(Ban, "ban", getApp()->resources->buttons.ban);
addButton(Ban, "ban", getResources().buttons.ban);
}
void UserInfoPopup::TimeoutWidget::paintEvent(QPaintEvent *)
src/widgets/splits/SplitHeader.cpp
+7 -7
View File
@@ -220,7 +220,7 @@ void SplitHeader::initializeLayout()
}),
// add split
this->addButton_ = makeWidget<Button>([&](auto w) {
w->setPixmap(getApp()->resources->buttons.addSplitDark);
w->setPixmap(getResources().buttons.addSplitDark);
w->setEnableMargin(false);
QObject::connect(w, &Button::leftClicked, this,
@@ -564,8 +564,8 @@ void SplitHeader::updateModerationModeIcon()
!getApp()->moderationActions->items.empty();
this->moderationButton_->setPixmap(
moderationMode ? getApp()->resources->buttons.modModeEnabled
: getApp()->resources->buttons.modModeDisabled);
moderationMode ? getResources().buttons.modModeEnabled
: getResources().buttons.modModeDisabled);
auto channel = this->split_->getChannel();
auto twitchChannel = dynamic_cast<TwitchChannel *>(channel.get());
@@ -713,14 +713,14 @@ void SplitHeader::themeChangedEvent()
// --
if (this->theme->isLightTheme())
{
this->dropdownButton_->setPixmap(getApp()->resources->buttons.menuDark);
this->addButton_->setPixmap(getApp()->resources->buttons.addSplit);
this->dropdownButton_->setPixmap(getResources().buttons.menuDark);
this->addButton_->setPixmap(getResources().buttons.addSplit);
}
else
{
this->dropdownButton_->setPixmap(
getApp()->resources->buttons.menuLight);
this->addButton_->setPixmap(getApp()->resources->buttons.addSplitDark);
getResources().buttons.menuLight);
this->addButton_->setPixmap(getResources().buttons.addSplitDark);
}
}
src/widgets/splits/SplitOverlay.cpp
+5 -5
View File
@@ -30,15 +30,15 @@ SplitOverlay::SplitOverlay(Split *parent)
layout->setColumnStretch(1, 1);
layout->setColumnStretch(3, 1);
auto *move = new QPushButton(getApp()->resources->split.move, QString());
auto *move = new QPushButton(getResources().split.move, QString());
auto *left = this->left_ =
new QPushButton(getApp()->resources->split.left, QString());
new QPushButton(getResources().split.left, QString());
auto *right = this->right_ =
new QPushButton(getApp()->resources->split.right, QString());
new QPushButton(getResources().split.right, QString());
auto *up = this->up_ =
new QPushButton(getApp()->resources->split.up, QString());
new QPushButton(getResources().split.up, QString());
auto *down = this->down_ =
new QPushButton(getApp()->resources->split.down, QString());
new QPushButton(getResources().split.down, QString());
move->setGraphicsEffect(new QGraphicsOpacityEffect(this));
left->setGraphicsEffect(new QGraphicsOpacityEffect(this));