summaryrefslogtreecommitdiffstats
path: root/framework
diff options
context:
space:
mode:
Diffstat (limited to 'framework')
-rw-r--r--framework/src/accounts/accountfactory.cpp3
-rw-r--r--framework/src/accounts/accountfactory.h2
2 files changed, 5 insertions, 0 deletions
diff --git a/framework/src/accounts/accountfactory.cpp b/framework/src/accounts/accountfactory.cpp
index 7f3f046d..c3c3a170 100644
--- a/framework/src/accounts/accountfactory.cpp
+++ b/framework/src/accounts/accountfactory.cpp
@@ -64,17 +64,20 @@ void AccountFactory::loadPackage()
64 }(); 64 }();
65 mUiPath.clear(); 65 mUiPath.clear();
66 mLoginUi.clear(); 66 mLoginUi.clear();
67 mAccountName.clear();
67 mRequiresKeyring = false; 68 mRequiresKeyring = false;
68 if (pluginPath.isEmpty()) { 69 if (pluginPath.isEmpty()) {
69 qWarning() << "Failed to load account package: " << "org.kube.accounts." + mAccountType; 70 qWarning() << "Failed to load account package: " << "org.kube.accounts." + mAccountType;
70 } else { 71 } else {
71 mUiPath = QUrl::fromLocalFile(pluginPath + "/AccountSettings.qml"); 72 mUiPath = QUrl::fromLocalFile(pluginPath + "/AccountSettings.qml");
72 mLoginUi = QUrl::fromLocalFile(pluginPath + "/Login.qml"); 73 mLoginUi = QUrl::fromLocalFile(pluginPath + "/Login.qml");
74 mAccountName = mAccountType;
73 if (QFileInfo::exists(pluginPath + "/metadata.json")) { 75 if (QFileInfo::exists(pluginPath + "/metadata.json")) {
74 QFile file{pluginPath + "/metadata.json"}; 76 QFile file{pluginPath + "/metadata.json"};
75 file.open(QIODevice::ReadOnly); 77 file.open(QIODevice::ReadOnly);
76 auto json = QJsonDocument::fromJson(file.readAll()); 78 auto json = QJsonDocument::fromJson(file.readAll());
77 mRequiresKeyring = json.object().value("RequiresKeyring").toBool(true); 79 mRequiresKeyring = json.object().value("RequiresKeyring").toBool(true);
80 mAccountName = json.object().value("Name").toString();
78 } else { 81 } else {
79 mRequiresKeyring = true; 82 mRequiresKeyring = true;
80 } 83 }
diff --git a/framework/src/accounts/accountfactory.h b/framework/src/accounts/accountfactory.h
index 10acfbc1..b183f8fe 100644
--- a/framework/src/accounts/accountfactory.h
+++ b/framework/src/accounts/accountfactory.h
@@ -32,6 +32,7 @@ class KUBE_EXPORT AccountFactory : public QObject
32 Q_OBJECT 32 Q_OBJECT
33 Q_PROPERTY(QString accountId MEMBER mAccountId WRITE setAccountId); 33 Q_PROPERTY(QString accountId MEMBER mAccountId WRITE setAccountId);
34 Q_PROPERTY(QString accountType MEMBER mAccountType WRITE setAccountType); 34 Q_PROPERTY(QString accountType MEMBER mAccountType WRITE setAccountType);
35 Q_PROPERTY(QString accountName MEMBER mAccountName NOTIFY accountLoaded);
35 Q_PROPERTY(QUrl uiPath MEMBER mUiPath NOTIFY accountLoaded); 36 Q_PROPERTY(QUrl uiPath MEMBER mUiPath NOTIFY accountLoaded);
36 Q_PROPERTY(QUrl loginUi MEMBER mLoginUi NOTIFY accountLoaded); 37 Q_PROPERTY(QUrl loginUi MEMBER mLoginUi NOTIFY accountLoaded);
37 Q_PROPERTY(bool requiresKeyring MEMBER mRequiresKeyring NOTIFY accountLoaded); 38 Q_PROPERTY(bool requiresKeyring MEMBER mRequiresKeyring NOTIFY accountLoaded);
@@ -47,6 +48,7 @@ signals:
47private: 48private:
48 void loadPackage(); 49 void loadPackage();
49 QString mAccountId; 50 QString mAccountId;
51 QString mAccountName;
50 QUrl mUiPath; 52 QUrl mUiPath;
51 QUrl mLoginUi; 53 QUrl mLoginUi;
52 QByteArray mAccountType; 54 QByteArray mAccountType;