Update AddressItem UI

Signed-off-by: Raul Metsma <raul@metsma.ee>
open-eid · Dec 2, 2024 · a5f3d03 · a5f3d03
1 parent 23da6ba
commit a5f3d03
Show file tree

Hide file tree

Showing 21 changed files with 160 additions and 289 deletions.
diff --git a/client/images/icon_download.svg b/client/images/icon_download.svg
diff --git a/client/images/icon_download_hover.svg b/client/images/icon_download_hover.svg
diff --git a/client/images/icon_download_pressed.svg b/client/images/icon_download_pressed.svg
diff --git a/client/images/icon_remove.svg b/client/images/icon_remove.svg
diff --git a/client/images/icon_remove_hover.svg b/client/images/icon_remove_hover.svg
diff --git a/client/images/icon_remove_pressed.svg b/client/images/icon_remove_pressed.svg
diff --git a/client/images/images.qrc b/client/images/images.qrc
@@ -29,9 +29,7 @@
 		<file>icon_checkbox_check_disabled.svg</file>
 		<file>icon_checkbox_check_hover.svg</file>
 		<file>icon_digitempel.svg</file>
-		<file>icon_download_hover.svg</file>
 		<file>icon_download.svg</file>
-		<file>icon_download_pressed.svg</file>
 		<file>icon_Edit_hover.svg</file>
 		<file>icon_Edit_pressed.svg</file>
 		<file>icon_Edit.svg</file>
@@ -55,9 +53,7 @@
 		<file>icon_radio_check_active.svg</file>
 		<file>icon_radio_check_disabled.svg</file>
 		<file>icon_radio_check_hover.svg</file>
-		<file>icon_remove_hover.svg</file>
 		<file>icon_remove.svg</file>
-		<file>icon_remove_pressed.svg</file>
 		<file>icon_Seaded.svg</file>
 		<file>icon_Seaded_hover.svg</file>
 		<file>intro_crypto-select_en.png</file>

diff --git a/client/translations/en.ts b/client/translations/en.ts
@@ -99,14 +99,6 @@
 </context>
 <context>
     <name>AddressItem</name>
-    <message>
-        <source>ADD</source>
-        <translation>ADD</translation>
-    </message>
-    <message>
-        <source>ADDED</source>
-        <translation>ADDED</translation>
-    </message>
     <message>
         <source> (Yourself)</source>
         <translation> (Yourself)</translation>
@@ -129,12 +121,10 @@
     </message>
     <message>
         <source>Added</source>
-        <extracomment>accessible</extracomment>
         <translation>Added</translation>
     </message>
     <message>
         <source>Add</source>
-        <extracomment>accessible</extracomment>
         <translation>Add</translation>
     </message>
     <message>

diff --git a/client/translations/et.ts b/client/translations/et.ts
@@ -99,14 +99,6 @@
 </context>
 <context>
     <name>AddressItem</name>
-    <message>
-        <source>ADD</source>
-        <translation>LISA</translation>
-    </message>
-    <message>
-        <source>ADDED</source>
-        <translation>LISATUD</translation>
-    </message>
     <message>
         <source> (Yourself)</source>
         <translation> (Sina ise)</translation>
@@ -129,12 +121,10 @@
     </message>
     <message>
         <source>Added</source>
-        <extracomment>accessible</extracomment>
         <translation>Lisatud</translation>
     </message>
     <message>
         <source>Add</source>
-        <extracomment>accessible</extracomment>
         <translation>Lisa</translation>
     </message>
     <message>

diff --git a/client/translations/ru.ts b/client/translations/ru.ts
@@ -99,14 +99,6 @@
 </context>
 <context>
     <name>AddressItem</name>
-    <message>
-        <source>ADD</source>
-        <translation>ДОБАВИТЬ</translation>
-    </message>
-    <message>
-        <source>ADDED</source>
-        <translation>Добавлен</translation>
-    </message>
     <message>
         <source> (Yourself)</source>
         <translation> (Вы сами)</translation>
@@ -129,12 +121,10 @@
     </message>
     <message>
         <source>Added</source>
-        <extracomment>accessible</extracomment>
         <translation>Добавлен</translation>
     </message>
     <message>
         <source>Add</source>
-        <extracomment>accessible</extracomment>
         <translation>Добавить</translation>
     </message>
     <message>

diff --git a/client/widgets/AddressItem.cpp b/client/widgets/AddressItem.cpp
@@ -51,11 +51,8 @@ AddressItem::AddressItem(CKey k, QWidget *parent, bool showIcon)
 	ui->idType->setFont(Styles::font(Styles::Regular, 11));
 	ui->idType->installEventFilter(this);
 
-	ui->remove->setIcons(QStringLiteral("/images/icon_remove.svg"), QStringLiteral("/images/icon_remove_hover.svg"),
-		QStringLiteral("/images/icon_remove_pressed.svg"), 17, 17);
-	ui->remove->init(LabelButton::White);
 	connect(ui->add, &QToolButton::clicked, this, [this]{ emit add(this);});
-	connect(ui->remove, &LabelButton::clicked, this, [this]{ emit remove(this);});
+	connect(ui->remove, &QToolButton::clicked, this, [this]{ emit remove(this);});
 
 	ui->add->setFont(Styles::font(Styles::Condensed, 12));
 	ui->added->setFont(ui->add->font());

diff --git a/client/widgets/AddressItem.h b/client/widgets/AddressItem.h
@@ -30,7 +30,6 @@ class AddressItem final : public Item
 public:
 	enum ShowToolButton
 	{
-		None,
 		Remove,
 		Add,
 		Added,