Merge lp:~juhapekka-piiroinen/ubuntu-qtcreator-plugins/add-support-for-multiple-devices into lp:ubuntu-qtcreator-plugins

[Juhapekka Piiroinen]

Adding support for multiple devices to Devices -tab.
Use ssh identify file for ssh and scp commands.
Added a fix for ARM platform (chromebook with 13.04), was missing application templates.

[lp:~juhapekka-piiroinen/ubuntu-qtcreator-plugins/add-support-for-multiple-devices]

191. By Juhapekka Piiroinen on 2013-05-01

Linked to bugs.

192. By Juhapekka Piiroinen on 2013-05-01

Fixed an issue with openssh_publickey script.
Improved Devices tab to use stackedwidgets.

193. By Juhapekka Piiroinen on 2013-05-01

added missing lines to pass the device serialnumber

194. By Juhapekka Piiroinen on 2013-05-01

.

=== modified file 'README'
--- README	2013-02-15 11:50:19 +0000
+++ README	2013-05-01 23:52:25 +0000
@@ -1,3 +1,4 @@
+
 Ubuntu Qt Creator plugins
 ===================================
 

=== modified file 'qtcreator/share/qtcreator/ubuntu/menu.json'
--- qtcreator/share/qtcreator/ubuntu/menu.json	2013-04-26 08:19:25 +0000
+++ qtcreator/share/qtcreator/ubuntu/menu.json	2013-05-01 23:52:25 +0000
@@ -14,7 +14,7 @@
                 "deviceRequired": true,
                 "qmlProjectRequired": true,
                 "actions": [
-                    "%SCRIPTDIRECTORY%/qtc_device_run_app %FOLDERNAME% %DISPLAYNAME%.desktop %DISPLAYNAME%.qml /home/phablet/dev_tmp /home/phablet/.local/share/applications"
+                    "%SCRIPTDIRECTORY%/qtc_device_run_app %SERIALNUMBER% %FOLDERNAME% %DISPLAYNAME%.desktop %DISPLAYNAME%.qml /home/phablet/dev_tmp /home/phablet/.local/share/applications"
                 ]
             },
             {
@@ -25,7 +25,7 @@
                 "deviceRequired": true,
                 "qmlProjectRequired": true,
                 "actions": [
-                    "%SCRIPTDIRECTORY%/qtc_device_close_all_apps %DISPLAYNAME%"
+                    "%SCRIPTDIRECTORY%/qtc_device_close_all_apps %SERIALNUMBER% %DISPLAYNAME%"
                 ]
             },
             {
@@ -48,7 +48,7 @@
                 "qmlProjectRequired": true,
                 "actions": [
                     "%SCRIPTDIRECTORY%/qtc_project_create_package",
-                    "%SCRIPTDIRECTORY%/qtc_device_deploy_package ../%FOLDERNAME%*.deb phablet@127.0.0.1 2222 /home/phablet"
+                    "%SCRIPTDIRECTORY%/qtc_device_deploy_package %SERIALNUMBER% ../%FOLDERNAME%*.deb phablet@127.0.0.1 2222 /home/phablet"
                 ]
             },
             {
@@ -59,7 +59,7 @@
                 "deviceRequired": true,
                 "qmakeProjectRequired": true,
                 "actions": [
-                    "%SCRIPTDIRECTORY%/qtc_device_buildpackage %FOLDERNAME%"
+                    "%SCRIPTDIRECTORY%/qtc_device_buildpackage %SERIALNUMBER% %FOLDERNAME%"
                 ]
             },
             {
@@ -70,7 +70,7 @@
                 "deviceRequired": true,
                 "qmakeProjectRequired": true,
                 "actions": [
-                    "%SCRIPTDIRECTORY%/qtc_device_buildanddeploypackage %FOLDERNAME%"
+                    "%SCRIPTDIRECTORY%/qtc_device_buildanddeploypackage %SERIALNUMBER% %FOLDERNAME%"
                 ]
             }
         ]
@@ -166,7 +166,7 @@
                         "keysequence": "Ctrl+F10",
                         "deviceRequired": true,
                         "actions": [
-                            "x-terminal-emulator -e \"ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null phablet@127.0.0.1 -p2222\""
+                            "x-terminal-emulator -e \"ssh -i ~/.ssh/ubuntudevice_%SERIALNUMBER%_id_rsa -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null phablet@127.0.0.1 -p2222\""
                         ]
                     },
                     {
@@ -174,7 +174,7 @@
                         "id": "Ubuntu.Menu.Device.CloseAllApps",
                         "deviceRequired": true,
                         "actions": [
-                            "%SCRIPTDIRECTORY%/qtc_device_close_all_apps"
+                            "%SCRIPTDIRECTORY%/qtc_device_close_all_apps %SERIALNUMBER%"
                         ]
                     },
                     {
@@ -187,7 +187,7 @@
                                 "keysequence": "Ctrl+F11",
                                 "deviceRequired": true,
                                 "actions": [
-                                    "%SCRIPTDIRECTORY%/qtc_device_developertools"
+                                    "%SCRIPTDIRECTORY%/qtc_device_developertools %SERIALNUMBER%"
                                     ]
                             }
                         ]
@@ -202,9 +202,9 @@
                                 "keysequence": "Ctrl+F8",
                                 "deviceRequired": true,
                                 "actions": [
-                                    "adb root",
-                                    "adb wait-for-device",
-                                    "adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin reboot"
+                                    "adb -s %SERIALNUMBER% root",
+                                    "adb -s %SERIALNUMBER% wait-for-device",
+                                    "adb -s %SERIALNUMBER% shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin reboot"
                                 ]
                             },
                             {
@@ -213,9 +213,9 @@
                                 "keysequence": "Ctrl+F9",
                                 "deviceRequired": true,
                                 "actions": [
-                                    "adb root",
-                                    "adb wait-for-device",
-                                    "adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin shutdown -h now"
+                                    "adb -s %SERIALNUMBER% root",
+                                    "adb -s %SERIALNUMBER% wait-for-device",
+                                    "adb -s %SERIALNUMBER% shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin shutdown -h now"
                                 ]
                             }
                         ]
@@ -231,9 +231,9 @@
                         "id": "Ubuntu.Menu.Device.AptGet.Update",
                         "deviceRequired": true,
                         "actions": [
-                            "adb root",
-                            "adb wait-for-device",
-                            "adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin apt-get update"
+                            "adb -s %SERIALNUMBER% root",
+                            "adb -s %SERIALNUMBER% wait-for-device",
+                            "adb -s %SERIALNUMBER% shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin apt-get update"
                         ]
                     },
                     {
@@ -241,9 +241,9 @@
                         "id": "Ubuntu.Menu.Device.AptGet.Upgrade",
                         "deviceRequired": true,
                         "actions": [
-                            "adb root",
-                            "adb wait-for-device",
-                            "x-terminal-emulator -e \"adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin apt-get upgrade\""
+                            "adb -s %SERIALNUMBER% root",
+                            "adb -s %SERIALNUMBER% wait-for-device",
+                            "x-terminal-emulator -e \"adb -s %SERIALNUMBER% shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin apt-get upgrade\""
                         ]
                     },
                     {
@@ -251,8 +251,6 @@
                         "id": "Ubuntu.Menu.Device.AptGet.Install",
                         "deviceRequired": true,
                         "actions": [
-                            "adb root",
-                            "adb wait-for-device",
                             {
                                 "queryDialog": {
                                     "title": "Install Package",
@@ -260,9 +258,9 @@
                                     "value": "<packagename>"
                                 }
                             },
-                            "adb root",
-                            "adb wait-for-device",
-                            "adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin apt-get -y install %0"
+                            "adb -s %SERIALNUMBER% root",
+                            "adb -s %SERIALNUMBER% wait-for-device",
+                            "adb -s %SERIALNUMBER% shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin apt-get -y install %0"
                         ]
                     },
                     {
@@ -270,8 +268,8 @@
                         "id": "Ubuntu.Menu.Device.AptGet.BuildDep",
                         "deviceRequired": true,
                         "actions": [
-                            "adb root",
-                            "adb wait-for-device",
+                            "adb -s %SERIALNUMBER% root",
+                            "adb -s %SERIALNUMBER% wait-for-device",
                             {
                                 "queryDialog": {
                                     "title": "Install Package Build Dependencies",
@@ -279,9 +277,7 @@
                                     "value": "<packagename>"
                                 }
                             },
-                            "adb root",
-                            "adb wait-for-device",
-                            "adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin apt-get -y build-dep %0"
+                            "adb -s %SERIALNUMBER% shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin apt-get -y build-dep %0"
                         ]
                     }
                 ]
@@ -295,7 +291,7 @@
                         "id": "Ubuntu.Menu.Device.ADB.shell",
                         "deviceRequired": true,
                         "actions": [
-                            "x-terminal-emulator -e \"adb shell\""
+                            "x-terminal-emulator -e \"adb -s %SERIALNUMBER% shell\""
                         ]
                     },
                     {
@@ -303,7 +299,7 @@
                         "id": "Ubuntu.Menu.Device.ADB.root",
                         "deviceRequired": true,
                         "actions": [
-                            "adb root"
+                            "adb -s %SERIALNUMBER% root"
                         ]
                     },
                     {
@@ -318,7 +314,7 @@
                         "id": "Ubuntu.Menu.Device.ADB.setUsbConfigPtpAdb",
                         "deviceRequired": true,
                         "actions": [
-                            "%SCRIPTDIRECTORY%/device_set_persist-sys-usb-config"
+                            "%SCRIPTDIRECTORY%/device_set_persist-sys-usb-config %SERIALNUMBER%"
                         ]
                     },
                     {
@@ -327,10 +323,10 @@
                         "keysequence": "Ctrl+Shift+P",
                         "deviceRequired": true,
                         "actions": [
-                            "adb root",
-                            "adb shell /system/bin/screencap -p /sdcard/screenshot.png",
-                            "adb pull /sdcard/screenshot.png screenshot.png",
-                            "eog screenshot.png"
+                            "adb -s %SERIALNUMBER% root",
+                            "adb -s %SERIALNUMBER% shell /system/bin/screencap -p /sdcard/screenshot.png",
+                            "adb -s %SERIALNUMBER% pull /sdcard/screenshot.png screenshot.png",
+                            "eog -s %SERIALNUMBER% screenshot.png"
                         ]
                     }
                 ]

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_flashdaily'
--- qtcreator/share/qtcreator/ubuntu/scripts/device_flashdaily	2013-04-23 11:09:57 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/device_flashdaily	2013-05-01 23:52:25 +0000
@@ -16,6 +16,8 @@
 # Author: Juhapekka Piiroinen <[e-mail]>
 set -e;
 
-adb root
-adb wait-for-device
-x-terminal-emulator -e "bash -ic phablet-flash"
+SERIALNUMBER=$1
+
+adb -s ${SERIALNUMBER} root
+adb -s ${SERIALNUMBER} wait-for-device
+x-terminal-emulator -e "bash -ic 'phablet-flash -s ${SERIALNUMBER}'"

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_flashdaily_bootstrap'
--- qtcreator/share/qtcreator/ubuntu/scripts/device_flashdaily_bootstrap	2013-04-23 11:09:57 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/device_flashdaily_bootstrap	2013-05-01 23:52:25 +0000
@@ -16,6 +16,8 @@
 # Author: Juhapekka Piiroinen <[e-mail]>
 set -e;
 
-adb root
-adb wait-for-device
-x-terminal-emulator -e "bash -ic phablet-flash -b"
+SERIALNUMBER=$1
+
+adb -s ${SERIALNUMBER} root
+adb -s ${SERIALNUMBER} wait-for-device
+x-terminal-emulator -e "bash -ic 'phablet-flash -b -s ${SERIALNUMBER}'"

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_hasnetwork'
--- qtcreator/share/qtcreator/ubuntu/scripts/device_hasnetwork	2013-04-23 11:09:57 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/device_hasnetwork	2013-05-01 23:52:25 +0000
@@ -16,9 +16,11 @@
 # Author: Juhapekka Piiroinen <[e-mail]>
 set -e;
 
-adb root &> /dev/null
-adb wait-for-device
-NM_STATE=`adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin nmcli nm | head -n+2 | awk '{print $2}'`
+SERIALNUMBER=$1
+
+adb -s ${SERIALNUMBER} root &> /dev/null
+adb -s ${SERIALNUMBER} wait-for-device &> /dev/null
+NM_STATE=`adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin nmcli nm | head -n+2 | awk '{print $2}'`
 if [[ $NM_STATE != *disconnected* ]]; then
   echo "1"
 else

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_network_clone'
--- qtcreator/share/qtcreator/ubuntu/scripts/device_network_clone	2013-04-23 11:09:57 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/device_network_clone	2013-05-01 23:52:25 +0000
@@ -16,13 +16,15 @@
 # Author: Juhapekka Piiroinen <[e-mail]>
 set -e;
 
-gksudo phablet-network-setup
+SERIALNUMBER=$1
+
+gksudo phablet-network-setup -s ${SERIALNUMBER}
 
 SCRIPTPATH=`dirname $0`
-HASNETWORK=`${SCRIPTPATH}/device_hasnetwork`
+HASNETWORK=`${SCRIPTPATH}/device_hasnetwork ${SERIALNUMBER}`
 while [[ ${HASNETWORK} == "0" ]]; do
 sleep 1
 echo -n .
-HASNETWORK=`${SCRIPTPATH}/device_hasnetwork`
+HASNETWORK=`${SCRIPTPATH}/device_hasnetwork ${SERIALNUMBER}`
 done
 echo "The device has connected to a network."

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_portforward'
--- qtcreator/share/qtcreator/ubuntu/scripts/device_portforward	2013-04-23 18:00:52 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/device_portforward	2013-05-01 23:52:25 +0000
@@ -16,8 +16,9 @@
 # Author: Juhapekka Piiroinen <[e-mail]>
 set -e;
 
-SSHPORT=$1
-QMLPORT=$2
+SERIALNUMBER=$1
+SSHPORT=$2
+QMLPORT=$3
 
 if [[ -z $SSHPORT ]]; then
   SSHPORT=2222
@@ -27,7 +28,7 @@
   QMLPORT=3768
 fi
 
-adb root &> /dev/null
-adb wait-for-device &> /dev/null
-adb forward tcp:$SSHPORT tcp:22
-adb forward tcp:$QMLPORT tcp:3768
+adb -s ${SERIALNUMBER} root &> /dev/null
+adb -s ${SERIALNUMBER} wait-for-device &> /dev/null
+adb -s ${SERIALNUMBER} forward tcp:$SSHPORT tcp:22
+adb -s ${SERIALNUMBER} forward tcp:$QMLPORT tcp:3768

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_reboot'
--- qtcreator/share/qtcreator/ubuntu/scripts/device_reboot	2013-04-23 11:09:57 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/device_reboot	2013-05-01 23:52:25 +0000
@@ -16,6 +16,8 @@
 # Author: Juhapekka Piiroinen <[e-mail]>
 set -e;
 
-adb root &> /dev/null
-adb wait-for-device &> /dev/null
-adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin reboot
+SERIALNUMBER=$1
+
+adb -s ${SERIALNUMBER} root &> /dev/null
+adb -s ${SERIALNUMBER} wait-for-device &> /dev/null
+adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin reboot

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_reboot2bootloader'
--- qtcreator/share/qtcreator/ubuntu/scripts/device_reboot2bootloader	2013-04-23 11:09:57 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/device_reboot2bootloader	2013-05-01 23:52:25 +0000
@@ -16,6 +16,8 @@
 # Author: Juhapekka Piiroinen <[e-mail]>
 set -e;
 
-adb root &> /dev/null
-adb wait-for-device &> /dev/null
-adb reboot-bootloader
+SERIALNUMBER=$1
+
+adb -s ${SERIALNUMBER} root &> /dev/null
+adb -s ${SERIALNUMBER} wait-for-device &> /dev/null
+adb -s ${SERIALNUMBER} reboot-bootloader

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_reboot2recovery'
--- qtcreator/share/qtcreator/ubuntu/scripts/device_reboot2recovery	2013-04-23 11:09:57 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/device_reboot2recovery	2013-05-01 23:52:25 +0000
@@ -16,6 +16,8 @@
 # Author: Juhapekka Piiroinen <[e-mail]>
 set -e;
 
-adb root &> /dev/null
-adb wait-for-device &> /dev/null
-adb reboot recovery
+SERIALNUMBER=$1
+
+adb -s ${SERIALNUMBER} root &> /dev/null
+adb -s ${SERIALNUMBER} wait-for-device &> /dev/null
+adb -s ${SERIALNUMBER} reboot recovery

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_rootshell'
--- qtcreator/share/qtcreator/ubuntu/scripts/device_rootshell	2013-04-23 11:09:57 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/device_rootshell	2013-05-01 23:52:25 +0000
@@ -16,6 +16,8 @@
 # Author: Juhapekka Piiroinen <[e-mail]>
 set -e;
 
-adb root &> /dev/null
-adb wait-for-device &> /dev/null
-x-terminal-emulator -e "adb shell ubuntu_chroot shell"
+SERIALNUMBER=$1
+
+adb -s ${SERIALNUMBER} root &> /dev/null
+adb -s ${SERIALNUMBER} wait-for-device &> /dev/null
+x-terminal-emulator -e "adb -s ${SERIALNUMBER} shell ubuntu_chroot shell"

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_set_persist-sys-usb-config'
--- qtcreator/share/qtcreator/ubuntu/scripts/device_set_persist-sys-usb-config	2013-04-26 08:16:54 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/device_set_persist-sys-usb-config	2013-05-01 23:52:25 +0000
@@ -15,4 +15,6 @@
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
 
-adb shell setprop persist.sys.usb.config ptp,adb
+SERIALNUMBER=$1
+
+adb -s ${SERIALNUMBER} shell setprop persist.sys.usb.config ptp,adb

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_shutdown'
--- qtcreator/share/qtcreator/ubuntu/scripts/device_shutdown	2013-04-23 11:09:57 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/device_shutdown	2013-05-01 23:52:25 +0000
@@ -16,6 +16,8 @@
 # Author: Juhapekka Piiroinen <[e-mail]>
 set -e;
 
-adb root &> /dev/null
-adb wait-for-device &> /dev/null
-adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin shutdown -h now
+SERIALNUMBER=$1
+
+adb -s ${SERIALNUMBER} root &> /dev/null
+adb -s ${SERIALNUMBER} wait-for-device &> /dev/null
+adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin shutdown -h now

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_time_clone'
--- qtcreator/share/qtcreator/ubuntu/scripts/device_time_clone	2013-04-19 13:55:48 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/device_time_clone	2013-05-01 23:52:25 +0000
@@ -16,7 +16,9 @@
 # Author: Zoltán Balogh <[e-mail]>
 set -e
 
-ADB="adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
+SERIALNUMBER=$1
+
+ADB="adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
 LOCAL_DATE=`date +%Y%m%d`
 LOCAL_TIME=`date +%T`
 TIMEZONE=`cat /etc/timezone`

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_version'
--- qtcreator/share/qtcreator/ubuntu/scripts/device_version	2013-04-23 11:09:57 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/device_version	2013-05-01 23:52:25 +0000
@@ -16,6 +16,8 @@
 # Author: Juhapekka Piiroinen <[e-mail]>
 set -e;
 
-adb root &> /dev/null
-adb wait-for-device &> /dev/null
-adb shell cat /system/*ubuntu_stamp
+SERIALNUMBER=$1
+
+adb -s ${SERIALNUMBER} root &> /dev/null
+adb -s ${SERIALNUMBER} wait-for-device &> /dev/null
+adb -s ${SERIALNUMBER} shell cat /system/*ubuntu_stamp

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/openssh_connect'
--- qtcreator/share/qtcreator/ubuntu/scripts/openssh_connect	2013-04-23 18:00:52 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/openssh_connect	2013-05-01 23:52:25 +0000
@@ -16,10 +16,12 @@
 # Author: Juhapekka Piiroinen <[e-mail]>
 set -e; 
 
-PORT=$1
-USERNAME=$2
+SERIALNUMBER=$1
+PORT=$2
+USERNAME=$3
 SCRIPTPATH=`dirname $0`
-
-${SCRIPTPATH}/device_portforward $PORT 3768
-
-x-terminal-emulator -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p $PORT $USERNAME@127.0.0.1 bash -i"
+SSHIDENTITY=~/.ssh/ubuntudevice_$SERIALNUMBER_id_rsa
+
+${SCRIPTPATH}/device_portforward ${SERIALNUMBER} ${PORT} 3768
+
+x-terminal-emulator -e "ssh -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p $PORT $USERNAME@127.0.0.1 bash -i" &

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/openssh_install'
--- qtcreator/share/qtcreator/ubuntu/scripts/openssh_install	2013-04-23 11:09:57 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/openssh_install	2013-05-01 23:52:25 +0000
@@ -16,5 +16,7 @@
 # Author: Juhapekka Piiroinen <[e-mail]>
 set -e; 
 
+SERIALNUMBER=$1
+
 SCRIPTPATH=`dirname $0`
-${SCRIPTPATH}/qtc_device_developertools
\ No newline at end of file
+${SCRIPTPATH}/qtc_device_developertools ${SERIALNUMBER}

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/openssh_publickey'
--- qtcreator/share/qtcreator/ubuntu/scripts/openssh_publickey	2013-04-23 18:00:52 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/openssh_publickey	2013-05-01 23:52:25 +0000
@@ -16,9 +16,11 @@
 # Author: Juhapekka Piiroinen <[e-mail]>
 set -e; 
 
-KEYPATH=~/.ssh/ubuntudevice_$2_id_rsa
 USERNAME=$1
-SHELL="adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
+SERIALNUMBER=$2
+KEYPATH=~/.ssh/ubuntudevice_${SERIALNUMBER}_id_rsa
+
+SHELL="adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
 
 function check_key {
 
@@ -43,8 +45,8 @@
 }
 
 #################
-adb root &> /dev/null
-adb wait-for-device > /dev/null
+adb -s ${SERIALNUMBER} root &> /dev/null
+adb -s ${SERIALNUMBER} wait-for-device > /dev/null
 
 if [[ -f $KEYPATH ]]; then
   check_key

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/openssh_remove'
--- qtcreator/share/qtcreator/ubuntu/scripts/openssh_remove	2013-04-23 11:09:57 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/openssh_remove	2013-05-01 23:52:25 +0000
@@ -16,8 +16,10 @@
 # Author: Juhapekka Piiroinen <[e-mail]>
 set -e; 
 
-adb root &> /dev/null
-adb wait-for-device &> /dev/null
-adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin apt-get remove openssh-server -y
+SERIALNUMBER=$1
+
+adb -s ${SERIALNUMBER} root &> /dev/null
+adb -s ${SERIALNUMBER} wait-for-device &> /dev/null
+adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin apt-get remove openssh-server -y
 
 

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/openssh_version'
--- qtcreator/share/qtcreator/ubuntu/scripts/openssh_version	2013-04-23 11:09:57 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/openssh_version	2013-05-01 23:52:25 +0000
@@ -14,11 +14,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
-set -e;
-
-adb root &> /dev/null
-adb wait-for-device &> /dev/null
-adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin apt-get -f install &> /dev/null
-adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin apt-cache policy openssh-server|grep Installed|sed "s/Installed\://g"
+#set -e;
+
+SERIALNUMBER=$1
+
+adb -s ${SERIALNUMBER} root &> /dev/null
+adb -s ${SERIALNUMBER} wait-for-device &> /dev/null
+adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin apt-get -f install &> /dev/null
+adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin apt-cache policy openssh-server|grep Installed|sed "s/Installed\://g"
 
 

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_buildanddeploypackage'
--- qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_buildanddeploypackage	2013-04-25 08:45:39 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_buildanddeploypackage	2013-05-01 23:52:25 +0000
@@ -16,10 +16,12 @@
 # Author: Juhapekka Piiroinen <[e-mail]>
 set -e;
 
-FOLDERNAME=$1
-TARGET_DEVICE=$2
-TARGET_DEVICE_PORT=$3
-TARGET_DEVICE_HOME=$4
+SERIALNUMBER=$1
+FOLDERNAME=$2
+TARGET_DEVICE=$3
+TARGET_DEVICE_PORT=$4
+TARGET_DEVICE_HOME=$5
+SSHIDENTITY=~/.ssh/ubuntudevice_$SERIALNUMBER_id_rsa
 
 if [[ -z ${TARGET_DEVICE_PORT} ]]; then
         TARGET_DEVICE_PORT=2222
@@ -33,13 +35,13 @@
         TARGET_DEVICE_HOME=/home/phablet/dev_tmp
 fi
 
-SCP="scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P${TARGET_DEVICE_PORT}"
-SSH="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p${TARGET_DEVICE_PORT} ${TARGET_DEVICE}"
-ADB="adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
+SCP="scp -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P${TARGET_DEVICE_PORT}"
+SSH="ssh -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p${TARGET_DEVICE_PORT} ${TARGET_DEVICE}"
+ADB="adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
 
 SCRIPTPATH=`dirname $0`
 
-${SCRIPTPATH}/qtc_device_buildpackage ${FOLDERNAME}
+${SCRIPTPATH}/qtc_device_buildpackage ${SERIALNUMBER} ${FOLDERNAME}
 
 FILES=`$SSH "cd ${TARGET_DEVICE_HOME}; ls -1 *.deb"`
 echo $FILES | xargs -0 -I FILE $ADB gdebi --n ${TARGET_DEVICE_HOME}/FILE

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_buildpackage'
--- qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_buildpackage	2013-04-25 11:02:31 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_buildpackage	2013-05-01 23:52:25 +0000
@@ -38,12 +38,14 @@
 
 set -e
 
-FOLDERNAME=$1
-TARGET_DEVICE=$2
-TARGET_DEVICE_PORT=$3
-TARGET_DEVICE_HOME=$4
+SERIALNUMBER=$1
+FOLDERNAME=$2
+TARGET_DEVICE=$3
+TARGET_DEVICE_PORT=$4
+TARGET_DEVICE_HOME=$5
 
-USAGE="$0 [foldername] [target_device] [target_device_port] [target_device_home]"
+USAGE="$0 [serialnumber] [foldername] [target_device] [target_device_port] [target_device_home]"
+SSHIDENTITY=~/.ssh/ubuntudevice_$SERIALNUMBER_id_rsa
 
 if [[ -z $FOLDERNAME ]]; then
  echo ${USAGE}
@@ -62,12 +64,12 @@
         TARGET_DEVICE_HOME=/home/phablet/dev_tmp
 fi
 
-SCP="scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P${TARGET_DEVICE_PORT}"
-SSH="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p${TARGET_DEVICE_PORT} ${TARGET_DEVICE}"
-ADB="adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin "
+SCP="scp -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P${TARGET_DEVICE_PORT}"
+SSH="ssh -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p${TARGET_DEVICE_PORT} ${TARGET_DEVICE}"
+ADB="adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin "
 SCRIPTPATH=`dirname $0`
 
-${SCRIPTPATH}/device_portforward ${TARGET_DEVICE_PORT} 3768
+${SCRIPTPATH}/device_portforward ${SERIALNUMBER} ${TARGET_DEVICE_PORT} 3768
 
 pushd ${FOLDERNAME}
  set +e

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_close_all_apps'
--- qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_close_all_apps	2013-04-25 12:41:29 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_close_all_apps	2013-05-01 23:52:25 +0000
@@ -17,8 +17,9 @@
 #set -e;
 #set -x
 
-APPLICATION=$1
-ADB="adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
+SERIALNUMBER=$1
+APPLICATION=$2
+ADB="adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
 
 if [[ -z ${APPLICATION} ]]; then
   ${ADB} kill -s 9 \`pidof qmlscene\`

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_deploy_package'
--- qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_deploy_package	2013-04-23 18:00:52 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_deploy_package	2013-05-01 23:52:25 +0000
@@ -16,12 +16,15 @@
 # Author: Juhapekka Piiroinen <[e-mail]>
 set -e;
 
-PACKAGE=$1
-TARGET_DEVICE=$2
-TARGET_DEVICE_PORT=$3
-TARGET_DEVICE_HOME=$4
-
-USAGE="$0 [package] [target_device] [target_device_port] [target_device_home]"
+SERIALNUMBER=$1
+PACKAGE=$2
+TARGET_DEVICE=$3
+TARGET_DEVICE_PORT=$4
+TARGET_DEVICE_HOME=$5
+
+SSHIDENTITY=~/.ssh/ubuntudevice_$SERIALNUMBER_id_rsa
+
+USAGE="$0 [serialnumber] [package] [target_device] [target_device_port] [target_device_home]"
 
 if [[ -z $PACKAGE || -z $TARGET_DEVICE || -z $TARGET_DEVICE_PORT || -z $TARGET_DEVICE_HOME ]]; then
  echo ${USAGE}
@@ -45,11 +48,11 @@
 PLAIN_PACKAGE=`basename ${PACKAGE}`
 SCRIPTPATH=`dirname $0`
 
-${SCRIPTPATH}/device_portforward ${TARGET_DEVICE_PORT} 3768
+${SCRIPTPATH}/device_portforward ${SERIALNUMBER} ${TARGET_DEVICE_PORT} 3768
 
-SCP="scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P${TARGET_DEVICE_PORT}"
-SSH="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p${TARGET_DEVICE_PORT} ${TARGET_DEVICE}"
-ADB="adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
+SCP="scp -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P${TARGET_DEVICE_PORT}"
+SSH="ssh -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p${TARGET_DEVICE_PORT} ${TARGET_DEVICE}"
+ADB="adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
 
 # -- actions --
 $SCP ${PACKAGE} ${TARGET_DEVICE}:${TARGET_DEVICE_HOME}

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_developertools'
--- qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_developertools	2013-04-23 11:09:57 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_developertools	2013-05-01 23:52:25 +0000
@@ -16,12 +16,14 @@
 # Author: Juhapekka Piiroinen <[e-mail]>
 set -e;
 
-ADB="adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
-
-adb root
-adb wait-for-device
-adb forward tcp:2222 tcp:22
-adb forward tcp:3768 tcp:3768
+SERIALNUMBER=$1
+
+ADB="adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
+
+adb -s ${SERIALNUMBER} root
+adb -s ${SERIALNUMBER} wait-for-device
+adb -s ${SERIALNUMBER} forward tcp:2222 tcp:22
+adb -s ${SERIALNUMBER} forward tcp:3768 tcp:3768
 $ADB apt-get -y -f install
 $ADB apt-get install software-properties-common -y
 $ADB apt-add-repository ppa:canonical-qt5-edgers/qt5-proper -y

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_restart_appslense'
--- qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_restart_appslense	2013-04-23 11:09:57 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_restart_appslense	2013-05-01 23:52:25 +0000
@@ -16,7 +16,8 @@
 # Author: Juhapekka Piiroinen <[e-mail]>
 set -e;
 
-ADB="adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
+SERIALNUMBER=$1
+ADB="adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
 
 # -- actions --
 $ADB kill -s 9 \`pidof unity-applications-daemon\`

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_run_app'
--- qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_run_app	2013-04-23 11:09:57 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_run_app	2013-05-01 23:52:25 +0000
@@ -17,15 +17,17 @@
 set -e;
 #set -x
 
-FOLDERNAME=$1
-DESKTOP_FILENAME=$2
-MAIN_QML=$3
-TARGET_DEVICE_HOME=$4
-TARGET_DEVICE_DESKTOP_PATH=$5
-TARGET_DEVICE=$6
-TARGET_DEVICE_PORT=$7
+SERIALNUMBER=$1
+SSHIDENTITY=~/.ssh/ubuntudevice_$1_id_rsa
+FOLDERNAME=$2
+DESKTOP_FILENAME=$3
+MAIN_QML=$4
+TARGET_DEVICE_HOME=$5
+TARGET_DEVICE_DESKTOP_PATH=$6
+TARGET_DEVICE=$7
+TARGET_DEVICE_PORT=$8
 
-USAGE="$0 [foldername] [desktop_filename] [main_qml] [target_device_home] [target_device_desktop_path] [target_device] [target_device_port]"
+USAGE="$0 [serialnumber] [foldername] [desktop_filename] [main_qml] [target_device_home] [target_device_desktop_path] [target_device] [target_device_port]"
 
 if [[ -z ${DESKTOP_FILENAME} || -z ${FOLDERNAME} ]]; then
 	echo ${USAGE}
@@ -52,12 +54,12 @@
 	TARGET_DEVICE_DESKTOP_PATH=${TARGET_DEVICE_HOME}/.local/share/applications
 fi
 
-SCP="scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P${TARGET_DEVICE_PORT}"
-SSH="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p${TARGET_DEVICE_PORT} ${TARGET_DEVICE}"
+SCP="scp -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P${TARGET_DEVICE_PORT}"
+SSH="ssh -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p${TARGET_DEVICE_PORT} ${TARGET_DEVICE}"
 SCRIPTPATH=`dirname $0`
 COMMAND="qmlscene ${TARGET_DEVICE_HOME}/${FOLDERNAME}/${MAIN_QML} --desktop_file_hint=${TARGET_DEVICE_DESKTOP_PATH}/${DESKTOP_FILENAME}"
 
-${SCRIPTPATH}/device_portforward 2222 3768
+${SCRIPTPATH}/device_portforward ${SERIALNUMBER} ${TARGET_DEVICE_PORT} 3768
 
 # make a tar package
 tar -cjf ${FOLDERNAME}.tar.bz2 ${FOLDERNAME}

=== modified file 'qtcreator/src/plugins/ubuntu/ubuntuconstants.h'
--- qtcreator/src/plugins/ubuntu/ubuntuconstants.h	2013-04-24 17:24:47 +0000
+++ qtcreator/src/plugins/ubuntu/ubuntuconstants.h	2013-05-01 23:52:25 +0000
@@ -86,6 +86,7 @@
 const char UBUNTU_ACTION_PROJECTFILES[] = "%PROJECTFILES%";
 const char UBUNTU_ACTION_SCRIPTDIRECTORY[] = "%SCRIPTDIRECTORY%";
 const char UBUNTU_ACTION_SHAREDIRECTORY[] = "%SHAREDIRECTORY%";
+const char UBUNTU_ACTION_SERIALNUMBER[] = "%SERIALNUMBER%";
 
 const char UBUNTU_FILENAME_DISPLAYNAME[] = "displayName";
 

=== modified file 'qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.cpp'
--- qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.cpp	2013-04-24 16:56:03 +0000
+++ qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.cpp	2013-05-01 23:52:25 +0000
@@ -46,11 +46,14 @@
     ui->pushButtonSshInstall->hide();
     ui->pushButtonSshRemove->hide();
     ui->widgetDeviceSerial->hide();
-    ui->pushButtonCancel->hide();
+    //ui->pushButtonCancel->hide();
     ui->frameNoDevices->hide();
     ui->lblLoading->hide();
     ui->frameNoNetwork->hide();
 
+    ui->progressBar->setMinimum(0);
+    ui->progressBar->setMaximum(0);
+
     connect(&m_ubuntuProcess,SIGNAL(started(QString)),this,SLOT(onStarted(QString)));
     connect(&m_ubuntuProcess,SIGNAL(message(QString)),this,SLOT(onMessage(QString)));
     connect(&m_ubuntuProcess,SIGNAL(finished(QString,int)),this,SLOT(onFinished(QString, int)));
@@ -64,12 +67,15 @@
 }
 
 void UbuntuDevicesWidget::onStarted(QString cmd) {
+    ui->stackedWidgetConnectedDevice->setCurrentIndex(1);
+    ui->lblDeviceProcessInfo->setText(QFileInfo(cmd).baseName());
     ui->widgetDeviceInfo->hide();
-    ui->pushButtonCancel->show();
+    //ui->pushButtonCancel->show();
     ui->lblLoading->show();
 }
 
 void UbuntuDevicesWidget::onFinished(QString cmd, int code) {
+    ui->stackedWidgetConnectedDevice->setCurrentIndex(0);
     if (m_aboutToClose) { return; }
 
     bool bOk = true;
@@ -82,10 +88,12 @@
             QStringList lineData = line.split(QLatin1String("\t"));
             if (lineData.count() == 2) {
                 QString sSerialNumber = lineData.takeFirst();
-                QString sDeviceName = lineData.takeFirst();
+                //QString sDeviceName = lineData.takeFirst();
 
-                ui->lblDeviceName->setText(sDeviceName.trimmed());
-                ui->lblSerialnumber->setText(sSerialNumber.trimmed());
+                //ui->lblDeviceName->setText(sDeviceName.trimmed());
+                ui->comboBoxSerialNumber->addItem(sSerialNumber.trimmed());
+                //ui->lblSerialnumber->setText(sSerialNumber.trimmed());
+                m_deviceSerialNumber = sSerialNumber.trimmed();
             }
         }
 
@@ -93,10 +101,11 @@
             ui->frameNoDevices->show();
             ui->widgetDeviceInfo->hide();
             ui->widgetDeviceSerial->hide();
-
+            ui->comboBoxSerialNumber->clear();
             bOk = false;
             m_deviceDetected = false;
 
+            ui->stackedWidgetDeviceConnected->setCurrentIndex(0);
             endAction(QString::fromLatin1(" * there is no device connected."));
         }
         if (lines.count() > 0) {
@@ -104,7 +113,7 @@
             ui->widgetDeviceSerial->show();
 
             m_deviceDetected = true;
-
+            ui->stackedWidgetDeviceConnected->setCurrentIndex(1);
             endAction(QString::fromLatin1(" * found %0 devices.").arg(lines.count()));
             detectDeviceVersion();
         }
@@ -119,13 +128,14 @@
             ui->widgetSshProperties->show();
             ui->pushButtonSshInstall->hide();
             ui->pushButtonSshRemove->show();
-
+            ui->stackedWidgetDeveloperMode->setCurrentIndex(1);
             on_pushButtonPortForward_clicked();
         } else {
             endAction(QString::fromLatin1("..openssh-server was not installed."));
             ui->pushButtonSshInstall->show();
             ui->pushButtonSshRemove->hide();
             ui->widgetSshProperties->hide();
+            ui->stackedWidgetDeveloperMode->setCurrentIndex(0);
         }
     } else if (cmd == QString::fromLatin1("%0/openssh_remove").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH)) {
         endAction(QString::fromLatin1("..openssh-server was removed."));
@@ -160,42 +170,38 @@
     if (bOk && bHasNetwork) {
         ui->widgetDeviceInfo->show();
     }
-    ui->pushButtonCancel->hide();
+   // ui->pushButtonCancel->hide();
     ui->lblLoading->hide();
     m_reply.clear();
 }
 
-void UbuntuDevicesWidget::on_pushButtonCancel_clicked() {
-    m_ubuntuProcess.kill();
-}
-
 void UbuntuDevicesWidget::on_pushButtonReboot_clicked() {
     beginAction(QString::fromLatin1("Reboot device.."));
-    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_reboot").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath());
+    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_reboot %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath());
     m_ubuntuProcess.processCmdQueue();
 }
 
 void UbuntuDevicesWidget::on_pushButtonShutdown_clicked() {
     beginAction(QString::fromLatin1("Shutdown device.."));
-    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_shutdown").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath());
+    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_shutdown %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath());
     m_ubuntuProcess.processCmdQueue();
 }
 
 void UbuntuDevicesWidget::on_pushButtonRebootToBootloader_clicked() {
     beginAction(QString::fromLatin1("Reboot to bootloader.."));
-    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_reboot2bootloader").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath());
+    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_reboot2bootloader %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath());
     m_ubuntuProcess.processCmdQueue();
 }
 
 void UbuntuDevicesWidget::on_pushButtonRebootToRecovery_clicked() {
     beginAction(QString::fromLatin1("Reboot to recovery.."));
-    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_reboot2recovery").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath());
+    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_reboot2recovery %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath());
     m_ubuntuProcess.processCmdQueue();
 }
 
 void UbuntuDevicesWidget::detectOpenSsh() {
     beginAction(QString::fromLatin1("Detecting if openssh-server is installed.."));
-    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/openssh_version").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath());
+    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/openssh_version %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath());
     m_ubuntuProcess.processCmdQueue();
 }
 
@@ -206,32 +212,46 @@
 }
 
 void UbuntuDevicesWidget::on_pushButtonSshConnect_clicked() {
-    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/openssh_connect %1 %2").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(ui->spinBoxSshPort->value()).arg(ui->lineEditUserName->text()) << QApplication::applicationDirPath());
+    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/openssh_connect %1 %2 %3").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()).arg(ui->spinBoxSshPort->value()).arg(ui->lineEditUserName->text()) << QApplication::applicationDirPath());
     m_ubuntuProcess.processCmdQueue();
 }
 
 void UbuntuDevicesWidget::on_pushButtonCloneNetworkConfig_clicked() {
     beginAction(QString::fromLatin1("Clone network configuration from host to device.."));
     ui->frameNoNetwork->hide();
-    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_network_clone").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath());
+    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_network_clone %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath());
     m_ubuntuProcess.processCmdQueue();
 }
 
+void UbuntuDevicesWidget::on_comboBoxSerialNumber_currentIndexChanged( const QString & text ) {
+    m_deviceSerialNumber = text;
+    if (!text.isEmpty()) {
+        detectDeviceVersion();
+    }
+}
+
 void UbuntuDevicesWidget::onError(QString msg) {
     ui->plainTextEdit->appendHtml(QString::fromLatin1("<p style=\"color: red\">%0</p>").arg(msg));
 }
 
 void UbuntuDevicesWidget::on_pushButtonRefresh_clicked() {
+    m_deviceDetected = false;
+    m_ubuntuProcess.clear();
+    m_ubuntuProcess.kill();
+
+    ui->plainTextEdit->clear();
+
     m_reply.clear();
 
     ui->frameNoDevices->hide();
 
     ui->widgetDeviceInfo->hide();
     ui->lblLoading->show();
-    ui->pushButtonCancel->show();
+ //   ui->pushButtonCancel->show();
 
-    ui->lblDeviceName->setText(QLatin1String(""));
-    ui->lblSerialnumber->setText(QLatin1String(""));
+    //ui->lblDeviceName->setText(QLatin1String(""));
+    ui->comboBoxSerialNumber->clear();
+   // ui->lblSerialnumber->setText(QLatin1String(""));
 
     detectDevices();
 }
@@ -246,37 +266,41 @@
 
 void UbuntuDevicesWidget::on_pushButtonPortForward_clicked() {
     beginAction(QString::fromLatin1("Enabling port forward.."));
-    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_portforward %1 %2").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(ui->spinBoxSshPort->value()).arg(ui->spinBoxQmlPort->value()) << QApplication::applicationDirPath());
+    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_portforward %1 %2 %3").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()).arg(ui->spinBoxSshPort->value()).arg(ui->spinBoxQmlPort->value()) << QApplication::applicationDirPath());
     m_ubuntuProcess.processCmdQueue();
 }
 
 void UbuntuDevicesWidget::on_pushButtonSshSetupPublicKey_clicked() {
     beginAction(QString::fromLatin1("Setting up public key authentication.."));
-    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/openssh_publickey %1 %2").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(ui->lineEditUserName->text()).arg(ui->lblSerialnumber->text()) << QApplication::applicationDirPath());
+    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/openssh_publickey %1 %2").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(ui->lineEditUserName->text()).arg(m_deviceSerialNumber) << QApplication::applicationDirPath());
     m_ubuntuProcess.processCmdQueue();
 }
 
 void UbuntuDevicesWidget::on_pushButtonUpgradeToDailyImage_clicked() {
     beginAction(QString::fromLatin1("Upgrade device to daily.."));
-    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_flashdaily").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath());
+    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_flashdaily %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath());
     m_ubuntuProcess.processCmdQueue();
 }
 
 void UbuntuDevicesWidget::on_pushButtonUpgradeToDailyImageWithBootstrap_clicked() {
     beginAction(QString::fromLatin1("Upgrade device to daily with a full bootstrap.."));
-    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_flashdaily_bootstrap").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath());
+    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_flashdaily_bootstrap %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath());
     m_ubuntuProcess.processCmdQueue();
 }
 
 void UbuntuDevicesWidget::detectHasNetworkConnection() {
     beginAction(QString::fromLatin1("Check if the device is connected to a network.."));
-    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_hasnetwork").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath());
+    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_hasnetwork %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath());
     m_ubuntuProcess.processCmdQueue();
 }
 
+QString UbuntuDevicesWidget::serialNumber() {
+    return ui->comboBoxSerialNumber->currentText();
+}
+
 void UbuntuDevicesWidget::detectDeviceVersion() {
     beginAction(QString::fromLatin1("Check device image version.."));
-    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_version").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath());
+    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_version %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath());
     m_ubuntuProcess.processCmdQueue();
 }
 
@@ -289,18 +313,18 @@
 
 void UbuntuDevicesWidget::on_pushButtonSshInstall_clicked() {
     beginAction(QString::fromLatin1("Installing openssh-server.."));
-    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/openssh_install").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath());
+    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/openssh_install %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath());
     m_ubuntuProcess.processCmdQueue();
 }
 
 void UbuntuDevicesWidget::on_pushButtonCloneTimeConfig_clicked() {
     beginAction(QString::fromLatin1("Cloning time configuration from host to device.."));
-    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_time_clone").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath());
+    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_time_clone %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath());
     m_ubuntuProcess.processCmdQueue();
 }
 
 void UbuntuDevicesWidget::on_pushButtonSshRemove_clicked() {
     beginAction(QString::fromLatin1("Removing openssh-server.."));
-    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/openssh_remove").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath());
+    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/openssh_remove %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath());
     m_ubuntuProcess.processCmdQueue();
 }

=== modified file 'qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.h'
--- qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.h	2013-04-24 16:56:03 +0000
+++ qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.h	2013-05-01 23:52:25 +0000
@@ -37,6 +37,7 @@
     static UbuntuDevicesWidget* instance();
 
     bool deviceDetected() { return m_deviceDetected; }
+    QString serialNumber();
 
 signals:
     void updateDeviceActions();
@@ -60,10 +61,10 @@
     void on_pushButtonRebootToRecovery_clicked();
     void on_pushButtonUpgradeToDailyImage_clicked();
     void on_pushButtonUpgradeToDailyImageWithBootstrap_clicked();
-    void on_pushButtonCancel_clicked();
     void on_pushButtonCloneNetworkConfig_clicked();
     void on_pushButtonCloneTimeConfig_clicked();
     void on_pushButtonCloneNetworkConfig_2_clicked() { on_pushButtonCloneNetworkConfig_clicked(); }
+    void on_comboBoxSerialNumber_currentIndexChanged( const QString & text );
 
     void detectDevices();
     void detectOpenSsh();
@@ -81,6 +82,7 @@
 
     bool m_aboutToClose;
     bool m_deviceDetected;
+    QString m_deviceSerialNumber;
 
     static UbuntuDevicesWidget *m_instance;
 };

=== modified file 'qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.ui'
--- qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.ui	2013-04-24 10:17:45 +0000
+++ qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.ui	2013-05-01 23:52:25 +0000
@@ -106,16 +106,6 @@
           </property>
          </spacer>
         </item>
-        <item>
-         <widget class="QPushButton" name="pushButtonRefresh">
-          <property name="text">
-           <string>Refresh</string>
-          </property>
-          <property name="flat">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
        </layout>
       </item>
       <item>
@@ -147,6 +137,79 @@
        </widget>
       </item>
       <item>
+       <widget class="QWidget" name="widgetDeviceSerial" native="true">
+        <layout class="QVBoxLayout" name="verticalLayout_4">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_2">
+           <property name="leftMargin">
+            <number>20</number>
+           </property>
+           <property name="rightMargin">
+            <number>20</number>
+           </property>
+           <item>
+            <widget class="QLabel" name="label_2">
+             <property name="font">
+              <font>
+               <family>Ubuntu</family>
+              </font>
+             </property>
+             <property name="text">
+              <string>Serial number</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QComboBox" name="comboBoxSerialNumber">
+             <property name="minimumSize">
+              <size>
+               <width>200</width>
+               <height>0</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer_2">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QPushButton" name="pushButtonRefresh">
+             <property name="text">
+              <string>Redetect Devices</string>
+             </property>
+             <property name="flat">
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
        <widget class="QScrollArea" name="scrollArea">
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
@@ -159,8 +222,8 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>1118</width>
-           <height>693</height>
+           <width>1134</width>
+           <height>637</height>
           </rect>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_14">
@@ -200,644 +263,712 @@
             </property>
             <widget class="QWidget" name="tab">
              <attribute name="title">
-              <string>Properties</string>
+              <string>Device Actions</string>
              </attribute>
              <layout class="QHBoxLayout" name="horizontalLayout_3">
               <property name="bottomMargin">
                <number>0</number>
               </property>
               <item>
-               <spacer name="horizontalSpacer_4">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeType">
-                 <enum>QSizePolicy::MinimumExpanding</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>40</width>
-                  <height>20</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-              <item>
-               <layout class="QVBoxLayout" name="verticalLayout_11">
-                <item>
-                 <spacer name="verticalSpacer_6">
-                  <property name="orientation">
-                   <enum>Qt::Vertical</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>20</width>
-                    <height>40</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-                <item>
-                 <widget class="QFrame" name="frameNoDevices">
-                  <property name="frameShape">
-                   <enum>QFrame::NoFrame</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <layout class="QVBoxLayout" name="verticalLayout_13">
-                   <item>
-                    <widget class="QLabel" name="labelNoDevices">
-                     <property name="font">
-                      <font>
-                       <family>Ubuntu</family>
-                       <pointsize>12</pointsize>
-                       <weight>50</weight>
-                       <italic>false</italic>
-                       <bold>false</bold>
-                      </font>
-                     </property>
-                     <property name="text">
-                      <string>No devices detected.</string>
-                     </property>
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <widget class="QPushButton" name="pushButtonRefresh_2">
-                     <property name="text">
-                      <string>Redetect devices</string>
-                     </property>
-                    </widget>
-                   </item>
-                  </layout>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QFrame" name="frameNoNetwork">
-                  <property name="frameShape">
-                   <enum>QFrame::NoFrame</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <layout class="QVBoxLayout" name="verticalLayout_12">
-                   <item>
-                    <widget class="QLabel" name="lblNoNetwork">
-                     <property name="font">
-                      <font>
-                       <family>Ubuntu</family>
-                       <pointsize>12</pointsize>
-                      </font>
-                     </property>
-                     <property name="text">
-                      <string>Device has no network connection.
+               <widget class="QStackedWidget" name="stackedWidgetDeviceConnected">
+                <property name="currentIndex">
+                 <number>1</number>
+                </property>
+                <widget class="QWidget" name="page_3">
+                 <layout class="QHBoxLayout" name="horizontalLayout_7">
+                  <item>
+                   <spacer name="horizontalSpacer_3">
+                    <property name="orientation">
+                     <enum>Qt::Horizontal</enum>
+                    </property>
+                    <property name="sizeType">
+                     <enum>QSizePolicy::MinimumExpanding</enum>
+                    </property>
+                    <property name="sizeHint" stdset="0">
+                     <size>
+                      <width>40</width>
+                      <height>20</height>
+                     </size>
+                    </property>
+                   </spacer>
+                  </item>
+                  <item>
+                   <layout class="QVBoxLayout" name="verticalLayout_11">
+                    <item>
+                     <spacer name="verticalSpacer_6">
+                      <property name="orientation">
+                       <enum>Qt::Vertical</enum>
+                      </property>
+                      <property name="sizeHint" stdset="0">
+                       <size>
+                        <width>20</width>
+                        <height>40</height>
+                       </size>
+                      </property>
+                     </spacer>
+                    </item>
+                    <item>
+                     <widget class="QFrame" name="frameNoDevices">
+                      <property name="frameShape">
+                       <enum>QFrame::NoFrame</enum>
+                      </property>
+                      <property name="frameShadow">
+                       <enum>QFrame::Raised</enum>
+                      </property>
+                      <layout class="QVBoxLayout" name="verticalLayout_13">
+                       <item>
+                        <widget class="QLabel" name="labelNoDevices">
+                         <property name="font">
+                          <font>
+                           <family>Ubuntu</family>
+                           <pointsize>12</pointsize>
+                           <weight>50</weight>
+                           <italic>false</italic>
+                           <bold>false</bold>
+                          </font>
+                         </property>
+                         <property name="text">
+                          <string>No devices detected.</string>
+                         </property>
+                         <property name="alignment">
+                          <set>Qt::AlignCenter</set>
+                         </property>
+                        </widget>
+                       </item>
+                       <item>
+                        <widget class="QPushButton" name="pushButtonRefresh_2">
+                         <property name="text">
+                          <string>Redetect devices</string>
+                         </property>
+                        </widget>
+                       </item>
+                      </layout>
+                     </widget>
+                    </item>
+                    <item>
+                     <widget class="QFrame" name="frameNoNetwork">
+                      <property name="frameShape">
+                       <enum>QFrame::NoFrame</enum>
+                      </property>
+                      <property name="frameShadow">
+                       <enum>QFrame::Raised</enum>
+                      </property>
+                      <layout class="QVBoxLayout" name="verticalLayout_12">
+                       <item>
+                        <widget class="QLabel" name="lblNoNetwork">
+                         <property name="font">
+                          <font>
+                           <family>Ubuntu</family>
+                           <pointsize>12</pointsize>
+                          </font>
+                         </property>
+                         <property name="text">
+                          <string>Device has no network connection.
 Connect to a wlan or to a wwan and try again.</string>
-                     </property>
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <widget class="QPushButton" name="pushButtonCloneNetworkConfig">
-                     <property name="text">
-                      <string>Clone network config from host to device</string>
-                     </property>
-                    </widget>
-                   </item>
-                  </layout>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QLabel" name="lblLoading">
-                  <property name="text">
-                   <string>please wait..</string>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignCenter</set>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QPushButton" name="pushButtonCancel">
-                  <property name="font">
-                   <font>
-                    <family>Ubuntu</family>
-                    <pointsize>12</pointsize>
-                   </font>
-                  </property>
-                  <property name="styleSheet">
-                   <string notr="true">padding: 10; color: #333</string>
-                  </property>
-                  <property name="text">
-                   <string>Cancel</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <spacer name="verticalSpacer_5">
-                  <property name="orientation">
-                   <enum>Qt::Vertical</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>20</width>
-                    <height>40</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-               </layout>
-              </item>
-              <item>
-               <widget class="QWidget" name="widgetDeviceInfo" native="true">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <layout class="QVBoxLayout" name="verticalLayout_6">
-                 <property name="topMargin">
-                  <number>0</number>
-                 </property>
-                 <property name="bottomMargin">
-                  <number>9</number>
-                 </property>
-                 <item>
-                  <widget class="QFrame" name="frame">
-                   <property name="frameShape">
-                    <enum>QFrame::NoFrame</enum>
-                   </property>
-                   <property name="frameShadow">
-                    <enum>QFrame::Raised</enum>
-                   </property>
-                   <layout class="QVBoxLayout" name="verticalLayout_15">
-                    <property name="leftMargin">
-                     <number>0</number>
-                    </property>
-                    <property name="topMargin">
-                     <number>0</number>
-                    </property>
-                    <property name="rightMargin">
-                     <number>0</number>
-                    </property>
-                    <property name="bottomMargin">
-                     <number>0</number>
-                    </property>
+                         </property>
+                         <property name="alignment">
+                          <set>Qt::AlignCenter</set>
+                         </property>
+                        </widget>
+                       </item>
+                       <item>
+                        <widget class="QPushButton" name="pushButtonCloneNetworkConfig">
+                         <property name="text">
+                          <string>Clone network config from host to device</string>
+                         </property>
+                        </widget>
+                       </item>
+                      </layout>
+                     </widget>
+                    </item>
                     <item>
-                     <widget class="QLabel" name="label_7">
+                     <widget class="QLabel" name="lblLoading">
                       <property name="text">
-                       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You will find Ubuntu UI templates from &lt;span style=&quot; font-weight:600;&quot;&gt;File &amp;gt; New File or Project&lt;/span&gt;. &lt;/p&gt;&lt;p&gt;After which you can deploy your app to the device using &lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;CTRL+F12&lt;/span&gt; or&lt;br/&gt;by browsing &lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;Build &amp;gt; Ubuntu &amp;gt; Run in Ubuntu Device.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;You can also find screenshot feature from &lt;b&gt;&lt;i&gt;Tools &amp;gt; Ubuntu&lt;/i&gt;&lt;/b&gt; and&lt;br /&gt;links from &lt;b&gt;&lt;i&gt;Help &amp;gt; Ubuntu&lt;/i&gt;&lt;/b&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:16pt; font-weight:600;&quot;&gt;Please wait&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;See more details by changing to &lt;span style=&quot; font-style:italic;&quot;&gt;Log&lt;/span&gt; tab below.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                      </property>
+                      <property name="alignment">
+                       <set>Qt::AlignCenter</set>
                       </property>
                      </widget>
                     </item>
+                    <item>
+                     <spacer name="verticalSpacer_5">
+                      <property name="orientation">
+                       <enum>Qt::Vertical</enum>
+                      </property>
+                      <property name="sizeHint" stdset="0">
+                       <size>
+                        <width>20</width>
+                        <height>40</height>
+                       </size>
+                      </property>
+                     </spacer>
+                    </item>
                    </layout>
-                  </widget>
-                 </item>
-                 <item>
-                  <spacer name="verticalSpacer_2">
-                   <property name="orientation">
-                    <enum>Qt::Vertical</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>20</width>
-                     <height>40</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
-                 <item>
-                  <widget class="QWidget" name="widgetSshProperties" native="true">
-                   <layout class="QGridLayout" name="gridLayout">
-                    <property name="topMargin">
-                     <number>0</number>
-                    </property>
-                    <property name="bottomMargin">
-                     <number>0</number>
-                    </property>
-                    <item row="1" column="0">
-                     <widget class="QPushButton" name="pushButtonPortForward">
-                      <property name="styleSheet">
-                       <string notr="true">color: #333</string>
-                      </property>
-                      <property name="text">
-                       <string>Enable port forward from device to localhost</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item row="2" column="0">
-                     <widget class="QPushButton" name="pushButtonSshSetupPublicKey">
-                      <property name="enabled">
-                       <bool>true</bool>
-                      </property>
-                      <property name="styleSheet">
-                       <string notr="true">color: #333</string>
-                      </property>
-                      <property name="text">
-                       <string>Setup public key authentication</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item row="0" column="0">
-                     <widget class="QGroupBox" name="groupBox_3">
-                      <property name="title">
-                       <string/>
-                      </property>
-                      <layout class="QHBoxLayout" name="horizontalLayout_5">
-                       <property name="topMargin">
-                        <number>0</number>
-                       </property>
-                       <property name="bottomMargin">
-                        <number>0</number>
-                       </property>
-                       <item>
-                        <widget class="QLabel" name="label_3">
-                         <property name="text">
-                          <string>Username</string>
-                         </property>
-                        </widget>
-                       </item>
-                       <item>
-                        <widget class="QLineEdit" name="lineEditUserName">
-                         <property name="enabled">
-                          <bool>false</bool>
-                         </property>
-                         <property name="text">
-                          <string>phablet</string>
-                         </property>
-                        </widget>
-                       </item>
-                       <item>
-                        <widget class="QLabel" name="label_6">
-                         <property name="text">
-                          <string>Ssh Port</string>
-                         </property>
-                        </widget>
-                       </item>
-                       <item>
-                        <widget class="QSpinBox" name="spinBoxSshPort">
-                         <property name="enabled">
-                          <bool>false</bool>
-                         </property>
-                         <property name="minimum">
-                          <number>1300</number>
-                         </property>
-                         <property name="maximum">
-                          <number>32000</number>
-                         </property>
-                         <property name="value">
-                          <number>2222</number>
-                         </property>
-                        </widget>
-                       </item>
-                       <item>
-                        <widget class="QLabel" name="label_5">
-                         <property name="text">
-                          <string>QML Port</string>
-                         </property>
-                        </widget>
-                       </item>
-                       <item>
-                        <widget class="QSpinBox" name="spinBoxQmlPort">
-                         <property name="enabled">
-                          <bool>false</bool>
-                         </property>
-                         <property name="minimum">
-                          <number>1300</number>
-                         </property>
-                         <property name="maximum">
-                          <number>32000</number>
-                         </property>
-                         <property name="value">
-                          <number>3768</number>
-                         </property>
-                        </widget>
-                       </item>
-                      </layout>
-                     </widget>
-                    </item>
-                    <item row="5" column="0">
-                     <widget class="QGroupBox" name="groupBox">
-                      <property name="title">
-                       <string>Device Mode</string>
-                      </property>
-                      <layout class="QVBoxLayout" name="verticalLayout_7">
-                       <property name="bottomMargin">
-                        <number>0</number>
-                       </property>
-                       <item>
-                        <layout class="QHBoxLayout" name="horizontalLayout_4">
-                         <item>
-                          <widget class="QPushButton" name="pushButtonReboot">
-                           <property name="sizePolicy">
-                            <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
-                             <horstretch>0</horstretch>
-                             <verstretch>0</verstretch>
-                            </sizepolicy>
-                           </property>
-                           <property name="styleSheet">
-                            <string notr="true">color: #333</string>
-                           </property>
-                           <property name="text">
-                            <string>Reboot</string>
-                           </property>
-                          </widget>
-                         </item>
-                         <item>
-                          <widget class="QPushButton" name="pushButtonShutdown">
-                           <property name="sizePolicy">
-                            <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
-                             <horstretch>0</horstretch>
-                             <verstretch>0</verstretch>
-                            </sizepolicy>
-                           </property>
-                           <property name="styleSheet">
-                            <string notr="true">color: #333</string>
-                           </property>
-                           <property name="text">
-                            <string>Shutdown</string>
-                           </property>
-                          </widget>
-                         </item>
-                         <item>
-                          <widget class="QPushButton" name="pushButtonRebootToBootloader">
-                           <property name="sizePolicy">
-                            <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
-                             <horstretch>0</horstretch>
-                             <verstretch>0</verstretch>
-                            </sizepolicy>
-                           </property>
-                           <property name="styleSheet">
-                            <string notr="true">color: #333</string>
-                           </property>
-                           <property name="text">
-                            <string>Reboot to 
+                  </item>
+                  <item>
+                   <spacer name="horizontalSpacer_4">
+                    <property name="orientation">
+                     <enum>Qt::Horizontal</enum>
+                    </property>
+                    <property name="sizeType">
+                     <enum>QSizePolicy::MinimumExpanding</enum>
+                    </property>
+                    <property name="sizeHint" stdset="0">
+                     <size>
+                      <width>365</width>
+                      <height>20</height>
+                     </size>
+                    </property>
+                   </spacer>
+                  </item>
+                 </layout>
+                </widget>
+                <widget class="QWidget" name="page_4">
+                 <layout class="QVBoxLayout" name="verticalLayout_19">
+                  <item>
+                   <widget class="QStackedWidget" name="stackedWidgetConnectedDevice">
+                    <property name="currentIndex">
+                     <number>1</number>
+                    </property>
+                    <widget class="QWidget" name="page_5">
+                     <layout class="QHBoxLayout" name="horizontalLayout_8">
+                      <item>
+                       <widget class="QWidget" name="widgetDeviceInfo" native="true">
+                        <property name="sizePolicy">
+                         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                          <horstretch>0</horstretch>
+                          <verstretch>0</verstretch>
+                         </sizepolicy>
+                        </property>
+                        <layout class="QHBoxLayout" name="horizontalLayout_6">
+                         <property name="topMargin">
+                          <number>0</number>
+                         </property>
+                         <property name="bottomMargin">
+                          <number>9</number>
+                         </property>
+                         <item>
+                          <widget class="QStackedWidget" name="stackedWidgetDeveloperMode">
+                           <property name="currentIndex">
+                            <number>0</number>
+                           </property>
+                           <widget class="QWidget" name="page">
+                            <layout class="QVBoxLayout" name="verticalLayout_16">
+                             <item>
+                              <widget class="QLabel" name="label_7">
+                               <property name="text">
+                                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:16pt;&quot;&gt;Your device has been detected.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Next&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt; you &lt;/span&gt;&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;will need to Enable Developer Mode &lt;/span&gt;from the right side.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                               </property>
+                               <property name="textFormat">
+                                <enum>Qt::RichText</enum>
+                               </property>
+                              </widget>
+                             </item>
+                            </layout>
+                           </widget>
+                           <widget class="QWidget" name="page_2">
+                            <layout class="QVBoxLayout" name="verticalLayout_17">
+                             <item>
+                              <widget class="QLabel" name="label_4">
+                               <property name="text">
+                                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:16pt;&quot;&gt;Your device has been enabled for developer use!&lt;/span&gt;&lt;/p&gt;&lt;p&gt;You will find Ubuntu UI templates from &lt;span style=&quot; font-weight:600;&quot;&gt;File &amp;gt; New File or Project&lt;/span&gt;. &lt;/p&gt;&lt;p&gt;After which you can deploy your app to the device using &lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;CTRL+F12&lt;/span&gt; or&lt;br/&gt;by browsing &lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;Build &amp;gt; Ubuntu Touch &amp;gt; Run Application on Device.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;You can also find screenshot feature from &lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;Tools &amp;gt; Ubuntu Touch&lt;/span&gt; and&lt;br/&gt;links from &lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;Help &amp;gt; Ubuntu Touch&lt;/span&gt;.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                               </property>
+                              </widget>
+                             </item>
+                            </layout>
+                           </widget>
+                          </widget>
+                         </item>
+                         <item>
+                          <widget class="QFrame" name="frame">
+                           <property name="frameShape">
+                            <enum>QFrame::NoFrame</enum>
+                           </property>
+                           <property name="frameShadow">
+                            <enum>QFrame::Raised</enum>
+                           </property>
+                           <layout class="QVBoxLayout" name="verticalLayout_15">
+                            <property name="leftMargin">
+                             <number>0</number>
+                            </property>
+                            <property name="topMargin">
+                             <number>0</number>
+                            </property>
+                            <property name="rightMargin">
+                             <number>0</number>
+                            </property>
+                            <property name="bottomMargin">
+                             <number>0</number>
+                            </property>
+                           </layout>
+                          </widget>
+                         </item>
+                        </layout>
+                       </widget>
+                      </item>
+                      <item>
+                       <widget class="QTabWidget" name="tabWidget_2">
+                        <property name="tabPosition">
+                         <enum>QTabWidget::West</enum>
+                        </property>
+                        <property name="currentIndex">
+                         <number>0</number>
+                        </property>
+                        <property name="documentMode">
+                         <bool>true</bool>
+                        </property>
+                        <widget class="QWidget" name="tab_3">
+                         <attribute name="title">
+                          <string>Simple</string>
+                         </attribute>
+                         <layout class="QVBoxLayout" name="verticalLayout_6">
+                          <item>
+                           <widget class="QWidget" name="widget_2" native="true">
+                            <layout class="QVBoxLayout" name="verticalLayout_5">
+                             <item>
+                              <spacer name="verticalSpacer">
+                               <property name="orientation">
+                                <enum>Qt::Vertical</enum>
+                               </property>
+                               <property name="sizeHint" stdset="0">
+                                <size>
+                                 <width>20</width>
+                                 <height>40</height>
+                                </size>
+                               </property>
+                              </spacer>
+                             </item>
+                             <item>
+                              <widget class="QPushButton" name="pushButtonCloneNetworkConfig_2">
+                               <property name="text">
+                                <string>Clone network config from host to device</string>
+                               </property>
+                              </widget>
+                             </item>
+                             <item>
+                              <widget class="QPushButton" name="pushButtonCloneTimeConfig">
+                               <property name="text">
+                                <string>Clone time config from host to device</string>
+                               </property>
+                              </widget>
+                             </item>
+                             <item>
+                              <widget class="QPushButton" name="pushButtonSshInstall">
+                               <property name="font">
+                                <font>
+                                 <family>Ubuntu</family>
+                                 <pointsize>12</pointsize>
+                                 <weight>50</weight>
+                                 <italic>false</italic>
+                                 <bold>false</bold>
+                                </font>
+                               </property>
+                               <property name="styleSheet">
+                                <string notr="true">padding: 10; color: #333</string>
+                               </property>
+                               <property name="text">
+                                <string>Enable developer mode</string>
+                               </property>
+                               <property name="flat">
+                                <bool>false</bool>
+                               </property>
+                              </widget>
+                             </item>
+                             <item>
+                              <widget class="QPushButton" name="pushButtonSshRemove">
+                               <property name="font">
+                                <font>
+                                 <family>Ubuntu</family>
+                                 <pointsize>12</pointsize>
+                                </font>
+                               </property>
+                               <property name="styleSheet">
+                                <string notr="true">padding: 10; color: #333</string>
+                               </property>
+                               <property name="text">
+                                <string>Disable developer mode</string>
+                               </property>
+                              </widget>
+                             </item>
+                             <item>
+                              <spacer name="verticalSpacer_2">
+                               <property name="orientation">
+                                <enum>Qt::Vertical</enum>
+                               </property>
+                               <property name="sizeHint" stdset="0">
+                                <size>
+                                 <width>20</width>
+                                 <height>40</height>
+                                </size>
+                               </property>
+                              </spacer>
+                             </item>
+                            </layout>
+                           </widget>
+                          </item>
+                         </layout>
+                        </widget>
+                        <widget class="QWidget" name="tab_4">
+                         <attribute name="title">
+                          <string>Advanced</string>
+                         </attribute>
+                         <layout class="QVBoxLayout" name="verticalLayout_10">
+                          <item>
+                           <widget class="QWidget" name="widgetSshProperties" native="true">
+                            <layout class="QGridLayout" name="gridLayout">
+                             <property name="topMargin">
+                              <number>0</number>
+                             </property>
+                             <property name="bottomMargin">
+                              <number>0</number>
+                             </property>
+                             <item row="2" column="1">
+                              <widget class="QPushButton" name="pushButtonPortForward">
+                               <property name="styleSheet">
+                                <string notr="true">color: #333</string>
+                               </property>
+                               <property name="text">
+                                <string>Enable port forward from device to localhost</string>
+                               </property>
+                              </widget>
+                             </item>
+                             <item row="3" column="1">
+                              <widget class="QPushButton" name="pushButtonSshSetupPublicKey">
+                               <property name="enabled">
+                                <bool>true</bool>
+                               </property>
+                               <property name="styleSheet">
+                                <string notr="true">color: #333</string>
+                               </property>
+                               <property name="text">
+                                <string>Setup public key authentication</string>
+                               </property>
+                              </widget>
+                             </item>
+                             <item row="1" column="1">
+                              <widget class="QGroupBox" name="groupBox_3">
+                               <property name="title">
+                                <string/>
+                               </property>
+                               <layout class="QHBoxLayout" name="horizontalLayout_5">
+                                <property name="topMargin">
+                                 <number>0</number>
+                                </property>
+                                <property name="bottomMargin">
+                                 <number>0</number>
+                                </property>
+                                <item>
+                                 <widget class="QLabel" name="label_3">
+                                  <property name="text">
+                                   <string>Username</string>
+                                  </property>
+                                 </widget>
+                                </item>
+                                <item>
+                                 <widget class="QLineEdit" name="lineEditUserName">
+                                  <property name="enabled">
+                                   <bool>false</bool>
+                                  </property>
+                                  <property name="text">
+                                   <string>phablet</string>
+                                  </property>
+                                 </widget>
+                                </item>
+                                <item>
+                                 <widget class="QLabel" name="label_6">
+                                  <property name="text">
+                                   <string>Ssh Port</string>
+                                  </property>
+                                 </widget>
+                                </item>
+                                <item>
+                                 <widget class="QSpinBox" name="spinBoxSshPort">
+                                  <property name="enabled">
+                                   <bool>false</bool>
+                                  </property>
+                                  <property name="minimum">
+                                   <number>1300</number>
+                                  </property>
+                                  <property name="maximum">
+                                   <number>32000</number>
+                                  </property>
+                                  <property name="value">
+                                   <number>2222</number>
+                                  </property>
+                                 </widget>
+                                </item>
+                                <item>
+                                 <widget class="QLabel" name="label_5">
+                                  <property name="text">
+                                   <string>QML Port</string>
+                                  </property>
+                                 </widget>
+                                </item>
+                                <item>
+                                 <widget class="QSpinBox" name="spinBoxQmlPort">
+                                  <property name="enabled">
+                                   <bool>false</bool>
+                                  </property>
+                                  <property name="minimum">
+                                   <number>1300</number>
+                                  </property>
+                                  <property name="maximum">
+                                   <number>32000</number>
+                                  </property>
+                                  <property name="value">
+                                   <number>3768</number>
+                                  </property>
+                                 </widget>
+                                </item>
+                               </layout>
+                              </widget>
+                             </item>
+                             <item row="4" column="1">
+                              <widget class="QPushButton" name="pushButtonSshConnect">
+                               <property name="styleSheet">
+                                <string notr="true">color: #333</string>
+                               </property>
+                               <property name="text">
+                                <string>Open ssh connection to device</string>
+                               </property>
+                              </widget>
+                             </item>
+                             <item row="5" column="1">
+                              <widget class="QGroupBox" name="groupBox_2">
+                               <property name="title">
+                                <string>Flash the device</string>
+                               </property>
+                               <layout class="QVBoxLayout" name="verticalLayout_9">
+                                <property name="topMargin">
+                                 <number>9</number>
+                                </property>
+                                <property name="bottomMargin">
+                                 <number>0</number>
+                                </property>
+                                <item>
+                                 <widget class="QPushButton" name="pushButtonUpgradeToDailyImage">
+                                  <property name="styleSheet">
+                                   <string notr="true">color: #333</string>
+                                  </property>
+                                  <property name="text">
+                                   <string>Upgrade to daily image</string>
+                                  </property>
+                                 </widget>
+                                </item>
+                                <item>
+                                 <widget class="QPushButton" name="pushButtonUpgradeToDailyImageWithBootstrap">
+                                  <property name="styleSheet">
+                                   <string notr="true">color: #333</string>
+                                  </property>
+                                  <property name="text">
+                                   <string>Upgrade to daily image (with full bootstrap)</string>
+                                  </property>
+                                 </widget>
+                                </item>
+                               </layout>
+                              </widget>
+                             </item>
+                             <item row="7" column="1">
+                              <spacer name="verticalSpacer_3">
+                               <property name="orientation">
+                                <enum>Qt::Vertical</enum>
+                               </property>
+                               <property name="sizeHint" stdset="0">
+                                <size>
+                                 <width>20</width>
+                                 <height>40</height>
+                                </size>
+                               </property>
+                              </spacer>
+                             </item>
+                             <item row="0" column="1">
+                              <spacer name="verticalSpacer_4">
+                               <property name="orientation">
+                                <enum>Qt::Vertical</enum>
+                               </property>
+                               <property name="sizeHint" stdset="0">
+                                <size>
+                                 <width>20</width>
+                                 <height>40</height>
+                                </size>
+                               </property>
+                              </spacer>
+                             </item>
+                             <item row="6" column="1">
+                              <widget class="QGroupBox" name="groupBox">
+                               <property name="title">
+                                <string>Device Mode</string>
+                               </property>
+                               <layout class="QVBoxLayout" name="verticalLayout_7">
+                                <property name="bottomMargin">
+                                 <number>0</number>
+                                </property>
+                                <item>
+                                 <layout class="QHBoxLayout" name="horizontalLayout_4">
+                                  <item>
+                                   <widget class="QPushButton" name="pushButtonReboot">
+                                    <property name="sizePolicy">
+                                     <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+                                      <horstretch>0</horstretch>
+                                      <verstretch>0</verstretch>
+                                     </sizepolicy>
+                                    </property>
+                                    <property name="styleSheet">
+                                     <string notr="true">color: #333</string>
+                                    </property>
+                                    <property name="text">
+                                     <string>Reboot</string>
+                                    </property>
+                                   </widget>
+                                  </item>
+                                  <item>
+                                   <widget class="QPushButton" name="pushButtonShutdown">
+                                    <property name="sizePolicy">
+                                     <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+                                      <horstretch>0</horstretch>
+                                      <verstretch>0</verstretch>
+                                     </sizepolicy>
+                                    </property>
+                                    <property name="styleSheet">
+                                     <string notr="true">color: #333</string>
+                                    </property>
+                                    <property name="text">
+                                     <string>Shutdown</string>
+                                    </property>
+                                   </widget>
+                                  </item>
+                                  <item>
+                                   <widget class="QPushButton" name="pushButtonRebootToBootloader">
+                                    <property name="sizePolicy">
+                                     <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+                                      <horstretch>0</horstretch>
+                                      <verstretch>0</verstretch>
+                                     </sizepolicy>
+                                    </property>
+                                    <property name="styleSheet">
+                                     <string notr="true">color: #333</string>
+                                    </property>
+                                    <property name="text">
+                                     <string>Reboot to 
 Bootloader</string>
-                           </property>
-                          </widget>
-                         </item>
-                         <item>
-                          <widget class="QPushButton" name="pushButtonRebootToRecovery">
-                           <property name="sizePolicy">
-                            <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
-                             <horstretch>0</horstretch>
-                             <verstretch>0</verstretch>
-                            </sizepolicy>
-                           </property>
-                           <property name="styleSheet">
-                            <string notr="true">color: #333</string>
-                           </property>
-                           <property name="text">
-                            <string>Reboot to
+                                    </property>
+                                   </widget>
+                                  </item>
+                                  <item>
+                                   <widget class="QPushButton" name="pushButtonRebootToRecovery">
+                                    <property name="sizePolicy">
+                                     <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+                                      <horstretch>0</horstretch>
+                                      <verstretch>0</verstretch>
+                                     </sizepolicy>
+                                    </property>
+                                    <property name="styleSheet">
+                                     <string notr="true">color: #333</string>
+                                    </property>
+                                    <property name="text">
+                                     <string>Reboot to
 Recovery</string>
-                           </property>
-                          </widget>
-                         </item>
-                        </layout>
-                       </item>
-                      </layout>
-                     </widget>
-                    </item>
-                    <item row="4" column="0">
-                     <widget class="QGroupBox" name="groupBox_2">
-                      <property name="title">
-                       <string>Flash the device</string>
-                      </property>
-                      <layout class="QVBoxLayout" name="verticalLayout_9">
-                       <property name="topMargin">
-                        <number>9</number>
-                       </property>
-                       <property name="bottomMargin">
-                        <number>0</number>
-                       </property>
-                       <item>
-                        <widget class="QPushButton" name="pushButtonUpgradeToDailyImage">
-                         <property name="styleSheet">
-                          <string notr="true">color: #333</string>
-                         </property>
-                         <property name="text">
-                          <string>Upgrade to daily image</string>
-                         </property>
-                        </widget>
-                       </item>
-                       <item>
-                        <widget class="QPushButton" name="pushButtonUpgradeToDailyImageWithBootstrap">
-                         <property name="styleSheet">
-                          <string notr="true">color: #333</string>
-                         </property>
-                         <property name="text">
-                          <string>/!\ Upgrade to daily image (with full bootstrap)  /!\</string>
-                         </property>
-                        </widget>
-                       </item>
-                      </layout>
-                     </widget>
-                    </item>
-                    <item row="3" column="0">
-                     <widget class="QPushButton" name="pushButtonSshConnect">
-                      <property name="styleSheet">
-                       <string notr="true">color: #333</string>
-                      </property>
-                      <property name="text">
-                       <string>Open ssh connection to device</string>
-                      </property>
-                     </widget>
-                    </item>
-                   </layout>
-                  </widget>
-                 </item>
-                 <item>
-                  <spacer name="verticalSpacer_3">
-                   <property name="orientation">
-                    <enum>Qt::Vertical</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>20</width>
-                     <height>40</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
-                 <item>
-                  <widget class="QPushButton" name="pushButtonCloneNetworkConfig_2">
-                   <property name="text">
-                    <string>Clone network config from host to device</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QPushButton" name="pushButtonCloneTimeConfig">
-                   <property name="text">
-                    <string>Clone time config from host to device</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QPushButton" name="pushButtonSshInstall">
-                   <property name="font">
-                    <font>
-                     <family>Ubuntu</family>
-                     <pointsize>12</pointsize>
-                     <weight>50</weight>
-                     <italic>false</italic>
-                     <bold>false</bold>
-                    </font>
-                   </property>
-                   <property name="styleSheet">
-                    <string notr="true">padding: 10; color: #333</string>
-                   </property>
-                   <property name="text">
-                    <string>Enable developer mode</string>
-                   </property>
-                   <property name="flat">
-                    <bool>false</bool>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QPushButton" name="pushButtonSshRemove">
-                   <property name="font">
-                    <font>
-                     <family>Ubuntu</family>
-                     <pointsize>12</pointsize>
-                    </font>
-                   </property>
-                   <property name="styleSheet">
-                    <string notr="true">padding: 10; color: #333</string>
-                   </property>
-                   <property name="text">
-                    <string>Disable developer mode</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <spacer name="verticalSpacer">
-                   <property name="orientation">
-                    <enum>Qt::Vertical</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>20</width>
-                     <height>40</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
-                 <item>
-                  <widget class="QWidget" name="widgetDeviceSerial" native="true">
-                   <layout class="QVBoxLayout" name="verticalLayout_4">
-                    <property name="leftMargin">
-                     <number>0</number>
-                    </property>
-                    <property name="topMargin">
-                     <number>0</number>
-                    </property>
-                    <property name="rightMargin">
-                     <number>0</number>
-                    </property>
-                    <property name="bottomMargin">
-                     <number>0</number>
-                    </property>
-                    <item>
-                     <layout class="QHBoxLayout" name="horizontalLayout_2">
-                      <item>
-                       <widget class="QLabel" name="label_2">
-                        <property name="font">
-                         <font>
-                          <family>Ubuntu</family>
-                         </font>
-                        </property>
-                        <property name="text">
-                         <string>Serial number</string>
-                        </property>
-                       </widget>
-                      </item>
-                      <item>
-                       <widget class="QLabel" name="lblSerialnumber">
-                        <property name="font">
-                         <font>
-                          <family>Ubuntu</family>
-                          <pointsize>9</pointsize>
-                         </font>
-                        </property>
-                        <property name="text">
-                         <string/>
-                        </property>
-                       </widget>
-                      </item>
-                      <item>
-                       <spacer name="horizontalSpacer_2">
-                        <property name="orientation">
-                         <enum>Qt::Horizontal</enum>
-                        </property>
-                        <property name="sizeHint" stdset="0">
-                         <size>
-                          <width>40</width>
-                          <height>20</height>
-                         </size>
-                        </property>
-                       </spacer>
-                      </item>
-                      <item>
-                       <widget class="QLabel" name="label_4">
-                        <property name="font">
-                         <font>
-                          <family>Ubuntu</family>
-                         </font>
-                        </property>
-                        <property name="text">
-                         <string>State</string>
-                        </property>
-                       </widget>
-                      </item>
-                      <item>
-                       <widget class="QLabel" name="lblDeviceName">
-                        <property name="font">
-                         <font>
-                          <family>Ubuntu</family>
-                          <pointsize>9</pointsize>
-                         </font>
-                        </property>
-                        <property name="text">
-                         <string/>
-                        </property>
-                       </widget>
-                      </item>
-                     </layout>
-                    </item>
-                   </layout>
-                  </widget>
-                 </item>
-                </layout>
+                                    </property>
+                                   </widget>
+                                  </item>
+                                 </layout>
+                                </item>
+                               </layout>
+                              </widget>
+                             </item>
+                            </layout>
+                           </widget>
+                          </item>
+                         </layout>
+                        </widget>
+                       </widget>
+                      </item>
+                     </layout>
+                    </widget>
+                    <widget class="QWidget" name="page_6">
+                     <layout class="QVBoxLayout" name="verticalLayout_18">
+                      <item>
+                       <spacer name="verticalSpacer_7">
+                        <property name="orientation">
+                         <enum>Qt::Vertical</enum>
+                        </property>
+                        <property name="sizeHint" stdset="0">
+                         <size>
+                          <width>20</width>
+                          <height>40</height>
+                         </size>
+                        </property>
+                       </spacer>
+                      </item>
+                      <item>
+                       <widget class="QLabel" name="label_8">
+                        <property name="text">
+                         <string>Executing following script in the background..</string>
+                        </property>
+                        <property name="alignment">
+                         <set>Qt::AlignCenter</set>
+                        </property>
+                       </widget>
+                      </item>
+                      <item>
+                       <widget class="QLabel" name="lblDeviceProcessInfo">
+                        <property name="font">
+                         <font>
+                          <pointsize>20</pointsize>
+                         </font>
+                        </property>
+                        <property name="text">
+                         <string>TextLabel</string>
+                        </property>
+                        <property name="alignment">
+                         <set>Qt::AlignCenter</set>
+                        </property>
+                       </widget>
+                      </item>
+                      <item>
+                       <widget class="QProgressBar" name="progressBar">
+                        <property name="value">
+                         <number>24</number>
+                        </property>
+                       </widget>
+                      </item>
+                      <item>
+                       <widget class="QLabel" name="label_9">
+                        <property name="text">
+                         <string>Please wait.. if you like you can follow the progress on the &lt;i&gt;Log&lt;/i&gt; tab at the bottom.</string>
+                        </property>
+                        <property name="alignment">
+                         <set>Qt::AlignCenter</set>
+                        </property>
+                       </widget>
+                      </item>
+                      <item>
+                       <spacer name="verticalSpacer_8">
+                        <property name="orientation">
+                         <enum>Qt::Vertical</enum>
+                        </property>
+                        <property name="sizeHint" stdset="0">
+                         <size>
+                          <width>20</width>
+                          <height>40</height>
+                         </size>
+                        </property>
+                       </spacer>
+                      </item>
+                     </layout>
+                    </widget>
+                   </widget>
+                  </item>
+                 </layout>
+                </widget>
                </widget>
               </item>
-              <item>
-               <spacer name="horizontalSpacer_3">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeType">
-                 <enum>QSizePolicy::MinimumExpanding</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>40</width>
-                  <height>20</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
              </layout>
             </widget>
             <widget class="QWidget" name="tab_2">
              <attribute name="title">
-              <string>Messages</string>
+              <string>Log</string>
              </attribute>
              <layout class="QVBoxLayout" name="verticalLayout_8">
               <item>

=== modified file 'qtcreator/src/plugins/ubuntu/ubuntumenu.cpp'
--- qtcreator/src/plugins/ubuntu/ubuntumenu.cpp	2013-04-24 17:24:47 +0000
+++ qtcreator/src/plugins/ubuntu/ubuntumenu.cpp	2013-05-01 23:52:25 +0000
@@ -336,6 +336,7 @@
 
                     command = command.replace(QLatin1String(Constants::UBUNTU_ACTION_SHAREDIRECTORY),Constants::UBUNTU_SHAREPATH);
                     command = command.replace(QLatin1String(Constants::UBUNTU_ACTION_SCRIPTDIRECTORY),Constants::UBUNTU_SCRIPTPATH);
+                    command = command.replace(QLatin1String(Constants::UBUNTU_ACTION_SERIALNUMBER),UbuntuDevicesWidget::instance()->serialNumber());
 
                     if (bQuery && bQueryOk) {
                         command = QString(command).arg(queryData);

=== modified file 'qtcreator/src/plugins/ubuntu/ubuntuprojectapplicationwizard.cpp'
--- qtcreator/src/plugins/ubuntu/ubuntuprojectapplicationwizard.cpp	2013-04-24 13:38:33 +0000
+++ qtcreator/src/plugins/ubuntu/ubuntuprojectapplicationwizard.cpp	2013-05-01 23:52:25 +0000
@@ -28,6 +28,8 @@
 #include <qtsupport/qtsupportconstants.h>
 #include <coreplugin/icore.h>
 
+#include <QtGlobal>
+
 #include <QIcon>
 #include <QDir>
 #include <QDebug>
@@ -57,8 +59,12 @@
 
 Core::FeatureSet UbuntuProjectApplicationWizard::requiredFeatures() const
 {
-  return Core::Feature(QtSupport::Constants::FEATURE_QMLPROJECT)
-       | Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK_2);
+#ifdef Q_PROCESSOR_ARM
+    return Core::Feature(0);
+#else
+    return Core::Feature(QtSupport::Constants::FEATURE_QMLPROJECT)
+         | Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK_2);
+#endif
 }
 
 Core::BaseFileWizardParameters UbuntuProjectApplicationWizard::parameters(QJsonObject params)