Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Müller <fmueller@owncloud.com>2022-08-09 20:38:55 +0300
committerFabian Müller <fmueller@owncloud.com>2022-08-09 20:38:55 +0300
commit2e50339cd110b4dc8ded3d726aaff986629003fb (patch)
tree5ea4841be23eb8627810f3f1e74f9ccdf426d791
parent7376430031aa577cf79ac53cb1b736d6518d1a10 (diff)
Use correctly themed iconswork/fix-wizard-icons
-rw-r--r--src/gui/askforoauthlogindialog.cpp3
-rw-r--r--src/gui/newwizard/pages/accountconfiguredwizardpage.cpp3
-rw-r--r--src/gui/newwizard/pages/oauthcredentialssetupwizardpage.cpp4
3 files changed, 9 insertions, 1 deletions
diff --git a/src/gui/askforoauthlogindialog.cpp b/src/gui/askforoauthlogindialog.cpp
index 46df43ea3..5e5a353e2 100644
--- a/src/gui/askforoauthlogindialog.cpp
+++ b/src/gui/askforoauthlogindialog.cpp
@@ -56,6 +56,9 @@ AskForOAuthLoginDialog::AskForOAuthLoginDialog(AccountPtr accountPtr, QWidget *p
ocApp()->clipboard()->setText(link);
});
connect(_ui->logoutButton, &QPushButton::clicked, this, &QDialog::reject);
+
+ // depending on the theme we have to use a light or dark icon
+ _ui->copyUrlToClipboardButton->setIcon(Utility::getCoreIcon("clipboard"));
}
AskForOAuthLoginDialog::~AskForOAuthLoginDialog()
diff --git a/src/gui/newwizard/pages/accountconfiguredwizardpage.cpp b/src/gui/newwizard/pages/accountconfiguredwizardpage.cpp
index 5bf7b22a0..67b02077f 100644
--- a/src/gui/newwizard/pages/accountconfiguredwizardpage.cpp
+++ b/src/gui/newwizard/pages/accountconfiguredwizardpage.cpp
@@ -1,6 +1,7 @@
#include "accountconfiguredwizardpage.h"
#include "ui_accountconfiguredwizardpage.h"
+#include "gui/guiutility.h"
#include "theme.h"
#include <QDir>
@@ -26,7 +27,7 @@ AccountConfiguredWizardPage::AccountConfiguredWizardPage(const QString &defaultS
_ui->useVfsRadioButton->setText(tr("Use &virtual files instead of downloading content immediately"));
if (vfsModeIsExperimental) {
- _ui->useVfsRadioButton->setIcon(QIcon(QStringLiteral(":/client/resources/light/warning.svg")));
+ _ui->useVfsRadioButton->setIcon(Utility::getCoreIcon(QStringLiteral("warning")));
}
// just adjusting the visibility should be sufficient for these branding options
diff --git a/src/gui/newwizard/pages/oauthcredentialssetupwizardpage.cpp b/src/gui/newwizard/pages/oauthcredentialssetupwizardpage.cpp
index 8dca5879f..8091532cb 100644
--- a/src/gui/newwizard/pages/oauthcredentialssetupwizardpage.cpp
+++ b/src/gui/newwizard/pages/oauthcredentialssetupwizardpage.cpp
@@ -15,6 +15,7 @@
#include "oauthcredentialssetupwizardpage.h"
#include "ui_oauthcredentialssetupwizardpage.h"
+#include "gui/guiutility.h"
#include "theme.h"
namespace OCC::Wizard {
@@ -44,6 +45,9 @@ OAuthCredentialsSetupWizardPage::OAuthCredentialsSetupWizardPage(const QUrl &ser
});
_ui->pleaseLogIntoLabel->setText(tr("Please use your browser to log in to %1").arg(Theme::instance()->appNameGUI()));
+
+ // depending on the theme we have to use a light or dark icon
+ _ui->copyUrlToClipboardButton->setIcon(Utility::getCoreIcon("clipboard"));
}
OAuthCredentialsSetupWizardPage::~OAuthCredentialsSetupWizardPage()