Ubuntu Terminal App

Merge lp:~flscogna/ubuntu-terminal-app/fix-1363414 into lp:ubuntu-terminal-app

  1. fix-1363414
  2. Merge into trunk
Proposed by Filippo Scognamiglio
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
Approved revision: 134
Merged at revision: 136
Proposed branch: lp:~flscogna/ubuntu-terminal-app/fix-1363414
Merge into: lp:ubuntu-terminal-app
Diff against target: 441 lines (+66/-156)
6 files modified
po/com.ubuntu.terminal.pot (+52/-53)
src/app/qml/Configs.qml (+0/-29)
src/app/qml/GraphicalTerminal.qml (+8/-31)
src/app/qml/ShaderTerminal.qml (+6/-33)
src/app/qml/Terminal.qml (+0/-1)
src/app/qml/config/JsConfig.qml (+0/-9)
To merge this branch: bzr merge lp:~flscogna/ubuntu-terminal-app/fix-1363414
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+233243@code.launchpad.net

Commit message

Fixes incompatibilities with Mali-400 gpu.

Description of the change

Fixes incompatibilities with Mali-400 gpu.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:134
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/92/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1807/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1807/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/36

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

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

PASSED: Continuous integration, rev:134
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/94/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1839
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1839/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/38

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

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

Tested on krillin. Thanks!

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-08-28 17:54:16 +0000
3+++ po/com.ubuntu.terminal.pot 2014-09-03 16:28:19 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: \n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2014-08-26 17:06+0200\n"
9+"POT-Creation-Date: 2014-09-03 18:14+0200\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@@ -29,127 +29,123 @@
14 msgid "Cancel"
15 msgstr ""
16
17-#: ../src/app/qml/Configs.qml:64
18+#: ../src/app/qml/Configs.qml:63
19 msgid "Color scheme"
20 msgstr ""
21
22-#: ../src/app/qml/Configs.qml:80
23+#: ../src/app/qml/Configs.qml:79
24 msgid "Font size"
25 msgstr ""
26
27-#: ../src/app/qml/Configs.qml:103
28+#: ../src/app/qml/Configs.qml:102
29 msgid "Enable effects:"
30 msgstr ""
31
32-#: ../src/app/qml/Configs.qml:115
33+#: ../src/app/qml/Configs.qml:114
34 msgid "Screen color"
35 msgstr ""
36
37-#: ../src/app/qml/Configs.qml:128
38+#: ../src/app/qml/Configs.qml:127
39 msgid "Color intensity"
40 msgstr ""
41
42-#: ../src/app/qml/Configs.qml:156
43+#: ../src/app/qml/Configs.qml:155
44 msgid "Bloom"
45 msgstr ""
46
47-#: ../src/app/qml/Configs.qml:184
48+#: ../src/app/qml/Configs.qml:183
49 msgid "Curvature"
50 msgstr ""
51
52-#: ../src/app/qml/Configs.qml:212
53+#: ../src/app/qml/Configs.qml:211
54 msgid "Noise"
55 msgstr ""
56
57-#: ../src/app/qml/Configs.qml:240
58+#: ../src/app/qml/Configs.qml:239
59 msgid "Jitter"
60 msgstr ""
61
62-#: ../src/app/qml/Configs.qml:268
63-msgid "Brightness flickering"
64+#: ../src/app/qml/Terminal.qml:376
65+msgid "Upload Crash Reports"
66 msgstr ""
67
68 #: ../src/app/qml/Terminal.qml:377
69-msgid "Upload Crash Reports"
70-msgstr ""
71-
72-#: ../src/app/qml/Terminal.qml:378
73 msgid "Whoopsie;Apport;Debugging;Bugs"
74 msgstr ""
75
76+#: ../src/app/qml/Terminal.qml:381
77+msgid "Make Image Writable"
78+msgstr ""
79+
80 #: ../src/app/qml/Terminal.qml:382
81-msgid "Make Image Writable"
82-msgstr ""
83-
84-#: ../src/app/qml/Terminal.qml:383
85 msgid "System Image;Install Deb"
86 msgstr ""
87
88+#: ../src/app/qml/Terminal.qml:386
89+msgid "List Running Applications"
90+msgstr ""
91+
92 #: ../src/app/qml/Terminal.qml:387
93-msgid "List Running Applications"
94-msgstr ""
95-
96-#: ../src/app/qml/Terminal.qml:388
97 msgid "Apps"
98 msgstr ""
99
100+#: ../src/app/qml/Terminal.qml:391
101+msgid "Installed Click Packages"
102+msgstr ""
103+
104 #: ../src/app/qml/Terminal.qml:392
105-msgid "Installed Click Packages"
106-msgstr ""
107-
108-#: ../src/app/qml/Terminal.qml:393
109 msgid "Packages;Applications;Utilities"
110 msgstr ""
111
112+#: ../src/app/qml/Terminal.qml:396
113+msgid "System Image Information"
114+msgstr ""
115+
116 #: ../src/app/qml/Terminal.qml:397
117-msgid "System Image Information"
118-msgstr ""
119-
120-#: ../src/app/qml/Terminal.qml:398
121 msgid "Image;Version;Channel"
122 msgstr ""
123
124-#: ../src/app/qml/Terminal.qml:402
125+#: ../src/app/qml/Terminal.qml:401
126 msgid "System Kernel Version"
127 msgstr ""
128
129+#: ../src/app/qml/Terminal.qml:405
130+msgid "Upstart Job Status"
131+msgstr ""
132+
133 #: ../src/app/qml/Terminal.qml:406
134-msgid "Upstart Job Status"
135-msgstr ""
136-
137-#: ../src/app/qml/Terminal.qml:407
138 msgid "Init;Session;User Job"
139 msgstr ""
140
141+#: ../src/app/qml/Terminal.qml:410
142+msgid "Hack into the NSA"
143+msgstr ""
144+
145 #: ../src/app/qml/Terminal.qml:411
146-msgid "Hack into the NSA"
147-msgstr ""
148-
149-#: ../src/app/qml/Terminal.qml:412
150 msgid "Government;Secret;Cracking"
151 msgstr ""
152
153+#: ../src/app/qml/Terminal.qml:415
154+msgid "Watch Running Processes"
155+msgstr ""
156+
157 #: ../src/app/qml/Terminal.qml:416
158-msgid "Watch Running Processes"
159-msgstr ""
160-
161-#: ../src/app/qml/Terminal.qml:417
162 msgid "Top;Memory;Usage"
163 msgstr ""
164
165+#: ../src/app/qml/Terminal.qml:420
166+msgid "Networking Status"
167+msgstr ""
168+
169 #: ../src/app/qml/Terminal.qml:421
170-msgid "Networking Status"
171-msgstr ""
172-
173-#: ../src/app/qml/Terminal.qml:422
174 msgid "Wireless;Ethernet;Access Points"
175 msgstr ""
176
177+#: ../src/app/qml/Terminal.qml:425
178+msgid "Watch Star Wars Episode IV"
179+msgstr ""
180+
181 #: ../src/app/qml/Terminal.qml:426
182-msgid "Watch Star Wars Episode IV"
183-msgstr ""
184-
185-#: ../src/app/qml/Terminal.qml:427
186 msgid "Death Star;Skywalker;Leia;Darth Vader"
187 msgstr ""
188
189@@ -177,10 +173,12 @@
190 msgid "END"
191 msgstr ""
192
193+#: ../src/app/qml/ubuntu-terminal-app.qml:30
194 #: com.ubuntu.terminal.desktop.in.in.h:1
195 msgid "Terminal"
196 msgstr ""
197
198+#: ../src/app/qml/ubuntu-terminal-app.qml:49
199 #: ../src/app/qml/ubuntu-terminal-app.qml:86
200 msgid "Settings"
201 msgstr ""
202@@ -201,6 +199,7 @@
203 msgid "Arrow keys"
204 msgstr ""
205
206+#: ../src/plugin/konsole/ColorScheme.cpp:276
207 #: ../src/plugin/konsole/ColorScheme.cpp:291
208 msgid "Un-named Color Scheme"
209 msgstr ""
210
211=== modified file 'src/app/qml/Configs.qml'
212--- src/app/qml/Configs.qml 2014-08-26 10:07:14 +0000
213+++ src/app/qml/Configs.qml 2014-09-03 16:28:19 +0000
214@@ -30,7 +30,6 @@
215 slCurvature.value = jsConf.getScreenCurvature();
216 slBloom.value = jsConf.getBloom();
217 slNoise.value = jsConf.getNoiseStrenght();
218- slBrightnessFlickering.value = jsConf.getBrightnessFlickering();
219 slJitter.value = jsConf.getJitter();
220 slColorIntensity.value = jsConf.getColorIntensity();
221 }
222@@ -258,33 +257,5 @@
223 enabled: effectsEnabled
224 function formatValue(v){return v.toFixed(2);}
225 }
226-
227- Label {
228- anchors {
229- left: parent.left
230- leftMargin: units.gu(2)
231- }
232-
233- text: i18n.tr("Brightness flickering") + ":"
234- }
235-
236- Slider{
237- id: slBrightnessFlickering
238- objectName: "slBrightnessFlickering"
239- anchors {
240- left: parent.left
241- leftMargin: units.gu(2)
242- right: parent.right
243- rightMargin: units.gu(2)
244- }
245- minimumValue: 0.0;
246- maximumValue: 1.0;
247- onValueChanged: {
248- jsConf.setBrightnessFlickering(value);
249- mparent.configChanged(true);
250- }
251- enabled: effectsEnabled
252- function formatValue(v){return v.toFixed(2);}
253- }
254 }
255 }
256
257=== modified file 'src/app/qml/GraphicalTerminal.qml'
258--- src/app/qml/GraphicalTerminal.qml 2014-08-26 13:22:52 +0000
259+++ src/app/qml/GraphicalTerminal.qml 2014-09-03 16:28:19 +0000
260@@ -8,7 +8,6 @@
261 property alias noise_strength: shaderTerminal.noise_strength
262 property alias screen_curvature: shaderTerminal.screen_curvature
263 property alias jitter: shaderTerminal.jitter
264- property alias brightness_flickering: shaderTerminal.brightness_flickering
265 property alias screen_color: shaderTerminal.screen_color
266
267 anchors.fill: parent
268@@ -60,8 +59,9 @@
269
270 blending: false
271
272- fragmentShader:
273- "uniform lowp float qt_Opacity;
274+ fragmentShader:"
275+ precision mediump float;
276+ uniform lowp float qt_Opacity;
277 varying highp vec2 qt_TexCoord0;
278 uniform highp vec2 virtual_resolution;" +
279
280@@ -75,12 +75,12 @@
281 return fract(sin(sn) * c);
282 }
283
284- vec2 sw(vec2 p) {return vec2( floor(p.x) , floor(p.y) );}
285- vec2 se(vec2 p) {return vec2( ceil(p.x) , floor(p.y) );}
286- vec2 nw(vec2 p) {return vec2( floor(p.x) , ceil(p.y) );}
287- vec2 ne(vec2 p) {return vec2( ceil(p.x) , ceil(p.y) );}
288+ highp vec2 sw(vec2 p) {return vec2( floor(p.x) , floor(p.y) );}
289+ highp vec2 se(vec2 p) {return vec2( ceil(p.x) , floor(p.y) );}
290+ highp vec2 nw(vec2 p) {return vec2( floor(p.x) , ceil(p.y) );}
291+ highp vec2 ne(vec2 p) {return vec2( ceil(p.x) , ceil(p.y) );}
292
293- float smoothNoise(vec2 p) {
294+ mediump float smoothNoise(highp vec2 p) {
295 vec2 inter = smoothstep(0., 1., fract(p));
296 float s = mix(noise(sw(p)), noise(se(p)), inter.x);
297 float n = mix(noise(nw(p)), noise(ne(p)), inter.x);
298@@ -104,27 +104,4 @@
299 smooth: true
300 }
301 }
302-
303- Loader{
304- id: randTextureLoader
305- active: brightness_flickering !== 0
306- width: 512
307- height: 512
308- sourceComponent: Image{
309- source: "images/randfunction.png"
310- sourceSize.width: 512
311- sourceSize.height: 256
312- fillMode: Image.TileVertically
313- }
314- }
315- Loader{
316- id: randTextureSourceLoader
317- active: brightness_flickering !== 0
318- sourceComponent: ShaderEffectSource{
319- sourceItem: randTextureLoader.item
320- live: false
321- hideSource: true
322- wrapMode: ShaderEffectSource.Repeat
323- }
324- }
325 }
326
327=== modified file 'src/app/qml/ShaderTerminal.qml'
328--- src/app/qml/ShaderTerminal.qml 2014-08-26 12:06:32 +0000
329+++ src/app/qml/ShaderTerminal.qml 2014-09-03 16:28:19 +0000
330@@ -34,7 +34,6 @@
331 property real jitter
332 property real noise_strength
333 property real screen_curvature
334- property real brightness_flickering
335
336 property real brightness: 0.5 * 1.5 + 0.5
337
338@@ -44,7 +43,7 @@
339 to: 10000;
340 duration: 10000;
341 loops: Animation.Infinite;
342- running: noise_strength !== 0 || jitter !== 0 || brightness_flickering !== 0
343+ running: noise_strength !== 0 || jitter !== 0
344 }
345
346 blending: false
347@@ -54,39 +53,13 @@
348 return num.toFixed(8);
349 }
350
351- vertexShader: "
352- uniform highp mat4 qt_Matrix;
353- uniform highp float time;" +
354-
355- (brightness_flickering !== 0 ?
356- "uniform sampler2D randomSource;" : "") + "
357-
358- attribute highp vec4 qt_Vertex;
359- attribute highp vec2 qt_MultiTexCoord0;
360-
361- varying highp vec2 qt_TexCoord0;
362- varying lowp float brightness;" +
363-
364- (brightness_flickering !== 0.0 ?"
365- uniform lowp float brightness_flickering;" : "") +
366- "
367- void main() {
368- qt_TexCoord0 = qt_MultiTexCoord0;
369- brightness = 1.0;" +
370- (brightness_flickering !== 0.0 ? "
371- vec2 coords = vec2(fract(time/(1024.0*2.0)), fract(time/(1024.0*1024.0)));
372- brightness += (texture2D(randomSource, coords).g - 0.5) * brightness_flickering;"
373- : "") +
374-
375- "gl_Position = qt_Matrix * qt_Vertex;
376- }"
377-
378 fragmentShader: "
379+ precision mediump float;
380+
381 uniform sampler2D source;
382 uniform highp float qt_Opacity;
383 uniform highp float time;
384 varying highp vec2 qt_TexCoord0;
385- varying highp float brightness;
386
387 uniform highp vec4 screen_color;" +
388
389@@ -99,11 +72,11 @@
390 (screen_curvature !== 0 ? "
391 uniform highp float screen_curvature;" : "")+
392
393- "float rgb2grey(vec3 v){
394+ "float rgb2grey(mediump vec3 v){
395 return dot(v, vec3(0.21, 0.72, 0.04));
396 }" +
397
398- "vec3 computeColor(vec3 color){
399+ "mediump vec3 computeColor(mediump vec3 color){
400 return mix(rgb2grey(color) * screen_color.rgb, color, "+str(color_intensity)+");
401 }" +
402
403@@ -136,7 +109,7 @@
404 vec4 bloomColor = texture2D(bloomSource, coords);
405 color += computeColor(bloomColor.rgb) * bloomColor.a * " + str(bloom * 2.8) + ";" : "") +
406
407- "gl_FragColor = vec4(color * brightness *"+str(brightness)+", qt_Opacity);
408+ "gl_FragColor = vec4(color * "+str(brightness)+", qt_Opacity);
409 }"
410
411 onStatusChanged: if (log) console.log(log) //Print warning messages
412
413=== modified file 'src/app/qml/Terminal.qml'
414--- src/app/qml/Terminal.qml 2014-08-26 13:31:30 +0000
415+++ src/app/qml/Terminal.qml 2014-09-03 16:28:19 +0000
416@@ -272,7 +272,6 @@
417 item.noise_strength = jsConf.getNoiseStrenght() * 0.8;
418 item.screen_curvature = jsConf.getScreenCurvature() * 0.3;
419 item.jitter = jsConf.getJitter();
420- item.brightness_flickering = jsConf.getBrightnessFlickering() * 0.5;
421 item.color_intensity = jsConf.getColorIntensity();
422 item.screen_color = jsConf.getScreenColor();
423 }
424
425=== modified file 'src/app/qml/config/JsConfig.qml'
426--- src/app/qml/config/JsConfig.qml 2014-08-26 13:31:30 +0000
427+++ src/app/qml/config/JsConfig.qml 2014-09-03 16:28:19 +0000
428@@ -95,13 +95,4 @@
429 function setJitter(jitter){
430 setSetting("jitter", jitter.toString() )
431 }
432-
433- //Brightness flickering
434- function getBrightnessFlickering(){
435- return parseFloat(getSetting("brightness_flickering", "0.0"));
436- }
437-
438- function setBrightnessFlickering(brightness_flickering){
439- setSetting("brightness_flickering", brightness_flickering.toString() );
440- }
441 }

Subscribers

People subscribed via source and target branches