diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp index 6faf73d0e..f9a2dea21 100644 --- a/src/gui/accountsettings.cpp +++ b/src/gui/accountsettings.cpp @@ -249,9 +249,8 @@ void AccountSettings::slotE2eEncryptionMnemonicReady() _ui->encryptionMessage->setMessageType(KMessageWidget::Positive); _ui->encryptionMessage->setText(tr("End-to-End encryption has been enabled for this account")); - _ui->encryptionMessage->setIcon(Theme::createIconFromSvgResource(QStringLiteral(":/client/theme/colored/state-ok.svg"))); + _ui->encryptionMessage->setIcon(Theme::createColorAwareIcon(QStringLiteral(":/client/theme/lock.svg"))); _ui->encryptionMessage->show(); - } void AccountSettings::slotE2eEncryptionGenerateKeys() diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp index 5ffcf947f..e9d3206c9 100644 --- a/src/libsync/theme.cpp +++ b/src/libsync/theme.cpp @@ -870,21 +870,6 @@ QPixmap Theme::createColorAwarePixmap(const QString &name) return createColorAwarePixmap(name, QGuiApplication::palette()); } -QIcon Theme::createIconFromSvgResource(const QString &resourcePath) -{ - QSvgRenderer renderer(resourcePath); - - QImage img(64, 64, QImage::Format_ARGB32); - img.fill(Qt::GlobalColor::transparent); - - QPainter imgPainter(&img); - renderer.render(&imgPainter); - - QIcon icon(QPixmap::fromImage(img)); - - return icon; -} - bool Theme::showVirtualFilesOption() const { const auto vfsMode = bestAvailableVfsMode(); diff --git a/src/libsync/theme.h b/src/libsync/theme.h index 609363db2..3162df4c9 100644 --- a/src/libsync/theme.h +++ b/src/libsync/theme.h @@ -567,8 +567,6 @@ public: */ static QPixmap createColorAwarePixmap(const QString &name); - static QIcon createIconFromSvgResource(const QString &resourcePath); - /** * @brief Whether to show the option to create folders using "virtual files". * diff --git a/theme.qrc.in b/theme.qrc.in index c341ac5a0..cdc669023 100644 --- a/theme.qrc.in +++ b/theme.qrc.in @@ -209,6 +209,7 @@ theme/more.svg theme/change.svg theme/colored/change-bordered.svg + theme/lock.svg theme/lock-http.svg theme/lock-https.svg theme/lock-broken.svg diff --git a/theme/black/state-info.svg b/theme/black/state-info.svg index 762de0370..fb9f81505 100644 --- a/theme/black/state-info.svg +++ b/theme/black/state-info.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/theme/lock-broken.svg b/theme/lock-broken.svg index c6cfce606..48d070f5c 100644 --- a/theme/lock-broken.svg +++ b/theme/lock-broken.svg @@ -1 +1,51 @@ - + + + + + + + + + + + diff --git a/theme/lock-http.svg b/theme/lock-http.svg index a77e45536..3dbf27870 100644 --- a/theme/lock-http.svg +++ b/theme/lock-http.svg @@ -1 +1,61 @@ - + + + + + + + + + + + + + + + diff --git a/theme/lock-https.svg b/theme/lock-https.svg index cf013708d..3d493c925 100644 --- a/theme/lock-https.svg +++ b/theme/lock-https.svg @@ -1 +1,43 @@ - + + + + + + + diff --git a/theme/lock.svg b/theme/lock.svg new file mode 100644 index 000000000..88c2274f5 --- /dev/null +++ b/theme/lock.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/theme/white/state-info.svg b/theme/white/state-info.svg index d644e9bad..715fe8bb1 100644 --- a/theme/white/state-info.svg +++ b/theme/white/state-info.svg @@ -1 +1 @@ - + \ No newline at end of file