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
=== modified file 'po/com.ubuntu.terminal.pot'
--- po/com.ubuntu.terminal.pot 2014-05-15 09:18:14 +0000
+++ po/com.ubuntu.terminal.pot 2014-06-27 13:21:35 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: ubuntu-terminal-app\n"9"Project-Id-Version: ubuntu-terminal-app\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2014-05-15 10:35+0200\n"11"POT-Creation-Date: 2014-06-27 07:49-0500\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,118 +17,119 @@
17"Content-Type: text/plain; charset=CHARSET\n"17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#: src/app/qml/Configs.qml:4820#: ../src/app/qml/Configs.qml:48
21msgid "Color scheme"21msgid "Color scheme"
22msgstr ""22msgstr ""
2323
24#: src/app/qml/Configs.qml:6424#: ../src/app/qml/Configs.qml:64
25msgid "Font size"25msgid "Font size"
26msgstr ""26msgstr ""
2727
28#: src/app/qml/Terminal.qml:31428#: ../src/app/qml/Terminal.qml:314
29msgid "Upload Crash Reports"29msgid "Upload Crash Reports"
30msgstr ""30msgstr ""
3131
32#: src/app/qml/Terminal.qml:31532#: ../src/app/qml/Terminal.qml:315
33msgid "Whoopsie;Apport;Debugging;Bugs"33msgid "Whoopsie;Apport;Debugging;Bugs"
34msgstr ""34msgstr ""
3535
36#: src/app/qml/Terminal.qml:31936#: ../src/app/qml/Terminal.qml:319
37msgid "Make Image Writable"37msgid "Make Image Writable"
38msgstr ""38msgstr ""
3939
40#: src/app/qml/Terminal.qml:32040#: ../src/app/qml/Terminal.qml:320
41msgid "System Image;Install Deb"41msgid "System Image;Install Deb"
42msgstr ""42msgstr ""
4343
44#: src/app/qml/Terminal.qml:32444#: ../src/app/qml/Terminal.qml:324
45msgid "List Running Applications"45msgid "List Running Applications"
46msgstr ""46msgstr ""
4747
48#: src/app/qml/Terminal.qml:32548#: ../src/app/qml/Terminal.qml:325
49msgid "Apps"49msgid "Apps"
50msgstr ""50msgstr ""
5151
52#: src/app/qml/Terminal.qml:32952#: ../src/app/qml/Terminal.qml:329
53msgid "Installed Click Packages"53msgid "Installed Click Packages"
54msgstr ""54msgstr ""
5555
56#: src/app/qml/Terminal.qml:33056#: ../src/app/qml/Terminal.qml:330
57msgid "Packages;Applications;Utilities"57msgid "Packages;Applications;Utilities"
58msgstr ""58msgstr ""
5959
60#: src/app/qml/Terminal.qml:33460#: ../src/app/qml/Terminal.qml:334
61msgid "System Image Information"61msgid "System Image Information"
62msgstr ""62msgstr ""
6363
64#: src/app/qml/Terminal.qml:33564#: ../src/app/qml/Terminal.qml:335
65msgid "Image;Version;Channel"65msgid "Image;Version;Channel"
66msgstr ""66msgstr ""
6767
68#: src/app/qml/Terminal.qml:33968#: ../src/app/qml/Terminal.qml:339
69msgid "System Kernel Version"69msgid "System Kernel Version"
70msgstr ""70msgstr ""
7171
72#: src/app/qml/Terminal.qml:34372#: ../src/app/qml/Terminal.qml:343
73msgid "Upstart Job Status"73msgid "Upstart Job Status"
74msgstr ""74msgstr ""
7575
76#: src/app/qml/Terminal.qml:34476#: ../src/app/qml/Terminal.qml:344
77msgid "Init;Session;User Job"77msgid "Init;Session;User Job"
78msgstr ""78msgstr ""
7979
80#: src/app/qml/Terminal.qml:34880#: ../src/app/qml/Terminal.qml:348
81msgid "Hack into the NSA"81msgid "Hack into the NSA"
82msgstr ""82msgstr ""
8383
84#: src/app/qml/Terminal.qml:34984#: ../src/app/qml/Terminal.qml:349
85msgid "Government;Secret;Cracking"85msgid "Government;Secret;Cracking"
86msgstr ""86msgstr ""
8787
88#: src/app/qml/Terminal.qml:35388#: ../src/app/qml/Terminal.qml:353
89msgid "Watch Running Processes"89msgid "Watch Running Processes"
90msgstr ""90msgstr ""
9191
92#: src/app/qml/Terminal.qml:35492#: ../src/app/qml/Terminal.qml:354
93msgid "Top;Memory;Usage"93msgid "Top;Memory;Usage"
94msgstr ""94msgstr ""
9595
96#: src/app/qml/Terminal.qml:35896#: ../src/app/qml/Terminal.qml:358
97msgid "Networking Status"97msgid "Networking Status"
98msgstr ""98msgstr ""
9999
100#: src/app/qml/Terminal.qml:359100#: ../src/app/qml/Terminal.qml:359
101msgid "Wireless;Ethernet;Access Points"101msgid "Wireless;Ethernet;Access Points"
102msgstr ""102msgstr ""
103103
104#: src/app/qml/Terminal.qml:363104#: ../src/app/qml/Terminal.qml:363
105msgid "Watch Star Wars Episode IV"105msgid "Watch Star Wars Episode IV"
106msgstr ""106msgstr ""
107107
108#: src/app/qml/Terminal.qml:364108#: ../src/app/qml/Terminal.qml:364
109msgid "Death Star;Skywalker;Leia;Darth Vader"109msgid "Death Star;Skywalker;Leia;Darth Vader"
110msgstr ""110msgstr ""
111111
112#: src/app/qml/ubuntu-terminal-app.qml:24112#: ../src/app/qml/ubuntu-terminal-app.qml:24
113msgid "Control keys"113msgid "Control keys"
114msgstr ""114msgstr ""
115115
116#: src/app/qml/ubuntu-terminal-app.qml:29116#: ../src/app/qml/ubuntu-terminal-app.qml:29
117msgid "Function keys"117msgid "Function keys"
118msgstr ""118msgstr ""
119119
120#: src/app/qml/ubuntu-terminal-app.qml:34120#: ../src/app/qml/ubuntu-terminal-app.qml:34
121msgid "Text ctrl keys"121msgid "Arrow keys"
122msgstr ""122msgstr ""
123123
124#: src/app/qml/ubuntu-terminal-app.qml:39124#: ../src/app/qml/ubuntu-terminal-app.qml:39
125msgid "Hide extra panel"125msgid "Hide extra panel"
126msgstr ""126msgstr ""
127127
128#: src/app/qml/ubuntu-terminal-app.qml:58128#: ../src/app/qml/ubuntu-terminal-app.qml:58
129#: ../.build/com.ubuntu.terminal_terminal.desktop.in:1
129msgid "Terminal"130msgid "Terminal"
130msgstr ""131msgstr ""
131132
132#: src/app/qml/ubuntu-terminal-app.qml:98133#: ../src/app/qml/ubuntu-terminal-app.qml:98
133msgid "Settings"134msgid "Settings"
134msgstr ""135msgstr ""
135136
=== modified file 'po/po.pro'
--- po/po.pro 2014-03-11 03:09:28 +0000
+++ po/po.pro 2014-06-27 13:21:35 +0000
@@ -9,11 +9,11 @@
99
10PROJECTNAME = ubuntu-terminal-app10PROJECTNAME = ubuntu-terminal-app
1111
12DESKTOPFILE = ../com.ubuntu.terminal_terminal.desktop.in12DESKTOPFILE = ../com.ubuntu.terminal.desktop.in
1313
14SOURCECODE = ../*.qml \14SOURCECODE = ../src/app/qml/*.qml \
15 ../config/*.qml \15 ../src/app/qml/config/*.qml \
16 ../extraPanel/*.qml16 ../src/app/qml/extraPanel/*.qml
1717
18BUILDDIR = ../.build18BUILDDIR = ../.build
19DESKTOPFILETEMP = $${BUILDDIR}/com.ubuntu.terminal_terminal.desktop.in19DESKTOPFILETEMP = $${BUILDDIR}/com.ubuntu.terminal_terminal.desktop.in
2020
=== modified file 'src/app/qml/ubuntu-terminal-app.qml'
--- src/app/qml/ubuntu-terminal-app.qml 2014-04-27 09:11:14 +0000
+++ src/app/qml/ubuntu-terminal-app.qml 2014-06-27 13:21:35 +0000
@@ -31,7 +31,7 @@
31 }31 }
32 Action {32 Action {
33 objectName: "textkeysaction"33 objectName: "textkeysaction"
34 text: i18n.tr("Text ctrl keys")34 text: i18n.tr("Arrow keys")
35 onTriggered: pgTerm.showExtraPanel(3)35 onTriggered: pgTerm.showExtraPanel(3)
36 }36 }
37 Action {37 Action {
3838
=== modified file 'tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py'
--- tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py 2014-06-16 10:38:24 +0000
+++ tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py 2014-06-27 13:21:35 +0000
@@ -72,7 +72,7 @@
72 for ritem in items:72 for ritem in items:
73 if ritem.text == value:73 if ritem.text == value:
74 self.pointing_device.click_object(ritem)74 self.pointing_device.click_object(ritem)
75 #the first label is always the "color scheme"75 # the first label is always the "color scheme"
76 itemLabel = lambda: ritem.text76 itemLabel = lambda: ritem.text
77 self.assertThat(itemLabel, Eventually(Equals(value)))77 self.assertThat(itemLabel, Eventually(Equals(value)))
7878
@@ -111,7 +111,7 @@
111 toolbar.click_button("PanelsButton")111 toolbar.click_button("PanelsButton")
112112
113 panel_popover = self.main_view.get_panel_actions_popover()113 panel_popover = self.main_view.get_panel_actions_popover()
114 panel_popover.click_button("Text ctrl keys")114 panel_popover.click_button("Arrow keys")
115115
116 panelScrl = lambda: self.main_view.get_scroll_panel().visible116 panelScrl = lambda: self.main_view.get_scroll_panel().visible
117 self.assertThat(panelScrl, Eventually(Equals(True)))117 self.assertThat(panelScrl, Eventually(Equals(True)))
@@ -126,11 +126,11 @@
126 tap_x = (x + w) / 2126 tap_x = (x + w) / 2
127 tap_y = (y + h) / 3127 tap_y = (y + h) / 3
128128
129 #tap in the top third of the screen, to avoid OSK129 # tap in the top third of the screen, to avoid OSK
130 self.pointing_device.move(tap_x, tap_y)130 self.pointing_device.move(tap_x, tap_y)
131 self.pointing_device.press()131 self.pointing_device.press()
132 #we can hold the press for a long time without issue132 # we can hold the press for a long time without issue
133 #so we'll ensure the app recieves our signal when under load133 # so we'll ensure the app recieves our signal when under load
134 sleep(4)134 sleep(4)
135 self.pointing_device.release()135 self.pointing_device.release()
136136
@@ -152,8 +152,8 @@
152 kterm = self.main_view.get_kterm()152 kterm = self.main_view.get_kterm()
153 self.main_view.switch_to_tab("SettingsTab")153 self.main_view.switch_to_tab("SettingsTab")
154154
155 #are these string translatable?155 # are these string translatable?
156 #if so, we need to do this another way156 # if so, we need to do this another way
157 schemeList = ("DarkPastels",157 schemeList = ("DarkPastels",
158 "Linux",158 "Linux",
159 "BlackOnRandomLight",159 "BlackOnRandomLight",
@@ -181,13 +181,13 @@
181 font_size = self.get_font_size_from_storage()181 font_size = self.get_font_size_from_storage()
182 self.assertThat(font_size, Equals(32))182 self.assertThat(font_size, Equals(32))
183183
184 ## change font size to min184 # change font size to min
185 self.main_view.drag_horizontal_slider("slFont", 8)185 self.main_view.drag_horizontal_slider("slFont", 8)
186 sleep(1)186 sleep(1)
187 font_size = self.get_font_size_from_storage()187 font_size = self.get_font_size_from_storage()
188 self.assertThat(font_size, Equals(8))188 self.assertThat(font_size, Equals(8))
189189
190 ## change font size to random sizes190 # change font size to random sizes
191 for loop in range(1, 3):191 for loop in range(1, 3):
192 randSize = random.randrange(8, 32, 1)192 randSize = random.randrange(8, 32, 1)
193 self.main_view.drag_horizontal_slider("slFont", randSize)193 self.main_view.drag_horizontal_slider("slFont", randSize)

Subscribers

People subscribed via source and target branches