Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/bug-1387299 into lp:qtcreator-plugin-ubuntu

[Benjamin Zeller]

- Fix bug lp:1387299 "Need to be able to create emulators for other image channels"
- Make the create emulator state not cancellable, it blocks the UI and does nothing

- Fix bug lp:1387299 "Need to be able to create emulators for other image channels"
- Make the create emulator state not cancellable, it blocks the UI and does nothing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:291
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/463/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-amd64-ci/231
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-armhf-ci/231

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

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

=== modified file 'share/qtcreator/ubuntu/devicespage/NewEmulatorDialog.qml'
--- share/qtcreator/ubuntu/devicespage/NewEmulatorDialog.qml	2014-07-28 09:25:34 +0000
+++ share/qtcreator/ubuntu/devicespage/NewEmulatorDialog.qml	2014-10-31 10:18:20 +0000
@@ -36,9 +36,26 @@
 
     ListItem.ItemSelector {
         id: channel
-        model: [i18n.tr("devel"), 
-                i18n.tr("devel-proposed"), 
-                i18n.tr("stable")]
+        model: ["devel",
+                "devel-proposed",
+                "stable",
+                "rtm-14.09",
+                "rtm-14.09-proposed",
+                "custom channel"]
+    }
+
+    TextField {
+        id: inputChannelName
+        placeholderText: i18n.tr("Emulator channel")
+        visible: channel.model[channel.selectedIndex] === "custom channel"
+    }
+
+    Label {
+        id: inputChannelNameError
+        horizontalAlignment: Text.AlignHCenter
+        text: "Channel name can not be empty"
+        color: "red"
+        visible: inputChannelName.visible && inputChannelName.text.length == 0
     }
 
     Button {
@@ -49,11 +66,14 @@
     Button {
         text: "Create"
         color: UbuntuColors.orange
-        enabled: !inputName.hasError
+        enabled: !inputName.hasError && !inputChannelNameError.visible
         onClicked: {
-            if(inputName.hasError)
+            if(inputName.hasError || inputChannelNameError.visible)
                 return;
-            devicesModel.createEmulatorImage(inputName.text,arch.model[arch.selectedIndex],channel.model[channel.selectedIndex]);
+            devicesModel.createEmulatorImage(inputName.text,
+                                             arch.model[arch.selectedIndex],
+                                             (inputChannelName.visible ? inputChannelName.text : channel.model[channel.selectedIndex])
+                                             );
             PopupUtils.close(dialogue);
         }
     }

=== modified file 'src/ubuntu/ubuntudevicesmodel.cpp'
--- src/ubuntu/ubuntudevicesmodel.cpp	2014-09-30 07:00:38 +0000
+++ src/ubuntu/ubuntudevicesmodel.cpp	2014-10-31 10:18:20 +0000
@@ -766,26 +766,42 @@
     strEmulatorPath += QLatin1String(Constants::DEFAULT_EMULATOR_PATH);
     strEmulatorPath += QDir::separator();
     QString strUserName = QProcessEnvironment::systemEnvironment().value(QLatin1String("USER"));
-    QString strUserHome = QProcessEnvironment::systemEnvironment().value(QLatin1String("HOME")); 
+    QString strUserHome = QProcessEnvironment::systemEnvironment().value(QLatin1String("HOME"));
     process->append(QStringList() << QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_LOCAL_CREATE_EMULATOR_SCRIPT)
-                      .arg(QString::fromLatin1(Ubuntu::Constants::UBUNTU_SUDO_BINARY))
-                      .arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH)
-                      .arg(strEmulatorPath)
-                      .arg(strEmulatorName)
-                      .arg(arch)
-                      .arg(channel)
-                      .arg(strUserName)
-                      .arg(strUserHome)
-                      << QCoreApplication::applicationDirPath());
+                    .arg(QString::fromLatin1(Ubuntu::Constants::UBUNTU_SUDO_BINARY))
+                    .arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH)
+                    .arg(strEmulatorPath)
+                    .arg(strEmulatorName)
+                    .arg(arch)
+                    .arg(channel)
+                    .arg(strUserName)
+                    .arg(strUserHome)
+                    << QCoreApplication::applicationDirPath());
     process->start(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_LOCAL_CREATE_EMULATOR));
 }
 
 void UbuntuDevicesModel::createEmulatorImage(const QString &name, const QString &arch, const QString &channel)
 {
+    QString ch = channel;
+
+    //to work around a problem in the UITK that clips long text in dropdown menus we use short aliases in the UI
+    //for some channels. Here they are resolved to the correct channel names.
+    QMap<QString,QString> channelAliasMap = {
+        {QStringLiteral("rtm-14.09"),QStringLiteral("ubuntu-touch/ubuntu-rtm/14.09")},
+        {QStringLiteral("rtm-14.09-proposed"),QStringLiteral("ubuntu-touch/ubuntu-rtm/14.09-proposed")}
+    };
+
+    if(channelAliasMap.contains(ch))
+        ch = channelAliasMap[ch];
+
     setState(CreateEmulatorImage);
-    setCancellable(true);
+
+    //@BUG this should be cancellable but the QProcess::kill call just blocks for a long time, and then returns
+    //     with the process still running. Most likely because the subprocess is executed with pkexec and has
+    //     elevated priviledges
+    setCancellable(false);
     beginAction(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_LOCAL_CREATE_EMULATOR));
-    doCreateEmulatorImage(m_process,name,arch,channel);
+    doCreateEmulatorImage(m_process,name,arch,ch);
 }
 
 void UbuntuDevicesModel::queryAdb()
@@ -827,8 +843,8 @@
 
     QStringList args = QStringList() << name;
     if(QProcess::startDetached(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_LOCAL_STOP_EMULATOR_SCRIPT).arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH)
-                            ,args
-                            ,QCoreApplication::applicationDirPath())) {
+                               ,args
+                               ,QCoreApplication::applicationDirPath())) {
     }
 }