Skip to content

qt: Finetune ModalOverlay #3699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
UdjinM6 merged 2 commits into from
Sep 12, 2020
Merged

qt: Finetune ModalOverlay #3699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f37708d
qt: Align warning icon in ModalOverlay properly with the text
xdustinface Sep 2, 2020
5a92cee
qt: Center form layout in modaloverlay
xdustinface Sep 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/qt/forms/modaloverlay.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,7 @@
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="warningIcon">
<property name="enabled">
<bool>false</bool>
</property>
<widget class="QLabel" name="warningIcon">
<property name="text">
<string/>
</property>
Expand Down Expand Up @@ -172,6 +169,9 @@
<property name="fieldGrowthPolicy">
<enum>QFormLayout::FieldsStayAtSizeHint</enum>
</property>
<property name="formAlignment">
<set>Qt::AlignHCenter|Qt::AlignTop</set>
</property>
<property name="horizontalSpacing">
<number>6</number>
</property>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/modaloverlay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ foreverHidden(false)
ui->labelEstimatedTimeLeft,
}, GUIUtil::FontWeight::Bold);

GUIUtil::setIcon(ui->warningIcon, "warning", GUIUtil::ThemedColor::ORANGE, QSize(48, 48));
ui->warningIcon->setPixmap(GUIUtil::getIcon("warning", GUIUtil::ThemedColor::ORANGE).pixmap(48, 48));

connect(ui->closeButton, SIGNAL(clicked()), this, SLOT(closeClicked()));
if (parent) {
Expand Down
7 changes: 3 additions & 4 deletions src/qt/res/css/general.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1231,11 +1231,10 @@ QWidget#bgWidget { /* The frame overlaying the overview-page */
padding-right: 10px;
}

QWidget#bgWidget .QPushButton#warningIcon {
QWidget#bgWidget .QLabel#warningIcon {
background-color: #00000000;
width: 64px;
height: 64px;
padding: 5px;
margin-left: 10px;
margin-right: 10px;
}

QWidget#contentWidget { /* The actual content with the text/buttons/etc... */
Expand Down