From 6c0d796b4bd69a79ad301ea349144bf6c0f80756 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ivan=20=C4=8Cuki=C4=87?= Date: Sat, 11 May 2019 19:19:17 +0200 Subject: [PATCH] E2E UI setup poligh MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit - 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ć --- src/3rdparty/kmessagewidget/kmessagewidget.cpp | 2 +- src/gui/accountsettings.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/3rdparty/kmessagewidget/kmessagewidget.cpp b/src/3rdparty/kmessagewidget/kmessagewidget.cpp index 9e9a7ebb0..cd3563a1d 100644 --- 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 4a554a196..db4e21123 100644 --- 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); -- 2.30.2