From edbf163eacf39b533112e0b567f80eaab39e0dd6 Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Fri, 23 May 2025 14:36:40 +0300 Subject: [PATCH] Update main button UI WE2-991, WE2-1123 Signed-off-by: Raul Metsma --- src/ui/dark.qss | 33 ++-------------- src/ui/dialog.ui | 77 ++++++++++++++----------------------- src/ui/images/arrow.svg | 4 -- src/ui/images/help.svg | 8 ---- src/ui/images/help_dark.svg | 8 ---- src/ui/images/link.svg | 3 ++ src/ui/languageselect.cpp | 3 +- src/ui/languageselect.ui | 20 ++++++---- src/ui/webeiddialog.cpp | 1 - 9 files changed, 50 insertions(+), 107 deletions(-) delete mode 100644 src/ui/images/arrow.svg delete mode 100644 src/ui/images/help.svg delete mode 100644 src/ui/images/help_dark.svg create mode 100644 src/ui/images/link.svg diff --git a/src/ui/dark.qss b/src/ui/dark.qss index c40ee360..fda55a34 100644 --- a/src/ui/dark.qss +++ b/src/ui/dark.qss @@ -3,36 +3,11 @@ background-color: #232325; color: white; } QPushButton { -border-color: #4E4E53; -background-color: #4E4E53; -} -QPushButton::disabled { -border-color: #27272A; -background-color: #27272A; -} -QPushButton::hover { -background-color: #76767B; -border-color: #76767B; -} -QPushButton::focus { -background-color: #76767B; -border-color: #DEDEDE; -} -QPushButton:default { -background-color: #113F8E; -border-color: #113F8E; +color: #FF5C79; +border-color: #FF5C79; } -QPushButton:default::disabled { -background-color: #15213E; -border-color: #15213E; -} -QPushButton:default::hover { -background-color: #008EEA; -border-color: #008EEA; -} -QPushButton:default::focus { -background-color: #008EEA; -border-color: #DEDEDE; +QPushButton:hover, QPushButton:pressed { +background-color: #232325; } #langButton { color: #FFFFFF; diff --git a/src/ui/dialog.ui b/src/ui/dialog.ui index 796b7a0d..b7e27342 100644 --- a/src/ui/dialog.ui +++ b/src/ui/dialog.ui @@ -27,43 +27,32 @@ font-family: "Roboto"; color: black; } QPushButton { -font-size: 17px; -border: 3px solid #EFEFEF; -border-radius: 3px; -height: 39px; -padding-left: 17px; -padding-right: 17px; -min-width: 30px; -background-color: #EFEFEF; -} -QPushButton::disabled { -background-color: #FAFAFA; -border-color: #FAFAFA; +color: #AD2A45; +border: 1px solid #AD2A45; +border-radius: 4px; +padding: 11px 12px; +font-family: Roboto, Helvetica; +font-size: 14px; +font-weight: 700; } -QPushButton::hover { -background-color: #DEDEDE; -border-color: #DEDEDE; +QPushButton:hover { +background-color: #F5EBED; } -QPushButton::focus { -background-color: #DEDEDE; -border-color: #76767B; +QPushButton:pressed { +background-color: #E1C1C6; } -QPushButton:default { +QPushButton::default, #helpButton { color: white; -background-color: #113F8E; -border-color: #113F8E; -} -QPushButton:default::disabled { -background-color: #B7C5DD; -border-color: #B7C5DD; +border-color: #2F70B6; +background-color: #2F70B6; } -QPushButton:default::hover { -background-color: #003168; -border-color: #003168 +QPushButton::default:hover, #helpButton:hover { +border-color: #2B66A6; +background-color: #2B66A6; } -QPushButton:default::focus { -background-color: #003168; -border-color: #008EEA; +QPushButton::default:pressed, #helpButton:pressed { +border-color: #215081; +background-color: #215081; } #langButton { color: #003168; @@ -166,9 +155,6 @@ border-radius: 3px; #fatalErrorLabel, #aboutAlert { color: #CD2541; } -#helpButton { -color: #003168; -} #aboutVersion { color: #76767B; } @@ -902,21 +888,24 @@ border-radius: 4px; PointingHandCursor + + Qt::RightToLeft + Help - :/images/help.svg:/images/help.svg + :/images/link.svg:/images/link.svg - 30 - 26 + 16 + 16 - - false + + true @@ -928,16 +917,6 @@ border-radius: 4px; Confirm - - - :/images/arrow.svg:/images/arrow.svg - - - - 20 - 16 - - true diff --git a/src/ui/images/arrow.svg b/src/ui/images/arrow.svg deleted file mode 100644 index 1a6a0997..00000000 --- a/src/ui/images/arrow.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/ui/images/help.svg b/src/ui/images/help.svg deleted file mode 100644 index c9fe386e..00000000 --- a/src/ui/images/help.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/ui/images/help_dark.svg b/src/ui/images/help_dark.svg deleted file mode 100644 index 0388ea38..00000000 --- a/src/ui/images/help_dark.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/ui/images/link.svg b/src/ui/images/link.svg new file mode 100644 index 00000000..b576d24b --- /dev/null +++ b/src/ui/images/link.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/ui/languageselect.cpp b/src/ui/languageselect.cpp index f932554b..db3aecef 100644 --- a/src/ui/languageselect.cpp +++ b/src/ui/languageselect.cpp @@ -34,7 +34,8 @@ LanguageSelect::LanguageSelect(QWidget* parent) : { ui->setupUi(this); if (Application::isDarkTheme()) { - if (QFile f(QStringLiteral(":dark-languageselect.qss")); f.open(QFile::ReadOnly | QFile::Text)) { + if (QFile f(QStringLiteral(":dark-languageselect.qss")); + f.open(QFile::ReadOnly | QFile::Text)) { style()->unpolish(this); setStyleSheet(styleSheet() + QTextStream(&f).readAll()); style()->polish(this); diff --git a/src/ui/languageselect.ui b/src/ui/languageselect.ui index 1d39b039..492ffd25 100644 --- a/src/ui/languageselect.ui +++ b/src/ui/languageselect.ui @@ -6,8 +6,8 @@ 0 0 - 537 - 456 + 616 + 444 @@ -88,6 +88,12 @@ background-color: #215081; + + + 536 + 0 + + Select language @@ -113,7 +119,7 @@ background-color: #215081; PointingHandCursor - Eesti keel + Eesti true @@ -204,7 +210,7 @@ background-color: #215081; PointingHandCursor - Hrvatska + Hrvatski true @@ -248,7 +254,7 @@ background-color: #215081; PointingHandCursor - Française + Français true @@ -314,7 +320,7 @@ background-color: #215081; PointingHandCursor - Slovenština + Slovenčina true @@ -346,7 +352,7 @@ background-color: #215081; - 317 + 0 20 diff --git a/src/ui/webeiddialog.cpp b/src/ui/webeiddialog.cpp index f82bc1ad..9fdf1f84 100644 --- a/src/ui/webeiddialog.cpp +++ b/src/ui/webeiddialog.cpp @@ -78,7 +78,6 @@ WebEidDialog::WebEidDialog(QWidget* parent) : WebEidUI(parent), ui(new Private) ui->cardChipIcon->setPixmap(pixmap("no-id-card"_L1)); ui->fatalErrorIcon->setPixmap(pixmap("fatal"_L1)); ui->aboutIcon->setPixmap(pixmap("fatal"_L1)); - ui->helpButton->setIcon(QIcon(QStringLiteral(":/images/help_dark.svg"))); } } setWindowFlag(Qt::CustomizeWindowHint);