Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/calm-down-kalikiana into lp:qtcreator-plugin-ubuntu

[Benjamin Zeller]

Add support to run more than one click maintenance task in the chroot
dialog.So updating multiple chroots is not asking back for every single
chroot.

Add support to run more than one click maintenance task in the chroot
dialog.So updating multiple chroots is not asking back for every single
chroot.

[Zoltan Balogh (bzoltan)]

The background chroot update feature is on our roadmap, but this one can go now

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:346
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/510/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/44
        deb: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/44/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-armhf-ci/44

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/510/rebuild

review: Approve (continuous-integration)

=== modified file 'src/ubuntu/targetupgrademanager.cpp'
--- src/ubuntu/targetupgrademanager.cpp	2015-01-14 12:22:33 +0000
+++ src/ubuntu/targetupgrademanager.cpp	2015-02-06 09:08:02 +0000
@@ -109,7 +109,6 @@
 
 void TargetUpgradeManagerDialog::selectAndUpgradeTargets(QList<UbuntuClickTool::Target> targets,QWidget *parent)
 {
-
     TargetUpgradeManagerDialog dlg(parent);
     for(int i = 0; i < targets.size(); i++) {
         QTreeWidgetItem *item = new QTreeWidgetItem;
@@ -119,11 +118,14 @@
     }
 
     if( dlg.exec() == QDialog::Accepted ) {
+        QList<UbuntuClickTool::Target> selectedTargets;
         for(int i = 0; i < targets.size(); i++) {
             if(dlg.m_ui->treeWidget->topLevelItem(i)->checkState(0) == Qt::Checked) {
-                UbuntuClickDialog::maintainClickModal(targets.at(i),UbuntuClickTool::Upgrade);
+                selectedTargets << targets.at(i);
             }
         }
+        if(selectedTargets.size() > 0)
+            UbuntuClickDialog::maintainClickModal(selectedTargets,UbuntuClickTool::Upgrade);
     }
 }
 

=== modified file 'src/ubuntu/ubuntuclickdialog.cpp'
--- src/ubuntu/ubuntuclickdialog.cpp	2014-12-12 13:33:10 +0000
+++ src/ubuntu/ubuntuclickdialog.cpp	2015-02-06 09:08:02 +0000
@@ -25,7 +25,6 @@
 #include <QPushButton>
 
 #include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/processparameters.h>
 #include <projectexplorer/toolchainmanager.h>
 #include <texteditor/fontsettings.h>
 
@@ -57,12 +56,9 @@
     delete m_ui;
 }
 
-void UbuntuClickDialog::setParameters(ProjectExplorer::ProcessParameters *params)
+void UbuntuClickDialog::setParameters(const QList<ProjectExplorer::ProcessParameters> &params)
 {
-    params->resolveAll();
-    m_process->setCommand(params->command(),params->arguments());
-    m_process->setEnvironment(params->environment());
-    m_process->setWorkingDirectory(params->workingDirectory());
+    m_tasks = params;
 }
 
 int UbuntuClickDialog::lastExitCode() const
@@ -78,10 +74,15 @@
     m_buttonBox->addButton(QDialogButtonBox::Cancel);
 #endif
     disableCloseButton(true);
-    m_process->start();
-}
-
-int UbuntuClickDialog::runClickModal(ProjectExplorer::ProcessParameters *params, QWidget *parent)
+    nextTask();
+}
+
+int UbuntuClickDialog::runClickModal(const ProjectExplorer::ProcessParameters &params, QWidget *parent)
+{
+    return runClickModal(QList<ProjectExplorer::ProcessParameters>()<<params,parent);
+}
+
+int UbuntuClickDialog::runClickModal(const QList<ProjectExplorer::ProcessParameters> &params, QWidget *parent)
 {
     UbuntuClickDialog dlg( parent ? parent : Core::ICore::mainWindow());
     dlg.setParameters(params);
@@ -101,7 +102,7 @@
     ProjectExplorer::ProcessParameters params;
     UbuntuClickTool::parametersForCreateChroot(t,&params);
 
-    bool success = (runClickModal(&params,parent) == 0);
+    bool success = (runClickModal(params,parent) == 0);
 
     if(success) {
         ClickToolChain* tc = new ClickToolChain(t, ProjectExplorer::ToolChain::AutoDetection);
@@ -116,29 +117,39 @@
 
 int UbuntuClickDialog::maintainClickModal(const UbuntuClickTool::Target &target, const UbuntuClickTool::MaintainMode &mode)
 {
-    if(mode == UbuntuClickTool::Delete) {
-        QString title = tr(Constants::UBUNTU_CLICK_DELETE_TITLE);
-        QString text  = tr(Constants::UBUNTU_CLICK_DELETE_MESSAGE);
-        if( QMessageBox::question(Core::ICore::mainWindow(),title,text) != QMessageBox::Yes )
-            return 0;
-
-        if(UbuntuClickTool::clickChrootSuffix() == QLatin1String(Constants::UBUNTU_CLICK_CHROOT_DEFAULT_NAME)) {
-            ComUbuntuSdkClickChrootAgentInterface clickAgent(QStringLiteral("com.ubuntu.sdk.ClickChrootAgent"),
-                                                             QStringLiteral("/com/ubuntu/sdk/ClickChrootAgent"),
-                                                             QDBusConnection::sessionBus());
-            if(clickAgent.isValid()) {
-                QDBusPendingReply<bool> ret = clickAgent.releaseSession(target.framework,target.architecture);
-                if(ret.isError())
-                    qDebug()<<ret.error();
-
-                ret.waitForFinished();
+    return maintainClickModal(QList<UbuntuClickTool::Target>()<<target,mode);
+}
+
+int UbuntuClickDialog::maintainClickModal(const QList<UbuntuClickTool::Target> &targetList, const UbuntuClickTool::MaintainMode &mode)
+{
+    QList<ProjectExplorer::ProcessParameters> paramList;
+    foreach(const UbuntuClickTool::Target &target, targetList) {
+        if(mode == UbuntuClickTool::Delete) {
+            QString title = tr(Constants::UBUNTU_CLICK_DELETE_TITLE);
+            QString text  = tr(Constants::UBUNTU_CLICK_DELETE_MESSAGE);
+            if( QMessageBox::question(Core::ICore::mainWindow(),title,text) != QMessageBox::Yes )
+                return 0;
+
+            if(UbuntuClickTool::clickChrootSuffix() == QLatin1String(Constants::UBUNTU_CLICK_CHROOT_DEFAULT_NAME)) {
+                ComUbuntuSdkClickChrootAgentInterface clickAgent(QStringLiteral("com.ubuntu.sdk.ClickChrootAgent"),
+                                                                 QStringLiteral("/com/ubuntu/sdk/ClickChrootAgent"),
+                                                                 QDBusConnection::sessionBus());
+                if(clickAgent.isValid()) {
+                    QDBusPendingReply<bool> ret = clickAgent.releaseSession(target.framework,target.architecture);
+                    if(ret.isError())
+                        qDebug()<<ret.error();
+
+                    ret.waitForFinished();
+                }
             }
         }
+
+        ProjectExplorer::ProcessParameters params;
+        UbuntuClickTool::parametersForMaintainChroot(mode,target,&params);
+        paramList<<params;
     }
 
-    ProjectExplorer::ProcessParameters params;
-    UbuntuClickTool::parametersForMaintainChroot(mode,target,&params);
-    return runClickModal(&params);
+    return runClickModal(paramList);
 }
 
 void UbuntuClickDialog::done(int code)
@@ -169,21 +180,39 @@
     if(bt) bt->setDisabled(disabled);
 }
 
+void UbuntuClickDialog::nextTask()
+{
+    if(m_tasks.length() <= 0)
+        return;
+
+    ProjectExplorer::ProcessParameters params = m_tasks.takeFirst();
+    params.resolveAll();
+    m_process->setCommand(params.command(),params.arguments());
+    m_process->setEnvironment(params.environment());
+    m_process->setWorkingDirectory(params.workingDirectory());
+    m_process->start();
+}
+
 void UbuntuClickDialog::on_clickFinished(int exitCode)
 {
-    disableCloseButton(false);
-#if 0
-    //set the button to close again
-    m_buttonBox->clear();
-    m_buttonBox->addButton(QDialogButtonBox::Close);
-#endif
-
     if (exitCode != 0) {
         on_clickReadyReadStandardError(tr("---%0---").arg(QLatin1String(Constants::UBUNTU_CLICK_ERROR_EXIT_MESSAGE)));
     } else {
         on_clickReadyReadStandardOutput(tr("---%0---").arg(QLatin1String(Constants::UBUNTU_CLICK_SUCCESS_EXIT_MESSAGE)));
     }
 
+    if(m_tasks.length() > 0) {
+        nextTask();
+        return;
+    }
+
+    disableCloseButton(false);
+#if 0
+    //set the button to close again
+    m_buttonBox->clear();
+    m_buttonBox->addButton(QDialogButtonBox::Close);
+#endif
+
     m_exitCode = exitCode;
 }
 

=== modified file 'src/ubuntu/ubuntuclickdialog.h'
--- src/ubuntu/ubuntuclickdialog.h	2014-07-31 09:41:18 +0000
+++ src/ubuntu/ubuntuclickdialog.h	2015-02-06 09:08:02 +0000
@@ -19,14 +19,15 @@
 #define UBUNTU_INTERNAL_UBUNTUCLICKDIALOG_H
 
 #include <QDialog>
+#include <QList>
 
+#include <projectexplorer/processparameters.h>
 #include <utils/qtcprocess.h>
 #include "ubuntuclicktool.h"
 
 namespace ProjectExplorer {
     class Project;
     class Target;
-    class ProcessParameters;
 }
 
 namespace Ubuntu {
@@ -43,21 +44,26 @@
     UbuntuClickDialog (QWidget* parent = 0);
     ~UbuntuClickDialog ();
 
-    void setParameters (ProjectExplorer::ProcessParameters* params);
+    void setParameters (const QList<ProjectExplorer::ProcessParameters> &params);
     int lastExitCode () const;
 
+
 public slots:
     void runClick ();
 
-    static int runClickModal (ProjectExplorer::ProcessParameters* params, QWidget *parent = 0);
+    static int runClickModal(const ProjectExplorer::ProcessParameters &params, QWidget *parent = 0);
+    static int runClickModal (const QList<ProjectExplorer::ProcessParameters> &params, QWidget *parent = 0);
     static bool createClickChrootModal (bool redetectKits = true , const QString &arch = QString(),QWidget *parent = 0);
+
     static int maintainClickModal (const UbuntuClickTool::Target &target, const UbuntuClickTool::MaintainMode &mode);
+    static int maintainClickModal (const QList<UbuntuClickTool::Target> &targetList, const UbuntuClickTool::MaintainMode &mode);
 
     // QDialog interface
     virtual void done(int code);
 
 protected:
     void disableCloseButton (const bool &disabled = true);
+    void nextTask ();
 
 protected slots:
     void on_clickFinished(int exitCode);
@@ -66,6 +72,7 @@
 private:
     Utils::QtcProcess *m_process;
     Ui::UbuntuClickDialog *m_ui;
+    QList<ProjectExplorer::ProcessParameters> m_tasks;
     int m_exitCode;
 };