E2E UI setup poligh

- Text changed to "Enable..." instead of "Setup"
- The close icon follows NC style
- "end-to-end" instead of "end to end"

Signed-off-by: Ivan Čukić <ivan.cukic@kde.org>

diff --git a/src/3rdparty/kmessagewidget/kmessagewidget.cpp b/src/3rdparty/kmessagewidget/kmessagewidget.cpp
index 9e9a7ebb07f66e34eeedc11a402f4bcf4eb332a9..cd3563a1d6570152642cf74c3415e58bbb401d32 100644 (file)
--- a/src/3rdparty/kmessagewidget/kmessagewidget.cpp
+++ b/src/3rdparty/kmessagewidget/kmessagewidget.cpp
@@ -94,7 +94,7 @@ void KMessageWidgetPrivate::init(KMessageWidget *q_ptr)
     QAction *closeAction = new QAction(q);
     closeAction->setText(KMessageWidget::tr("&Close"));
     closeAction->setToolTip(KMessageWidget::tr("Close message"));
-    closeAction->setIcon(q->style()->standardIcon(QStyle::SP_DialogCloseButton));
+    closeAction->setIcon(QIcon(":/client/resources/close.svg")); // ivan: NC customization
 
     QObject::connect(closeAction, &QAction::triggered, q, &KMessageWidget::animatedHide);
 

diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index 4a554a196a38b677ebbbc27215c9de0ee3ffe77b..db4e211239699d1b352c7f7697873deb04cd1cf8 100644 (file)
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -233,9 +233,9 @@ void AccountSettings::createAccountToolbox()
 
 void AccountSettings::slotNewMnemonicGenerated()
 {
-    ui->encryptionMessage->setText(tr("This account supports end to end encryption"));
+    ui->encryptionMessage->setText(tr("This account supports end-to-end encryption"));
 
-    QAction *mnemonic = new QAction(tr("Setup"), this);
+    QAction *mnemonic = new QAction(tr("Enable..."), this);
     connect(mnemonic, &QAction::triggered, this, &AccountSettings::requesetMnemonic);
     connect(mnemonic, &QAction::triggered, ui->encryptionMessage, &KMessageWidget::hide);