Skip to content

Commit edbf163

Browse files
metsmametsma
committed
Update main button UI
WE2-991, WE2-1123 Signed-off-by: Raul Metsma <raul@metsma.ee>
1 parent ed1a78c commit edbf163

File tree

9 files changed

+50
-107
lines changed

9 files changed

+50
-107
lines changed

‎src/ui/dark.qss‎

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,11 @@ background-color: #232325;
33
color: white;
44
}
55
QPushButton {
6-
border-color: #4E4E53;
7-
background-color: #4E4E53;
8-
}
9-
QPushButton::disabled {
10-
border-color: #27272A;
11-
background-color: #27272A;
12-
}
13-
QPushButton::hover {
14-
background-color: #76767B;
15-
border-color: #76767B;
16-
}
17-
QPushButton::focus {
18-
background-color: #76767B;
19-
border-color: #DEDEDE;
20-
}
21-
QPushButton:default {
22-
background-color: #113F8E;
23-
border-color: #113F8E;
6+
color: #FF5C79;
7+
border-color: #FF5C79;
248
}
25-
QPushButton:default::disabled {
26-
background-color: #15213E;
27-
border-color: #15213E;
28-
}
29-
QPushButton:default::hover {
30-
background-color: #008EEA;
31-
border-color: #008EEA;
32-
}
33-
QPushButton:default::focus {
34-
background-color: #008EEA;
35-
border-color: #DEDEDE;
9+
QPushButton:hover, QPushButton:pressed {
10+
background-color: #232325;
3611
}
3712
#langButton {
3813
color: #FFFFFF;

‎src/ui/dialog.ui‎

Lines changed: 28 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -27,43 +27,32 @@ font-family: &quot;Roboto&quot;;
2727
color: black;
2828
}
2929
QPushButton {
30-
font-size: 17px;
31-
border: 3px solid #EFEFEF;
32-
border-radius: 3px;
33-
height: 39px;
34-
padding-left: 17px;
35-
padding-right: 17px;
36-
min-width: 30px;
37-
background-color: #EFEFEF;
38-
}
39-
QPushButton::disabled {
40-
background-color: #FAFAFA;
41-
border-color: #FAFAFA;
30+
color: #AD2A45;
31+
border: 1px solid #AD2A45;
32+
border-radius: 4px;
33+
padding: 11px 12px;
34+
font-family: Roboto, Helvetica;
35+
font-size: 14px;
36+
font-weight: 700;
4237
}
43-
QPushButton::hover {
44-
background-color: #DEDEDE;
45-
border-color: #DEDEDE;
38+
QPushButton:hover {
39+
background-color: #F5EBED;
4640
}
47-
QPushButton::focus {
48-
background-color: #DEDEDE;
49-
border-color: #76767B;
41+
QPushButton:pressed {
42+
background-color: #E1C1C6;
5043
}
51-
QPushButton:default {
44+
QPushButton::default, #helpButton {
5245
color: white;
53-
background-color: #113F8E;
54-
border-color: #113F8E;
55-
}
56-
QPushButton:default::disabled {
57-
background-color: #B7C5DD;
58-
border-color: #B7C5DD;
46+
border-color: #2F70B6;
47+
background-color: #2F70B6;
5948
}
60-
QPushButton:default::hover {
61-
background-color: #003168;
62-
border-color: #003168
49+
QPushButton::default:hover, #helpButton:hover {
50+
border-color: #2B66A6;
51+
background-color: #2B66A6;
6352
}
64-
QPushButton:default::focus {
65-
background-color: #003168;
66-
border-color: #008EEA;
53+
QPushButton::default:pressed, #helpButton:pressed {
54+
border-color: #215081;
55+
background-color: #215081;
6756
}
6857
#langButton {
6958
color: #003168;
@@ -166,9 +155,6 @@ border-radius: 3px;
166155
#fatalErrorLabel, #aboutAlert {
167156
color: #CD2541;
168157
}
169-
#helpButton {
170-
color: #003168;
171-
}
172158
#aboutVersion {
173159
color: #76767B;
174160
}
@@ -902,21 +888,24 @@ border-radius: 4px;</string>
902888
<property name="cursor">
903889
<cursorShape>PointingHandCursor</cursorShape>
904890
</property>
891+
<property name="layoutDirection">
892+
<enum>Qt::RightToLeft</enum>
893+
</property>
905894
<property name="text">
906895
<string>Help</string>
907896
</property>
908897
<property name="icon">
909898
<iconset resource="web-eid-resources.qrc">
910-
<normaloff>:/images/help.svg</normaloff>:/images/help.svg</iconset>
899+
<normaloff>:/images/link.svg</normaloff>:/images/link.svg</iconset>
911900
</property>
912901
<property name="iconSize">
913902
<size>
914-
<width>30</width>
915-
<height>26</height>
903+
<width>16</width>
904+
<height>16</height>
916905
</size>
917906
</property>
918-
<property name="autoDefault">
919-
<bool>false</bool>
907+
<property name="default">
908+
<bool>true</bool>
920909
</property>
921910
</widget>
922911
</item>
@@ -928,16 +917,6 @@ border-radius: 4px;</string>
928917
<property name="text">
929918
<string>Confirm</string>
930919
</property>
931-
<property name="icon">
932-
<iconset resource="web-eid-resources.qrc">
933-
<normaloff>:/images/arrow.svg</normaloff>:/images/arrow.svg</iconset>
934-
</property>
935-
<property name="iconSize">
936-
<size>
937-
<width>20</width>
938-
<height>16</height>
939-
</size>
940-
</property>
941920
<property name="default">
942921
<bool>true</bool>
943922
</property>

‎src/ui/images/arrow.svg‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/ui/images/help.svg‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/ui/images/help_dark.svg‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/ui/images/link.svg‎

Lines changed: 3 additions & 0 deletions
Loading

‎src/ui/languageselect.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ LanguageSelect::LanguageSelect(QWidget* parent) :
3434
{
3535
ui->setupUi(this);
3636
if (Application::isDarkTheme()) {
37-
if (QFile f(QStringLiteral(":dark-languageselect.qss")); f.open(QFile::ReadOnly | QFile::Text)) {
37+
if (QFile f(QStringLiteral(":dark-languageselect.qss"));
38+
f.open(QFile::ReadOnly | QFile::Text)) {
3839
style()->unpolish(this);
3940
setStyleSheet(styleSheet() + QTextStream(&f).readAll());
4041
style()->polish(this);

‎src/ui/languageselect.ui‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>537</width>
10-
<height>456</height>
9+
<width>616</width>
10+
<height>444</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -88,6 +88,12 @@ background-color: #215081;
8888
</property>
8989
<item row="0" column="0" colspan="3">
9090
<widget class="QLabel" name="label">
91+
<property name="minimumSize">
92+
<size>
93+
<width>536</width>
94+
<height>0</height>
95+
</size>
96+
</property>
9197
<property name="text">
9298
<string>Select language</string>
9399
</property>
@@ -113,7 +119,7 @@ background-color: #215081;
113119
<cursorShape>PointingHandCursor</cursorShape>
114120
</property>
115121
<property name="text">
116-
<string notr="true">Eesti keel</string>
122+
<string notr="true">Eesti</string>
117123
</property>
118124
<property name="checkable">
119125
<bool>true</bool>
@@ -204,7 +210,7 @@ background-color: #215081;
204210
<cursorShape>PointingHandCursor</cursorShape>
205211
</property>
206212
<property name="text">
207-
<string notr="true">Hrvatska</string>
213+
<string notr="true">Hrvatski</string>
208214
</property>
209215
<property name="checkable">
210216
<bool>true</bool>
@@ -248,7 +254,7 @@ background-color: #215081;
248254
<cursorShape>PointingHandCursor</cursorShape>
249255
</property>
250256
<property name="text">
251-
<string notr="true">Française</string>
257+
<string notr="true">Français</string>
252258
</property>
253259
<property name="checkable">
254260
<bool>true</bool>
@@ -314,7 +320,7 @@ background-color: #215081;
314320
<cursorShape>PointingHandCursor</cursorShape>
315321
</property>
316322
<property name="text">
317-
<string notr="true">Slovenština</string>
323+
<string notr="true">Slovenčina</string>
318324
</property>
319325
<property name="checkable">
320326
<bool>true</bool>
@@ -346,7 +352,7 @@ background-color: #215081;
346352
</property>
347353
<property name="sizeHint" stdset="0">
348354
<size>
349-
<width>317</width>
355+
<width>0</width>
350356
<height>20</height>
351357
</size>
352358
</property>

‎src/ui/webeiddialog.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ WebEidDialog::WebEidDialog(QWidget* parent) : WebEidUI(parent), ui(new Private)
7878
ui->cardChipIcon->setPixmap(pixmap("no-id-card"_L1));
7979
ui->fatalErrorIcon->setPixmap(pixmap("fatal"_L1));
8080
ui->aboutIcon->setPixmap(pixmap("fatal"_L1));
81-
ui->helpButton->setIcon(QIcon(QStringLiteral(":/images/help_dark.svg")));
8281
}
8382
}
8483
setWindowFlag(Qt::CustomizeWindowHint);

0 commit comments

Comments
 (0)