Ubuntu Terminal App

Merge lp:~vthompson/ubuntu-terminal-app/fix-1320710 into lp:ubuntu-terminal-app

  1. fix-1320710
  2. Merge into trunk
Proposed by Victor Thompson
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
Approved revision: 79
Merged at revision: 92
Proposed branch: lp:~vthompson/ubuntu-terminal-app/fix-1320710
Merge into: lp:ubuntu-terminal-app
Diff against target: 259 lines (+46/-45)
4 files modified
po/com.ubuntu.terminal.pot (+32/-31)
po/po.pro (+4/-4)
src/app/qml/ubuntu-terminal-app.qml (+1/-1)
tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py (+9/-9)
To merge this branch: bzr merge lp:~vthompson/ubuntu-terminal-app/fix-1320710
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
David Planella Needs Fixing
Review via email: mp+221478@code.launchpad.net

Commit message

* Update button text for arrow keys
* Update translations
* Fix Python code for updated PEP8

Description of the change

* Update button text for arrow keys
* Update translations
* Fix Python code for updated PEP8

To post a comment you must log in.
Revision history for this message
David Planella (dpm) wrote :

Note that I've written this already in an inline comment in the diff, but since they're a new feature, I'm not quite sure how it works, thus repeating here just in case:

If we're doing this change, the top CMakeLists.txt file needs to be adjusted accordingly, otherwise the app won't build:

+ set(DESKTOP_FILE "${PROJECT_NAME}_${APP_NAME}.desktop")

Note that the reason we removed the _${APP_NAME} suffix initially was because otherwise Qt Creator would not find the .desktop file when running the app (neither on the desktop nor on a device). If that has been fixed in Qt Creator we can re-add it, but it needs to be tested first.

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

FAILED: Continuous integration, rev:75
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/60/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2865/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-terminal-app-trusty-amd64-ci/48/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/4/console

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

review: Needs Fixing (continuous-integration)
lp:~vthompson/ubuntu-terminal-app/fix-1320710 updated
76. By Victor Thompson

Fix desktop file issue

77. By Victor Thompson

revert manifest completely

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

PASSED: Continuous integration, rev:77
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/61/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2870
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2870/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-trusty-amd64-ci/49
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/5

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

review: Approve (continuous-integration)
Revision history for this message
Victor Thompson (vthompson) wrote :

@dpm, ah yes. The was an issue with the desktop file due to the po/po.pro file having the wrong file name. I reverted that and fixed the .pro file.

Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Without wishing to bikeshed I'd rather the "Text ctrl keys" was called something like "Arrow keys".

http://en.wikipedia.org/wiki/Arrow_keys

While the panel shows more than just arrows (page up/down, home/end, tab/del) I think "Arrow keys" is descriptive enough.

lp:~vthompson/ubuntu-terminal-app/fix-1320710 updated
78. By Victor Thompson

Update button text

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

FAILED: Continuous integration, rev:78
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/63/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/688/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/7/console

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

review: Needs Fixing (continuous-integration)
lp:~vthompson/ubuntu-terminal-app/fix-1320710 updated
79. By Victor Thompson

fix for pep8 update

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

PASSED: Continuous integration, rev:79
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/64/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/689
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/689/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/8

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

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

Looks great!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/com.ubuntu.terminal.pot'
2--- po/com.ubuntu.terminal.pot 2014-05-15 09:18:14 +0000
3+++ po/com.ubuntu.terminal.pot 2014-06-27 13:21:35 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: ubuntu-terminal-app\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2014-05-15 10:35+0200\n"
9+"POT-Creation-Date: 2014-06-27 07:49-0500\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13@@ -17,118 +17,119 @@
14 "Content-Type: text/plain; charset=CHARSET\n"
15 "Content-Transfer-Encoding: 8bit\n"
16
17-#: src/app/qml/Configs.qml:48
18+#: ../src/app/qml/Configs.qml:48
19 msgid "Color scheme"
20 msgstr ""
21
22-#: src/app/qml/Configs.qml:64
23+#: ../src/app/qml/Configs.qml:64
24 msgid "Font size"
25 msgstr ""
26
27-#: src/app/qml/Terminal.qml:314
28+#: ../src/app/qml/Terminal.qml:314
29 msgid "Upload Crash Reports"
30 msgstr ""
31
32-#: src/app/qml/Terminal.qml:315
33+#: ../src/app/qml/Terminal.qml:315
34 msgid "Whoopsie;Apport;Debugging;Bugs"
35 msgstr ""
36
37-#: src/app/qml/Terminal.qml:319
38+#: ../src/app/qml/Terminal.qml:319
39 msgid "Make Image Writable"
40 msgstr ""
41
42-#: src/app/qml/Terminal.qml:320
43+#: ../src/app/qml/Terminal.qml:320
44 msgid "System Image;Install Deb"
45 msgstr ""
46
47-#: src/app/qml/Terminal.qml:324
48+#: ../src/app/qml/Terminal.qml:324
49 msgid "List Running Applications"
50 msgstr ""
51
52-#: src/app/qml/Terminal.qml:325
53+#: ../src/app/qml/Terminal.qml:325
54 msgid "Apps"
55 msgstr ""
56
57-#: src/app/qml/Terminal.qml:329
58+#: ../src/app/qml/Terminal.qml:329
59 msgid "Installed Click Packages"
60 msgstr ""
61
62-#: src/app/qml/Terminal.qml:330
63+#: ../src/app/qml/Terminal.qml:330
64 msgid "Packages;Applications;Utilities"
65 msgstr ""
66
67-#: src/app/qml/Terminal.qml:334
68+#: ../src/app/qml/Terminal.qml:334
69 msgid "System Image Information"
70 msgstr ""
71
72-#: src/app/qml/Terminal.qml:335
73+#: ../src/app/qml/Terminal.qml:335
74 msgid "Image;Version;Channel"
75 msgstr ""
76
77-#: src/app/qml/Terminal.qml:339
78+#: ../src/app/qml/Terminal.qml:339
79 msgid "System Kernel Version"
80 msgstr ""
81
82-#: src/app/qml/Terminal.qml:343
83+#: ../src/app/qml/Terminal.qml:343
84 msgid "Upstart Job Status"
85 msgstr ""
86
87-#: src/app/qml/Terminal.qml:344
88+#: ../src/app/qml/Terminal.qml:344
89 msgid "Init;Session;User Job"
90 msgstr ""
91
92-#: src/app/qml/Terminal.qml:348
93+#: ../src/app/qml/Terminal.qml:348
94 msgid "Hack into the NSA"
95 msgstr ""
96
97-#: src/app/qml/Terminal.qml:349
98+#: ../src/app/qml/Terminal.qml:349
99 msgid "Government;Secret;Cracking"
100 msgstr ""
101
102-#: src/app/qml/Terminal.qml:353
103+#: ../src/app/qml/Terminal.qml:353
104 msgid "Watch Running Processes"
105 msgstr ""
106
107-#: src/app/qml/Terminal.qml:354
108+#: ../src/app/qml/Terminal.qml:354
109 msgid "Top;Memory;Usage"
110 msgstr ""
111
112-#: src/app/qml/Terminal.qml:358
113+#: ../src/app/qml/Terminal.qml:358
114 msgid "Networking Status"
115 msgstr ""
116
117-#: src/app/qml/Terminal.qml:359
118+#: ../src/app/qml/Terminal.qml:359
119 msgid "Wireless;Ethernet;Access Points"
120 msgstr ""
121
122-#: src/app/qml/Terminal.qml:363
123+#: ../src/app/qml/Terminal.qml:363
124 msgid "Watch Star Wars Episode IV"
125 msgstr ""
126
127-#: src/app/qml/Terminal.qml:364
128+#: ../src/app/qml/Terminal.qml:364
129 msgid "Death Star;Skywalker;Leia;Darth Vader"
130 msgstr ""
131
132-#: src/app/qml/ubuntu-terminal-app.qml:24
133+#: ../src/app/qml/ubuntu-terminal-app.qml:24
134 msgid "Control keys"
135 msgstr ""
136
137-#: src/app/qml/ubuntu-terminal-app.qml:29
138+#: ../src/app/qml/ubuntu-terminal-app.qml:29
139 msgid "Function keys"
140 msgstr ""
141
142-#: src/app/qml/ubuntu-terminal-app.qml:34
143-msgid "Text ctrl keys"
144+#: ../src/app/qml/ubuntu-terminal-app.qml:34
145+msgid "Arrow keys"
146 msgstr ""
147
148-#: src/app/qml/ubuntu-terminal-app.qml:39
149+#: ../src/app/qml/ubuntu-terminal-app.qml:39
150 msgid "Hide extra panel"
151 msgstr ""
152
153-#: src/app/qml/ubuntu-terminal-app.qml:58
154+#: ../src/app/qml/ubuntu-terminal-app.qml:58
155+#: ../.build/com.ubuntu.terminal_terminal.desktop.in:1
156 msgid "Terminal"
157 msgstr ""
158
159-#: src/app/qml/ubuntu-terminal-app.qml:98
160+#: ../src/app/qml/ubuntu-terminal-app.qml:98
161 msgid "Settings"
162 msgstr ""
163
164=== modified file 'po/po.pro'
165--- po/po.pro 2014-03-11 03:09:28 +0000
166+++ po/po.pro 2014-06-27 13:21:35 +0000
167@@ -9,11 +9,11 @@
168
169 PROJECTNAME = ubuntu-terminal-app
170
171-DESKTOPFILE = ../com.ubuntu.terminal_terminal.desktop.in
172+DESKTOPFILE = ../com.ubuntu.terminal.desktop.in
173
174-SOURCECODE = ../*.qml \
175- ../config/*.qml \
176- ../extraPanel/*.qml
177+SOURCECODE = ../src/app/qml/*.qml \
178+ ../src/app/qml/config/*.qml \
179+ ../src/app/qml/extraPanel/*.qml
180
181 BUILDDIR = ../.build
182 DESKTOPFILETEMP = $${BUILDDIR}/com.ubuntu.terminal_terminal.desktop.in
183
184=== modified file 'src/app/qml/ubuntu-terminal-app.qml'
185--- src/app/qml/ubuntu-terminal-app.qml 2014-04-27 09:11:14 +0000
186+++ src/app/qml/ubuntu-terminal-app.qml 2014-06-27 13:21:35 +0000
187@@ -31,7 +31,7 @@
188 }
189 Action {
190 objectName: "textkeysaction"
191- text: i18n.tr("Text ctrl keys")
192+ text: i18n.tr("Arrow keys")
193 onTriggered: pgTerm.showExtraPanel(3)
194 }
195 Action {
196
197=== modified file 'tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py'
198--- tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py 2014-06-16 10:38:24 +0000
199+++ tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py 2014-06-27 13:21:35 +0000
200@@ -72,7 +72,7 @@
201 for ritem in items:
202 if ritem.text == value:
203 self.pointing_device.click_object(ritem)
204- #the first label is always the "color scheme"
205+ # the first label is always the "color scheme"
206 itemLabel = lambda: ritem.text
207 self.assertThat(itemLabel, Eventually(Equals(value)))
208
209@@ -111,7 +111,7 @@
210 toolbar.click_button("PanelsButton")
211
212 panel_popover = self.main_view.get_panel_actions_popover()
213- panel_popover.click_button("Text ctrl keys")
214+ panel_popover.click_button("Arrow keys")
215
216 panelScrl = lambda: self.main_view.get_scroll_panel().visible
217 self.assertThat(panelScrl, Eventually(Equals(True)))
218@@ -126,11 +126,11 @@
219 tap_x = (x + w) / 2
220 tap_y = (y + h) / 3
221
222- #tap in the top third of the screen, to avoid OSK
223+ # tap in the top third of the screen, to avoid OSK
224 self.pointing_device.move(tap_x, tap_y)
225 self.pointing_device.press()
226- #we can hold the press for a long time without issue
227- #so we'll ensure the app recieves our signal when under load
228+ # we can hold the press for a long time without issue
229+ # so we'll ensure the app recieves our signal when under load
230 sleep(4)
231 self.pointing_device.release()
232
233@@ -152,8 +152,8 @@
234 kterm = self.main_view.get_kterm()
235 self.main_view.switch_to_tab("SettingsTab")
236
237- #are these string translatable?
238- #if so, we need to do this another way
239+ # are these string translatable?
240+ # if so, we need to do this another way
241 schemeList = ("DarkPastels",
242 "Linux",
243 "BlackOnRandomLight",
244@@ -181,13 +181,13 @@
245 font_size = self.get_font_size_from_storage()
246 self.assertThat(font_size, Equals(32))
247
248- ## change font size to min
249+ # change font size to min
250 self.main_view.drag_horizontal_slider("slFont", 8)
251 sleep(1)
252 font_size = self.get_font_size_from_storage()
253 self.assertThat(font_size, Equals(8))
254
255- ## change font size to random sizes
256+ # change font size to random sizes
257 for loop in range(1, 3):
258 randSize = random.randrange(8, 32, 1)
259 self.main_view.drag_horizontal_slider("slFont", randSize)

Subscribers

People subscribed via source and target branches