feat(plugin): support option widgets

Change-Id: I3084c995cd4158af773c8ea7a70fd632b4ba1ffb
linuxdeepin · Jan 31, 2018 · ceffd7b · ceffd7b
1 parent 3ca6157
commit ceffd7b
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 16 deletions.
diff --git a/AuthDialog.cpp b/AuthDialog.cpp
@@ -27,6 +27,7 @@
 #include <QVBoxLayout>
 #include <QUrl>
 #include <QAbstractButton>
+#include <QButtonGroup>
 
 #include <DHiDPIHelper>
 
@@ -102,12 +103,17 @@ void AuthDialog::setRequest(const QString &request, bool requiresAdmin)
     m_passwordInput->setPlaceholderText(QString(dgettext("Linux-PAM", request.toUtf8().data())));
 }
 
-void AuthDialog::setOptions()
+void AuthDialog::addOptions(QButtonGroup *bg)
 {
-    /*
-    lblContent->setText(tr("An application is attempting to perform an action that requires privileges."
-                             " Authentication is required to perform this action."));
-    */
+    QList<QAbstractButton*> btns = bg->buttons();
+
+    if (btns.length() > 0) {
+        addSpacing(10);
+    }
+
+    for (QAbstractButton *btn : btns) {
+        addContent(btn);
+    }
 }
 
 void AuthDialog::createUserCB(const PolkitQt1::Identity::List &identities)

diff --git a/AuthDialog.h b/AuthDialog.h
@@ -56,7 +56,8 @@ class AuthDialog : public DDialog
     void setError(const QString &error);
     void setRequest(const QString &request, bool requiresAdmin);
 
-    void setOptions();
+    void addOptions(QButtonGroup *bg);
+
     QString password() const;
     void authenticationFailure();
 

diff --git a/agent-extension.h b/agent-extension.h
@@ -2,6 +2,7 @@
 #define AGENTEXTENSION_H
 
 #include <QtCore>
+#include <QButtonGroup>
 
 namespace dpa {
 
@@ -34,6 +35,11 @@ class AgentExtension {
      */
     virtual QString description() const = 0;
 
+    /**
+     * @brief options returns options left to user to choose.
+     */
+    virtual QButtonGroup* options() = 0;
+
     /**
      * @brief extendedDo is where extension actually do the dirty work.
      */

diff --git a/pluginmanager.cpp b/pluginmanager.cpp
@@ -18,6 +18,19 @@ PluginManager::PluginManager(QObject *parent)
     load();
 }
 
+QList<QButtonGroup*> PluginManager::reduceGetOptions(const QString &actionID)
+{
+    QList<QButtonGroup*> ret;
+
+    for (AgentExtension *plugin : m_plugins) {
+        if (plugin->interestedActions().contains(actionID) || plugin->interestedActions().isEmpty()) {
+            ret << plugin->options();
+        }
+    }
+
+    return ret;
+}
+
 void PluginManager::load()
 {
 
@@ -48,6 +61,8 @@ AgentExtension *PluginManager::loadFile(const QString &filePath)
 
         if (ret) ret->initialize(this);
 
+        qDebug() << "done loading plugin: " << filePath;
+
         return ret;
     } else {
         qWarning() << "failed to load plugin file: " << loader->errorString();
@@ -59,19 +74,22 @@ AgentExtension *PluginManager::loadFile(const QString &filePath)
 
 }
 
-void PluginManager::reduce(const QString &actionID, const QString &username, const QString passwd)
+void PluginManager::reduce(const QString &username, const QString passwd)
 {
-    m_actionID = actionID;
     m_username = username;
     m_password = passwd;
 
     for (AgentExtension *plugin : m_plugins) {
-        if (plugin->interestedActions().contains(actionID) || plugin->interestedActions().isEmpty()) {
+        if (plugin->interestedActions().contains(m_actionID) || plugin->interestedActions().isEmpty()) {
             plugin->extendedDo();
         }
     }
 
-    m_actionID = "";
     m_username = "";
     m_password = "";
 }
+
+void PluginManager::setActionID(const QString &actionID)
+{
+    m_actionID = actionID;
+}
diff --git a/pluginmanager.h b/pluginmanager.h
@@ -3,24 +3,29 @@
 
 #include <QObject>
 #include <QMap>
+#include <QList>
 
 #include "agent-extension.h"
 #include "agent-extension-proxy.h"
 
 using namespace dpa;
 
+class QButtonGroup;
 class PluginManager : public QObject, AgentExtensionProxy
 {
     Q_OBJECT
 public:
     explicit PluginManager(QObject *parent = nullptr);
 
-    void reduce(const QString &actionID, const QString &username, const QString passwd);
+    QList<QButtonGroup*> reduceGetOptions(const QString &actionID);
+    void reduce(const QString &username, const QString passwd);
 
     const QString & actionID() const Q_DECL_OVERRIDE { return m_actionID; }
     const QString & username() const Q_DECL_OVERRIDE { return m_username; }
     const QString & password() const Q_DECL_OVERRIDE { return m_password; }
 
+    void setActionID(const QString &actionID);
+
 private:
     QList<AgentExtension*> m_plugins;
     QString m_actionID;

diff --git a/policykitlistener.cpp b/policykitlistener.cpp
@@ -85,22 +85,27 @@ void PolicyKitListener::initiateAuthentication(const QString &actionId,
     m_session.clear();
 
     m_inProgress = true;
-    m_actionID = actionId;
 
     WId parentId = 0;
     if (m_actionsToWID.contains(actionId)) {
         parentId = m_actionsToWID[actionId];
     }
 
+    m_pluginManager.data()->setActionID(actionId);
+
     m_dialog = new AuthDialog(actionId, message, iconName, details, identities, parentId);
     connect(m_dialog.data(), SIGNAL(okClicked()), SLOT(dialogAccepted()));
     connect(m_dialog.data(), SIGNAL(rejected()), SLOT(dialogCanceled()));
     connect(m_dialog.data(), SIGNAL(adminUserSelected(PolkitQt1::Identity)), SLOT(userSelected(PolkitQt1::Identity)));
 
     // TODO(hualet): show extended action information.
 
+    QList<QButtonGroup*> optionsList = m_pluginManager.data()->reduceGetOptions(actionId);
+    for (QButtonGroup *bg : optionsList) {
+        m_dialog.data()->addOptions(bg);
+    }
+
     qDebug() << "WinId of the dialog is " << m_dialog.data()->winId() << m_dialog.data()->effectiveWinId();
-    m_dialog.data()->setOptions();
     m_dialog.data()->show();
     qDebug() << "WinId of the shown dialog is " << m_dialog.data()->winId() << m_dialog.data()->effectiveWinId();
     m_dialog.data()->activateWindow();
@@ -154,8 +159,7 @@ void PolicyKitListener::finishObtainPrivilege()
         }
     }
 
-    m_pluginManager.data()->reduce(m_actionID,
-                                   m_selectedUser.toString().remove("unix-user:"),
+    m_pluginManager.data()->reduce(m_selectedUser.toString().remove("unix-user:"),
                                    m_dialog.data()->password());
 
     if (!m_session.isNull()) {

diff --git a/policykitlistener.h b/policykitlistener.h
@@ -66,7 +66,6 @@ public slots:
     bool m_gainedAuthorization;
     bool m_wasCancelled;
     int m_numTries;
-    QString m_actionID;
     PolkitQt1::Identity::List m_identities;
     PolkitQt1::Agent::AsyncResult* m_result;
     QString m_cookie;