Merge lp:~juhapekka-piiroinen/ubuntu-qtcreator-plugins/add-support-for-multiple-devices into lp:ubuntu-qtcreator-plugins
- add-support-for-multiple-devices
- Merge into trunk
Proposed by
Juhapekka Piiroinen
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Zoltan Balogh | ||||||||
Approved revision: | 193 | ||||||||
Merged at revision: | 182 | ||||||||
Proposed branch: | lp:~juhapekka-piiroinen/ubuntu-qtcreator-plugins/add-support-for-multiple-devices | ||||||||
Merge into: | lp:ubuntu-qtcreator-plugins | ||||||||
Diff against target: |
2566 lines (+1016/-806) 33 files modified
README (+1/-0) qtcreator/share/qtcreator/ubuntu/menu.json (+33/-37) qtcreator/share/qtcreator/ubuntu/scripts/device_flashdaily (+5/-3) qtcreator/share/qtcreator/ubuntu/scripts/device_flashdaily_bootstrap (+5/-3) qtcreator/share/qtcreator/ubuntu/scripts/device_hasnetwork (+5/-3) qtcreator/share/qtcreator/ubuntu/scripts/device_network_clone (+5/-3) qtcreator/share/qtcreator/ubuntu/scripts/device_portforward (+7/-6) qtcreator/share/qtcreator/ubuntu/scripts/device_reboot (+5/-3) qtcreator/share/qtcreator/ubuntu/scripts/device_reboot2bootloader (+5/-3) qtcreator/share/qtcreator/ubuntu/scripts/device_reboot2recovery (+5/-3) qtcreator/share/qtcreator/ubuntu/scripts/device_rootshell (+5/-3) qtcreator/share/qtcreator/ubuntu/scripts/device_set_persist-sys-usb-config (+3/-1) qtcreator/share/qtcreator/ubuntu/scripts/device_shutdown (+5/-3) qtcreator/share/qtcreator/ubuntu/scripts/device_time_clone (+3/-1) qtcreator/share/qtcreator/ubuntu/scripts/device_version (+5/-3) qtcreator/share/qtcreator/ubuntu/scripts/openssh_connect (+8/-6) qtcreator/share/qtcreator/ubuntu/scripts/openssh_install (+3/-1) qtcreator/share/qtcreator/ubuntu/scripts/openssh_publickey (+6/-4) qtcreator/share/qtcreator/ubuntu/scripts/openssh_remove (+5/-3) qtcreator/share/qtcreator/ubuntu/scripts/openssh_version (+8/-6) qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_buildanddeploypackage (+10/-8) qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_buildpackage (+11/-9) qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_close_all_apps (+3/-2) qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_deploy_package (+13/-10) qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_developertools (+8/-6) qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_restart_appslense (+2/-1) qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_run_app (+13/-11) qtcreator/src/plugins/ubuntu/ubuntuconstants.h (+1/-0) qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.cpp (+56/-32) qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.h (+3/-1) qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.ui (+760/-629) qtcreator/src/plugins/ubuntu/ubuntumenu.cpp (+1/-0) qtcreator/src/plugins/ubuntu/ubuntuprojectapplicationwizard.cpp (+8/-2) |
||||||||
To merge this branch: | bzr merge lp:~juhapekka-piiroinen/ubuntu-qtcreator-plugins/add-support-for-multiple-devices | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Zoltan Balogh | Pending | ||
Review via email: mp+161948@code.launchpad.net |
Commit message
Description of the change
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.
To post a comment you must log in.
- 191. By Juhapekka Piiroinen
-
Linked to bugs.
- 192. By Juhapekka Piiroinen
-
Fixed an issue with openssh_publickey script.
Improved Devices tab to use stackedwidgets. - 193. By Juhapekka Piiroinen
-
added missing lines to pass the device serialnumber
- 194. By Juhapekka Piiroinen
-
.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'README' | |||
2 | --- README 2013-02-15 11:50:19 +0000 | |||
3 | +++ README 2013-05-01 23:52:25 +0000 | |||
4 | @@ -1,3 +1,4 @@ | |||
5 | 1 | |||
6 | 1 | Ubuntu Qt Creator plugins | 2 | Ubuntu Qt Creator plugins |
7 | 2 | =================================== | 3 | =================================== |
8 | 3 | 4 | ||
9 | 4 | 5 | ||
10 | === modified file 'qtcreator/share/qtcreator/ubuntu/menu.json' | |||
11 | --- qtcreator/share/qtcreator/ubuntu/menu.json 2013-04-26 08:19:25 +0000 | |||
12 | +++ qtcreator/share/qtcreator/ubuntu/menu.json 2013-05-01 23:52:25 +0000 | |||
13 | @@ -14,7 +14,7 @@ | |||
14 | 14 | "deviceRequired": true, | 14 | "deviceRequired": true, |
15 | 15 | "qmlProjectRequired": true, | 15 | "qmlProjectRequired": true, |
16 | 16 | "actions": [ | 16 | "actions": [ |
18 | 17 | "%SCRIPTDIRECTORY%/qtc_device_run_app %FOLDERNAME% %DISPLAYNAME%.desktop %DISPLAYNAME%.qml /home/phablet/dev_tmp /home/phablet/.local/share/applications" | 17 | "%SCRIPTDIRECTORY%/qtc_device_run_app %SERIALNUMBER% %FOLDERNAME% %DISPLAYNAME%.desktop %DISPLAYNAME%.qml /home/phablet/dev_tmp /home/phablet/.local/share/applications" |
19 | 18 | ] | 18 | ] |
20 | 19 | }, | 19 | }, |
21 | 20 | { | 20 | { |
22 | @@ -25,7 +25,7 @@ | |||
23 | 25 | "deviceRequired": true, | 25 | "deviceRequired": true, |
24 | 26 | "qmlProjectRequired": true, | 26 | "qmlProjectRequired": true, |
25 | 27 | "actions": [ | 27 | "actions": [ |
27 | 28 | "%SCRIPTDIRECTORY%/qtc_device_close_all_apps %DISPLAYNAME%" | 28 | "%SCRIPTDIRECTORY%/qtc_device_close_all_apps %SERIALNUMBER% %DISPLAYNAME%" |
28 | 29 | ] | 29 | ] |
29 | 30 | }, | 30 | }, |
30 | 31 | { | 31 | { |
31 | @@ -48,7 +48,7 @@ | |||
32 | 48 | "qmlProjectRequired": true, | 48 | "qmlProjectRequired": true, |
33 | 49 | "actions": [ | 49 | "actions": [ |
34 | 50 | "%SCRIPTDIRECTORY%/qtc_project_create_package", | 50 | "%SCRIPTDIRECTORY%/qtc_project_create_package", |
36 | 51 | "%SCRIPTDIRECTORY%/qtc_device_deploy_package ../%FOLDERNAME%*.deb phablet@127.0.0.1 2222 /home/phablet" | 51 | "%SCRIPTDIRECTORY%/qtc_device_deploy_package %SERIALNUMBER% ../%FOLDERNAME%*.deb phablet@127.0.0.1 2222 /home/phablet" |
37 | 52 | ] | 52 | ] |
38 | 53 | }, | 53 | }, |
39 | 54 | { | 54 | { |
40 | @@ -59,7 +59,7 @@ | |||
41 | 59 | "deviceRequired": true, | 59 | "deviceRequired": true, |
42 | 60 | "qmakeProjectRequired": true, | 60 | "qmakeProjectRequired": true, |
43 | 61 | "actions": [ | 61 | "actions": [ |
45 | 62 | "%SCRIPTDIRECTORY%/qtc_device_buildpackage %FOLDERNAME%" | 62 | "%SCRIPTDIRECTORY%/qtc_device_buildpackage %SERIALNUMBER% %FOLDERNAME%" |
46 | 63 | ] | 63 | ] |
47 | 64 | }, | 64 | }, |
48 | 65 | { | 65 | { |
49 | @@ -70,7 +70,7 @@ | |||
50 | 70 | "deviceRequired": true, | 70 | "deviceRequired": true, |
51 | 71 | "qmakeProjectRequired": true, | 71 | "qmakeProjectRequired": true, |
52 | 72 | "actions": [ | 72 | "actions": [ |
54 | 73 | "%SCRIPTDIRECTORY%/qtc_device_buildanddeploypackage %FOLDERNAME%" | 73 | "%SCRIPTDIRECTORY%/qtc_device_buildanddeploypackage %SERIALNUMBER% %FOLDERNAME%" |
55 | 74 | ] | 74 | ] |
56 | 75 | } | 75 | } |
57 | 76 | ] | 76 | ] |
58 | @@ -166,7 +166,7 @@ | |||
59 | 166 | "keysequence": "Ctrl+F10", | 166 | "keysequence": "Ctrl+F10", |
60 | 167 | "deviceRequired": true, | 167 | "deviceRequired": true, |
61 | 168 | "actions": [ | 168 | "actions": [ |
63 | 169 | "x-terminal-emulator -e \"ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null phablet@127.0.0.1 -p2222\"" | 169 | "x-terminal-emulator -e \"ssh -i ~/.ssh/ubuntudevice_%SERIALNUMBER%_id_rsa -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null phablet@127.0.0.1 -p2222\"" |
64 | 170 | ] | 170 | ] |
65 | 171 | }, | 171 | }, |
66 | 172 | { | 172 | { |
67 | @@ -174,7 +174,7 @@ | |||
68 | 174 | "id": "Ubuntu.Menu.Device.CloseAllApps", | 174 | "id": "Ubuntu.Menu.Device.CloseAllApps", |
69 | 175 | "deviceRequired": true, | 175 | "deviceRequired": true, |
70 | 176 | "actions": [ | 176 | "actions": [ |
72 | 177 | "%SCRIPTDIRECTORY%/qtc_device_close_all_apps" | 177 | "%SCRIPTDIRECTORY%/qtc_device_close_all_apps %SERIALNUMBER%" |
73 | 178 | ] | 178 | ] |
74 | 179 | }, | 179 | }, |
75 | 180 | { | 180 | { |
76 | @@ -187,7 +187,7 @@ | |||
77 | 187 | "keysequence": "Ctrl+F11", | 187 | "keysequence": "Ctrl+F11", |
78 | 188 | "deviceRequired": true, | 188 | "deviceRequired": true, |
79 | 189 | "actions": [ | 189 | "actions": [ |
81 | 190 | "%SCRIPTDIRECTORY%/qtc_device_developertools" | 190 | "%SCRIPTDIRECTORY%/qtc_device_developertools %SERIALNUMBER%" |
82 | 191 | ] | 191 | ] |
83 | 192 | } | 192 | } |
84 | 193 | ] | 193 | ] |
85 | @@ -202,9 +202,9 @@ | |||
86 | 202 | "keysequence": "Ctrl+F8", | 202 | "keysequence": "Ctrl+F8", |
87 | 203 | "deviceRequired": true, | 203 | "deviceRequired": true, |
88 | 204 | "actions": [ | 204 | "actions": [ |
92 | 205 | "adb root", | 205 | "adb -s %SERIALNUMBER% root", |
93 | 206 | "adb wait-for-device", | 206 | "adb -s %SERIALNUMBER% wait-for-device", |
94 | 207 | "adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin reboot" | 207 | "adb -s %SERIALNUMBER% shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin reboot" |
95 | 208 | ] | 208 | ] |
96 | 209 | }, | 209 | }, |
97 | 210 | { | 210 | { |
98 | @@ -213,9 +213,9 @@ | |||
99 | 213 | "keysequence": "Ctrl+F9", | 213 | "keysequence": "Ctrl+F9", |
100 | 214 | "deviceRequired": true, | 214 | "deviceRequired": true, |
101 | 215 | "actions": [ | 215 | "actions": [ |
105 | 216 | "adb root", | 216 | "adb -s %SERIALNUMBER% root", |
106 | 217 | "adb wait-for-device", | 217 | "adb -s %SERIALNUMBER% wait-for-device", |
107 | 218 | "adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin shutdown -h now" | 218 | "adb -s %SERIALNUMBER% shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin shutdown -h now" |
108 | 219 | ] | 219 | ] |
109 | 220 | } | 220 | } |
110 | 221 | ] | 221 | ] |
111 | @@ -231,9 +231,9 @@ | |||
112 | 231 | "id": "Ubuntu.Menu.Device.AptGet.Update", | 231 | "id": "Ubuntu.Menu.Device.AptGet.Update", |
113 | 232 | "deviceRequired": true, | 232 | "deviceRequired": true, |
114 | 233 | "actions": [ | 233 | "actions": [ |
118 | 234 | "adb root", | 234 | "adb -s %SERIALNUMBER% root", |
119 | 235 | "adb wait-for-device", | 235 | "adb -s %SERIALNUMBER% wait-for-device", |
120 | 236 | "adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin apt-get update" | 236 | "adb -s %SERIALNUMBER% shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin apt-get update" |
121 | 237 | ] | 237 | ] |
122 | 238 | }, | 238 | }, |
123 | 239 | { | 239 | { |
124 | @@ -241,9 +241,9 @@ | |||
125 | 241 | "id": "Ubuntu.Menu.Device.AptGet.Upgrade", | 241 | "id": "Ubuntu.Menu.Device.AptGet.Upgrade", |
126 | 242 | "deviceRequired": true, | 242 | "deviceRequired": true, |
127 | 243 | "actions": [ | 243 | "actions": [ |
131 | 244 | "adb root", | 244 | "adb -s %SERIALNUMBER% root", |
132 | 245 | "adb wait-for-device", | 245 | "adb -s %SERIALNUMBER% wait-for-device", |
133 | 246 | "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\"" | 246 | "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\"" |
134 | 247 | ] | 247 | ] |
135 | 248 | }, | 248 | }, |
136 | 249 | { | 249 | { |
137 | @@ -251,8 +251,6 @@ | |||
138 | 251 | "id": "Ubuntu.Menu.Device.AptGet.Install", | 251 | "id": "Ubuntu.Menu.Device.AptGet.Install", |
139 | 252 | "deviceRequired": true, | 252 | "deviceRequired": true, |
140 | 253 | "actions": [ | 253 | "actions": [ |
141 | 254 | "adb root", | ||
142 | 255 | "adb wait-for-device", | ||
143 | 256 | { | 254 | { |
144 | 257 | "queryDialog": { | 255 | "queryDialog": { |
145 | 258 | "title": "Install Package", | 256 | "title": "Install Package", |
146 | @@ -260,9 +258,9 @@ | |||
147 | 260 | "value": "<packagename>" | 258 | "value": "<packagename>" |
148 | 261 | } | 259 | } |
149 | 262 | }, | 260 | }, |
153 | 263 | "adb root", | 261 | "adb -s %SERIALNUMBER% root", |
154 | 264 | "adb wait-for-device", | 262 | "adb -s %SERIALNUMBER% wait-for-device", |
155 | 265 | "adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin apt-get -y install %0" | 263 | "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" |
156 | 266 | ] | 264 | ] |
157 | 267 | }, | 265 | }, |
158 | 268 | { | 266 | { |
159 | @@ -270,8 +268,8 @@ | |||
160 | 270 | "id": "Ubuntu.Menu.Device.AptGet.BuildDep", | 268 | "id": "Ubuntu.Menu.Device.AptGet.BuildDep", |
161 | 271 | "deviceRequired": true, | 269 | "deviceRequired": true, |
162 | 272 | "actions": [ | 270 | "actions": [ |
165 | 273 | "adb root", | 271 | "adb -s %SERIALNUMBER% root", |
166 | 274 | "adb wait-for-device", | 272 | "adb -s %SERIALNUMBER% wait-for-device", |
167 | 275 | { | 273 | { |
168 | 276 | "queryDialog": { | 274 | "queryDialog": { |
169 | 277 | "title": "Install Package Build Dependencies", | 275 | "title": "Install Package Build Dependencies", |
170 | @@ -279,9 +277,7 @@ | |||
171 | 279 | "value": "<packagename>" | 277 | "value": "<packagename>" |
172 | 280 | } | 278 | } |
173 | 281 | }, | 279 | }, |
177 | 282 | "adb root", | 280 | "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" |
175 | 283 | "adb wait-for-device", | ||
176 | 284 | "adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin apt-get -y build-dep %0" | ||
178 | 285 | ] | 281 | ] |
179 | 286 | } | 282 | } |
180 | 287 | ] | 283 | ] |
181 | @@ -295,7 +291,7 @@ | |||
182 | 295 | "id": "Ubuntu.Menu.Device.ADB.shell", | 291 | "id": "Ubuntu.Menu.Device.ADB.shell", |
183 | 296 | "deviceRequired": true, | 292 | "deviceRequired": true, |
184 | 297 | "actions": [ | 293 | "actions": [ |
186 | 298 | "x-terminal-emulator -e \"adb shell\"" | 294 | "x-terminal-emulator -e \"adb -s %SERIALNUMBER% shell\"" |
187 | 299 | ] | 295 | ] |
188 | 300 | }, | 296 | }, |
189 | 301 | { | 297 | { |
190 | @@ -303,7 +299,7 @@ | |||
191 | 303 | "id": "Ubuntu.Menu.Device.ADB.root", | 299 | "id": "Ubuntu.Menu.Device.ADB.root", |
192 | 304 | "deviceRequired": true, | 300 | "deviceRequired": true, |
193 | 305 | "actions": [ | 301 | "actions": [ |
195 | 306 | "adb root" | 302 | "adb -s %SERIALNUMBER% root" |
196 | 307 | ] | 303 | ] |
197 | 308 | }, | 304 | }, |
198 | 309 | { | 305 | { |
199 | @@ -318,7 +314,7 @@ | |||
200 | 318 | "id": "Ubuntu.Menu.Device.ADB.setUsbConfigPtpAdb", | 314 | "id": "Ubuntu.Menu.Device.ADB.setUsbConfigPtpAdb", |
201 | 319 | "deviceRequired": true, | 315 | "deviceRequired": true, |
202 | 320 | "actions": [ | 316 | "actions": [ |
204 | 321 | "%SCRIPTDIRECTORY%/device_set_persist-sys-usb-config" | 317 | "%SCRIPTDIRECTORY%/device_set_persist-sys-usb-config %SERIALNUMBER%" |
205 | 322 | ] | 318 | ] |
206 | 323 | }, | 319 | }, |
207 | 324 | { | 320 | { |
208 | @@ -327,10 +323,10 @@ | |||
209 | 327 | "keysequence": "Ctrl+Shift+P", | 323 | "keysequence": "Ctrl+Shift+P", |
210 | 328 | "deviceRequired": true, | 324 | "deviceRequired": true, |
211 | 329 | "actions": [ | 325 | "actions": [ |
216 | 330 | "adb root", | 326 | "adb -s %SERIALNUMBER% root", |
217 | 331 | "adb shell /system/bin/screencap -p /sdcard/screenshot.png", | 327 | "adb -s %SERIALNUMBER% shell /system/bin/screencap -p /sdcard/screenshot.png", |
218 | 332 | "adb pull /sdcard/screenshot.png screenshot.png", | 328 | "adb -s %SERIALNUMBER% pull /sdcard/screenshot.png screenshot.png", |
219 | 333 | "eog screenshot.png" | 329 | "eog -s %SERIALNUMBER% screenshot.png" |
220 | 334 | ] | 330 | ] |
221 | 335 | } | 331 | } |
222 | 336 | ] | 332 | ] |
223 | 337 | 333 | ||
224 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_flashdaily' | |||
225 | --- qtcreator/share/qtcreator/ubuntu/scripts/device_flashdaily 2013-04-23 11:09:57 +0000 | |||
226 | +++ qtcreator/share/qtcreator/ubuntu/scripts/device_flashdaily 2013-05-01 23:52:25 +0000 | |||
227 | @@ -16,6 +16,8 @@ | |||
228 | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> |
229 | 17 | set -e; | 17 | set -e; |
230 | 18 | 18 | ||
234 | 19 | adb root | 19 | SERIALNUMBER=$1 |
235 | 20 | adb wait-for-device | 20 | |
236 | 21 | x-terminal-emulator -e "bash -ic phablet-flash" | 21 | adb -s ${SERIALNUMBER} root |
237 | 22 | adb -s ${SERIALNUMBER} wait-for-device | ||
238 | 23 | x-terminal-emulator -e "bash -ic 'phablet-flash -s ${SERIALNUMBER}'" | ||
239 | 22 | 24 | ||
240 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_flashdaily_bootstrap' | |||
241 | --- qtcreator/share/qtcreator/ubuntu/scripts/device_flashdaily_bootstrap 2013-04-23 11:09:57 +0000 | |||
242 | +++ qtcreator/share/qtcreator/ubuntu/scripts/device_flashdaily_bootstrap 2013-05-01 23:52:25 +0000 | |||
243 | @@ -16,6 +16,8 @@ | |||
244 | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> |
245 | 17 | set -e; | 17 | set -e; |
246 | 18 | 18 | ||
250 | 19 | adb root | 19 | SERIALNUMBER=$1 |
251 | 20 | adb wait-for-device | 20 | |
252 | 21 | x-terminal-emulator -e "bash -ic phablet-flash -b" | 21 | adb -s ${SERIALNUMBER} root |
253 | 22 | adb -s ${SERIALNUMBER} wait-for-device | ||
254 | 23 | x-terminal-emulator -e "bash -ic 'phablet-flash -b -s ${SERIALNUMBER}'" | ||
255 | 22 | 24 | ||
256 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_hasnetwork' | |||
257 | --- qtcreator/share/qtcreator/ubuntu/scripts/device_hasnetwork 2013-04-23 11:09:57 +0000 | |||
258 | +++ qtcreator/share/qtcreator/ubuntu/scripts/device_hasnetwork 2013-05-01 23:52:25 +0000 | |||
259 | @@ -16,9 +16,11 @@ | |||
260 | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> |
261 | 17 | set -e; | 17 | set -e; |
262 | 18 | 18 | ||
266 | 19 | adb root &> /dev/null | 19 | SERIALNUMBER=$1 |
267 | 20 | adb wait-for-device | 20 | |
268 | 21 | 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}'` | 21 | adb -s ${SERIALNUMBER} root &> /dev/null |
269 | 22 | adb -s ${SERIALNUMBER} wait-for-device &> /dev/null | ||
270 | 23 | 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}'` | ||
271 | 22 | if [[ $NM_STATE != *disconnected* ]]; then | 24 | if [[ $NM_STATE != *disconnected* ]]; then |
272 | 23 | echo "1" | 25 | echo "1" |
273 | 24 | else | 26 | else |
274 | 25 | 27 | ||
275 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_network_clone' | |||
276 | --- qtcreator/share/qtcreator/ubuntu/scripts/device_network_clone 2013-04-23 11:09:57 +0000 | |||
277 | +++ qtcreator/share/qtcreator/ubuntu/scripts/device_network_clone 2013-05-01 23:52:25 +0000 | |||
278 | @@ -16,13 +16,15 @@ | |||
279 | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> |
280 | 17 | set -e; | 17 | set -e; |
281 | 18 | 18 | ||
283 | 19 | gksudo phablet-network-setup | 19 | SERIALNUMBER=$1 |
284 | 20 | |||
285 | 21 | gksudo phablet-network-setup -s ${SERIALNUMBER} | ||
286 | 20 | 22 | ||
287 | 21 | SCRIPTPATH=`dirname $0` | 23 | SCRIPTPATH=`dirname $0` |
289 | 22 | HASNETWORK=`${SCRIPTPATH}/device_hasnetwork` | 24 | HASNETWORK=`${SCRIPTPATH}/device_hasnetwork ${SERIALNUMBER}` |
290 | 23 | while [[ ${HASNETWORK} == "0" ]]; do | 25 | while [[ ${HASNETWORK} == "0" ]]; do |
291 | 24 | sleep 1 | 26 | sleep 1 |
292 | 25 | echo -n . | 27 | echo -n . |
294 | 26 | HASNETWORK=`${SCRIPTPATH}/device_hasnetwork` | 28 | HASNETWORK=`${SCRIPTPATH}/device_hasnetwork ${SERIALNUMBER}` |
295 | 27 | done | 29 | done |
296 | 28 | echo "The device has connected to a network." | 30 | echo "The device has connected to a network." |
297 | 29 | 31 | ||
298 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_portforward' | |||
299 | --- qtcreator/share/qtcreator/ubuntu/scripts/device_portforward 2013-04-23 18:00:52 +0000 | |||
300 | +++ qtcreator/share/qtcreator/ubuntu/scripts/device_portforward 2013-05-01 23:52:25 +0000 | |||
301 | @@ -16,8 +16,9 @@ | |||
302 | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> |
303 | 17 | set -e; | 17 | set -e; |
304 | 18 | 18 | ||
307 | 19 | SSHPORT=$1 | 19 | SERIALNUMBER=$1 |
308 | 20 | QMLPORT=$2 | 20 | SSHPORT=$2 |
309 | 21 | QMLPORT=$3 | ||
310 | 21 | 22 | ||
311 | 22 | if [[ -z $SSHPORT ]]; then | 23 | if [[ -z $SSHPORT ]]; then |
312 | 23 | SSHPORT=2222 | 24 | SSHPORT=2222 |
313 | @@ -27,7 +28,7 @@ | |||
314 | 27 | QMLPORT=3768 | 28 | QMLPORT=3768 |
315 | 28 | fi | 29 | fi |
316 | 29 | 30 | ||
321 | 30 | adb root &> /dev/null | 31 | adb -s ${SERIALNUMBER} root &> /dev/null |
322 | 31 | adb wait-for-device &> /dev/null | 32 | adb -s ${SERIALNUMBER} wait-for-device &> /dev/null |
323 | 32 | adb forward tcp:$SSHPORT tcp:22 | 33 | adb -s ${SERIALNUMBER} forward tcp:$SSHPORT tcp:22 |
324 | 33 | adb forward tcp:$QMLPORT tcp:3768 | 34 | adb -s ${SERIALNUMBER} forward tcp:$QMLPORT tcp:3768 |
325 | 34 | 35 | ||
326 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_reboot' | |||
327 | --- qtcreator/share/qtcreator/ubuntu/scripts/device_reboot 2013-04-23 11:09:57 +0000 | |||
328 | +++ qtcreator/share/qtcreator/ubuntu/scripts/device_reboot 2013-05-01 23:52:25 +0000 | |||
329 | @@ -16,6 +16,8 @@ | |||
330 | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> |
331 | 17 | set -e; | 17 | set -e; |
332 | 18 | 18 | ||
336 | 19 | adb root &> /dev/null | 19 | SERIALNUMBER=$1 |
337 | 20 | adb wait-for-device &> /dev/null | 20 | |
338 | 21 | adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin reboot | 21 | adb -s ${SERIALNUMBER} root &> /dev/null |
339 | 22 | adb -s ${SERIALNUMBER} wait-for-device &> /dev/null | ||
340 | 23 | adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin reboot | ||
341 | 22 | 24 | ||
342 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_reboot2bootloader' | |||
343 | --- qtcreator/share/qtcreator/ubuntu/scripts/device_reboot2bootloader 2013-04-23 11:09:57 +0000 | |||
344 | +++ qtcreator/share/qtcreator/ubuntu/scripts/device_reboot2bootloader 2013-05-01 23:52:25 +0000 | |||
345 | @@ -16,6 +16,8 @@ | |||
346 | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> |
347 | 17 | set -e; | 17 | set -e; |
348 | 18 | 18 | ||
352 | 19 | adb root &> /dev/null | 19 | SERIALNUMBER=$1 |
353 | 20 | adb wait-for-device &> /dev/null | 20 | |
354 | 21 | adb reboot-bootloader | 21 | adb -s ${SERIALNUMBER} root &> /dev/null |
355 | 22 | adb -s ${SERIALNUMBER} wait-for-device &> /dev/null | ||
356 | 23 | adb -s ${SERIALNUMBER} reboot-bootloader | ||
357 | 22 | 24 | ||
358 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_reboot2recovery' | |||
359 | --- qtcreator/share/qtcreator/ubuntu/scripts/device_reboot2recovery 2013-04-23 11:09:57 +0000 | |||
360 | +++ qtcreator/share/qtcreator/ubuntu/scripts/device_reboot2recovery 2013-05-01 23:52:25 +0000 | |||
361 | @@ -16,6 +16,8 @@ | |||
362 | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> |
363 | 17 | set -e; | 17 | set -e; |
364 | 18 | 18 | ||
368 | 19 | adb root &> /dev/null | 19 | SERIALNUMBER=$1 |
369 | 20 | adb wait-for-device &> /dev/null | 20 | |
370 | 21 | adb reboot recovery | 21 | adb -s ${SERIALNUMBER} root &> /dev/null |
371 | 22 | adb -s ${SERIALNUMBER} wait-for-device &> /dev/null | ||
372 | 23 | adb -s ${SERIALNUMBER} reboot recovery | ||
373 | 22 | 24 | ||
374 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_rootshell' | |||
375 | --- qtcreator/share/qtcreator/ubuntu/scripts/device_rootshell 2013-04-23 11:09:57 +0000 | |||
376 | +++ qtcreator/share/qtcreator/ubuntu/scripts/device_rootshell 2013-05-01 23:52:25 +0000 | |||
377 | @@ -16,6 +16,8 @@ | |||
378 | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> |
379 | 17 | set -e; | 17 | set -e; |
380 | 18 | 18 | ||
384 | 19 | adb root &> /dev/null | 19 | SERIALNUMBER=$1 |
385 | 20 | adb wait-for-device &> /dev/null | 20 | |
386 | 21 | x-terminal-emulator -e "adb shell ubuntu_chroot shell" | 21 | adb -s ${SERIALNUMBER} root &> /dev/null |
387 | 22 | adb -s ${SERIALNUMBER} wait-for-device &> /dev/null | ||
388 | 23 | x-terminal-emulator -e "adb -s ${SERIALNUMBER} shell ubuntu_chroot shell" | ||
389 | 22 | 24 | ||
390 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_set_persist-sys-usb-config' | |||
391 | --- qtcreator/share/qtcreator/ubuntu/scripts/device_set_persist-sys-usb-config 2013-04-26 08:16:54 +0000 | |||
392 | +++ qtcreator/share/qtcreator/ubuntu/scripts/device_set_persist-sys-usb-config 2013-05-01 23:52:25 +0000 | |||
393 | @@ -15,4 +15,6 @@ | |||
394 | 15 | # | 15 | # |
395 | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> |
396 | 17 | 17 | ||
398 | 18 | adb shell setprop persist.sys.usb.config ptp,adb | 18 | SERIALNUMBER=$1 |
399 | 19 | |||
400 | 20 | adb -s ${SERIALNUMBER} shell setprop persist.sys.usb.config ptp,adb | ||
401 | 19 | 21 | ||
402 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_shutdown' | |||
403 | --- qtcreator/share/qtcreator/ubuntu/scripts/device_shutdown 2013-04-23 11:09:57 +0000 | |||
404 | +++ qtcreator/share/qtcreator/ubuntu/scripts/device_shutdown 2013-05-01 23:52:25 +0000 | |||
405 | @@ -16,6 +16,8 @@ | |||
406 | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> |
407 | 17 | set -e; | 17 | set -e; |
408 | 18 | 18 | ||
412 | 19 | adb root &> /dev/null | 19 | SERIALNUMBER=$1 |
413 | 20 | adb wait-for-device &> /dev/null | 20 | |
414 | 21 | adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin shutdown -h now | 21 | adb -s ${SERIALNUMBER} root &> /dev/null |
415 | 22 | adb -s ${SERIALNUMBER} wait-for-device &> /dev/null | ||
416 | 23 | adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin shutdown -h now | ||
417 | 22 | 24 | ||
418 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_time_clone' | |||
419 | --- qtcreator/share/qtcreator/ubuntu/scripts/device_time_clone 2013-04-19 13:55:48 +0000 | |||
420 | +++ qtcreator/share/qtcreator/ubuntu/scripts/device_time_clone 2013-05-01 23:52:25 +0000 | |||
421 | @@ -16,7 +16,9 @@ | |||
422 | 16 | # Author: Zoltán Balogh <zoltan.balogh@canonical.com> | 16 | # Author: Zoltán Balogh <zoltan.balogh@canonical.com> |
423 | 17 | set -e | 17 | set -e |
424 | 18 | 18 | ||
426 | 19 | ADB="adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin" | 19 | SERIALNUMBER=$1 |
427 | 20 | |||
428 | 21 | ADB="adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin" | ||
429 | 20 | LOCAL_DATE=`date +%Y%m%d` | 22 | LOCAL_DATE=`date +%Y%m%d` |
430 | 21 | LOCAL_TIME=`date +%T` | 23 | LOCAL_TIME=`date +%T` |
431 | 22 | TIMEZONE=`cat /etc/timezone` | 24 | TIMEZONE=`cat /etc/timezone` |
432 | 23 | 25 | ||
433 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_version' | |||
434 | --- qtcreator/share/qtcreator/ubuntu/scripts/device_version 2013-04-23 11:09:57 +0000 | |||
435 | +++ qtcreator/share/qtcreator/ubuntu/scripts/device_version 2013-05-01 23:52:25 +0000 | |||
436 | @@ -16,6 +16,8 @@ | |||
437 | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> |
438 | 17 | set -e; | 17 | set -e; |
439 | 18 | 18 | ||
443 | 19 | adb root &> /dev/null | 19 | SERIALNUMBER=$1 |
444 | 20 | adb wait-for-device &> /dev/null | 20 | |
445 | 21 | adb shell cat /system/*ubuntu_stamp | 21 | adb -s ${SERIALNUMBER} root &> /dev/null |
446 | 22 | adb -s ${SERIALNUMBER} wait-for-device &> /dev/null | ||
447 | 23 | adb -s ${SERIALNUMBER} shell cat /system/*ubuntu_stamp | ||
448 | 22 | 24 | ||
449 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/openssh_connect' | |||
450 | --- qtcreator/share/qtcreator/ubuntu/scripts/openssh_connect 2013-04-23 18:00:52 +0000 | |||
451 | +++ qtcreator/share/qtcreator/ubuntu/scripts/openssh_connect 2013-05-01 23:52:25 +0000 | |||
452 | @@ -16,10 +16,12 @@ | |||
453 | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> |
454 | 17 | set -e; | 17 | set -e; |
455 | 18 | 18 | ||
458 | 19 | PORT=$1 | 19 | SERIALNUMBER=$1 |
459 | 20 | USERNAME=$2 | 20 | PORT=$2 |
460 | 21 | USERNAME=$3 | ||
461 | 21 | SCRIPTPATH=`dirname $0` | 22 | SCRIPTPATH=`dirname $0` |
466 | 22 | 23 | SSHIDENTITY=~/.ssh/ubuntudevice_$SERIALNUMBER_id_rsa | |
467 | 23 | ${SCRIPTPATH}/device_portforward $PORT 3768 | 24 | |
468 | 24 | 25 | ${SCRIPTPATH}/device_portforward ${SERIALNUMBER} ${PORT} 3768 | |
469 | 25 | x-terminal-emulator -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p $PORT $USERNAME@127.0.0.1 bash -i" | 26 | |
470 | 27 | x-terminal-emulator -e "ssh -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p $PORT $USERNAME@127.0.0.1 bash -i" & | ||
471 | 26 | 28 | ||
472 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/openssh_install' | |||
473 | --- qtcreator/share/qtcreator/ubuntu/scripts/openssh_install 2013-04-23 11:09:57 +0000 | |||
474 | +++ qtcreator/share/qtcreator/ubuntu/scripts/openssh_install 2013-05-01 23:52:25 +0000 | |||
475 | @@ -16,5 +16,7 @@ | |||
476 | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> |
477 | 17 | set -e; | 17 | set -e; |
478 | 18 | 18 | ||
479 | 19 | SERIALNUMBER=$1 | ||
480 | 20 | |||
481 | 19 | SCRIPTPATH=`dirname $0` | 21 | SCRIPTPATH=`dirname $0` |
482 | 20 | ${SCRIPTPATH}/qtc_device_developertools | ||
483 | 21 | \ No newline at end of file | 22 | \ No newline at end of file |
484 | 23 | ${SCRIPTPATH}/qtc_device_developertools ${SERIALNUMBER} | ||
485 | 22 | 24 | ||
486 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/openssh_publickey' | |||
487 | --- qtcreator/share/qtcreator/ubuntu/scripts/openssh_publickey 2013-04-23 18:00:52 +0000 | |||
488 | +++ qtcreator/share/qtcreator/ubuntu/scripts/openssh_publickey 2013-05-01 23:52:25 +0000 | |||
489 | @@ -16,9 +16,11 @@ | |||
490 | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> |
491 | 17 | set -e; | 17 | set -e; |
492 | 18 | 18 | ||
493 | 19 | KEYPATH=~/.ssh/ubuntudevice_$2_id_rsa | ||
494 | 20 | USERNAME=$1 | 19 | USERNAME=$1 |
496 | 21 | SHELL="adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin" | 20 | SERIALNUMBER=$2 |
497 | 21 | KEYPATH=~/.ssh/ubuntudevice_${SERIALNUMBER}_id_rsa | ||
498 | 22 | |||
499 | 23 | SHELL="adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin" | ||
500 | 22 | 24 | ||
501 | 23 | function check_key { | 25 | function check_key { |
502 | 24 | 26 | ||
503 | @@ -43,8 +45,8 @@ | |||
504 | 43 | } | 45 | } |
505 | 44 | 46 | ||
506 | 45 | ################# | 47 | ################# |
509 | 46 | adb root &> /dev/null | 48 | adb -s ${SERIALNUMBER} root &> /dev/null |
510 | 47 | adb wait-for-device > /dev/null | 49 | adb -s ${SERIALNUMBER} wait-for-device > /dev/null |
511 | 48 | 50 | ||
512 | 49 | if [[ -f $KEYPATH ]]; then | 51 | if [[ -f $KEYPATH ]]; then |
513 | 50 | check_key | 52 | check_key |
514 | 51 | 53 | ||
515 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/openssh_remove' | |||
516 | --- qtcreator/share/qtcreator/ubuntu/scripts/openssh_remove 2013-04-23 11:09:57 +0000 | |||
517 | +++ qtcreator/share/qtcreator/ubuntu/scripts/openssh_remove 2013-05-01 23:52:25 +0000 | |||
518 | @@ -16,8 +16,10 @@ | |||
519 | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> |
520 | 17 | set -e; | 17 | set -e; |
521 | 18 | 18 | ||
525 | 19 | adb root &> /dev/null | 19 | SERIALNUMBER=$1 |
526 | 20 | adb wait-for-device &> /dev/null | 20 | |
527 | 21 | adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin apt-get remove openssh-server -y | 21 | adb -s ${SERIALNUMBER} root &> /dev/null |
528 | 22 | adb -s ${SERIALNUMBER} wait-for-device &> /dev/null | ||
529 | 23 | 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 | ||
530 | 22 | 24 | ||
531 | 23 | 25 | ||
532 | 24 | 26 | ||
533 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/openssh_version' | |||
534 | --- qtcreator/share/qtcreator/ubuntu/scripts/openssh_version 2013-04-23 11:09:57 +0000 | |||
535 | +++ qtcreator/share/qtcreator/ubuntu/scripts/openssh_version 2013-05-01 23:52:25 +0000 | |||
536 | @@ -14,11 +14,13 @@ | |||
537 | 14 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
538 | 15 | # | 15 | # |
539 | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> |
546 | 17 | set -e; | 17 | #set -e; |
547 | 18 | 18 | ||
548 | 19 | adb root &> /dev/null | 19 | SERIALNUMBER=$1 |
549 | 20 | adb wait-for-device &> /dev/null | 20 | |
550 | 21 | adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin apt-get -f install &> /dev/null | 21 | adb -s ${SERIALNUMBER} root &> /dev/null |
551 | 22 | 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" | 22 | adb -s ${SERIALNUMBER} wait-for-device &> /dev/null |
552 | 23 | 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 | ||
553 | 24 | 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" | ||
554 | 23 | 25 | ||
555 | 24 | 26 | ||
556 | 25 | 27 | ||
557 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_buildanddeploypackage' | |||
558 | --- qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_buildanddeploypackage 2013-04-25 08:45:39 +0000 | |||
559 | +++ qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_buildanddeploypackage 2013-05-01 23:52:25 +0000 | |||
560 | @@ -16,10 +16,12 @@ | |||
561 | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> |
562 | 17 | set -e; | 17 | set -e; |
563 | 18 | 18 | ||
568 | 19 | FOLDERNAME=$1 | 19 | SERIALNUMBER=$1 |
569 | 20 | TARGET_DEVICE=$2 | 20 | FOLDERNAME=$2 |
570 | 21 | TARGET_DEVICE_PORT=$3 | 21 | TARGET_DEVICE=$3 |
571 | 22 | TARGET_DEVICE_HOME=$4 | 22 | TARGET_DEVICE_PORT=$4 |
572 | 23 | TARGET_DEVICE_HOME=$5 | ||
573 | 24 | SSHIDENTITY=~/.ssh/ubuntudevice_$SERIALNUMBER_id_rsa | ||
574 | 23 | 25 | ||
575 | 24 | if [[ -z ${TARGET_DEVICE_PORT} ]]; then | 26 | if [[ -z ${TARGET_DEVICE_PORT} ]]; then |
576 | 25 | TARGET_DEVICE_PORT=2222 | 27 | TARGET_DEVICE_PORT=2222 |
577 | @@ -33,13 +35,13 @@ | |||
578 | 33 | TARGET_DEVICE_HOME=/home/phablet/dev_tmp | 35 | TARGET_DEVICE_HOME=/home/phablet/dev_tmp |
579 | 34 | fi | 36 | fi |
580 | 35 | 37 | ||
584 | 36 | SCP="scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P${TARGET_DEVICE_PORT}" | 38 | SCP="scp -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P${TARGET_DEVICE_PORT}" |
585 | 37 | SSH="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p${TARGET_DEVICE_PORT} ${TARGET_DEVICE}" | 39 | SSH="ssh -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p${TARGET_DEVICE_PORT} ${TARGET_DEVICE}" |
586 | 38 | ADB="adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin" | 40 | ADB="adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin" |
587 | 39 | 41 | ||
588 | 40 | SCRIPTPATH=`dirname $0` | 42 | SCRIPTPATH=`dirname $0` |
589 | 41 | 43 | ||
591 | 42 | ${SCRIPTPATH}/qtc_device_buildpackage ${FOLDERNAME} | 44 | ${SCRIPTPATH}/qtc_device_buildpackage ${SERIALNUMBER} ${FOLDERNAME} |
592 | 43 | 45 | ||
593 | 44 | FILES=`$SSH "cd ${TARGET_DEVICE_HOME}; ls -1 *.deb"` | 46 | FILES=`$SSH "cd ${TARGET_DEVICE_HOME}; ls -1 *.deb"` |
594 | 45 | echo $FILES | xargs -0 -I FILE $ADB gdebi --n ${TARGET_DEVICE_HOME}/FILE | 47 | echo $FILES | xargs -0 -I FILE $ADB gdebi --n ${TARGET_DEVICE_HOME}/FILE |
595 | 46 | 48 | ||
596 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_buildpackage' | |||
597 | --- qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_buildpackage 2013-04-25 11:02:31 +0000 | |||
598 | +++ qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_buildpackage 2013-05-01 23:52:25 +0000 | |||
599 | @@ -38,12 +38,14 @@ | |||
600 | 38 | 38 | ||
601 | 39 | set -e | 39 | set -e |
602 | 40 | 40 | ||
607 | 41 | FOLDERNAME=$1 | 41 | SERIALNUMBER=$1 |
608 | 42 | TARGET_DEVICE=$2 | 42 | FOLDERNAME=$2 |
609 | 43 | TARGET_DEVICE_PORT=$3 | 43 | TARGET_DEVICE=$3 |
610 | 44 | TARGET_DEVICE_HOME=$4 | 44 | TARGET_DEVICE_PORT=$4 |
611 | 45 | TARGET_DEVICE_HOME=$5 | ||
612 | 45 | 46 | ||
614 | 46 | USAGE="$0 [foldername] [target_device] [target_device_port] [target_device_home]" | 47 | USAGE="$0 [serialnumber] [foldername] [target_device] [target_device_port] [target_device_home]" |
615 | 48 | SSHIDENTITY=~/.ssh/ubuntudevice_$SERIALNUMBER_id_rsa | ||
616 | 47 | 49 | ||
617 | 48 | if [[ -z $FOLDERNAME ]]; then | 50 | if [[ -z $FOLDERNAME ]]; then |
618 | 49 | echo ${USAGE} | 51 | echo ${USAGE} |
619 | @@ -62,12 +64,12 @@ | |||
620 | 62 | TARGET_DEVICE_HOME=/home/phablet/dev_tmp | 64 | TARGET_DEVICE_HOME=/home/phablet/dev_tmp |
621 | 63 | fi | 65 | fi |
622 | 64 | 66 | ||
626 | 65 | SCP="scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P${TARGET_DEVICE_PORT}" | 67 | SCP="scp -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P${TARGET_DEVICE_PORT}" |
627 | 66 | SSH="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p${TARGET_DEVICE_PORT} ${TARGET_DEVICE}" | 68 | SSH="ssh -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p${TARGET_DEVICE_PORT} ${TARGET_DEVICE}" |
628 | 67 | ADB="adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin " | 69 | ADB="adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin " |
629 | 68 | SCRIPTPATH=`dirname $0` | 70 | SCRIPTPATH=`dirname $0` |
630 | 69 | 71 | ||
632 | 70 | ${SCRIPTPATH}/device_portforward ${TARGET_DEVICE_PORT} 3768 | 72 | ${SCRIPTPATH}/device_portforward ${SERIALNUMBER} ${TARGET_DEVICE_PORT} 3768 |
633 | 71 | 73 | ||
634 | 72 | pushd ${FOLDERNAME} | 74 | pushd ${FOLDERNAME} |
635 | 73 | set +e | 75 | set +e |
636 | 74 | 76 | ||
637 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_close_all_apps' | |||
638 | --- qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_close_all_apps 2013-04-25 12:41:29 +0000 | |||
639 | +++ qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_close_all_apps 2013-05-01 23:52:25 +0000 | |||
640 | @@ -17,8 +17,9 @@ | |||
641 | 17 | #set -e; | 17 | #set -e; |
642 | 18 | #set -x | 18 | #set -x |
643 | 19 | 19 | ||
646 | 20 | APPLICATION=$1 | 20 | SERIALNUMBER=$1 |
647 | 21 | ADB="adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin" | 21 | APPLICATION=$2 |
648 | 22 | ADB="adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin" | ||
649 | 22 | 23 | ||
650 | 23 | if [[ -z ${APPLICATION} ]]; then | 24 | if [[ -z ${APPLICATION} ]]; then |
651 | 24 | ${ADB} kill -s 9 \`pidof qmlscene\` | 25 | ${ADB} kill -s 9 \`pidof qmlscene\` |
652 | 25 | 26 | ||
653 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_deploy_package' | |||
654 | --- qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_deploy_package 2013-04-23 18:00:52 +0000 | |||
655 | +++ qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_deploy_package 2013-05-01 23:52:25 +0000 | |||
656 | @@ -16,12 +16,15 @@ | |||
657 | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> |
658 | 17 | set -e; | 17 | set -e; |
659 | 18 | 18 | ||
666 | 19 | PACKAGE=$1 | 19 | SERIALNUMBER=$1 |
667 | 20 | TARGET_DEVICE=$2 | 20 | PACKAGE=$2 |
668 | 21 | TARGET_DEVICE_PORT=$3 | 21 | TARGET_DEVICE=$3 |
669 | 22 | TARGET_DEVICE_HOME=$4 | 22 | TARGET_DEVICE_PORT=$4 |
670 | 23 | 23 | TARGET_DEVICE_HOME=$5 | |
671 | 24 | USAGE="$0 [package] [target_device] [target_device_port] [target_device_home]" | 24 | |
672 | 25 | SSHIDENTITY=~/.ssh/ubuntudevice_$SERIALNUMBER_id_rsa | ||
673 | 26 | |||
674 | 27 | USAGE="$0 [serialnumber] [package] [target_device] [target_device_port] [target_device_home]" | ||
675 | 25 | 28 | ||
676 | 26 | if [[ -z $PACKAGE || -z $TARGET_DEVICE || -z $TARGET_DEVICE_PORT || -z $TARGET_DEVICE_HOME ]]; then | 29 | if [[ -z $PACKAGE || -z $TARGET_DEVICE || -z $TARGET_DEVICE_PORT || -z $TARGET_DEVICE_HOME ]]; then |
677 | 27 | echo ${USAGE} | 30 | echo ${USAGE} |
678 | @@ -45,11 +48,11 @@ | |||
679 | 45 | PLAIN_PACKAGE=`basename ${PACKAGE}` | 48 | PLAIN_PACKAGE=`basename ${PACKAGE}` |
680 | 46 | SCRIPTPATH=`dirname $0` | 49 | SCRIPTPATH=`dirname $0` |
681 | 47 | 50 | ||
683 | 48 | ${SCRIPTPATH}/device_portforward ${TARGET_DEVICE_PORT} 3768 | 51 | ${SCRIPTPATH}/device_portforward ${SERIALNUMBER} ${TARGET_DEVICE_PORT} 3768 |
684 | 49 | 52 | ||
688 | 50 | SCP="scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P${TARGET_DEVICE_PORT}" | 53 | SCP="scp -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P${TARGET_DEVICE_PORT}" |
689 | 51 | SSH="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p${TARGET_DEVICE_PORT} ${TARGET_DEVICE}" | 54 | SSH="ssh -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p${TARGET_DEVICE_PORT} ${TARGET_DEVICE}" |
690 | 52 | ADB="adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin" | 55 | ADB="adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin" |
691 | 53 | 56 | ||
692 | 54 | # -- actions -- | 57 | # -- actions -- |
693 | 55 | $SCP ${PACKAGE} ${TARGET_DEVICE}:${TARGET_DEVICE_HOME} | 58 | $SCP ${PACKAGE} ${TARGET_DEVICE}:${TARGET_DEVICE_HOME} |
694 | 56 | 59 | ||
695 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_developertools' | |||
696 | --- qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_developertools 2013-04-23 11:09:57 +0000 | |||
697 | +++ qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_developertools 2013-05-01 23:52:25 +0000 | |||
698 | @@ -16,12 +16,14 @@ | |||
699 | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> |
700 | 17 | set -e; | 17 | set -e; |
701 | 18 | 18 | ||
708 | 19 | ADB="adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin" | 19 | SERIALNUMBER=$1 |
709 | 20 | 20 | ||
710 | 21 | adb root | 21 | ADB="adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin" |
711 | 22 | adb wait-for-device | 22 | |
712 | 23 | adb forward tcp:2222 tcp:22 | 23 | adb -s ${SERIALNUMBER} root |
713 | 24 | adb forward tcp:3768 tcp:3768 | 24 | adb -s ${SERIALNUMBER} wait-for-device |
714 | 25 | adb -s ${SERIALNUMBER} forward tcp:2222 tcp:22 | ||
715 | 26 | adb -s ${SERIALNUMBER} forward tcp:3768 tcp:3768 | ||
716 | 25 | $ADB apt-get -y -f install | 27 | $ADB apt-get -y -f install |
717 | 26 | $ADB apt-get install software-properties-common -y | 28 | $ADB apt-get install software-properties-common -y |
718 | 27 | $ADB apt-add-repository ppa:canonical-qt5-edgers/qt5-proper -y | 29 | $ADB apt-add-repository ppa:canonical-qt5-edgers/qt5-proper -y |
719 | 28 | 30 | ||
720 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_restart_appslense' | |||
721 | --- qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_restart_appslense 2013-04-23 11:09:57 +0000 | |||
722 | +++ qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_restart_appslense 2013-05-01 23:52:25 +0000 | |||
723 | @@ -16,7 +16,8 @@ | |||
724 | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> | 16 | # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> |
725 | 17 | set -e; | 17 | set -e; |
726 | 18 | 18 | ||
728 | 19 | ADB="adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin" | 19 | SERIALNUMBER=$1 |
729 | 20 | ADB="adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin" | ||
730 | 20 | 21 | ||
731 | 21 | # -- actions -- | 22 | # -- actions -- |
732 | 22 | $ADB kill -s 9 \`pidof unity-applications-daemon\` | 23 | $ADB kill -s 9 \`pidof unity-applications-daemon\` |
733 | 23 | 24 | ||
734 | === modified file 'qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_run_app' | |||
735 | --- qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_run_app 2013-04-23 11:09:57 +0000 | |||
736 | +++ qtcreator/share/qtcreator/ubuntu/scripts/qtc_device_run_app 2013-05-01 23:52:25 +0000 | |||
737 | @@ -17,15 +17,17 @@ | |||
738 | 17 | set -e; | 17 | set -e; |
739 | 18 | #set -x | 18 | #set -x |
740 | 19 | 19 | ||
748 | 20 | FOLDERNAME=$1 | 20 | SERIALNUMBER=$1 |
749 | 21 | DESKTOP_FILENAME=$2 | 21 | SSHIDENTITY=~/.ssh/ubuntudevice_$1_id_rsa |
750 | 22 | MAIN_QML=$3 | 22 | FOLDERNAME=$2 |
751 | 23 | TARGET_DEVICE_HOME=$4 | 23 | DESKTOP_FILENAME=$3 |
752 | 24 | TARGET_DEVICE_DESKTOP_PATH=$5 | 24 | MAIN_QML=$4 |
753 | 25 | TARGET_DEVICE=$6 | 25 | TARGET_DEVICE_HOME=$5 |
754 | 26 | TARGET_DEVICE_PORT=$7 | 26 | TARGET_DEVICE_DESKTOP_PATH=$6 |
755 | 27 | TARGET_DEVICE=$7 | ||
756 | 28 | TARGET_DEVICE_PORT=$8 | ||
757 | 27 | 29 | ||
759 | 28 | USAGE="$0 [foldername] [desktop_filename] [main_qml] [target_device_home] [target_device_desktop_path] [target_device] [target_device_port]" | 30 | USAGE="$0 [serialnumber] [foldername] [desktop_filename] [main_qml] [target_device_home] [target_device_desktop_path] [target_device] [target_device_port]" |
760 | 29 | 31 | ||
761 | 30 | if [[ -z ${DESKTOP_FILENAME} || -z ${FOLDERNAME} ]]; then | 32 | if [[ -z ${DESKTOP_FILENAME} || -z ${FOLDERNAME} ]]; then |
762 | 31 | echo ${USAGE} | 33 | echo ${USAGE} |
763 | @@ -52,12 +54,12 @@ | |||
764 | 52 | TARGET_DEVICE_DESKTOP_PATH=${TARGET_DEVICE_HOME}/.local/share/applications | 54 | TARGET_DEVICE_DESKTOP_PATH=${TARGET_DEVICE_HOME}/.local/share/applications |
765 | 53 | fi | 55 | fi |
766 | 54 | 56 | ||
769 | 55 | SCP="scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P${TARGET_DEVICE_PORT}" | 57 | SCP="scp -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P${TARGET_DEVICE_PORT}" |
770 | 56 | SSH="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p${TARGET_DEVICE_PORT} ${TARGET_DEVICE}" | 58 | SSH="ssh -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p${TARGET_DEVICE_PORT} ${TARGET_DEVICE}" |
771 | 57 | SCRIPTPATH=`dirname $0` | 59 | SCRIPTPATH=`dirname $0` |
772 | 58 | COMMAND="qmlscene ${TARGET_DEVICE_HOME}/${FOLDERNAME}/${MAIN_QML} --desktop_file_hint=${TARGET_DEVICE_DESKTOP_PATH}/${DESKTOP_FILENAME}" | 60 | COMMAND="qmlscene ${TARGET_DEVICE_HOME}/${FOLDERNAME}/${MAIN_QML} --desktop_file_hint=${TARGET_DEVICE_DESKTOP_PATH}/${DESKTOP_FILENAME}" |
773 | 59 | 61 | ||
775 | 60 | ${SCRIPTPATH}/device_portforward 2222 3768 | 62 | ${SCRIPTPATH}/device_portforward ${SERIALNUMBER} ${TARGET_DEVICE_PORT} 3768 |
776 | 61 | 63 | ||
777 | 62 | # make a tar package | 64 | # make a tar package |
778 | 63 | tar -cjf ${FOLDERNAME}.tar.bz2 ${FOLDERNAME} | 65 | tar -cjf ${FOLDERNAME}.tar.bz2 ${FOLDERNAME} |
779 | 64 | 66 | ||
780 | === modified file 'qtcreator/src/plugins/ubuntu/ubuntuconstants.h' | |||
781 | --- qtcreator/src/plugins/ubuntu/ubuntuconstants.h 2013-04-24 17:24:47 +0000 | |||
782 | +++ qtcreator/src/plugins/ubuntu/ubuntuconstants.h 2013-05-01 23:52:25 +0000 | |||
783 | @@ -86,6 +86,7 @@ | |||
784 | 86 | const char UBUNTU_ACTION_PROJECTFILES[] = "%PROJECTFILES%"; | 86 | const char UBUNTU_ACTION_PROJECTFILES[] = "%PROJECTFILES%"; |
785 | 87 | const char UBUNTU_ACTION_SCRIPTDIRECTORY[] = "%SCRIPTDIRECTORY%"; | 87 | const char UBUNTU_ACTION_SCRIPTDIRECTORY[] = "%SCRIPTDIRECTORY%"; |
786 | 88 | const char UBUNTU_ACTION_SHAREDIRECTORY[] = "%SHAREDIRECTORY%"; | 88 | const char UBUNTU_ACTION_SHAREDIRECTORY[] = "%SHAREDIRECTORY%"; |
787 | 89 | const char UBUNTU_ACTION_SERIALNUMBER[] = "%SERIALNUMBER%"; | ||
788 | 89 | 90 | ||
789 | 90 | const char UBUNTU_FILENAME_DISPLAYNAME[] = "displayName"; | 91 | const char UBUNTU_FILENAME_DISPLAYNAME[] = "displayName"; |
790 | 91 | 92 | ||
791 | 92 | 93 | ||
792 | === modified file 'qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.cpp' | |||
793 | --- qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.cpp 2013-04-24 16:56:03 +0000 | |||
794 | +++ qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.cpp 2013-05-01 23:52:25 +0000 | |||
795 | @@ -46,11 +46,14 @@ | |||
796 | 46 | ui->pushButtonSshInstall->hide(); | 46 | ui->pushButtonSshInstall->hide(); |
797 | 47 | ui->pushButtonSshRemove->hide(); | 47 | ui->pushButtonSshRemove->hide(); |
798 | 48 | ui->widgetDeviceSerial->hide(); | 48 | ui->widgetDeviceSerial->hide(); |
800 | 49 | ui->pushButtonCancel->hide(); | 49 | //ui->pushButtonCancel->hide(); |
801 | 50 | ui->frameNoDevices->hide(); | 50 | ui->frameNoDevices->hide(); |
802 | 51 | ui->lblLoading->hide(); | 51 | ui->lblLoading->hide(); |
803 | 52 | ui->frameNoNetwork->hide(); | 52 | ui->frameNoNetwork->hide(); |
804 | 53 | 53 | ||
805 | 54 | ui->progressBar->setMinimum(0); | ||
806 | 55 | ui->progressBar->setMaximum(0); | ||
807 | 56 | |||
808 | 54 | connect(&m_ubuntuProcess,SIGNAL(started(QString)),this,SLOT(onStarted(QString))); | 57 | connect(&m_ubuntuProcess,SIGNAL(started(QString)),this,SLOT(onStarted(QString))); |
809 | 55 | connect(&m_ubuntuProcess,SIGNAL(message(QString)),this,SLOT(onMessage(QString))); | 58 | connect(&m_ubuntuProcess,SIGNAL(message(QString)),this,SLOT(onMessage(QString))); |
810 | 56 | connect(&m_ubuntuProcess,SIGNAL(finished(QString,int)),this,SLOT(onFinished(QString, int))); | 59 | connect(&m_ubuntuProcess,SIGNAL(finished(QString,int)),this,SLOT(onFinished(QString, int))); |
811 | @@ -64,12 +67,15 @@ | |||
812 | 64 | } | 67 | } |
813 | 65 | 68 | ||
814 | 66 | void UbuntuDevicesWidget::onStarted(QString cmd) { | 69 | void UbuntuDevicesWidget::onStarted(QString cmd) { |
815 | 70 | ui->stackedWidgetConnectedDevice->setCurrentIndex(1); | ||
816 | 71 | ui->lblDeviceProcessInfo->setText(QFileInfo(cmd).baseName()); | ||
817 | 67 | ui->widgetDeviceInfo->hide(); | 72 | ui->widgetDeviceInfo->hide(); |
819 | 68 | ui->pushButtonCancel->show(); | 73 | //ui->pushButtonCancel->show(); |
820 | 69 | ui->lblLoading->show(); | 74 | ui->lblLoading->show(); |
821 | 70 | } | 75 | } |
822 | 71 | 76 | ||
823 | 72 | void UbuntuDevicesWidget::onFinished(QString cmd, int code) { | 77 | void UbuntuDevicesWidget::onFinished(QString cmd, int code) { |
824 | 78 | ui->stackedWidgetConnectedDevice->setCurrentIndex(0); | ||
825 | 73 | if (m_aboutToClose) { return; } | 79 | if (m_aboutToClose) { return; } |
826 | 74 | 80 | ||
827 | 75 | bool bOk = true; | 81 | bool bOk = true; |
828 | @@ -82,10 +88,12 @@ | |||
829 | 82 | QStringList lineData = line.split(QLatin1String("\t")); | 88 | QStringList lineData = line.split(QLatin1String("\t")); |
830 | 83 | if (lineData.count() == 2) { | 89 | if (lineData.count() == 2) { |
831 | 84 | QString sSerialNumber = lineData.takeFirst(); | 90 | QString sSerialNumber = lineData.takeFirst(); |
833 | 85 | QString sDeviceName = lineData.takeFirst(); | 91 | //QString sDeviceName = lineData.takeFirst(); |
834 | 86 | 92 | ||
837 | 87 | ui->lblDeviceName->setText(sDeviceName.trimmed()); | 93 | //ui->lblDeviceName->setText(sDeviceName.trimmed()); |
838 | 88 | ui->lblSerialnumber->setText(sSerialNumber.trimmed()); | 94 | ui->comboBoxSerialNumber->addItem(sSerialNumber.trimmed()); |
839 | 95 | //ui->lblSerialnumber->setText(sSerialNumber.trimmed()); | ||
840 | 96 | m_deviceSerialNumber = sSerialNumber.trimmed(); | ||
841 | 89 | } | 97 | } |
842 | 90 | } | 98 | } |
843 | 91 | 99 | ||
844 | @@ -93,10 +101,11 @@ | |||
845 | 93 | ui->frameNoDevices->show(); | 101 | ui->frameNoDevices->show(); |
846 | 94 | ui->widgetDeviceInfo->hide(); | 102 | ui->widgetDeviceInfo->hide(); |
847 | 95 | ui->widgetDeviceSerial->hide(); | 103 | ui->widgetDeviceSerial->hide(); |
849 | 96 | 104 | ui->comboBoxSerialNumber->clear(); | |
850 | 97 | bOk = false; | 105 | bOk = false; |
851 | 98 | m_deviceDetected = false; | 106 | m_deviceDetected = false; |
852 | 99 | 107 | ||
853 | 108 | ui->stackedWidgetDeviceConnected->setCurrentIndex(0); | ||
854 | 100 | endAction(QString::fromLatin1(" * there is no device connected.")); | 109 | endAction(QString::fromLatin1(" * there is no device connected.")); |
855 | 101 | } | 110 | } |
856 | 102 | if (lines.count() > 0) { | 111 | if (lines.count() > 0) { |
857 | @@ -104,7 +113,7 @@ | |||
858 | 104 | ui->widgetDeviceSerial->show(); | 113 | ui->widgetDeviceSerial->show(); |
859 | 105 | 114 | ||
860 | 106 | m_deviceDetected = true; | 115 | m_deviceDetected = true; |
862 | 107 | 116 | ui->stackedWidgetDeviceConnected->setCurrentIndex(1); | |
863 | 108 | endAction(QString::fromLatin1(" * found %0 devices.").arg(lines.count())); | 117 | endAction(QString::fromLatin1(" * found %0 devices.").arg(lines.count())); |
864 | 109 | detectDeviceVersion(); | 118 | detectDeviceVersion(); |
865 | 110 | } | 119 | } |
866 | @@ -119,13 +128,14 @@ | |||
867 | 119 | ui->widgetSshProperties->show(); | 128 | ui->widgetSshProperties->show(); |
868 | 120 | ui->pushButtonSshInstall->hide(); | 129 | ui->pushButtonSshInstall->hide(); |
869 | 121 | ui->pushButtonSshRemove->show(); | 130 | ui->pushButtonSshRemove->show(); |
871 | 122 | 131 | ui->stackedWidgetDeveloperMode->setCurrentIndex(1); | |
872 | 123 | on_pushButtonPortForward_clicked(); | 132 | on_pushButtonPortForward_clicked(); |
873 | 124 | } else { | 133 | } else { |
874 | 125 | endAction(QString::fromLatin1("..openssh-server was not installed.")); | 134 | endAction(QString::fromLatin1("..openssh-server was not installed.")); |
875 | 126 | ui->pushButtonSshInstall->show(); | 135 | ui->pushButtonSshInstall->show(); |
876 | 127 | ui->pushButtonSshRemove->hide(); | 136 | ui->pushButtonSshRemove->hide(); |
877 | 128 | ui->widgetSshProperties->hide(); | 137 | ui->widgetSshProperties->hide(); |
878 | 138 | ui->stackedWidgetDeveloperMode->setCurrentIndex(0); | ||
879 | 129 | } | 139 | } |
880 | 130 | } else if (cmd == QString::fromLatin1("%0/openssh_remove").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH)) { | 140 | } else if (cmd == QString::fromLatin1("%0/openssh_remove").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH)) { |
881 | 131 | endAction(QString::fromLatin1("..openssh-server was removed.")); | 141 | endAction(QString::fromLatin1("..openssh-server was removed.")); |
882 | @@ -160,42 +170,38 @@ | |||
883 | 160 | if (bOk && bHasNetwork) { | 170 | if (bOk && bHasNetwork) { |
884 | 161 | ui->widgetDeviceInfo->show(); | 171 | ui->widgetDeviceInfo->show(); |
885 | 162 | } | 172 | } |
887 | 163 | ui->pushButtonCancel->hide(); | 173 | // ui->pushButtonCancel->hide(); |
888 | 164 | ui->lblLoading->hide(); | 174 | ui->lblLoading->hide(); |
889 | 165 | m_reply.clear(); | 175 | m_reply.clear(); |
890 | 166 | } | 176 | } |
891 | 167 | 177 | ||
892 | 168 | void UbuntuDevicesWidget::on_pushButtonCancel_clicked() { | ||
893 | 169 | m_ubuntuProcess.kill(); | ||
894 | 170 | } | ||
895 | 171 | |||
896 | 172 | void UbuntuDevicesWidget::on_pushButtonReboot_clicked() { | 178 | void UbuntuDevicesWidget::on_pushButtonReboot_clicked() { |
897 | 173 | beginAction(QString::fromLatin1("Reboot device..")); | 179 | beginAction(QString::fromLatin1("Reboot device..")); |
899 | 174 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_reboot").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath()); | 180 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_reboot %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath()); |
900 | 175 | m_ubuntuProcess.processCmdQueue(); | 181 | m_ubuntuProcess.processCmdQueue(); |
901 | 176 | } | 182 | } |
902 | 177 | 183 | ||
903 | 178 | void UbuntuDevicesWidget::on_pushButtonShutdown_clicked() { | 184 | void UbuntuDevicesWidget::on_pushButtonShutdown_clicked() { |
904 | 179 | beginAction(QString::fromLatin1("Shutdown device..")); | 185 | beginAction(QString::fromLatin1("Shutdown device..")); |
906 | 180 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_shutdown").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath()); | 186 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_shutdown %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath()); |
907 | 181 | m_ubuntuProcess.processCmdQueue(); | 187 | m_ubuntuProcess.processCmdQueue(); |
908 | 182 | } | 188 | } |
909 | 183 | 189 | ||
910 | 184 | void UbuntuDevicesWidget::on_pushButtonRebootToBootloader_clicked() { | 190 | void UbuntuDevicesWidget::on_pushButtonRebootToBootloader_clicked() { |
911 | 185 | beginAction(QString::fromLatin1("Reboot to bootloader..")); | 191 | beginAction(QString::fromLatin1("Reboot to bootloader..")); |
913 | 186 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_reboot2bootloader").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath()); | 192 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_reboot2bootloader %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath()); |
914 | 187 | m_ubuntuProcess.processCmdQueue(); | 193 | m_ubuntuProcess.processCmdQueue(); |
915 | 188 | } | 194 | } |
916 | 189 | 195 | ||
917 | 190 | void UbuntuDevicesWidget::on_pushButtonRebootToRecovery_clicked() { | 196 | void UbuntuDevicesWidget::on_pushButtonRebootToRecovery_clicked() { |
918 | 191 | beginAction(QString::fromLatin1("Reboot to recovery..")); | 197 | beginAction(QString::fromLatin1("Reboot to recovery..")); |
920 | 192 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_reboot2recovery").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath()); | 198 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_reboot2recovery %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath()); |
921 | 193 | m_ubuntuProcess.processCmdQueue(); | 199 | m_ubuntuProcess.processCmdQueue(); |
922 | 194 | } | 200 | } |
923 | 195 | 201 | ||
924 | 196 | void UbuntuDevicesWidget::detectOpenSsh() { | 202 | void UbuntuDevicesWidget::detectOpenSsh() { |
925 | 197 | beginAction(QString::fromLatin1("Detecting if openssh-server is installed..")); | 203 | beginAction(QString::fromLatin1("Detecting if openssh-server is installed..")); |
927 | 198 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/openssh_version").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath()); | 204 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/openssh_version %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath()); |
928 | 199 | m_ubuntuProcess.processCmdQueue(); | 205 | m_ubuntuProcess.processCmdQueue(); |
929 | 200 | } | 206 | } |
930 | 201 | 207 | ||
931 | @@ -206,32 +212,46 @@ | |||
932 | 206 | } | 212 | } |
933 | 207 | 213 | ||
934 | 208 | void UbuntuDevicesWidget::on_pushButtonSshConnect_clicked() { | 214 | void UbuntuDevicesWidget::on_pushButtonSshConnect_clicked() { |
936 | 209 | 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()); | 215 | 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()); |
937 | 210 | m_ubuntuProcess.processCmdQueue(); | 216 | m_ubuntuProcess.processCmdQueue(); |
938 | 211 | } | 217 | } |
939 | 212 | 218 | ||
940 | 213 | void UbuntuDevicesWidget::on_pushButtonCloneNetworkConfig_clicked() { | 219 | void UbuntuDevicesWidget::on_pushButtonCloneNetworkConfig_clicked() { |
941 | 214 | beginAction(QString::fromLatin1("Clone network configuration from host to device..")); | 220 | beginAction(QString::fromLatin1("Clone network configuration from host to device..")); |
942 | 215 | ui->frameNoNetwork->hide(); | 221 | ui->frameNoNetwork->hide(); |
944 | 216 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_network_clone").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath()); | 222 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_network_clone %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath()); |
945 | 217 | m_ubuntuProcess.processCmdQueue(); | 223 | m_ubuntuProcess.processCmdQueue(); |
946 | 218 | } | 224 | } |
947 | 219 | 225 | ||
948 | 226 | void UbuntuDevicesWidget::on_comboBoxSerialNumber_currentIndexChanged( const QString & text ) { | ||
949 | 227 | m_deviceSerialNumber = text; | ||
950 | 228 | if (!text.isEmpty()) { | ||
951 | 229 | detectDeviceVersion(); | ||
952 | 230 | } | ||
953 | 231 | } | ||
954 | 232 | |||
955 | 220 | void UbuntuDevicesWidget::onError(QString msg) { | 233 | void UbuntuDevicesWidget::onError(QString msg) { |
956 | 221 | ui->plainTextEdit->appendHtml(QString::fromLatin1("<p style=\"color: red\">%0</p>").arg(msg)); | 234 | ui->plainTextEdit->appendHtml(QString::fromLatin1("<p style=\"color: red\">%0</p>").arg(msg)); |
957 | 222 | } | 235 | } |
958 | 223 | 236 | ||
959 | 224 | void UbuntuDevicesWidget::on_pushButtonRefresh_clicked() { | 237 | void UbuntuDevicesWidget::on_pushButtonRefresh_clicked() { |
960 | 238 | m_deviceDetected = false; | ||
961 | 239 | m_ubuntuProcess.clear(); | ||
962 | 240 | m_ubuntuProcess.kill(); | ||
963 | 241 | |||
964 | 242 | ui->plainTextEdit->clear(); | ||
965 | 243 | |||
966 | 225 | m_reply.clear(); | 244 | m_reply.clear(); |
967 | 226 | 245 | ||
968 | 227 | ui->frameNoDevices->hide(); | 246 | ui->frameNoDevices->hide(); |
969 | 228 | 247 | ||
970 | 229 | ui->widgetDeviceInfo->hide(); | 248 | ui->widgetDeviceInfo->hide(); |
971 | 230 | ui->lblLoading->show(); | 249 | ui->lblLoading->show(); |
973 | 231 | ui->pushButtonCancel->show(); | 250 | // ui->pushButtonCancel->show(); |
974 | 232 | 251 | ||
977 | 233 | ui->lblDeviceName->setText(QLatin1String("")); | 252 | //ui->lblDeviceName->setText(QLatin1String("")); |
978 | 234 | ui->lblSerialnumber->setText(QLatin1String("")); | 253 | ui->comboBoxSerialNumber->clear(); |
979 | 254 | // ui->lblSerialnumber->setText(QLatin1String("")); | ||
980 | 235 | 255 | ||
981 | 236 | detectDevices(); | 256 | detectDevices(); |
982 | 237 | } | 257 | } |
983 | @@ -246,37 +266,41 @@ | |||
984 | 246 | 266 | ||
985 | 247 | void UbuntuDevicesWidget::on_pushButtonPortForward_clicked() { | 267 | void UbuntuDevicesWidget::on_pushButtonPortForward_clicked() { |
986 | 248 | beginAction(QString::fromLatin1("Enabling port forward..")); | 268 | beginAction(QString::fromLatin1("Enabling port forward..")); |
988 | 249 | 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()); | 269 | 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()); |
989 | 250 | m_ubuntuProcess.processCmdQueue(); | 270 | m_ubuntuProcess.processCmdQueue(); |
990 | 251 | } | 271 | } |
991 | 252 | 272 | ||
992 | 253 | void UbuntuDevicesWidget::on_pushButtonSshSetupPublicKey_clicked() { | 273 | void UbuntuDevicesWidget::on_pushButtonSshSetupPublicKey_clicked() { |
993 | 254 | beginAction(QString::fromLatin1("Setting up public key authentication..")); | 274 | beginAction(QString::fromLatin1("Setting up public key authentication..")); |
995 | 255 | 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()); | 275 | 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()); |
996 | 256 | m_ubuntuProcess.processCmdQueue(); | 276 | m_ubuntuProcess.processCmdQueue(); |
997 | 257 | } | 277 | } |
998 | 258 | 278 | ||
999 | 259 | void UbuntuDevicesWidget::on_pushButtonUpgradeToDailyImage_clicked() { | 279 | void UbuntuDevicesWidget::on_pushButtonUpgradeToDailyImage_clicked() { |
1000 | 260 | beginAction(QString::fromLatin1("Upgrade device to daily..")); | 280 | beginAction(QString::fromLatin1("Upgrade device to daily..")); |
1002 | 261 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_flashdaily").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath()); | 281 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_flashdaily %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath()); |
1003 | 262 | m_ubuntuProcess.processCmdQueue(); | 282 | m_ubuntuProcess.processCmdQueue(); |
1004 | 263 | } | 283 | } |
1005 | 264 | 284 | ||
1006 | 265 | void UbuntuDevicesWidget::on_pushButtonUpgradeToDailyImageWithBootstrap_clicked() { | 285 | void UbuntuDevicesWidget::on_pushButtonUpgradeToDailyImageWithBootstrap_clicked() { |
1007 | 266 | beginAction(QString::fromLatin1("Upgrade device to daily with a full bootstrap..")); | 286 | beginAction(QString::fromLatin1("Upgrade device to daily with a full bootstrap..")); |
1009 | 267 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_flashdaily_bootstrap").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath()); | 287 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_flashdaily_bootstrap %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath()); |
1010 | 268 | m_ubuntuProcess.processCmdQueue(); | 288 | m_ubuntuProcess.processCmdQueue(); |
1011 | 269 | } | 289 | } |
1012 | 270 | 290 | ||
1013 | 271 | void UbuntuDevicesWidget::detectHasNetworkConnection() { | 291 | void UbuntuDevicesWidget::detectHasNetworkConnection() { |
1014 | 272 | beginAction(QString::fromLatin1("Check if the device is connected to a network..")); | 292 | beginAction(QString::fromLatin1("Check if the device is connected to a network..")); |
1016 | 273 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_hasnetwork").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath()); | 293 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_hasnetwork %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath()); |
1017 | 274 | m_ubuntuProcess.processCmdQueue(); | 294 | m_ubuntuProcess.processCmdQueue(); |
1018 | 275 | } | 295 | } |
1019 | 276 | 296 | ||
1020 | 297 | QString UbuntuDevicesWidget::serialNumber() { | ||
1021 | 298 | return ui->comboBoxSerialNumber->currentText(); | ||
1022 | 299 | } | ||
1023 | 300 | |||
1024 | 277 | void UbuntuDevicesWidget::detectDeviceVersion() { | 301 | void UbuntuDevicesWidget::detectDeviceVersion() { |
1025 | 278 | beginAction(QString::fromLatin1("Check device image version..")); | 302 | beginAction(QString::fromLatin1("Check device image version..")); |
1027 | 279 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_version").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath()); | 303 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_version %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath()); |
1028 | 280 | m_ubuntuProcess.processCmdQueue(); | 304 | m_ubuntuProcess.processCmdQueue(); |
1029 | 281 | } | 305 | } |
1030 | 282 | 306 | ||
1031 | @@ -289,18 +313,18 @@ | |||
1032 | 289 | 313 | ||
1033 | 290 | void UbuntuDevicesWidget::on_pushButtonSshInstall_clicked() { | 314 | void UbuntuDevicesWidget::on_pushButtonSshInstall_clicked() { |
1034 | 291 | beginAction(QString::fromLatin1("Installing openssh-server..")); | 315 | beginAction(QString::fromLatin1("Installing openssh-server..")); |
1036 | 292 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/openssh_install").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath()); | 316 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/openssh_install %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath()); |
1037 | 293 | m_ubuntuProcess.processCmdQueue(); | 317 | m_ubuntuProcess.processCmdQueue(); |
1038 | 294 | } | 318 | } |
1039 | 295 | 319 | ||
1040 | 296 | void UbuntuDevicesWidget::on_pushButtonCloneTimeConfig_clicked() { | 320 | void UbuntuDevicesWidget::on_pushButtonCloneTimeConfig_clicked() { |
1041 | 297 | beginAction(QString::fromLatin1("Cloning time configuration from host to device..")); | 321 | beginAction(QString::fromLatin1("Cloning time configuration from host to device..")); |
1043 | 298 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_time_clone").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath()); | 322 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/device_time_clone %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath()); |
1044 | 299 | m_ubuntuProcess.processCmdQueue(); | 323 | m_ubuntuProcess.processCmdQueue(); |
1045 | 300 | } | 324 | } |
1046 | 301 | 325 | ||
1047 | 302 | void UbuntuDevicesWidget::on_pushButtonSshRemove_clicked() { | 326 | void UbuntuDevicesWidget::on_pushButtonSshRemove_clicked() { |
1048 | 303 | beginAction(QString::fromLatin1("Removing openssh-server..")); | 327 | beginAction(QString::fromLatin1("Removing openssh-server..")); |
1050 | 304 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/openssh_remove").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH) << QApplication::applicationDirPath()); | 328 | m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/openssh_remove %1").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()) << QApplication::applicationDirPath()); |
1051 | 305 | m_ubuntuProcess.processCmdQueue(); | 329 | m_ubuntuProcess.processCmdQueue(); |
1052 | 306 | } | 330 | } |
1053 | 307 | 331 | ||
1054 | === modified file 'qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.h' | |||
1055 | --- qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.h 2013-04-24 16:56:03 +0000 | |||
1056 | +++ qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.h 2013-05-01 23:52:25 +0000 | |||
1057 | @@ -37,6 +37,7 @@ | |||
1058 | 37 | static UbuntuDevicesWidget* instance(); | 37 | static UbuntuDevicesWidget* instance(); |
1059 | 38 | 38 | ||
1060 | 39 | bool deviceDetected() { return m_deviceDetected; } | 39 | bool deviceDetected() { return m_deviceDetected; } |
1061 | 40 | QString serialNumber(); | ||
1062 | 40 | 41 | ||
1063 | 41 | signals: | 42 | signals: |
1064 | 42 | void updateDeviceActions(); | 43 | void updateDeviceActions(); |
1065 | @@ -60,10 +61,10 @@ | |||
1066 | 60 | void on_pushButtonRebootToRecovery_clicked(); | 61 | void on_pushButtonRebootToRecovery_clicked(); |
1067 | 61 | void on_pushButtonUpgradeToDailyImage_clicked(); | 62 | void on_pushButtonUpgradeToDailyImage_clicked(); |
1068 | 62 | void on_pushButtonUpgradeToDailyImageWithBootstrap_clicked(); | 63 | void on_pushButtonUpgradeToDailyImageWithBootstrap_clicked(); |
1069 | 63 | void on_pushButtonCancel_clicked(); | ||
1070 | 64 | void on_pushButtonCloneNetworkConfig_clicked(); | 64 | void on_pushButtonCloneNetworkConfig_clicked(); |
1071 | 65 | void on_pushButtonCloneTimeConfig_clicked(); | 65 | void on_pushButtonCloneTimeConfig_clicked(); |
1072 | 66 | void on_pushButtonCloneNetworkConfig_2_clicked() { on_pushButtonCloneNetworkConfig_clicked(); } | 66 | void on_pushButtonCloneNetworkConfig_2_clicked() { on_pushButtonCloneNetworkConfig_clicked(); } |
1073 | 67 | void on_comboBoxSerialNumber_currentIndexChanged( const QString & text ); | ||
1074 | 67 | 68 | ||
1075 | 68 | void detectDevices(); | 69 | void detectDevices(); |
1076 | 69 | void detectOpenSsh(); | 70 | void detectOpenSsh(); |
1077 | @@ -81,6 +82,7 @@ | |||
1078 | 81 | 82 | ||
1079 | 82 | bool m_aboutToClose; | 83 | bool m_aboutToClose; |
1080 | 83 | bool m_deviceDetected; | 84 | bool m_deviceDetected; |
1081 | 85 | QString m_deviceSerialNumber; | ||
1082 | 84 | 86 | ||
1083 | 85 | static UbuntuDevicesWidget *m_instance; | 87 | static UbuntuDevicesWidget *m_instance; |
1084 | 86 | }; | 88 | }; |
1085 | 87 | 89 | ||
1086 | === modified file 'qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.ui' | |||
1087 | --- qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.ui 2013-04-24 10:17:45 +0000 | |||
1088 | +++ qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.ui 2013-05-01 23:52:25 +0000 | |||
1089 | @@ -106,16 +106,6 @@ | |||
1090 | 106 | </property> | 106 | </property> |
1091 | 107 | </spacer> | 107 | </spacer> |
1092 | 108 | </item> | 108 | </item> |
1093 | 109 | <item> | ||
1094 | 110 | <widget class="QPushButton" name="pushButtonRefresh"> | ||
1095 | 111 | <property name="text"> | ||
1096 | 112 | <string>Refresh</string> | ||
1097 | 113 | </property> | ||
1098 | 114 | <property name="flat"> | ||
1099 | 115 | <bool>true</bool> | ||
1100 | 116 | </property> | ||
1101 | 117 | </widget> | ||
1102 | 118 | </item> | ||
1103 | 119 | </layout> | 109 | </layout> |
1104 | 120 | </item> | 110 | </item> |
1105 | 121 | <item> | 111 | <item> |
1106 | @@ -147,6 +137,79 @@ | |||
1107 | 147 | </widget> | 137 | </widget> |
1108 | 148 | </item> | 138 | </item> |
1109 | 149 | <item> | 139 | <item> |
1110 | 140 | <widget class="QWidget" name="widgetDeviceSerial" native="true"> | ||
1111 | 141 | <layout class="QVBoxLayout" name="verticalLayout_4"> | ||
1112 | 142 | <property name="leftMargin"> | ||
1113 | 143 | <number>0</number> | ||
1114 | 144 | </property> | ||
1115 | 145 | <property name="topMargin"> | ||
1116 | 146 | <number>0</number> | ||
1117 | 147 | </property> | ||
1118 | 148 | <property name="rightMargin"> | ||
1119 | 149 | <number>0</number> | ||
1120 | 150 | </property> | ||
1121 | 151 | <property name="bottomMargin"> | ||
1122 | 152 | <number>0</number> | ||
1123 | 153 | </property> | ||
1124 | 154 | <item> | ||
1125 | 155 | <layout class="QHBoxLayout" name="horizontalLayout_2"> | ||
1126 | 156 | <property name="leftMargin"> | ||
1127 | 157 | <number>20</number> | ||
1128 | 158 | </property> | ||
1129 | 159 | <property name="rightMargin"> | ||
1130 | 160 | <number>20</number> | ||
1131 | 161 | </property> | ||
1132 | 162 | <item> | ||
1133 | 163 | <widget class="QLabel" name="label_2"> | ||
1134 | 164 | <property name="font"> | ||
1135 | 165 | <font> | ||
1136 | 166 | <family>Ubuntu</family> | ||
1137 | 167 | </font> | ||
1138 | 168 | </property> | ||
1139 | 169 | <property name="text"> | ||
1140 | 170 | <string>Serial number</string> | ||
1141 | 171 | </property> | ||
1142 | 172 | </widget> | ||
1143 | 173 | </item> | ||
1144 | 174 | <item> | ||
1145 | 175 | <widget class="QComboBox" name="comboBoxSerialNumber"> | ||
1146 | 176 | <property name="minimumSize"> | ||
1147 | 177 | <size> | ||
1148 | 178 | <width>200</width> | ||
1149 | 179 | <height>0</height> | ||
1150 | 180 | </size> | ||
1151 | 181 | </property> | ||
1152 | 182 | </widget> | ||
1153 | 183 | </item> | ||
1154 | 184 | <item> | ||
1155 | 185 | <spacer name="horizontalSpacer_2"> | ||
1156 | 186 | <property name="orientation"> | ||
1157 | 187 | <enum>Qt::Horizontal</enum> | ||
1158 | 188 | </property> | ||
1159 | 189 | <property name="sizeHint" stdset="0"> | ||
1160 | 190 | <size> | ||
1161 | 191 | <width>40</width> | ||
1162 | 192 | <height>20</height> | ||
1163 | 193 | </size> | ||
1164 | 194 | </property> | ||
1165 | 195 | </spacer> | ||
1166 | 196 | </item> | ||
1167 | 197 | <item> | ||
1168 | 198 | <widget class="QPushButton" name="pushButtonRefresh"> | ||
1169 | 199 | <property name="text"> | ||
1170 | 200 | <string>Redetect Devices</string> | ||
1171 | 201 | </property> | ||
1172 | 202 | <property name="flat"> | ||
1173 | 203 | <bool>false</bool> | ||
1174 | 204 | </property> | ||
1175 | 205 | </widget> | ||
1176 | 206 | </item> | ||
1177 | 207 | </layout> | ||
1178 | 208 | </item> | ||
1179 | 209 | </layout> | ||
1180 | 210 | </widget> | ||
1181 | 211 | </item> | ||
1182 | 212 | <item> | ||
1183 | 150 | <widget class="QScrollArea" name="scrollArea"> | 213 | <widget class="QScrollArea" name="scrollArea"> |
1184 | 151 | <property name="frameShape"> | 214 | <property name="frameShape"> |
1185 | 152 | <enum>QFrame::NoFrame</enum> | 215 | <enum>QFrame::NoFrame</enum> |
1186 | @@ -159,8 +222,8 @@ | |||
1187 | 159 | <rect> | 222 | <rect> |
1188 | 160 | <x>0</x> | 223 | <x>0</x> |
1189 | 161 | <y>0</y> | 224 | <y>0</y> |
1192 | 162 | <width>1118</width> | 225 | <width>1134</width> |
1193 | 163 | <height>693</height> | 226 | <height>637</height> |
1194 | 164 | </rect> | 227 | </rect> |
1195 | 165 | </property> | 228 | </property> |
1196 | 166 | <layout class="QVBoxLayout" name="verticalLayout_14"> | 229 | <layout class="QVBoxLayout" name="verticalLayout_14"> |
1197 | @@ -200,644 +263,712 @@ | |||
1198 | 200 | </property> | 263 | </property> |
1199 | 201 | <widget class="QWidget" name="tab"> | 264 | <widget class="QWidget" name="tab"> |
1200 | 202 | <attribute name="title"> | 265 | <attribute name="title"> |
1202 | 203 | <string>Properties</string> | 266 | <string>Device Actions</string> |
1203 | 204 | </attribute> | 267 | </attribute> |
1204 | 205 | <layout class="QHBoxLayout" name="horizontalLayout_3"> | 268 | <layout class="QHBoxLayout" name="horizontalLayout_3"> |
1205 | 206 | <property name="bottomMargin"> | 269 | <property name="bottomMargin"> |
1206 | 207 | <number>0</number> | 270 | <number>0</number> |
1207 | 208 | </property> | 271 | </property> |
1208 | 209 | <item> | 272 | <item> |
1296 | 210 | <spacer name="horizontalSpacer_4"> | 273 | <widget class="QStackedWidget" name="stackedWidgetDeviceConnected"> |
1297 | 211 | <property name="orientation"> | 274 | <property name="currentIndex"> |
1298 | 212 | <enum>Qt::Horizontal</enum> | 275 | <number>1</number> |
1299 | 213 | </property> | 276 | </property> |
1300 | 214 | <property name="sizeType"> | 277 | <widget class="QWidget" name="page_3"> |
1301 | 215 | <enum>QSizePolicy::MinimumExpanding</enum> | 278 | <layout class="QHBoxLayout" name="horizontalLayout_7"> |
1302 | 216 | </property> | 279 | <item> |
1303 | 217 | <property name="sizeHint" stdset="0"> | 280 | <spacer name="horizontalSpacer_3"> |
1304 | 218 | <size> | 281 | <property name="orientation"> |
1305 | 219 | <width>40</width> | 282 | <enum>Qt::Horizontal</enum> |
1306 | 220 | <height>20</height> | 283 | </property> |
1307 | 221 | </size> | 284 | <property name="sizeType"> |
1308 | 222 | </property> | 285 | <enum>QSizePolicy::MinimumExpanding</enum> |
1309 | 223 | </spacer> | 286 | </property> |
1310 | 224 | </item> | 287 | <property name="sizeHint" stdset="0"> |
1311 | 225 | <item> | 288 | <size> |
1312 | 226 | <layout class="QVBoxLayout" name="verticalLayout_11"> | 289 | <width>40</width> |
1313 | 227 | <item> | 290 | <height>20</height> |
1314 | 228 | <spacer name="verticalSpacer_6"> | 291 | </size> |
1315 | 229 | <property name="orientation"> | 292 | </property> |
1316 | 230 | <enum>Qt::Vertical</enum> | 293 | </spacer> |
1317 | 231 | </property> | 294 | </item> |
1318 | 232 | <property name="sizeHint" stdset="0"> | 295 | <item> |
1319 | 233 | <size> | 296 | <layout class="QVBoxLayout" name="verticalLayout_11"> |
1320 | 234 | <width>20</width> | 297 | <item> |
1321 | 235 | <height>40</height> | 298 | <spacer name="verticalSpacer_6"> |
1322 | 236 | </size> | 299 | <property name="orientation"> |
1323 | 237 | </property> | 300 | <enum>Qt::Vertical</enum> |
1324 | 238 | </spacer> | 301 | </property> |
1325 | 239 | </item> | 302 | <property name="sizeHint" stdset="0"> |
1326 | 240 | <item> | 303 | <size> |
1327 | 241 | <widget class="QFrame" name="frameNoDevices"> | 304 | <width>20</width> |
1328 | 242 | <property name="frameShape"> | 305 | <height>40</height> |
1329 | 243 | <enum>QFrame::NoFrame</enum> | 306 | </size> |
1330 | 244 | </property> | 307 | </property> |
1331 | 245 | <property name="frameShadow"> | 308 | </spacer> |
1332 | 246 | <enum>QFrame::Raised</enum> | 309 | </item> |
1333 | 247 | </property> | 310 | <item> |
1334 | 248 | <layout class="QVBoxLayout" name="verticalLayout_13"> | 311 | <widget class="QFrame" name="frameNoDevices"> |
1335 | 249 | <item> | 312 | <property name="frameShape"> |
1336 | 250 | <widget class="QLabel" name="labelNoDevices"> | 313 | <enum>QFrame::NoFrame</enum> |
1337 | 251 | <property name="font"> | 314 | </property> |
1338 | 252 | <font> | 315 | <property name="frameShadow"> |
1339 | 253 | <family>Ubuntu</family> | 316 | <enum>QFrame::Raised</enum> |
1340 | 254 | <pointsize>12</pointsize> | 317 | </property> |
1341 | 255 | <weight>50</weight> | 318 | <layout class="QVBoxLayout" name="verticalLayout_13"> |
1342 | 256 | <italic>false</italic> | 319 | <item> |
1343 | 257 | <bold>false</bold> | 320 | <widget class="QLabel" name="labelNoDevices"> |
1344 | 258 | </font> | 321 | <property name="font"> |
1345 | 259 | </property> | 322 | <font> |
1346 | 260 | <property name="text"> | 323 | <family>Ubuntu</family> |
1347 | 261 | <string>No devices detected.</string> | 324 | <pointsize>12</pointsize> |
1348 | 262 | </property> | 325 | <weight>50</weight> |
1349 | 263 | <property name="alignment"> | 326 | <italic>false</italic> |
1350 | 264 | <set>Qt::AlignCenter</set> | 327 | <bold>false</bold> |
1351 | 265 | </property> | 328 | </font> |
1352 | 266 | </widget> | 329 | </property> |
1353 | 267 | </item> | 330 | <property name="text"> |
1354 | 268 | <item> | 331 | <string>No devices detected.</string> |
1355 | 269 | <widget class="QPushButton" name="pushButtonRefresh_2"> | 332 | </property> |
1356 | 270 | <property name="text"> | 333 | <property name="alignment"> |
1357 | 271 | <string>Redetect devices</string> | 334 | <set>Qt::AlignCenter</set> |
1358 | 272 | </property> | 335 | </property> |
1359 | 273 | </widget> | 336 | </widget> |
1360 | 274 | </item> | 337 | </item> |
1361 | 275 | </layout> | 338 | <item> |
1362 | 276 | </widget> | 339 | <widget class="QPushButton" name="pushButtonRefresh_2"> |
1363 | 277 | </item> | 340 | <property name="text"> |
1364 | 278 | <item> | 341 | <string>Redetect devices</string> |
1365 | 279 | <widget class="QFrame" name="frameNoNetwork"> | 342 | </property> |
1366 | 280 | <property name="frameShape"> | 343 | </widget> |
1367 | 281 | <enum>QFrame::NoFrame</enum> | 344 | </item> |
1368 | 282 | </property> | 345 | </layout> |
1369 | 283 | <property name="frameShadow"> | 346 | </widget> |
1370 | 284 | <enum>QFrame::Raised</enum> | 347 | </item> |
1371 | 285 | </property> | 348 | <item> |
1372 | 286 | <layout class="QVBoxLayout" name="verticalLayout_12"> | 349 | <widget class="QFrame" name="frameNoNetwork"> |
1373 | 287 | <item> | 350 | <property name="frameShape"> |
1374 | 288 | <widget class="QLabel" name="lblNoNetwork"> | 351 | <enum>QFrame::NoFrame</enum> |
1375 | 289 | <property name="font"> | 352 | </property> |
1376 | 290 | <font> | 353 | <property name="frameShadow"> |
1377 | 291 | <family>Ubuntu</family> | 354 | <enum>QFrame::Raised</enum> |
1378 | 292 | <pointsize>12</pointsize> | 355 | </property> |
1379 | 293 | </font> | 356 | <layout class="QVBoxLayout" name="verticalLayout_12"> |
1380 | 294 | </property> | 357 | <item> |
1381 | 295 | <property name="text"> | 358 | <widget class="QLabel" name="lblNoNetwork"> |
1382 | 296 | <string>Device has no network connection. | 359 | <property name="font"> |
1383 | 360 | <font> | ||
1384 | 361 | <family>Ubuntu</family> | ||
1385 | 362 | <pointsize>12</pointsize> | ||
1386 | 363 | </font> | ||
1387 | 364 | </property> | ||
1388 | 365 | <property name="text"> | ||
1389 | 366 | <string>Device has no network connection. | ||
1390 | 297 | Connect to a wlan or to a wwan and try again.</string> | 367 | Connect to a wlan or to a wwan and try again.</string> |
1484 | 298 | </property> | 368 | </property> |
1485 | 299 | <property name="alignment"> | 369 | <property name="alignment"> |
1486 | 300 | <set>Qt::AlignCenter</set> | 370 | <set>Qt::AlignCenter</set> |
1487 | 301 | </property> | 371 | </property> |
1488 | 302 | </widget> | 372 | </widget> |
1489 | 303 | </item> | 373 | </item> |
1490 | 304 | <item> | 374 | <item> |
1491 | 305 | <widget class="QPushButton" name="pushButtonCloneNetworkConfig"> | 375 | <widget class="QPushButton" name="pushButtonCloneNetworkConfig"> |
1492 | 306 | <property name="text"> | 376 | <property name="text"> |
1493 | 307 | <string>Clone network config from host to device</string> | 377 | <string>Clone network config from host to device</string> |
1494 | 308 | </property> | 378 | </property> |
1495 | 309 | </widget> | 379 | </widget> |
1496 | 310 | </item> | 380 | </item> |
1497 | 311 | </layout> | 381 | </layout> |
1498 | 312 | </widget> | 382 | </widget> |
1499 | 313 | </item> | 383 | </item> |
1407 | 314 | <item> | ||
1408 | 315 | <widget class="QLabel" name="lblLoading"> | ||
1409 | 316 | <property name="text"> | ||
1410 | 317 | <string>please wait..</string> | ||
1411 | 318 | </property> | ||
1412 | 319 | <property name="alignment"> | ||
1413 | 320 | <set>Qt::AlignCenter</set> | ||
1414 | 321 | </property> | ||
1415 | 322 | </widget> | ||
1416 | 323 | </item> | ||
1417 | 324 | <item> | ||
1418 | 325 | <widget class="QPushButton" name="pushButtonCancel"> | ||
1419 | 326 | <property name="font"> | ||
1420 | 327 | <font> | ||
1421 | 328 | <family>Ubuntu</family> | ||
1422 | 329 | <pointsize>12</pointsize> | ||
1423 | 330 | </font> | ||
1424 | 331 | </property> | ||
1425 | 332 | <property name="styleSheet"> | ||
1426 | 333 | <string notr="true">padding: 10; color: #333</string> | ||
1427 | 334 | </property> | ||
1428 | 335 | <property name="text"> | ||
1429 | 336 | <string>Cancel</string> | ||
1430 | 337 | </property> | ||
1431 | 338 | </widget> | ||
1432 | 339 | </item> | ||
1433 | 340 | <item> | ||
1434 | 341 | <spacer name="verticalSpacer_5"> | ||
1435 | 342 | <property name="orientation"> | ||
1436 | 343 | <enum>Qt::Vertical</enum> | ||
1437 | 344 | </property> | ||
1438 | 345 | <property name="sizeHint" stdset="0"> | ||
1439 | 346 | <size> | ||
1440 | 347 | <width>20</width> | ||
1441 | 348 | <height>40</height> | ||
1442 | 349 | </size> | ||
1443 | 350 | </property> | ||
1444 | 351 | </spacer> | ||
1445 | 352 | </item> | ||
1446 | 353 | </layout> | ||
1447 | 354 | </item> | ||
1448 | 355 | <item> | ||
1449 | 356 | <widget class="QWidget" name="widgetDeviceInfo" native="true"> | ||
1450 | 357 | <property name="sizePolicy"> | ||
1451 | 358 | <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> | ||
1452 | 359 | <horstretch>0</horstretch> | ||
1453 | 360 | <verstretch>0</verstretch> | ||
1454 | 361 | </sizepolicy> | ||
1455 | 362 | </property> | ||
1456 | 363 | <layout class="QVBoxLayout" name="verticalLayout_6"> | ||
1457 | 364 | <property name="topMargin"> | ||
1458 | 365 | <number>0</number> | ||
1459 | 366 | </property> | ||
1460 | 367 | <property name="bottomMargin"> | ||
1461 | 368 | <number>9</number> | ||
1462 | 369 | </property> | ||
1463 | 370 | <item> | ||
1464 | 371 | <widget class="QFrame" name="frame"> | ||
1465 | 372 | <property name="frameShape"> | ||
1466 | 373 | <enum>QFrame::NoFrame</enum> | ||
1467 | 374 | </property> | ||
1468 | 375 | <property name="frameShadow"> | ||
1469 | 376 | <enum>QFrame::Raised</enum> | ||
1470 | 377 | </property> | ||
1471 | 378 | <layout class="QVBoxLayout" name="verticalLayout_15"> | ||
1472 | 379 | <property name="leftMargin"> | ||
1473 | 380 | <number>0</number> | ||
1474 | 381 | </property> | ||
1475 | 382 | <property name="topMargin"> | ||
1476 | 383 | <number>0</number> | ||
1477 | 384 | </property> | ||
1478 | 385 | <property name="rightMargin"> | ||
1479 | 386 | <number>0</number> | ||
1480 | 387 | </property> | ||
1481 | 388 | <property name="bottomMargin"> | ||
1482 | 389 | <number>0</number> | ||
1483 | 390 | </property> | ||
1500 | 391 | <item> | 384 | <item> |
1502 | 392 | <widget class="QLabel" name="label_7"> | 385 | <widget class="QLabel" name="lblLoading"> |
1503 | 393 | <property name="text"> | 386 | <property name="text"> |
1505 | 394 | <string><html><head/><body><p>You will find Ubuntu UI templates from <span style=" font-weight:600;">File &gt; New File or Project</span>. </p><p>After which you can deploy your app to the device using <span style=" font-weight:600; font-style:italic;">CTRL+F12</span> or<br/>by browsing <span style=" font-weight:600; font-style:italic;">Build &gt; Ubuntu &gt; Run in Ubuntu Device.</span></p><p>You can also find screenshot feature from <b><i>Tools &gt; Ubuntu</i></b> and<br />links from <b><i>Help &gt; Ubuntu</i></b>.</p></body></html></string> | 387 | <string><html><head/><body><p><span style=" font-size:16pt; font-weight:600;">Please wait</span></p><p><br/></p><p>See more details by changing to <span style=" font-style:italic;">Log</span> tab below.</p></body></html></string> |
1506 | 388 | </property> | ||
1507 | 389 | <property name="alignment"> | ||
1508 | 390 | <set>Qt::AlignCenter</set> | ||
1509 | 395 | </property> | 391 | </property> |
1510 | 396 | </widget> | 392 | </widget> |
1511 | 397 | </item> | 393 | </item> |
1512 | 394 | <item> | ||
1513 | 395 | <spacer name="verticalSpacer_5"> | ||
1514 | 396 | <property name="orientation"> | ||
1515 | 397 | <enum>Qt::Vertical</enum> | ||
1516 | 398 | </property> | ||
1517 | 399 | <property name="sizeHint" stdset="0"> | ||
1518 | 400 | <size> | ||
1519 | 401 | <width>20</width> | ||
1520 | 402 | <height>40</height> | ||
1521 | 403 | </size> | ||
1522 | 404 | </property> | ||
1523 | 405 | </spacer> | ||
1524 | 406 | </item> | ||
1525 | 398 | </layout> | 407 | </layout> |
1707 | 399 | </widget> | 408 | </item> |
1708 | 400 | </item> | 409 | <item> |
1709 | 401 | <item> | 410 | <spacer name="horizontalSpacer_4"> |
1710 | 402 | <spacer name="verticalSpacer_2"> | 411 | <property name="orientation"> |
1711 | 403 | <property name="orientation"> | 412 | <enum>Qt::Horizontal</enum> |
1712 | 404 | <enum>Qt::Vertical</enum> | 413 | </property> |
1713 | 405 | </property> | 414 | <property name="sizeType"> |
1714 | 406 | <property name="sizeHint" stdset="0"> | 415 | <enum>QSizePolicy::MinimumExpanding</enum> |
1715 | 407 | <size> | 416 | </property> |
1716 | 408 | <width>20</width> | 417 | <property name="sizeHint" stdset="0"> |
1717 | 409 | <height>40</height> | 418 | <size> |
1718 | 410 | </size> | 419 | <width>365</width> |
1719 | 411 | </property> | 420 | <height>20</height> |
1720 | 412 | </spacer> | 421 | </size> |
1721 | 413 | </item> | 422 | </property> |
1722 | 414 | <item> | 423 | </spacer> |
1723 | 415 | <widget class="QWidget" name="widgetSshProperties" native="true"> | 424 | </item> |
1724 | 416 | <layout class="QGridLayout" name="gridLayout"> | 425 | </layout> |
1725 | 417 | <property name="topMargin"> | 426 | </widget> |
1726 | 418 | <number>0</number> | 427 | <widget class="QWidget" name="page_4"> |
1727 | 419 | </property> | 428 | <layout class="QVBoxLayout" name="verticalLayout_19"> |
1728 | 420 | <property name="bottomMargin"> | 429 | <item> |
1729 | 421 | <number>0</number> | 430 | <widget class="QStackedWidget" name="stackedWidgetConnectedDevice"> |
1730 | 422 | </property> | 431 | <property name="currentIndex"> |
1731 | 423 | <item row="1" column="0"> | 432 | <number>1</number> |
1732 | 424 | <widget class="QPushButton" name="pushButtonPortForward"> | 433 | </property> |
1733 | 425 | <property name="styleSheet"> | 434 | <widget class="QWidget" name="page_5"> |
1734 | 426 | <string notr="true">color: #333</string> | 435 | <layout class="QHBoxLayout" name="horizontalLayout_8"> |
1735 | 427 | </property> | 436 | <item> |
1736 | 428 | <property name="text"> | 437 | <widget class="QWidget" name="widgetDeviceInfo" native="true"> |
1737 | 429 | <string>Enable port forward from device to localhost</string> | 438 | <property name="sizePolicy"> |
1738 | 430 | </property> | 439 | <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> |
1739 | 431 | </widget> | 440 | <horstretch>0</horstretch> |
1740 | 432 | </item> | 441 | <verstretch>0</verstretch> |
1741 | 433 | <item row="2" column="0"> | 442 | </sizepolicy> |
1742 | 434 | <widget class="QPushButton" name="pushButtonSshSetupPublicKey"> | 443 | </property> |
1743 | 435 | <property name="enabled"> | 444 | <layout class="QHBoxLayout" name="horizontalLayout_6"> |
1744 | 436 | <bool>true</bool> | 445 | <property name="topMargin"> |
1745 | 437 | </property> | 446 | <number>0</number> |
1746 | 438 | <property name="styleSheet"> | 447 | </property> |
1747 | 439 | <string notr="true">color: #333</string> | 448 | <property name="bottomMargin"> |
1748 | 440 | </property> | 449 | <number>9</number> |
1749 | 441 | <property name="text"> | 450 | </property> |
1750 | 442 | <string>Setup public key authentication</string> | 451 | <item> |
1751 | 443 | </property> | 452 | <widget class="QStackedWidget" name="stackedWidgetDeveloperMode"> |
1752 | 444 | </widget> | 453 | <property name="currentIndex"> |
1753 | 445 | </item> | 454 | <number>0</number> |
1754 | 446 | <item row="0" column="0"> | 455 | </property> |
1755 | 447 | <widget class="QGroupBox" name="groupBox_3"> | 456 | <widget class="QWidget" name="page"> |
1756 | 448 | <property name="title"> | 457 | <layout class="QVBoxLayout" name="verticalLayout_16"> |
1757 | 449 | <string/> | 458 | <item> |
1758 | 450 | </property> | 459 | <widget class="QLabel" name="label_7"> |
1759 | 451 | <layout class="QHBoxLayout" name="horizontalLayout_5"> | 460 | <property name="text"> |
1760 | 452 | <property name="topMargin"> | 461 | <string><html><head/><body><p><span style=" font-size:16pt;">Your device has been detected.</span></p><p>Next<span style=" font-weight:600; font-style:italic;"> you </span><span style=" font-weight:600; font-style:italic;">will need to Enable Developer Mode </span>from the right side.</p></body></html></string> |
1761 | 453 | <number>0</number> | 462 | </property> |
1762 | 454 | </property> | 463 | <property name="textFormat"> |
1763 | 455 | <property name="bottomMargin"> | 464 | <enum>Qt::RichText</enum> |
1764 | 456 | <number>0</number> | 465 | </property> |
1765 | 457 | </property> | 466 | </widget> |
1766 | 458 | <item> | 467 | </item> |
1767 | 459 | <widget class="QLabel" name="label_3"> | 468 | </layout> |
1768 | 460 | <property name="text"> | 469 | </widget> |
1769 | 461 | <string>Username</string> | 470 | <widget class="QWidget" name="page_2"> |
1770 | 462 | </property> | 471 | <layout class="QVBoxLayout" name="verticalLayout_17"> |
1771 | 463 | </widget> | 472 | <item> |
1772 | 464 | </item> | 473 | <widget class="QLabel" name="label_4"> |
1773 | 465 | <item> | 474 | <property name="text"> |
1774 | 466 | <widget class="QLineEdit" name="lineEditUserName"> | 475 | <string><html><head/><body><p><span style=" font-size:16pt;">Your device has been enabled for developer use!</span></p><p>You will find Ubuntu UI templates from <span style=" font-weight:600;">File &gt; New File or Project</span>. </p><p>After which you can deploy your app to the device using <span style=" font-weight:600; font-style:italic;">CTRL+F12</span> or<br/>by browsing <span style=" font-weight:600; font-style:italic;">Build &gt; Ubuntu Touch &gt; Run Application on Device.</span></p><p>You can also find screenshot feature from <span style=" font-weight:600; font-style:italic;">Tools &gt; Ubuntu Touch</span> and<br/>links from <span style=" font-weight:600; font-style:italic;">Help &gt; Ubuntu Touch</span>.</p><p><br/></p></body></html></string> |
1775 | 467 | <property name="enabled"> | 476 | </property> |
1776 | 468 | <bool>false</bool> | 477 | </widget> |
1777 | 469 | </property> | 478 | </item> |
1778 | 470 | <property name="text"> | 479 | </layout> |
1779 | 471 | <string>phablet</string> | 480 | </widget> |
1780 | 472 | </property> | 481 | </widget> |
1781 | 473 | </widget> | 482 | </item> |
1782 | 474 | </item> | 483 | <item> |
1783 | 475 | <item> | 484 | <widget class="QFrame" name="frame"> |
1784 | 476 | <widget class="QLabel" name="label_6"> | 485 | <property name="frameShape"> |
1785 | 477 | <property name="text"> | 486 | <enum>QFrame::NoFrame</enum> |
1786 | 478 | <string>Ssh Port</string> | 487 | </property> |
1787 | 479 | </property> | 488 | <property name="frameShadow"> |
1788 | 480 | </widget> | 489 | <enum>QFrame::Raised</enum> |
1789 | 481 | </item> | 490 | </property> |
1790 | 482 | <item> | 491 | <layout class="QVBoxLayout" name="verticalLayout_15"> |
1791 | 483 | <widget class="QSpinBox" name="spinBoxSshPort"> | 492 | <property name="leftMargin"> |
1792 | 484 | <property name="enabled"> | 493 | <number>0</number> |
1793 | 485 | <bool>false</bool> | 494 | </property> |
1794 | 486 | </property> | 495 | <property name="topMargin"> |
1795 | 487 | <property name="minimum"> | 496 | <number>0</number> |
1796 | 488 | <number>1300</number> | 497 | </property> |
1797 | 489 | </property> | 498 | <property name="rightMargin"> |
1798 | 490 | <property name="maximum"> | 499 | <number>0</number> |
1799 | 491 | <number>32000</number> | 500 | </property> |
1800 | 492 | </property> | 501 | <property name="bottomMargin"> |
1801 | 493 | <property name="value"> | 502 | <number>0</number> |
1802 | 494 | <number>2222</number> | 503 | </property> |
1803 | 495 | </property> | 504 | </layout> |
1804 | 496 | </widget> | 505 | </widget> |
1805 | 497 | </item> | 506 | </item> |
1806 | 498 | <item> | 507 | </layout> |
1807 | 499 | <widget class="QLabel" name="label_5"> | 508 | </widget> |
1808 | 500 | <property name="text"> | 509 | </item> |
1809 | 501 | <string>QML Port</string> | 510 | <item> |
1810 | 502 | </property> | 511 | <widget class="QTabWidget" name="tabWidget_2"> |
1811 | 503 | </widget> | 512 | <property name="tabPosition"> |
1812 | 504 | </item> | 513 | <enum>QTabWidget::West</enum> |
1813 | 505 | <item> | 514 | </property> |
1814 | 506 | <widget class="QSpinBox" name="spinBoxQmlPort"> | 515 | <property name="currentIndex"> |
1815 | 507 | <property name="enabled"> | 516 | <number>0</number> |
1816 | 508 | <bool>false</bool> | 517 | </property> |
1817 | 509 | </property> | 518 | <property name="documentMode"> |
1818 | 510 | <property name="minimum"> | 519 | <bool>true</bool> |
1819 | 511 | <number>1300</number> | 520 | </property> |
1820 | 512 | </property> | 521 | <widget class="QWidget" name="tab_3"> |
1821 | 513 | <property name="maximum"> | 522 | <attribute name="title"> |
1822 | 514 | <number>32000</number> | 523 | <string>Simple</string> |
1823 | 515 | </property> | 524 | </attribute> |
1824 | 516 | <property name="value"> | 525 | <layout class="QVBoxLayout" name="verticalLayout_6"> |
1825 | 517 | <number>3768</number> | 526 | <item> |
1826 | 518 | </property> | 527 | <widget class="QWidget" name="widget_2" native="true"> |
1827 | 519 | </widget> | 528 | <layout class="QVBoxLayout" name="verticalLayout_5"> |
1828 | 520 | </item> | 529 | <item> |
1829 | 521 | </layout> | 530 | <spacer name="verticalSpacer"> |
1830 | 522 | </widget> | 531 | <property name="orientation"> |
1831 | 523 | </item> | 532 | <enum>Qt::Vertical</enum> |
1832 | 524 | <item row="5" column="0"> | 533 | </property> |
1833 | 525 | <widget class="QGroupBox" name="groupBox"> | 534 | <property name="sizeHint" stdset="0"> |
1834 | 526 | <property name="title"> | 535 | <size> |
1835 | 527 | <string>Device Mode</string> | 536 | <width>20</width> |
1836 | 528 | </property> | 537 | <height>40</height> |
1837 | 529 | <layout class="QVBoxLayout" name="verticalLayout_7"> | 538 | </size> |
1838 | 530 | <property name="bottomMargin"> | 539 | </property> |
1839 | 531 | <number>0</number> | 540 | </spacer> |
1840 | 532 | </property> | 541 | </item> |
1841 | 533 | <item> | 542 | <item> |
1842 | 534 | <layout class="QHBoxLayout" name="horizontalLayout_4"> | 543 | <widget class="QPushButton" name="pushButtonCloneNetworkConfig_2"> |
1843 | 535 | <item> | 544 | <property name="text"> |
1844 | 536 | <widget class="QPushButton" name="pushButtonReboot"> | 545 | <string>Clone network config from host to device</string> |
1845 | 537 | <property name="sizePolicy"> | 546 | </property> |
1846 | 538 | <sizepolicy hsizetype="Minimum" vsizetype="Expanding"> | 547 | </widget> |
1847 | 539 | <horstretch>0</horstretch> | 548 | </item> |
1848 | 540 | <verstretch>0</verstretch> | 549 | <item> |
1849 | 541 | </sizepolicy> | 550 | <widget class="QPushButton" name="pushButtonCloneTimeConfig"> |
1850 | 542 | </property> | 551 | <property name="text"> |
1851 | 543 | <property name="styleSheet"> | 552 | <string>Clone time config from host to device</string> |
1852 | 544 | <string notr="true">color: #333</string> | 553 | </property> |
1853 | 545 | </property> | 554 | </widget> |
1854 | 546 | <property name="text"> | 555 | </item> |
1855 | 547 | <string>Reboot</string> | 556 | <item> |
1856 | 548 | </property> | 557 | <widget class="QPushButton" name="pushButtonSshInstall"> |
1857 | 549 | </widget> | 558 | <property name="font"> |
1858 | 550 | </item> | 559 | <font> |
1859 | 551 | <item> | 560 | <family>Ubuntu</family> |
1860 | 552 | <widget class="QPushButton" name="pushButtonShutdown"> | 561 | <pointsize>12</pointsize> |
1861 | 553 | <property name="sizePolicy"> | 562 | <weight>50</weight> |
1862 | 554 | <sizepolicy hsizetype="Minimum" vsizetype="Expanding"> | 563 | <italic>false</italic> |
1863 | 555 | <horstretch>0</horstretch> | 564 | <bold>false</bold> |
1864 | 556 | <verstretch>0</verstretch> | 565 | </font> |
1865 | 557 | </sizepolicy> | 566 | </property> |
1866 | 558 | </property> | 567 | <property name="styleSheet"> |
1867 | 559 | <property name="styleSheet"> | 568 | <string notr="true">padding: 10; color: #333</string> |
1868 | 560 | <string notr="true">color: #333</string> | 569 | </property> |
1869 | 561 | </property> | 570 | <property name="text"> |
1870 | 562 | <property name="text"> | 571 | <string>Enable developer mode</string> |
1871 | 563 | <string>Shutdown</string> | 572 | </property> |
1872 | 564 | </property> | 573 | <property name="flat"> |
1873 | 565 | </widget> | 574 | <bool>false</bool> |
1874 | 566 | </item> | 575 | </property> |
1875 | 567 | <item> | 576 | </widget> |
1876 | 568 | <widget class="QPushButton" name="pushButtonRebootToBootloader"> | 577 | </item> |
1877 | 569 | <property name="sizePolicy"> | 578 | <item> |
1878 | 570 | <sizepolicy hsizetype="Minimum" vsizetype="Expanding"> | 579 | <widget class="QPushButton" name="pushButtonSshRemove"> |
1879 | 571 | <horstretch>0</horstretch> | 580 | <property name="font"> |
1880 | 572 | <verstretch>0</verstretch> | 581 | <font> |
1881 | 573 | </sizepolicy> | 582 | <family>Ubuntu</family> |
1882 | 574 | </property> | 583 | <pointsize>12</pointsize> |
1883 | 575 | <property name="styleSheet"> | 584 | </font> |
1884 | 576 | <string notr="true">color: #333</string> | 585 | </property> |
1885 | 577 | </property> | 586 | <property name="styleSheet"> |
1886 | 578 | <property name="text"> | 587 | <string notr="true">padding: 10; color: #333</string> |
1887 | 579 | <string>Reboot to | 588 | </property> |
1888 | 589 | <property name="text"> | ||
1889 | 590 | <string>Disable developer mode</string> | ||
1890 | 591 | </property> | ||
1891 | 592 | </widget> | ||
1892 | 593 | </item> | ||
1893 | 594 | <item> | ||
1894 | 595 | <spacer name="verticalSpacer_2"> | ||
1895 | 596 | <property name="orientation"> | ||
1896 | 597 | <enum>Qt::Vertical</enum> | ||
1897 | 598 | </property> | ||
1898 | 599 | <property name="sizeHint" stdset="0"> | ||
1899 | 600 | <size> | ||
1900 | 601 | <width>20</width> | ||
1901 | 602 | <height>40</height> | ||
1902 | 603 | </size> | ||
1903 | 604 | </property> | ||
1904 | 605 | </spacer> | ||
1905 | 606 | </item> | ||
1906 | 607 | </layout> | ||
1907 | 608 | </widget> | ||
1908 | 609 | </item> | ||
1909 | 610 | </layout> | ||
1910 | 611 | </widget> | ||
1911 | 612 | <widget class="QWidget" name="tab_4"> | ||
1912 | 613 | <attribute name="title"> | ||
1913 | 614 | <string>Advanced</string> | ||
1914 | 615 | </attribute> | ||
1915 | 616 | <layout class="QVBoxLayout" name="verticalLayout_10"> | ||
1916 | 617 | <item> | ||
1917 | 618 | <widget class="QWidget" name="widgetSshProperties" native="true"> | ||
1918 | 619 | <layout class="QGridLayout" name="gridLayout"> | ||
1919 | 620 | <property name="topMargin"> | ||
1920 | 621 | <number>0</number> | ||
1921 | 622 | </property> | ||
1922 | 623 | <property name="bottomMargin"> | ||
1923 | 624 | <number>0</number> | ||
1924 | 625 | </property> | ||
1925 | 626 | <item row="2" column="1"> | ||
1926 | 627 | <widget class="QPushButton" name="pushButtonPortForward"> | ||
1927 | 628 | <property name="styleSheet"> | ||
1928 | 629 | <string notr="true">color: #333</string> | ||
1929 | 630 | </property> | ||
1930 | 631 | <property name="text"> | ||
1931 | 632 | <string>Enable port forward from device to localhost</string> | ||
1932 | 633 | </property> | ||
1933 | 634 | </widget> | ||
1934 | 635 | </item> | ||
1935 | 636 | <item row="3" column="1"> | ||
1936 | 637 | <widget class="QPushButton" name="pushButtonSshSetupPublicKey"> | ||
1937 | 638 | <property name="enabled"> | ||
1938 | 639 | <bool>true</bool> | ||
1939 | 640 | </property> | ||
1940 | 641 | <property name="styleSheet"> | ||
1941 | 642 | <string notr="true">color: #333</string> | ||
1942 | 643 | </property> | ||
1943 | 644 | <property name="text"> | ||
1944 | 645 | <string>Setup public key authentication</string> | ||
1945 | 646 | </property> | ||
1946 | 647 | </widget> | ||
1947 | 648 | </item> | ||
1948 | 649 | <item row="1" column="1"> | ||
1949 | 650 | <widget class="QGroupBox" name="groupBox_3"> | ||
1950 | 651 | <property name="title"> | ||
1951 | 652 | <string/> | ||
1952 | 653 | </property> | ||
1953 | 654 | <layout class="QHBoxLayout" name="horizontalLayout_5"> | ||
1954 | 655 | <property name="topMargin"> | ||
1955 | 656 | <number>0</number> | ||
1956 | 657 | </property> | ||
1957 | 658 | <property name="bottomMargin"> | ||
1958 | 659 | <number>0</number> | ||
1959 | 660 | </property> | ||
1960 | 661 | <item> | ||
1961 | 662 | <widget class="QLabel" name="label_3"> | ||
1962 | 663 | <property name="text"> | ||
1963 | 664 | <string>Username</string> | ||
1964 | 665 | </property> | ||
1965 | 666 | </widget> | ||
1966 | 667 | </item> | ||
1967 | 668 | <item> | ||
1968 | 669 | <widget class="QLineEdit" name="lineEditUserName"> | ||
1969 | 670 | <property name="enabled"> | ||
1970 | 671 | <bool>false</bool> | ||
1971 | 672 | </property> | ||
1972 | 673 | <property name="text"> | ||
1973 | 674 | <string>phablet</string> | ||
1974 | 675 | </property> | ||
1975 | 676 | </widget> | ||
1976 | 677 | </item> | ||
1977 | 678 | <item> | ||
1978 | 679 | <widget class="QLabel" name="label_6"> | ||
1979 | 680 | <property name="text"> | ||
1980 | 681 | <string>Ssh Port</string> | ||
1981 | 682 | </property> | ||
1982 | 683 | </widget> | ||
1983 | 684 | </item> | ||
1984 | 685 | <item> | ||
1985 | 686 | <widget class="QSpinBox" name="spinBoxSshPort"> | ||
1986 | 687 | <property name="enabled"> | ||
1987 | 688 | <bool>false</bool> | ||
1988 | 689 | </property> | ||
1989 | 690 | <property name="minimum"> | ||
1990 | 691 | <number>1300</number> | ||
1991 | 692 | </property> | ||
1992 | 693 | <property name="maximum"> | ||
1993 | 694 | <number>32000</number> | ||
1994 | 695 | </property> | ||
1995 | 696 | <property name="value"> | ||
1996 | 697 | <number>2222</number> | ||
1997 | 698 | </property> | ||
1998 | 699 | </widget> | ||
1999 | 700 | </item> | ||
2000 | 701 | <item> | ||
2001 | 702 | <widget class="QLabel" name="label_5"> | ||
2002 | 703 | <property name="text"> | ||
2003 | 704 | <string>QML Port</string> | ||
2004 | 705 | </property> | ||
2005 | 706 | </widget> | ||
2006 | 707 | </item> | ||
2007 | 708 | <item> | ||
2008 | 709 | <widget class="QSpinBox" name="spinBoxQmlPort"> | ||
2009 | 710 | <property name="enabled"> | ||
2010 | 711 | <bool>false</bool> | ||
2011 | 712 | </property> | ||
2012 | 713 | <property name="minimum"> | ||
2013 | 714 | <number>1300</number> | ||
2014 | 715 | </property> | ||
2015 | 716 | <property name="maximum"> | ||
2016 | 717 | <number>32000</number> | ||
2017 | 718 | </property> | ||
2018 | 719 | <property name="value"> | ||
2019 | 720 | <number>3768</number> | ||
2020 | 721 | </property> | ||
2021 | 722 | </widget> | ||
2022 | 723 | </item> | ||
2023 | 724 | </layout> | ||
2024 | 725 | </widget> | ||
2025 | 726 | </item> | ||
2026 | 727 | <item row="4" column="1"> | ||
2027 | 728 | <widget class="QPushButton" name="pushButtonSshConnect"> | ||
2028 | 729 | <property name="styleSheet"> | ||
2029 | 730 | <string notr="true">color: #333</string> | ||
2030 | 731 | </property> | ||
2031 | 732 | <property name="text"> | ||
2032 | 733 | <string>Open ssh connection to device</string> | ||
2033 | 734 | </property> | ||
2034 | 735 | </widget> | ||
2035 | 736 | </item> | ||
2036 | 737 | <item row="5" column="1"> | ||
2037 | 738 | <widget class="QGroupBox" name="groupBox_2"> | ||
2038 | 739 | <property name="title"> | ||
2039 | 740 | <string>Flash the device</string> | ||
2040 | 741 | </property> | ||
2041 | 742 | <layout class="QVBoxLayout" name="verticalLayout_9"> | ||
2042 | 743 | <property name="topMargin"> | ||
2043 | 744 | <number>9</number> | ||
2044 | 745 | </property> | ||
2045 | 746 | <property name="bottomMargin"> | ||
2046 | 747 | <number>0</number> | ||
2047 | 748 | </property> | ||
2048 | 749 | <item> | ||
2049 | 750 | <widget class="QPushButton" name="pushButtonUpgradeToDailyImage"> | ||
2050 | 751 | <property name="styleSheet"> | ||
2051 | 752 | <string notr="true">color: #333</string> | ||
2052 | 753 | </property> | ||
2053 | 754 | <property name="text"> | ||
2054 | 755 | <string>Upgrade to daily image</string> | ||
2055 | 756 | </property> | ||
2056 | 757 | </widget> | ||
2057 | 758 | </item> | ||
2058 | 759 | <item> | ||
2059 | 760 | <widget class="QPushButton" name="pushButtonUpgradeToDailyImageWithBootstrap"> | ||
2060 | 761 | <property name="styleSheet"> | ||
2061 | 762 | <string notr="true">color: #333</string> | ||
2062 | 763 | </property> | ||
2063 | 764 | <property name="text"> | ||
2064 | 765 | <string>Upgrade to daily image (with full bootstrap)</string> | ||
2065 | 766 | </property> | ||
2066 | 767 | </widget> | ||
2067 | 768 | </item> | ||
2068 | 769 | </layout> | ||
2069 | 770 | </widget> | ||
2070 | 771 | </item> | ||
2071 | 772 | <item row="7" column="1"> | ||
2072 | 773 | <spacer name="verticalSpacer_3"> | ||
2073 | 774 | <property name="orientation"> | ||
2074 | 775 | <enum>Qt::Vertical</enum> | ||
2075 | 776 | </property> | ||
2076 | 777 | <property name="sizeHint" stdset="0"> | ||
2077 | 778 | <size> | ||
2078 | 779 | <width>20</width> | ||
2079 | 780 | <height>40</height> | ||
2080 | 781 | </size> | ||
2081 | 782 | </property> | ||
2082 | 783 | </spacer> | ||
2083 | 784 | </item> | ||
2084 | 785 | <item row="0" column="1"> | ||
2085 | 786 | <spacer name="verticalSpacer_4"> | ||
2086 | 787 | <property name="orientation"> | ||
2087 | 788 | <enum>Qt::Vertical</enum> | ||
2088 | 789 | </property> | ||
2089 | 790 | <property name="sizeHint" stdset="0"> | ||
2090 | 791 | <size> | ||
2091 | 792 | <width>20</width> | ||
2092 | 793 | <height>40</height> | ||
2093 | 794 | </size> | ||
2094 | 795 | </property> | ||
2095 | 796 | </spacer> | ||
2096 | 797 | </item> | ||
2097 | 798 | <item row="6" column="1"> | ||
2098 | 799 | <widget class="QGroupBox" name="groupBox"> | ||
2099 | 800 | <property name="title"> | ||
2100 | 801 | <string>Device Mode</string> | ||
2101 | 802 | </property> | ||
2102 | 803 | <layout class="QVBoxLayout" name="verticalLayout_7"> | ||
2103 | 804 | <property name="bottomMargin"> | ||
2104 | 805 | <number>0</number> | ||
2105 | 806 | </property> | ||
2106 | 807 | <item> | ||
2107 | 808 | <layout class="QHBoxLayout" name="horizontalLayout_4"> | ||
2108 | 809 | <item> | ||
2109 | 810 | <widget class="QPushButton" name="pushButtonReboot"> | ||
2110 | 811 | <property name="sizePolicy"> | ||
2111 | 812 | <sizepolicy hsizetype="Minimum" vsizetype="Expanding"> | ||
2112 | 813 | <horstretch>0</horstretch> | ||
2113 | 814 | <verstretch>0</verstretch> | ||
2114 | 815 | </sizepolicy> | ||
2115 | 816 | </property> | ||
2116 | 817 | <property name="styleSheet"> | ||
2117 | 818 | <string notr="true">color: #333</string> | ||
2118 | 819 | </property> | ||
2119 | 820 | <property name="text"> | ||
2120 | 821 | <string>Reboot</string> | ||
2121 | 822 | </property> | ||
2122 | 823 | </widget> | ||
2123 | 824 | </item> | ||
2124 | 825 | <item> | ||
2125 | 826 | <widget class="QPushButton" name="pushButtonShutdown"> | ||
2126 | 827 | <property name="sizePolicy"> | ||
2127 | 828 | <sizepolicy hsizetype="Minimum" vsizetype="Expanding"> | ||
2128 | 829 | <horstretch>0</horstretch> | ||
2129 | 830 | <verstretch>0</verstretch> | ||
2130 | 831 | </sizepolicy> | ||
2131 | 832 | </property> | ||
2132 | 833 | <property name="styleSheet"> | ||
2133 | 834 | <string notr="true">color: #333</string> | ||
2134 | 835 | </property> | ||
2135 | 836 | <property name="text"> | ||
2136 | 837 | <string>Shutdown</string> | ||
2137 | 838 | </property> | ||
2138 | 839 | </widget> | ||
2139 | 840 | </item> | ||
2140 | 841 | <item> | ||
2141 | 842 | <widget class="QPushButton" name="pushButtonRebootToBootloader"> | ||
2142 | 843 | <property name="sizePolicy"> | ||
2143 | 844 | <sizepolicy hsizetype="Minimum" vsizetype="Expanding"> | ||
2144 | 845 | <horstretch>0</horstretch> | ||
2145 | 846 | <verstretch>0</verstretch> | ||
2146 | 847 | </sizepolicy> | ||
2147 | 848 | </property> | ||
2148 | 849 | <property name="styleSheet"> | ||
2149 | 850 | <string notr="true">color: #333</string> | ||
2150 | 851 | </property> | ||
2151 | 852 | <property name="text"> | ||
2152 | 853 | <string>Reboot to | ||
2153 | 580 | Bootloader</string> | 854 | Bootloader</string> |
2170 | 581 | </property> | 855 | </property> |
2171 | 582 | </widget> | 856 | </widget> |
2172 | 583 | </item> | 857 | </item> |
2173 | 584 | <item> | 858 | <item> |
2174 | 585 | <widget class="QPushButton" name="pushButtonRebootToRecovery"> | 859 | <widget class="QPushButton" name="pushButtonRebootToRecovery"> |
2175 | 586 | <property name="sizePolicy"> | 860 | <property name="sizePolicy"> |
2176 | 587 | <sizepolicy hsizetype="Minimum" vsizetype="Expanding"> | 861 | <sizepolicy hsizetype="Minimum" vsizetype="Expanding"> |
2177 | 588 | <horstretch>0</horstretch> | 862 | <horstretch>0</horstretch> |
2178 | 589 | <verstretch>0</verstretch> | 863 | <verstretch>0</verstretch> |
2179 | 590 | </sizepolicy> | 864 | </sizepolicy> |
2180 | 591 | </property> | 865 | </property> |
2181 | 592 | <property name="styleSheet"> | 866 | <property name="styleSheet"> |
2182 | 593 | <string notr="true">color: #333</string> | 867 | <string notr="true">color: #333</string> |
2183 | 594 | </property> | 868 | </property> |
2184 | 595 | <property name="text"> | 869 | <property name="text"> |
2185 | 596 | <string>Reboot to | 870 | <string>Reboot to |
2186 | 597 | Recovery</string> | 871 | Recovery</string> |
2407 | 598 | </property> | 872 | </property> |
2408 | 599 | </widget> | 873 | </widget> |
2409 | 600 | </item> | 874 | </item> |
2410 | 601 | </layout> | 875 | </layout> |
2411 | 602 | </item> | 876 | </item> |
2412 | 603 | </layout> | 877 | </layout> |
2413 | 604 | </widget> | 878 | </widget> |
2414 | 605 | </item> | 879 | </item> |
2415 | 606 | <item row="4" column="0"> | 880 | </layout> |
2416 | 607 | <widget class="QGroupBox" name="groupBox_2"> | 881 | </widget> |
2417 | 608 | <property name="title"> | 882 | </item> |
2418 | 609 | <string>Flash the device</string> | 883 | </layout> |
2419 | 610 | </property> | 884 | </widget> |
2420 | 611 | <layout class="QVBoxLayout" name="verticalLayout_9"> | 885 | </widget> |
2421 | 612 | <property name="topMargin"> | 886 | </item> |
2422 | 613 | <number>9</number> | 887 | </layout> |
2423 | 614 | </property> | 888 | </widget> |
2424 | 615 | <property name="bottomMargin"> | 889 | <widget class="QWidget" name="page_6"> |
2425 | 616 | <number>0</number> | 890 | <layout class="QVBoxLayout" name="verticalLayout_18"> |
2426 | 617 | </property> | 891 | <item> |
2427 | 618 | <item> | 892 | <spacer name="verticalSpacer_7"> |
2428 | 619 | <widget class="QPushButton" name="pushButtonUpgradeToDailyImage"> | 893 | <property name="orientation"> |
2429 | 620 | <property name="styleSheet"> | 894 | <enum>Qt::Vertical</enum> |
2430 | 621 | <string notr="true">color: #333</string> | 895 | </property> |
2431 | 622 | </property> | 896 | <property name="sizeHint" stdset="0"> |
2432 | 623 | <property name="text"> | 897 | <size> |
2433 | 624 | <string>Upgrade to daily image</string> | 898 | <width>20</width> |
2434 | 625 | </property> | 899 | <height>40</height> |
2435 | 626 | </widget> | 900 | </size> |
2436 | 627 | </item> | 901 | </property> |
2437 | 628 | <item> | 902 | </spacer> |
2438 | 629 | <widget class="QPushButton" name="pushButtonUpgradeToDailyImageWithBootstrap"> | 903 | </item> |
2439 | 630 | <property name="styleSheet"> | 904 | <item> |
2440 | 631 | <string notr="true">color: #333</string> | 905 | <widget class="QLabel" name="label_8"> |
2441 | 632 | </property> | 906 | <property name="text"> |
2442 | 633 | <property name="text"> | 907 | <string>Executing following script in the background..</string> |
2443 | 634 | <string>/!\ Upgrade to daily image (with full bootstrap) /!\</string> | 908 | </property> |
2444 | 635 | </property> | 909 | <property name="alignment"> |
2445 | 636 | </widget> | 910 | <set>Qt::AlignCenter</set> |
2446 | 637 | </item> | 911 | </property> |
2447 | 638 | </layout> | 912 | </widget> |
2448 | 639 | </widget> | 913 | </item> |
2449 | 640 | </item> | 914 | <item> |
2450 | 641 | <item row="3" column="0"> | 915 | <widget class="QLabel" name="lblDeviceProcessInfo"> |
2451 | 642 | <widget class="QPushButton" name="pushButtonSshConnect"> | 916 | <property name="font"> |
2452 | 643 | <property name="styleSheet"> | 917 | <font> |
2453 | 644 | <string notr="true">color: #333</string> | 918 | <pointsize>20</pointsize> |
2454 | 645 | </property> | 919 | </font> |
2455 | 646 | <property name="text"> | 920 | </property> |
2456 | 647 | <string>Open ssh connection to device</string> | 921 | <property name="text"> |
2457 | 648 | </property> | 922 | <string>TextLabel</string> |
2458 | 649 | </widget> | 923 | </property> |
2459 | 650 | </item> | 924 | <property name="alignment"> |
2460 | 651 | </layout> | 925 | <set>Qt::AlignCenter</set> |
2461 | 652 | </widget> | 926 | </property> |
2462 | 653 | </item> | 927 | </widget> |
2463 | 654 | <item> | 928 | </item> |
2464 | 655 | <spacer name="verticalSpacer_3"> | 929 | <item> |
2465 | 656 | <property name="orientation"> | 930 | <widget class="QProgressBar" name="progressBar"> |
2466 | 657 | <enum>Qt::Vertical</enum> | 931 | <property name="value"> |
2467 | 658 | </property> | 932 | <number>24</number> |
2468 | 659 | <property name="sizeHint" stdset="0"> | 933 | </property> |
2469 | 660 | <size> | 934 | </widget> |
2470 | 661 | <width>20</width> | 935 | </item> |
2471 | 662 | <height>40</height> | 936 | <item> |
2472 | 663 | </size> | 937 | <widget class="QLabel" name="label_9"> |
2473 | 664 | </property> | 938 | <property name="text"> |
2474 | 665 | </spacer> | 939 | <string>Please wait.. if you like you can follow the progress on the <i>Log</i> tab at the bottom.</string> |
2475 | 666 | </item> | 940 | </property> |
2476 | 667 | <item> | 941 | <property name="alignment"> |
2477 | 668 | <widget class="QPushButton" name="pushButtonCloneNetworkConfig_2"> | 942 | <set>Qt::AlignCenter</set> |
2478 | 669 | <property name="text"> | 943 | </property> |
2479 | 670 | <string>Clone network config from host to device</string> | 944 | </widget> |
2480 | 671 | </property> | 945 | </item> |
2481 | 672 | </widget> | 946 | <item> |
2482 | 673 | </item> | 947 | <spacer name="verticalSpacer_8"> |
2483 | 674 | <item> | 948 | <property name="orientation"> |
2484 | 675 | <widget class="QPushButton" name="pushButtonCloneTimeConfig"> | 949 | <enum>Qt::Vertical</enum> |
2485 | 676 | <property name="text"> | 950 | </property> |
2486 | 677 | <string>Clone time config from host to device</string> | 951 | <property name="sizeHint" stdset="0"> |
2487 | 678 | </property> | 952 | <size> |
2488 | 679 | </widget> | 953 | <width>20</width> |
2489 | 680 | </item> | 954 | <height>40</height> |
2490 | 681 | <item> | 955 | </size> |
2491 | 682 | <widget class="QPushButton" name="pushButtonSshInstall"> | 956 | </property> |
2492 | 683 | <property name="font"> | 957 | </spacer> |
2493 | 684 | <font> | 958 | </item> |
2494 | 685 | <family>Ubuntu</family> | 959 | </layout> |
2495 | 686 | <pointsize>12</pointsize> | 960 | </widget> |
2496 | 687 | <weight>50</weight> | 961 | </widget> |
2497 | 688 | <italic>false</italic> | 962 | </item> |
2498 | 689 | <bold>false</bold> | 963 | </layout> |
2499 | 690 | </font> | 964 | </widget> |
2280 | 691 | </property> | ||
2281 | 692 | <property name="styleSheet"> | ||
2282 | 693 | <string notr="true">padding: 10; color: #333</string> | ||
2283 | 694 | </property> | ||
2284 | 695 | <property name="text"> | ||
2285 | 696 | <string>Enable developer mode</string> | ||
2286 | 697 | </property> | ||
2287 | 698 | <property name="flat"> | ||
2288 | 699 | <bool>false</bool> | ||
2289 | 700 | </property> | ||
2290 | 701 | </widget> | ||
2291 | 702 | </item> | ||
2292 | 703 | <item> | ||
2293 | 704 | <widget class="QPushButton" name="pushButtonSshRemove"> | ||
2294 | 705 | <property name="font"> | ||
2295 | 706 | <font> | ||
2296 | 707 | <family>Ubuntu</family> | ||
2297 | 708 | <pointsize>12</pointsize> | ||
2298 | 709 | </font> | ||
2299 | 710 | </property> | ||
2300 | 711 | <property name="styleSheet"> | ||
2301 | 712 | <string notr="true">padding: 10; color: #333</string> | ||
2302 | 713 | </property> | ||
2303 | 714 | <property name="text"> | ||
2304 | 715 | <string>Disable developer mode</string> | ||
2305 | 716 | </property> | ||
2306 | 717 | </widget> | ||
2307 | 718 | </item> | ||
2308 | 719 | <item> | ||
2309 | 720 | <spacer name="verticalSpacer"> | ||
2310 | 721 | <property name="orientation"> | ||
2311 | 722 | <enum>Qt::Vertical</enum> | ||
2312 | 723 | </property> | ||
2313 | 724 | <property name="sizeHint" stdset="0"> | ||
2314 | 725 | <size> | ||
2315 | 726 | <width>20</width> | ||
2316 | 727 | <height>40</height> | ||
2317 | 728 | </size> | ||
2318 | 729 | </property> | ||
2319 | 730 | </spacer> | ||
2320 | 731 | </item> | ||
2321 | 732 | <item> | ||
2322 | 733 | <widget class="QWidget" name="widgetDeviceSerial" native="true"> | ||
2323 | 734 | <layout class="QVBoxLayout" name="verticalLayout_4"> | ||
2324 | 735 | <property name="leftMargin"> | ||
2325 | 736 | <number>0</number> | ||
2326 | 737 | </property> | ||
2327 | 738 | <property name="topMargin"> | ||
2328 | 739 | <number>0</number> | ||
2329 | 740 | </property> | ||
2330 | 741 | <property name="rightMargin"> | ||
2331 | 742 | <number>0</number> | ||
2332 | 743 | </property> | ||
2333 | 744 | <property name="bottomMargin"> | ||
2334 | 745 | <number>0</number> | ||
2335 | 746 | </property> | ||
2336 | 747 | <item> | ||
2337 | 748 | <layout class="QHBoxLayout" name="horizontalLayout_2"> | ||
2338 | 749 | <item> | ||
2339 | 750 | <widget class="QLabel" name="label_2"> | ||
2340 | 751 | <property name="font"> | ||
2341 | 752 | <font> | ||
2342 | 753 | <family>Ubuntu</family> | ||
2343 | 754 | </font> | ||
2344 | 755 | </property> | ||
2345 | 756 | <property name="text"> | ||
2346 | 757 | <string>Serial number</string> | ||
2347 | 758 | </property> | ||
2348 | 759 | </widget> | ||
2349 | 760 | </item> | ||
2350 | 761 | <item> | ||
2351 | 762 | <widget class="QLabel" name="lblSerialnumber"> | ||
2352 | 763 | <property name="font"> | ||
2353 | 764 | <font> | ||
2354 | 765 | <family>Ubuntu</family> | ||
2355 | 766 | <pointsize>9</pointsize> | ||
2356 | 767 | </font> | ||
2357 | 768 | </property> | ||
2358 | 769 | <property name="text"> | ||
2359 | 770 | <string/> | ||
2360 | 771 | </property> | ||
2361 | 772 | </widget> | ||
2362 | 773 | </item> | ||
2363 | 774 | <item> | ||
2364 | 775 | <spacer name="horizontalSpacer_2"> | ||
2365 | 776 | <property name="orientation"> | ||
2366 | 777 | <enum>Qt::Horizontal</enum> | ||
2367 | 778 | </property> | ||
2368 | 779 | <property name="sizeHint" stdset="0"> | ||
2369 | 780 | <size> | ||
2370 | 781 | <width>40</width> | ||
2371 | 782 | <height>20</height> | ||
2372 | 783 | </size> | ||
2373 | 784 | </property> | ||
2374 | 785 | </spacer> | ||
2375 | 786 | </item> | ||
2376 | 787 | <item> | ||
2377 | 788 | <widget class="QLabel" name="label_4"> | ||
2378 | 789 | <property name="font"> | ||
2379 | 790 | <font> | ||
2380 | 791 | <family>Ubuntu</family> | ||
2381 | 792 | </font> | ||
2382 | 793 | </property> | ||
2383 | 794 | <property name="text"> | ||
2384 | 795 | <string>State</string> | ||
2385 | 796 | </property> | ||
2386 | 797 | </widget> | ||
2387 | 798 | </item> | ||
2388 | 799 | <item> | ||
2389 | 800 | <widget class="QLabel" name="lblDeviceName"> | ||
2390 | 801 | <property name="font"> | ||
2391 | 802 | <font> | ||
2392 | 803 | <family>Ubuntu</family> | ||
2393 | 804 | <pointsize>9</pointsize> | ||
2394 | 805 | </font> | ||
2395 | 806 | </property> | ||
2396 | 807 | <property name="text"> | ||
2397 | 808 | <string/> | ||
2398 | 809 | </property> | ||
2399 | 810 | </widget> | ||
2400 | 811 | </item> | ||
2401 | 812 | </layout> | ||
2402 | 813 | </item> | ||
2403 | 814 | </layout> | ||
2404 | 815 | </widget> | ||
2405 | 816 | </item> | ||
2406 | 817 | </layout> | ||
2500 | 818 | </widget> | 965 | </widget> |
2501 | 819 | </item> | 966 | </item> |
2502 | 820 | <item> | ||
2503 | 821 | <spacer name="horizontalSpacer_3"> | ||
2504 | 822 | <property name="orientation"> | ||
2505 | 823 | <enum>Qt::Horizontal</enum> | ||
2506 | 824 | </property> | ||
2507 | 825 | <property name="sizeType"> | ||
2508 | 826 | <enum>QSizePolicy::MinimumExpanding</enum> | ||
2509 | 827 | </property> | ||
2510 | 828 | <property name="sizeHint" stdset="0"> | ||
2511 | 829 | <size> | ||
2512 | 830 | <width>40</width> | ||
2513 | 831 | <height>20</height> | ||
2514 | 832 | </size> | ||
2515 | 833 | </property> | ||
2516 | 834 | </spacer> | ||
2517 | 835 | </item> | ||
2518 | 836 | </layout> | 967 | </layout> |
2519 | 837 | </widget> | 968 | </widget> |
2520 | 838 | <widget class="QWidget" name="tab_2"> | 969 | <widget class="QWidget" name="tab_2"> |
2521 | 839 | <attribute name="title"> | 970 | <attribute name="title"> |
2523 | 840 | <string>Messages</string> | 971 | <string>Log</string> |
2524 | 841 | </attribute> | 972 | </attribute> |
2525 | 842 | <layout class="QVBoxLayout" name="verticalLayout_8"> | 973 | <layout class="QVBoxLayout" name="verticalLayout_8"> |
2526 | 843 | <item> | 974 | <item> |
2527 | 844 | 975 | ||
2528 | === modified file 'qtcreator/src/plugins/ubuntu/ubuntumenu.cpp' | |||
2529 | --- qtcreator/src/plugins/ubuntu/ubuntumenu.cpp 2013-04-24 17:24:47 +0000 | |||
2530 | +++ qtcreator/src/plugins/ubuntu/ubuntumenu.cpp 2013-05-01 23:52:25 +0000 | |||
2531 | @@ -336,6 +336,7 @@ | |||
2532 | 336 | 336 | ||
2533 | 337 | command = command.replace(QLatin1String(Constants::UBUNTU_ACTION_SHAREDIRECTORY),Constants::UBUNTU_SHAREPATH); | 337 | command = command.replace(QLatin1String(Constants::UBUNTU_ACTION_SHAREDIRECTORY),Constants::UBUNTU_SHAREPATH); |
2534 | 338 | command = command.replace(QLatin1String(Constants::UBUNTU_ACTION_SCRIPTDIRECTORY),Constants::UBUNTU_SCRIPTPATH); | 338 | command = command.replace(QLatin1String(Constants::UBUNTU_ACTION_SCRIPTDIRECTORY),Constants::UBUNTU_SCRIPTPATH); |
2535 | 339 | command = command.replace(QLatin1String(Constants::UBUNTU_ACTION_SERIALNUMBER),UbuntuDevicesWidget::instance()->serialNumber()); | ||
2536 | 339 | 340 | ||
2537 | 340 | if (bQuery && bQueryOk) { | 341 | if (bQuery && bQueryOk) { |
2538 | 341 | command = QString(command).arg(queryData); | 342 | command = QString(command).arg(queryData); |
2539 | 342 | 343 | ||
2540 | === modified file 'qtcreator/src/plugins/ubuntu/ubuntuprojectapplicationwizard.cpp' | |||
2541 | --- qtcreator/src/plugins/ubuntu/ubuntuprojectapplicationwizard.cpp 2013-04-24 13:38:33 +0000 | |||
2542 | +++ qtcreator/src/plugins/ubuntu/ubuntuprojectapplicationwizard.cpp 2013-05-01 23:52:25 +0000 | |||
2543 | @@ -28,6 +28,8 @@ | |||
2544 | 28 | #include <qtsupport/qtsupportconstants.h> | 28 | #include <qtsupport/qtsupportconstants.h> |
2545 | 29 | #include <coreplugin/icore.h> | 29 | #include <coreplugin/icore.h> |
2546 | 30 | 30 | ||
2547 | 31 | #include <QtGlobal> | ||
2548 | 32 | |||
2549 | 31 | #include <QIcon> | 33 | #include <QIcon> |
2550 | 32 | #include <QDir> | 34 | #include <QDir> |
2551 | 33 | #include <QDebug> | 35 | #include <QDebug> |
2552 | @@ -57,8 +59,12 @@ | |||
2553 | 57 | 59 | ||
2554 | 58 | Core::FeatureSet UbuntuProjectApplicationWizard::requiredFeatures() const | 60 | Core::FeatureSet UbuntuProjectApplicationWizard::requiredFeatures() const |
2555 | 59 | { | 61 | { |
2558 | 60 | return Core::Feature(QtSupport::Constants::FEATURE_QMLPROJECT) | 62 | #ifdef Q_PROCESSOR_ARM |
2559 | 61 | | Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK_2); | 63 | return Core::Feature(0); |
2560 | 64 | #else | ||
2561 | 65 | return Core::Feature(QtSupport::Constants::FEATURE_QMLPROJECT) | ||
2562 | 66 | | Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK_2); | ||
2563 | 67 | #endif | ||
2564 | 62 | } | 68 | } |
2565 | 63 | 69 | ||
2566 | 64 | Core::BaseFileWizardParameters UbuntuProjectApplicationWizard::parameters(QJsonObject params) | 70 | Core::BaseFileWizardParameters UbuntuProjectApplicationWizard::parameters(QJsonObject params) |