Ubuntu Terminal App

Merge lp:~nikwen/ubuntu-terminal-app/uitk-update into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

  1. uitk-update
  2. Merge into reboot
Proposed by Niklas Wenzel
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
Approved revision: 106
Merged at revision: 110
Proposed branch: lp:~nikwen/ubuntu-terminal-app/uitk-update
Merge into: lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
Diff against target: 438 lines (+65/-81)
27 files modified
README.md (+1/-1)
manifest.json.in (+1/-1)
po/com.ubuntu.terminal.pot (+6/-6)
src/app/qml/AlternateActionPopover.qml (+11/-26)
src/app/qml/AuthenticationDialog.qml (+3/-3)
src/app/qml/AuthenticationService.qml (+3/-3)
src/app/qml/CircularTransparentButton.qml (+2/-2)
src/app/qml/ExpandableButton.qml (+2/-2)
src/app/qml/KeyboardBar.qml (+2/-2)
src/app/qml/KeyboardRows/ExpandableKeyboardButton.qml (+2/-2)
src/app/qml/KeyboardRows/KeyModel.qml (+2/-2)
src/app/qml/KeyboardRows/KeyboardButton.qml (+2/-2)
src/app/qml/KeyboardRows/KeyboardLayout.qml (+4/-4)
src/app/qml/KeyboardRows/KeyboardRow.qml (+2/-2)
src/app/qml/LayoutsPage.qml (+2/-2)
src/app/qml/ListItemWithActions.qml (+2/-2)
src/app/qml/PressFeedback.qml (+1/-1)
src/app/qml/SettingsPage.qml (+2/-2)
src/app/qml/TabsModel.qml (+1/-1)
src/app/qml/TabsPage.qml (+2/-2)
src/app/qml/TerminalComponent.qml (+2/-2)
src/app/qml/TerminalInputArea.qml (+1/-1)
src/app/qml/TerminalKeyboardShortcutHandler.qml (+1/-1)
src/app/qml/TerminalPage.qml (+3/-3)
src/app/qml/TerminalSettings.qml (+1/-1)
src/app/qml/ubuntu-terminal-app.qml (+2/-3)
terminal.apparmor (+2/-2)
To merge this branch: bzr merge lp:~nikwen/ubuntu-terminal-app/uitk-update
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+266665@code.launchpad.net

Commit message

Update to the new UI Toolkit

Description of the change

Update to the new UI Toolkit

I decided not to switch to the new ListItem component this time as it does not seem to be ready yet. (Check out this thread: https://lists.launchpad.net/ubuntu-phone/msg14149.html)

To post a comment you must log in.
Revision history for this message
Niklas Wenzel (nikwen) wrote :

Should be ready for merging now. :)

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:106
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/166/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3140
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3140/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/87
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-vivid-amd64-ci/50

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/166/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

LGTM!

review: Approve
Revision history for this message
Niklas Wenzel (nikwen) wrote :

Thanks for merging. :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.md'
2--- README.md 2014-10-25 04:42:31 +0000
3+++ README.md 2015-08-02 13:06:25 +0000
4@@ -104,7 +104,7 @@
5
6 1. Install phablet-tools: `sudo apt-get install phablet-tools`
7 2. Run click-buddy in your source tree:
8- click-buddy --dir . --arch armhf --framework ubuntu-sdk-14.04
9+ click-buddy --dir . --arch armhf --framework ubuntu-sdk-15.04
10 3. Once finished, click-buddy will tell you the location of your source package
11
12 ## Installing a click package
13
14=== modified file 'manifest.json.in'
15--- manifest.json.in 2015-01-17 00:51:51 +0000
16+++ manifest.json.in 2015-08-02 13:06:25 +0000
17@@ -1,6 +1,6 @@
18 {
19 "description": "Terminal application",
20- "framework": "ubuntu-sdk-14.10",
21+ "framework": "ubuntu-sdk-15.04",
22 "architecture": "@CLICK_ARCH@",
23 "hooks": {
24 "terminal": {
25
26=== modified file 'po/com.ubuntu.terminal.pot'
27--- po/com.ubuntu.terminal.pot 2015-06-18 21:10:04 +0000
28+++ po/com.ubuntu.terminal.pot 2015-08-02 13:06:25 +0000
29@@ -8,7 +8,7 @@
30 msgstr ""
31 "Project-Id-Version: \n"
32 "Report-Msgid-Bugs-To: \n"
33-"POT-Creation-Date: 2015-06-14 17:32+0200\n"
34+"POT-Creation-Date: 2015-08-02 15:04+0200\n"
35 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
36 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
37 "Language-Team: LANGUAGE <LL@li.org>\n"
38@@ -17,15 +17,15 @@
39 "Content-Type: text/plain; charset=CHARSET\n"
40 "Content-Transfer-Encoding: 8bit\n"
41
42-#: ../src/app/qml/AlternateActionPopover.qml:19
43+#: ../src/app/qml/AlternateActionPopover.qml:13
44 msgid "Select"
45 msgstr ""
46
47-#: ../src/app/qml/AlternateActionPopover.qml:26
48+#: ../src/app/qml/AlternateActionPopover.qml:17
49 msgid "Copy"
50 msgstr ""
51
52-#: ../src/app/qml/AlternateActionPopover.qml:33
53+#: ../src/app/qml/AlternateActionPopover.qml:21
54 msgid "Paste"
55 msgstr ""
56
57@@ -73,7 +73,7 @@
58 msgid "Font Size:"
59 msgstr ""
60
61-#: ../src/app/qml/SettingsPage.qml:78
62+#: ../src/app/qml/SettingsPage.qml:85
63 msgid "Color Scheme"
64 msgstr ""
65
66@@ -85,7 +85,7 @@
67 msgid "New tab"
68 msgstr ""
69
70-#: ../src/app/qml/TerminalPage.qml:166
71+#: ../src/app/qml/TerminalPage.qml:164
72 msgid "Selection Mode"
73 msgstr ""
74
75
76=== modified file 'src/app/qml/AlternateActionPopover.qml'
77--- src/app/qml/AlternateActionPopover.qml 2015-01-17 00:48:05 +0000
78+++ src/app/qml/AlternateActionPopover.qml 2015-08-02 13:06:25 +0000
79@@ -1,40 +1,25 @@
80-import QtQuick 2.0
81-import Ubuntu.Components 1.1
82-import Ubuntu.Components.ListItems 1.0 as ListItem
83+import QtQuick 2.4
84+import Ubuntu.Components 1.2
85 import Ubuntu.Components.Popups 1.0
86
87 Component {
88 id: popoverComponent
89- Popover {
90+
91+ ActionSelectionPopover {
92 id: popover
93
94- Column {
95- id: containerLayout
96- anchors {
97- left: parent.left
98- top: parent.top
99- right: parent.right
100- }
101- ListItem.Standard {
102+ actions: ActionList {
103+ Action {
104 text: i18n.tr("Select")
105- onClicked: {
106- terminalPage.state = "SELECTION";
107- popover.hide();
108- }
109+ onTriggered: terminalPage.state = "SELECTION";
110 }
111- ListItem.Standard {
112+ Action {
113 text: i18n.tr("Copy")
114- onClicked: {
115- terminal.copyClipboard();
116- popover.hide();
117- }
118+ onTriggered: terminal.copyClipboard();
119 }
120- ListItem.Standard {
121+ Action {
122 text: i18n.tr("Paste")
123- onClicked: {
124- terminal.pasteClipboard();
125- popover.hide();
126- }
127+ onTriggered: terminal.pasteClipboard();
128 }
129 }
130 }
131
132=== modified file 'src/app/qml/AuthenticationDialog.qml'
133--- src/app/qml/AuthenticationDialog.qml 2015-05-29 21:14:13 +0000
134+++ src/app/qml/AuthenticationDialog.qml 2015-08-02 13:06:25 +0000
135@@ -15,9 +15,9 @@
136 *
137 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
138 */
139-import QtQuick 2.3
140-import Ubuntu.Components 1.1
141-import Ubuntu.Components.Popups 0.1
142+import QtQuick 2.4
143+import Ubuntu.Components 1.2
144+import Ubuntu.Components.Popups 1.0
145
146 Dialog {
147 id: root
148
149=== modified file 'src/app/qml/AuthenticationService.qml'
150--- src/app/qml/AuthenticationService.qml 2014-10-25 04:42:31 +0000
151+++ src/app/qml/AuthenticationService.qml 2015-08-02 13:06:25 +0000
152@@ -13,9 +13,9 @@
153 * You should have received a copy of the GNU General Public License
154 * along with this program. If not, see <http://www.gnu.org/licenses/>.
155 */
156-import QtQuick 2.3
157-import Ubuntu.Components 1.1
158-import Ubuntu.Components.Popups 0.1
159+import QtQuick 2.4
160+import Ubuntu.Components 1.2
161+import Ubuntu.Components.Popups 1.0
162 import com.ubuntu.PamAuthentication 0.1
163
164 /**
165
166=== modified file 'src/app/qml/CircularTransparentButton.qml'
167--- src/app/qml/CircularTransparentButton.qml 2014-11-22 14:30:52 +0000
168+++ src/app/qml/CircularTransparentButton.qml 2015-08-02 13:06:25 +0000
169@@ -1,5 +1,5 @@
170-import QtQuick 2.0
171-import Ubuntu.Components 1.1
172+import QtQuick 2.4
173+import Ubuntu.Components 1.2
174
175 Rectangle {
176 property color backgroundColor: "black"
177
178=== modified file 'src/app/qml/ExpandableButton.qml'
179--- src/app/qml/ExpandableButton.qml 2015-01-16 23:04:14 +0000
180+++ src/app/qml/ExpandableButton.qml 2015-08-02 13:06:25 +0000
181@@ -1,5 +1,5 @@
182-import QtQuick 2.0
183-import Ubuntu.Components 1.1
184+import QtQuick 2.4
185+import Ubuntu.Components 1.2
186
187 Item {
188 id: container
189
190=== modified file 'src/app/qml/KeyboardBar.qml'
191--- src/app/qml/KeyboardBar.qml 2015-06-02 19:44:37 +0000
192+++ src/app/qml/KeyboardBar.qml 2015-08-02 13:06:25 +0000
193@@ -1,5 +1,5 @@
194-import QtQuick 2.2
195-import Ubuntu.Components 1.1
196+import QtQuick 2.4
197+import Ubuntu.Components 1.2
198 import "KeyboardRows"
199
200 import "KeyboardRows/jsonParser.js" as Parser
201
202=== modified file 'src/app/qml/KeyboardRows/ExpandableKeyboardButton.qml'
203--- src/app/qml/KeyboardRows/ExpandableKeyboardButton.qml 2015-01-16 23:04:14 +0000
204+++ src/app/qml/KeyboardRows/ExpandableKeyboardButton.qml 2015-08-02 13:06:25 +0000
205@@ -1,5 +1,5 @@
206-import QtQuick 2.0
207-import Ubuntu.Components 1.1
208+import QtQuick 2.4
209+import Ubuntu.Components 1.2
210
211 import ".."
212
213
214=== modified file 'src/app/qml/KeyboardRows/KeyModel.qml'
215--- src/app/qml/KeyboardRows/KeyModel.qml 2014-12-07 16:11:58 +0000
216+++ src/app/qml/KeyboardRows/KeyModel.qml 2015-08-02 13:06:25 +0000
217@@ -1,5 +1,5 @@
218-import QtQuick 2.0
219-import Ubuntu.Components 1.1
220+import QtQuick 2.4
221+import Ubuntu.Components 1.2
222
223 QtObject {
224 property string text
225
226=== modified file 'src/app/qml/KeyboardRows/KeyboardButton.qml'
227--- src/app/qml/KeyboardRows/KeyboardButton.qml 2014-12-07 16:11:58 +0000
228+++ src/app/qml/KeyboardRows/KeyboardButton.qml 2015-08-02 13:06:25 +0000
229@@ -1,5 +1,5 @@
230-import QtQuick 2.0
231-import Ubuntu.Components 1.1
232+import QtQuick 2.4
233+import Ubuntu.Components 1.2
234
235 Rectangle {
236 property alias text: mainLabel.text
237
238=== modified file 'src/app/qml/KeyboardRows/KeyboardLayout.qml'
239--- src/app/qml/KeyboardRows/KeyboardLayout.qml 2015-04-01 22:01:44 +0000
240+++ src/app/qml/KeyboardRows/KeyboardLayout.qml 2015-08-02 13:06:25 +0000
241@@ -1,5 +1,5 @@
242-import QtQuick 2.0
243-import Ubuntu.Components 1.1
244+import QtQuick 2.4
245+import Ubuntu.Components 1.2
246
247 import "jsonParser.js" as Parser
248
249@@ -57,8 +57,8 @@
250
251 function createEntryString(text, actionString, otherActionsString) {
252 var objectString = "
253- import QtQuick 2.0
254- import Ubuntu.Components 1.1
255+ import QtQuick 2.4
256+ import Ubuntu.Components 1.2
257
258 KeyModel {
259 text: \"" + text + "\"
260
261=== modified file 'src/app/qml/KeyboardRows/KeyboardRow.qml'
262--- src/app/qml/KeyboardRows/KeyboardRow.qml 2015-02-03 21:43:38 +0000
263+++ src/app/qml/KeyboardRows/KeyboardRow.qml 2015-08-02 13:06:25 +0000
264@@ -1,5 +1,5 @@
265-import QtQuick 2.0
266-import Ubuntu.Components 1.1
267+import QtQuick 2.4
268+import Ubuntu.Components 1.2
269
270 Rectangle {
271 id: container
272
273=== modified file 'src/app/qml/LayoutsPage.qml'
274--- src/app/qml/LayoutsPage.qml 2015-03-26 22:32:38 +0000
275+++ src/app/qml/LayoutsPage.qml 2015-08-02 13:06:25 +0000
276@@ -16,8 +16,8 @@
277 * Authored by: Filippo Scognamiglio <flscogna@gmail.com>
278 */
279
280-import QtQuick 2.0
281-import Ubuntu.Components 1.1
282+import QtQuick 2.4
283+import Ubuntu.Components 1.2
284 import Ubuntu.Components.ListItems 1.0 as ListItem
285
286 Page {
287
288=== modified file 'src/app/qml/ListItemWithActions.qml'
289--- src/app/qml/ListItemWithActions.qml 2014-11-16 20:10:09 +0000
290+++ src/app/qml/ListItemWithActions.qml 2015-08-02 13:06:25 +0000
291@@ -14,8 +14,8 @@
292 * along with this program. If not, see <http://www.gnu.org/licenses/>.
293 */
294
295-import QtQuick 2.2
296-import Ubuntu.Components 1.1
297+import QtQuick 2.4
298+import Ubuntu.Components 1.2
299
300 Item {
301 id: root
302
303=== modified file 'src/app/qml/PressFeedback.qml'
304--- src/app/qml/PressFeedback.qml 2014-11-22 14:30:52 +0000
305+++ src/app/qml/PressFeedback.qml 2015-08-02 13:06:25 +0000
306@@ -1,4 +1,4 @@
307-import QtQuick 2.0
308+import QtQuick 2.4
309 import QtFeedback 5.0
310
311 HapticsEffect {
312
313=== modified file 'src/app/qml/SettingsPage.qml'
314--- src/app/qml/SettingsPage.qml 2015-06-11 22:10:24 +0000
315+++ src/app/qml/SettingsPage.qml 2015-08-02 13:06:25 +0000
316@@ -16,8 +16,8 @@
317 * Authored by: Filippo Scognamiglio <flscogna@gmail.com>
318 */
319
320-import QtQuick 2.0
321-import Ubuntu.Components 1.1
322+import QtQuick 2.4
323+import Ubuntu.Components 1.2
324 import Ubuntu.Components.ListItems 1.0 as ListItem
325
326 Page {
327
328=== modified file 'src/app/qml/TabsModel.qml'
329--- src/app/qml/TabsModel.qml 2015-06-11 21:33:57 +0000
330+++ src/app/qml/TabsModel.qml 2015-08-02 13:06:25 +0000
331@@ -1,4 +1,4 @@
332-import QtQuick 2.0
333+import QtQuick 2.4
334
335 ListModel {
336 property int selectedIndex: 0
337
338=== modified file 'src/app/qml/TabsPage.qml'
339--- src/app/qml/TabsPage.qml 2014-12-07 16:11:58 +0000
340+++ src/app/qml/TabsPage.qml 2015-08-02 13:06:25 +0000
341@@ -1,5 +1,5 @@
342-import QtQuick 2.0
343-import Ubuntu.Components 1.1
344+import QtQuick 2.4
345+import Ubuntu.Components 1.2
346 import Ubuntu.Components.ListItems 1.0 as ListItem
347
348 Page {
349
350=== modified file 'src/app/qml/TerminalComponent.qml'
351--- src/app/qml/TerminalComponent.qml 2015-06-23 17:38:54 +0000
352+++ src/app/qml/TerminalComponent.qml 2015-08-02 13:06:25 +0000
353@@ -1,5 +1,5 @@
354-import QtQuick 2.0
355-import Ubuntu.Components 1.1
356+import QtQuick 2.4
357+import Ubuntu.Components 1.2
358 import QMLTermWidget 1.0
359
360 Component {
361
362=== modified file 'src/app/qml/TerminalInputArea.qml'
363--- src/app/qml/TerminalInputArea.qml 2015-06-19 20:55:45 +0000
364+++ src/app/qml/TerminalInputArea.qml 2015-08-02 13:06:25 +0000
365@@ -1,4 +1,4 @@
366-import QtQuick 2.3
367+import QtQuick 2.4
368
369 Item{
370 property bool touchAreaPressed: false
371
372=== modified file 'src/app/qml/TerminalKeyboardShortcutHandler.qml'
373--- src/app/qml/TerminalKeyboardShortcutHandler.qml 2015-06-23 17:38:54 +0000
374+++ src/app/qml/TerminalKeyboardShortcutHandler.qml 2015-08-02 13:06:25 +0000
375@@ -1,4 +1,4 @@
376-import QtQuick 2.0
377+import QtQuick 2.4
378
379 Item {
380
381
382=== modified file 'src/app/qml/TerminalPage.qml'
383--- src/app/qml/TerminalPage.qml 2015-06-14 15:42:15 +0000
384+++ src/app/qml/TerminalPage.qml 2015-08-02 13:06:25 +0000
385@@ -1,6 +1,6 @@
386-import QtQuick 2.0
387-import Ubuntu.Components 1.1
388-import Ubuntu.Components.Popups 0.1
389+import QtQuick 2.4
390+import Ubuntu.Components 1.2
391+import Ubuntu.Components.Popups 1.0
392 import QMLTermWidget 1.0
393
394 Page {
395
396=== modified file 'src/app/qml/TerminalSettings.qml'
397--- src/app/qml/TerminalSettings.qml 2015-06-11 22:10:24 +0000
398+++ src/app/qml/TerminalSettings.qml 2015-08-02 13:06:25 +0000
399@@ -1,4 +1,4 @@
400-import QtQuick 2.0
401+import QtQuick 2.4
402 import Qt.labs.settings 1.0
403
404 import "KeyboardRows/jsonParser.js" as Parser
405
406=== modified file 'src/app/qml/ubuntu-terminal-app.qml'
407--- src/app/qml/ubuntu-terminal-app.qml 2015-03-26 22:32:38 +0000
408+++ src/app/qml/ubuntu-terminal-app.qml 2015-08-02 13:06:25 +0000
409@@ -1,6 +1,6 @@
410-import QtQuick 2.3
411+import QtQuick 2.4
412 import QtGraphicalEffects 1.0
413-import Ubuntu.Components 1.1
414+import Ubuntu.Components 1.2
415
416 import QMLTermWidget 1.0
417
418@@ -10,7 +10,6 @@
419 objectName: "terminal"
420 applicationName: "com.ubuntu.terminal"
421 automaticOrientation: true
422- useDeprecatedToolbar: false
423
424 width: units.gu(50)
425 height: units.gu(75)
426
427=== modified file 'terminal.apparmor'
428--- terminal.apparmor 2014-10-25 04:42:31 +0000
429+++ terminal.apparmor 2015-08-02 13:06:25 +0000
430@@ -1,5 +1,5 @@
431 {
432 "policy_groups": [],
433- "policy_version": 1.2,
434+ "policy_version": 1.3,
435 "template": "unconfined"
436-}
437\ No newline at end of file
438+}

Subscribers

People subscribed via source and target branches