From e7d5671eaf4cd6451d194b6f8e0b9123f7fb7ee1 Mon Sep 17 00:00:00 2001
From: Raul Metsma <raul@metsma.ee>
Date: Fri, 23 May 2025 14:36:40 +0300
Subject: [PATCH] Update main button UI

WE2-991

Signed-off-by: Raul Metsma <raul@metsma.ee>
---
 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/webeiddialog.cpp     |  1 -
 7 files changed, 35 insertions(+), 99 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 4f97d404..7d021372 100644
--- a/src/ui/dialog.ui
+++ b/src/ui/dialog.ui
@@ -27,43 +27,32 @@ font-family: &quot;Roboto&quot;;
 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;
 }
@@ -896,21 +882,24 @@ border-radius: 4px;</string>
        <property name="cursor">
         <cursorShape>PointingHandCursor</cursorShape>
        </property>
+       <property name="layoutDirection">
+        <enum>Qt::RightToLeft</enum>
+       </property>
        <property name="text">
         <string>Help</string>
        </property>
        <property name="icon">
         <iconset resource="web-eid-resources.qrc">
-         <normaloff>:/images/help.svg</normaloff>:/images/help.svg</iconset>
+         <normaloff>:/images/link.svg</normaloff>:/images/link.svg</iconset>
        </property>
        <property name="iconSize">
         <size>
-         <width>30</width>
-         <height>26</height>
+         <width>16</width>
+         <height>16</height>
         </size>
        </property>
-       <property name="autoDefault">
-        <bool>false</bool>
+       <property name="default">
+        <bool>true</bool>
        </property>
       </widget>
      </item>
@@ -922,16 +911,6 @@ border-radius: 4px;</string>
        <property name="text">
         <string>Confirm</string>
        </property>
-       <property name="icon">
-        <iconset resource="web-eid-resources.qrc">
-         <normaloff>:/images/arrow.svg</normaloff>:/images/arrow.svg</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>20</width>
-         <height>16</height>
-        </size>
-       </property>
        <property name="default">
         <bool>true</bool>
        </property>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="16px" version="1.1" viewBox="0 0 20 16" xmlns="http://www.w3.org/2000/svg">
-    <polygon id="Arrow" fill="#FFFFFF" transform="translate(-4,-4)" points="12.222 19.778 10.808 18.364 16.172 13 4 13 4 11 16.172 11 10.808 5.636 12.222 4.222 20 12"/>
-</svg>
\ 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="26px" viewBox="0 0 30 26" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <g id="help" transform="translate(1.000000, 1.000000)" stroke="#113F8E" stroke-width="2" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <path d="M14.07776,23.81872 C17.1236,23.28328 19.8452,21.59256 21.6748,19.0992 C23.50432,16.60576 24.30064,13.50232 23.8976,10.43608 C23.49456,7.36984 21.92328,4.5776 19.51144,2.641744 C17.09968,0.705896 14.0336,-0.224072 10.9528,0.045808 C7.872,0.315688 5.014312,1.764576 2.975824,4.090272 C0.937344,6.415968 -0.1245456,9.43888 0.011656,12.52848 C0.147856,15.61808 1.471616,18.53584 3.70684,20.67312 C5.942064,22.81048 8.91616,24.00224 12.0088,24.0000005" id="Path"/>
-        <path d="M6.893456,8.58752 C6.893456,7.22968 7.43248,5.927472 8.39192,4.96732 C9.35136,4.00716 10.65264,3.467576 12.00952,3.467576 C13.36648,3.467576 14.66776,4.00716 15.6272,4.96732 C16.58664,5.927472 17.1256,7.22968 17.1256,8.58752 C17.1256,9.65096 16.79464,10.688 16.17896,11.55472 C15.56328,12.42152 14.69328,13.07512 13.6896,13.42472 C13.1908,13.60928 12.76136,13.944 12.46048,14.3828 C12.15968,14.8216 12.00208,15.34296 12.00952,15.87512 L12.00952,16.26864" id="Path"/>
-        <path d="M12.0096,18.82696 L12.0096,20.10696" id="Path"/>
-    </g>
-</svg>
\ 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="26px" viewBox="0 0 30 26" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <g id="help" transform="translate(1.000000, 1.000000)" stroke="#FFFFFF" stroke-width="2" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <path d="M14.07776,23.81872 C17.1236,23.28328 19.8452,21.59256 21.6748,19.0992 C23.50432,16.60576 24.30064,13.50232 23.8976,10.43608 C23.49456,7.36984 21.92328,4.5776 19.51144,2.641744 C17.09968,0.705896 14.0336,-0.224072 10.9528,0.045808 C7.872,0.315688 5.014312,1.764576 2.975824,4.090272 C0.937344,6.415968 -0.1245456,9.43888 0.011656,12.52848 C0.147856,15.61808 1.471616,18.53584 3.70684,20.67312 C5.942064,22.81048 8.91616,24.00224 12.0088,24.0000005" id="Path"/>
-        <path d="M6.893456,8.58752 C6.893456,7.22968 7.43248,5.927472 8.39192,4.96732 C9.35136,4.00716 10.65264,3.467576 12.00952,3.467576 C13.36648,3.467576 14.66776,4.00716 15.6272,4.96732 C16.58664,5.927472 17.1256,7.22968 17.1256,8.58752 C17.1256,9.65096 16.79464,10.688 16.17896,11.55472 C15.56328,12.42152 14.69328,13.07512 13.6896,13.42472 C13.1908,13.60928 12.76136,13.944 12.46048,14.3828 C12.15968,14.8216 12.00208,15.34296 12.00952,15.87512 L12.00952,16.26864" id="Path"/>
-        <path d="M12.0096,18.82696 L12.0096,20.10696" id="Path"/>
-    </g>
-</svg>
\ 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 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.6667 12.6667H3.33333V3.33333H8V2H3.33333C2.59333 2 2 2.6 2 3.33333V12.6667C2 13.4 2.59333 14 3.33333 14H12.6667C13.4 14 14 13.4 14 12.6667V8H12.6667V12.6667ZM9.33333 2V3.33333H11.7267L5.17333 9.88667L6.11333 10.8267L12.6667 4.27333V6.66667H14V2H9.33333Z" fill="white"/>
+</svg>
\ No newline at end of file
diff --git a/src/ui/webeiddialog.cpp b/src/ui/webeiddialog.cpp
index 5b5d42a0..76f733e6 100644
--- a/src/ui/webeiddialog.cpp
+++ b/src/ui/webeiddialog.cpp
@@ -79,7 +79,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);