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

[Benjamin Zeller]

- Fix bug LP:1338936 "Use Suru Icon theme for buttons"
- Fix Bug lp:1355086 "welcome wizard "do not show again" does not work if you click cancel"
- Disable runconfiguration if the app is running to prevent execution of the same configuration multiple times
- Make it possible to create Kits even if the Device is not attached
- Do not crash if there is no deploy configuration
- Do not change the project name if it contains a cmake var

- Fix bug LP:1338936 "Use Suru Icon theme for buttons"
- Disable runconfiguration if the app is running to prevent execution of the same configuration multiple times
- Make it possible to create Kits even if the Device is not attached

[Nekhelesh Ramananthan (nik90)]

108 + iconSource: "qrc:/ubuntu/images/reload.svg"

It is not required to hardcode the icon path. With iconName you can just set "reload" or "add" and the SDK should retrieve them automatically from the suru-icon-theme. You will need to add that package as a dependency to the the qtcreator-plugin-ubuntu. At least that's how core apps do it.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~zeller-benjamin/qtcreator-plugin-ubuntu/kitcreate]

244. By Benjamin Zeller on 2014-08-11

Fix Bug lp:1355086 "welcome wizard "do not show again" does not
work if you click cancel"

245. By Benjamin Zeller on 2014-08-11

- Do not crash if there is no deploy configuration
- Do not change the project name if it contains a cmake var

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'share/qtcreator/ubuntu/devicespage/DeviceEmulatorTab.qml'
--- share/qtcreator/ubuntu/devicespage/DeviceEmulatorTab.qml	2014-08-06 16:00:53 +0000
+++ share/qtcreator/ubuntu/devicespage/DeviceEmulatorTab.qml	2014-08-11 15:35:47 +0000
@@ -10,9 +10,9 @@
 
 ColumnLayout {
     UbuntuListView {
-        anchors.left: parent.left
+        Layout.alignment: Qt.AlignLeft | Qt.AlignTop
         width: units.gu(50)
-        Layout.fillHeight: true
+        height: childrenRect.height
         model: VisualItemModel {
             ListItem.SingleValue {
                 text: i18n.tr("Ubuntu version")
@@ -59,9 +59,13 @@
                         emulatorMemorySetting = textAt(index);
                     }
                 }
-
-
             }
         }
     }
+    ListItem.Divider{}
+    DeviceKitManager{
+        Layout.alignment: Qt.AlignLeft | Qt.AlignTop
+        Layout.fillHeight: true
+        width: units.gu(50)
+    }
 }

=== added file 'share/qtcreator/ubuntu/devicespage/DeviceKitManager.qml'
--- share/qtcreator/ubuntu/devicespage/DeviceKitManager.qml	1970-01-01 00:00:00 +0000
+++ share/qtcreator/ubuntu/devicespage/DeviceKitManager.qml	2014-08-11 15:35:47 +0000
@@ -0,0 +1,62 @@
+import QtQuick 2.0
+import QtQuick.Controls 1.0 as Controls
+import QtQuick.Layouts 1.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.DevicesModel 0.1
+
+Item {
+    ColumnLayout {
+        anchors.fill: parent
+        Label {
+            text: "Device Kits"
+            fontSize: "large"
+        }
+
+        Column {
+            Layout.fillWidth: true
+            Repeater {
+                model: kits
+                delegate: ListItem.Standard {
+                    text: modelData.displayName
+                    Layout.fillWidth: true
+                    control: Button{
+                        text: "Remove"
+                        enabled: !deviceItemView.deviceBusy
+                        onClicked: devicesModel.triggerKitRemove(deviceId,modelData.id)
+                    }
+                }
+            }
+        }
+
+        Item {
+            clip: true
+            visible: kits.length === 0
+            Layout.minimumHeight: units.gu(25)
+            Layout.fillWidth: true
+            Label {
+                id:label
+                anchors.centerIn: parent
+                anchors.bottom: button.top
+                fontSize: "large"
+                text: "There is currently no Kit defined for your device.\n In order to use the device in your Projects,\n you can either add a existing Kit "
+                      +"\nor let Qt Creator autocreate one for you."
+            }
+            Button {
+                id: button
+                anchors.left: label.left
+                anchors.right: label.right
+                anchors.top: label.bottom
+                anchors.topMargin: units.gu(2)
+                text: "Autocreate"
+                enabled: !deviceItemView.deviceBusy
+                onClicked: devicesModel.triggerKitAutocreate(deviceId)
+            }
+        }
+
+        //Spacer Item
+        Item {
+            Layout.fillHeight: true
+        }
+    }
+}

=== modified file 'share/qtcreator/ubuntu/devicespage/DevicePage.qml'
--- share/qtcreator/ubuntu/devicespage/DevicePage.qml	2014-08-06 16:00:53 +0000
+++ share/qtcreator/ubuntu/devicespage/DevicePage.qml	2014-08-11 15:35:47 +0000
@@ -136,13 +136,13 @@
                     Controls.ToolButton {
                         text: i18n.tr("Refresh devices")
                         tooltip: text
-                        iconSource: "qrc:/ubuntu/images/view-refresh.png"
+                        iconSource: "qrc:/ubuntu/images/reload.svg"
                         onClicked: devicesModel.refresh()
                     }
                     Controls.ToolButton {
                         text: i18n.tr("Add Emulator")
                         tooltip: text
-                        iconSource: "qrc:/ubuntu/images/list-add.png"
+                        iconSource: "qrc:/ubuntu/images/list-add.svg"
                         onClicked: PopupUtils.open(resourceRoot+"/NewEmulatorDialog.qml",devicePage);
                     }
 
@@ -224,11 +224,33 @@
                         }
                     }
 
-                    Label {
+                    ColumnLayout {
                         visible: !deviceConnected && !deviceBooting && !detectionError && (machineType !== DeviceMachineType.Emulator)
-                        anchors.centerIn: parent
-                        text: "The device is currently not connected"
-                        fontSize: "large"
+                        anchors.left: parent.left
+                        anchors.top: emulatorToolBar.bottom
+                        anchors.bottom: parent.bottom
+                        anchors.margins: 10
+                        width: units.gu(75)
+                        spacing: units.gu(1)
+
+                        Label {
+                            text:"Device Status: Disconnected"
+                            fontSize: "large"
+                            Layout.alignment: Qt.AlignLeft | Qt.AlignTop
+                            Layout.fillWidth: true
+                        }
+                        ListItem.SingleValue {
+                            Layout.alignment: Qt.AlignLeft | Qt.AlignTop
+                            text:i18n.tr("Serial ID")
+                            Layout.fillWidth: true
+                            value: serial
+                        }
+                        ListItem.Divider{}
+                        DeviceKitManager {
+                            Layout.alignment: Qt.AlignLeft | Qt.AlignTop
+                            Layout.fillHeight: true
+                            Layout.fillWidth: true
+                        }
                     }
 
                     DeviceEmulatorTab {
@@ -238,6 +260,7 @@
                         anchors.right: parent.right
                         anchors.top: emulatorToolBar.bottom
                         anchors.bottom: parent.bottom
+                        anchors.margins: 10
                     }
 
                     Column {

=== modified file 'share/qtcreator/ubuntu/devicespage/DeviceStatusTab.qml'
--- share/qtcreator/ubuntu/devicespage/DeviceStatusTab.qml	2014-08-06 16:00:53 +0000
+++ share/qtcreator/ubuntu/devicespage/DeviceStatusTab.qml	2014-08-11 15:35:47 +0000
@@ -64,46 +64,8 @@
             }
             ListItem.Divider{}
 
-            Label {
-                text: "Device Kits"
-                fontSize: "large"
-                anchors.left: parent.left
-            }
-            Repeater {
-                model: kits
-                delegate: ListItem.Standard {
-                    text: modelData.displayName
-                    Layout.fillWidth: true
-                    control: Button{
-                        text: "Remove"
-                        enabled: !deviceItemView.deviceBusy
-                        onClicked: devicesModel.triggerKitRemove(deviceId,modelData.id)
-                    }
-                }
-            }
-            Item {
-                clip: true
-                visible: kits.length === 0
-                Layout.minimumHeight: units.gu(25)
+            DeviceKitManager{
                 Layout.fillWidth: true
-                Label {
-                    id:label
-                    anchors.centerIn: parent
-                    anchors.bottom: button.top
-                    fontSize: "large"
-                    text: "There is currently no Kit defined for your device.\n In order to use the device in your Projects,\n you can either add a existing Kit "
-                          +"\nor let Qt Creator autocreate one for you."
-                }
-                Button {
-                    id: button
-                    anchors.left: label.left
-                    anchors.right: label.right
-                    anchors.top: label.bottom
-                    anchors.topMargin: units.gu(2)
-                    text: "Autocreate"
-                    enabled: !deviceItemView.deviceBusy
-                    onClicked: devicesModel.triggerKitAutocreate(deviceId)
-                }
             }
         }
     }

=== added file 'src/ubuntu/images/list-add.svg'
--- src/ubuntu/images/list-add.svg	1970-01-01 00:00:00 +0000
+++ src/ubuntu/images/list-add.svg	2014-08-11 15:35:47 +0000
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="90"
+   height="90"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   viewBox="0 0 90 90.000001"
+   sodipodi:docname="add.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.3664629"
+     inkscape:cx="29.309837"
+     inkscape:cy="26.631742"
+     inkscape:document-units="px"
+     inkscape:current-layer="g1708"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="6" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="6,77"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="3,78"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="55,84"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="53,87"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,3"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,6"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="87,7"
+       id="guide4075" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,7"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="58,81"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="9,74"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="21,9"
+       id="guide4078" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="81,4"
+       id="guide4080" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-84.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         inkscape:label="Layer 1"
+         id="g1708"
+         transform="matrix(0,-1,-1,0,1394.3622,441.36221)"
+         inkscape:export-filename="add01.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90">
+        <rect
+           style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect1710"
+           width="90"
+           height="90"
+           x="0"
+           y="962.36218" />
+        <path
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 40.500004,970.36212 9,-2 0,78.00018 -9,0 z"
+           id="rect1712"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <rect
+           transform="matrix(0,1,-1,0,0,0)"
+           y="-83.999985"
+           x="1002.8622"
+           height="77.999985"
+           width="9"
+           id="rect1714"
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      </g>
+    </g>
+  </g>
+</svg>

=== added file 'src/ubuntu/images/list-remove.svg'
--- src/ubuntu/images/list-remove.svg	1970-01-01 00:00:00 +0000
+++ src/ubuntu/images/list-remove.svg	2014-08-11 15:35:47 +0000
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="90"
+   height="90"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   viewBox="0 0 90 90.000001"
+   sodipodi:docname="remove.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="12.434498"
+     inkscape:cx="39.989551"
+     inkscape:cy="39.273802"
+     inkscape:document-units="px"
+     inkscape:current-layer="g1708"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="6" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="6,77"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="3,78"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="55,84"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="53,87"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,3"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,6"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="87,7"
+       id="guide4075" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,7"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="58,81"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="9,74"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="21,9"
+       id="guide4078" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="81,4"
+       id="guide4080" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-84.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         inkscape:label="Layer 1"
+         id="g1708"
+         transform="matrix(0,-1,-1,0,1394.3622,441.36221)"
+         inkscape:export-filename="add01.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90">
+        <rect
+           style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect1710"
+           width="90"
+           height="90"
+           x="0"
+           y="962.36218" />
+        <rect
+           transform="matrix(0,1,-1,0,0,0)"
+           y="-81.000008"
+           x="1002.8622"
+           height="71.999977"
+           width="9"
+           id="rect1714"
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      </g>
+    </g>
+  </g>
+</svg>

=== added file 'src/ubuntu/images/reload.svg'
--- src/ubuntu/images/reload.svg	1970-01-01 00:00:00 +0000
+++ src/ubuntu/images/reload.svg	2014-08-11 15:35:47 +0000
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="90"
+   height="90"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   viewBox="0 0 90 90.000001"
+   sodipodi:docname="reload.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.9475983"
+     inkscape:cx="42.070456"
+     inkscape:cy="48.363433"
+     inkscape:document-units="px"
+     inkscape:current-layer="g5368"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="6" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="6,77"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="3,78"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="55,84"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="53,87"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,3"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,6"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="87,7"
+       id="guide4075" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,7"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="58,81"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="9,74"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="21,9"
+       id="guide4078" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="81,4"
+       id="guide4080" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-84.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         transform="matrix(0,-1,-1,0,1394.3622,441.36221)"
+         id="g5362"
+         inkscape:label="Layer 1">
+        <rect
+           y="962.36218"
+           x="0"
+           height="90"
+           width="90"
+           id="rect5364"
+           style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <g
+           transform="translate(-60,548.00002)"
+           id="g5366">
+          <g
+             transform="matrix(-1.1111111,0,0,1.1111111,217.07643,-57.611595)"
+             id="g5368">
+            <rect
+               transform="matrix(0.90000001,0,0,0.90000001,60.368786,424.77638)"
+               y="1.7382814e-05"
+               x="0"
+               height="90"
+               width="90"
+               id="rect5374"
+               style="color:#000000;fill:none;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+            <path
+               style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+               d="m 87.455074,450.36498 c 0,0 -11.878624,4.71653 -24.300014,6.81142 -0.0033,-0.004 -0.0034,-0.005 -0.004,-0.007 -0.0025,-0.005 -0.0018,-0.006 -0.0022,-0.01 -0.0022,-0.005 -0.0017,-0.007 -0.0021,-0.01 -0.0022,-0.005 -0.0022,-0.005 -0.0039,-0.007 2.307886,-12.98677 6.794642,-24.26728 6.794642,-24.26728 z"
+               id="path2194-7"
+               inkscape:connector-curvature="0"
+               inkscape:transform-center-x="13.578688"
+               inkscape:transform-center-y="-13.586457"
+               sodipodi:nodetypes="ccsssccc" />
+            <path
+               style="color:#000000;fill:none;stroke:#808080;stroke-width:5.4000001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+               id="path4116"
+               sodipodi:type="arc"
+               sodipodi:cx="-100.87494"
+               sodipodi:cy="465.27643"
+               sodipodi:rx="32.388229"
+               sodipodi:ry="32.394321"
+               sodipodi:start="0.52359878"
+               sodipodi:end="5.6286868"
+               sodipodi:open="true"
+               d="m -72.82591,481.47359 a 32.388229,32.394321 0 1 1 -2.35372,-35.91758"
+               transform="scale(-1,1)"
+               inkscape:transform-center-x="3.7386554"
+               inkscape:transform-center-y="3.0412449e-05" />
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

=== modified file 'src/ubuntu/resources.qrc'
--- src/ubuntu/resources.qrc	2014-04-23 13:14:19 +0000
+++ src/ubuntu/resources.qrc	2014-08-11 15:35:47 +0000
@@ -16,5 +16,8 @@
         <file>manifestlib.js</file>
         <file>images/view-refresh.png</file>
         <file>images/list-add.png</file>
+        <file>images/reload.svg</file>
+        <file>images/list-add.svg</file>
+        <file>images/list-remove.svg</file>
     </qresource>
 </RCC>

=== modified file 'src/ubuntu/ubuntupackagingwidget.cpp'
--- src/ubuntu/ubuntupackagingwidget.cpp	2014-08-05 10:04:39 +0000
+++ src/ubuntu/ubuntupackagingwidget.cpp	2014-08-11 15:35:47 +0000
@@ -433,7 +433,12 @@
     switch (m_previous_tab) {
         case 0: {
             // set package name to lower, bug #1219877
-            m_manifest.setName(ui->lineEdit_name->text().toLower());
+            QString packageName = ui->lineEdit_name->text();
+            static const QRegularExpression varCheck(QStringLiteral("@.*@"));
+            if(!varCheck.match(packageName).hasMatch())
+                packageName = packageName.toLower();
+
+            m_manifest.setName(packageName);
             m_manifest.setMaintainer(ui->lineEdit_maintainer->text());
             m_manifest.setVersion(ui->lineEdit_version->text());
             m_manifest.setTitle(ui->lineEdit_title->text());

=== modified file 'src/ubuntu/ubuntuplugin.cpp'
--- src/ubuntu/ubuntuplugin.cpp	2014-07-31 09:41:18 +0000
+++ src/ubuntu/ubuntuplugin.cpp	2014-08-11 15:35:47 +0000
@@ -217,13 +217,13 @@
                 //invoke the method the next time the event loop starts
                 QMetaObject::invokeMethod(m_ubuntuDeviceMode,"showAddEmulatorDialog",Qt::QueuedConnection);
             }
+        }
 
-            if(wiz.field(QStringLiteral("disableWizard")).toBool()) {
-                QFile f(file);
-                if(f.open(QIODevice::WriteOnly)) {
-                    f.write("1");
-                    f.close();
-                }
+        if(wiz.field(QStringLiteral("disableWizard")).toBool()) {
+            QFile f(file);
+            if(f.open(QIODevice::WriteOnly)) {
+                f.write("1");
+                f.close();
             }
         }
     }

=== modified file 'src/ubuntu/ubunturemoterunconfiguration.cpp'
--- src/ubuntu/ubunturemoterunconfiguration.cpp	2014-07-29 12:35:13 +0000
+++ src/ubuntu/ubunturemoterunconfiguration.cpp	2014-08-11 15:35:47 +0000
@@ -48,14 +48,16 @@
 };
 
 UbuntuRemoteRunConfiguration::UbuntuRemoteRunConfiguration(ProjectExplorer::Target *parent, Core::Id id)
-    : AbstractRemoteLinuxRunConfiguration(parent,id)
+    : AbstractRemoteLinuxRunConfiguration(parent,id),
+      m_running(false)
 {
     setDisplayName(appId());
     addExtraAspect(new RemoteLinux::RemoteLinuxEnvironmentAspect(this));
 }
 
 UbuntuRemoteRunConfiguration::UbuntuRemoteRunConfiguration(ProjectExplorer::Target *parent, UbuntuRemoteRunConfiguration *source)
-    : AbstractRemoteLinuxRunConfiguration(parent,source)
+    : AbstractRemoteLinuxRunConfiguration(parent,source),
+      m_running(false)
 {
 }
 
@@ -114,11 +116,13 @@
 
 bool UbuntuRemoteRunConfiguration::isEnabled() const
 {
-    return true;
+    return (!m_running);
 }
 
 QString UbuntuRemoteRunConfiguration::disabledReason() const
 {
+    if(m_running)
+        return tr("This configuration is already running on the device");
     return QString();
 }
 
@@ -155,6 +159,13 @@
         return false;
 
     ProjectExplorer::DeployConfiguration *deplConf = qobject_cast<ProjectExplorer::DeployConfiguration*>(target()->activeDeployConfiguration());
+    if(!deplConf) {
+        if(errorMessage)
+            *errorMessage = tr("No valid deploy configuration is set.");
+
+        return false;
+    }
+
     ProjectExplorer::BuildStepList *bsList = deplConf->stepList();
     foreach(ProjectExplorer::BuildStep *currStep ,bsList->steps()) {
         UbuntuPackageStep *pckStep = qobject_cast<UbuntuPackageStep*>(currStep);
@@ -282,5 +293,13 @@
     return QString();
 }
 
+void UbuntuRemoteRunConfiguration::setRunning(const bool set)
+{
+    if(m_running != set) {
+        m_running = set;
+        emit enabledChanged();
+    }
+}
+
 } // namespace Internal
 } // namespace Ubuntu

=== modified file 'src/ubuntu/ubunturemoterunconfiguration.h'
--- src/ubuntu/ubunturemoterunconfiguration.h	2014-07-14 15:39:54 +0000
+++ src/ubuntu/ubunturemoterunconfiguration.h	2014-08-11 15:35:47 +0000
@@ -60,6 +60,7 @@
     void setArguments (const QStringList &args);
 
     QString packageDir () const;
+    void setRunning (const bool set = true);
 
 private:
     QString m_clickPackage;
@@ -68,6 +69,7 @@
     QString m_localExecutable;
     QString m_remoteExecutable;
     QStringList m_arguments;
+    bool    m_running;
 
 };
 

=== modified file 'src/ubuntu/ubunturemoteruncontrol.cpp'
--- src/ubuntu/ubunturemoteruncontrol.cpp	2014-08-06 11:47:54 +0000
+++ src/ubuntu/ubunturemoteruncontrol.cpp	2014-08-11 15:35:47 +0000
@@ -60,6 +60,7 @@
     Utils::Environment environment;
 
     QPointer<UbuntuWaitForDeviceDialog> waitDialog;
+    QPointer<UbuntuRemoteRunConfiguration> runConfig;
 };
 
 UbuntuRemoteRunControl::UbuntuRemoteRunControl(RunConfiguration *rc)
@@ -68,9 +69,9 @@
     d->running = false;
 
     d->device = qSharedPointerCast<const UbuntuDevice>(DeviceKitInformation::device(rc->target()->kit()));
-    const UbuntuRemoteRunConfiguration * const lrc = static_cast<UbuntuRemoteRunConfiguration *>(rc);
-    d->environment = lrc->environment();
-    d->clickPackage = lrc->clickPackage();
+    d->runConfig = QPointer<UbuntuRemoteRunConfiguration>(static_cast<UbuntuRemoteRunConfiguration *>(rc));
+    d->environment = d->runConfig->environment();
+    d->clickPackage = d->runConfig->clickPackage();
 }
 
 UbuntuRemoteRunControl::~UbuntuRemoteRunControl()
@@ -134,9 +135,13 @@
 void UbuntuRemoteRunControl::handleDeviceReady()
 {
     d->waitDialog->deleteLater();
-
     d->running = true;
+
+    if(d->runConfig)
+        d->runConfig->setRunning(true);
+
     emit started();
+
     d->runner.disconnect(this);
 
     connect(&d->runner, SIGNAL(reportError(QString)), SLOT(handleErrorMessage(QString)));
@@ -166,6 +171,8 @@
 
 void UbuntuRemoteRunControl::setFinished()
 {
+    if(d->runConfig)
+        d->runConfig->setRunning(false);
     d->runner.disconnect(this);
     d->running = false;
     emit finished();