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

[Filippo Scognamiglio]

Porting of some of the effects of cool-old-term into terminal-app.

Porting of some of the effects of cool-old-term into terminal-app.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Looks like you had a merge conflict that needs resolving.

[Filippo Scognamiglio (flscogna)]

> Looks like you had a merge conflict that needs resolving.

Ok I didn't see the update upstream. Is everything fine now?

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Tested this out on the desktop and device and it works great! Thanks Filippo!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:119
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~flscogna/ubuntu-terminal-app/ubuntu-terminal-app/+merge/232215/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/80/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1706
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1706/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/24

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

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:119
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/82/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1712
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1712/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/26

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

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-terminal-app-autolanding/49/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1716
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1716/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-autolanding/15

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'apparmor.json'
--- apparmor.json	2014-07-02 12:30:36 +0000
+++ apparmor.json	2014-08-26 15:24:15 +0000
@@ -2,4 +2,4 @@
     "policy_groups": [],
     "policy_version": 1.2,
     "template": "unconfined"
-}
+}
 \ No newline at end of file
 
=== modified file 'po/com.ubuntu.terminal.pot'
--- po/com.ubuntu.terminal.pot	2014-08-25 12:56:56 +0000
+++ po/com.ubuntu.terminal.pot	2014-08-26 15:24:15 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-25 13:55+0100\n"
+"POT-Creation-Date: 2014-08-26 17:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,95 +17,139 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/app/qml/Configs.qml:48
+#: ../src/app/qml/ColorDialog.qml:25
+msgid "Pick a color"
+msgstr ""
+
+#: ../src/app/qml/ColorDialog.qml:129
+msgid "OK"
+msgstr ""
+
+#: ../src/app/qml/ColorDialog.qml:149
+msgid "Cancel"
+msgstr ""
+
+#: ../src/app/qml/Configs.qml:64
 msgid "Color scheme"
 msgstr ""
 
-#: ../src/app/qml/Configs.qml:64
+#: ../src/app/qml/Configs.qml:80
 msgid "Font size"
 msgstr ""
 
-#: ../src/app/qml/Terminal.qml:344
+#: ../src/app/qml/Configs.qml:103
+msgid "Enable effects:"
+msgstr ""
+
+#: ../src/app/qml/Configs.qml:115
+msgid "Screen color"
+msgstr ""
+
+#: ../src/app/qml/Configs.qml:128
+msgid "Color intensity"
+msgstr ""
+
+#: ../src/app/qml/Configs.qml:156
+msgid "Bloom"
+msgstr ""
+
+#: ../src/app/qml/Configs.qml:184
+msgid "Curvature"
+msgstr ""
+
+#: ../src/app/qml/Configs.qml:212
+msgid "Noise"
+msgstr ""
+
+#: ../src/app/qml/Configs.qml:240
+msgid "Jitter"
+msgstr ""
+
+#: ../src/app/qml/Configs.qml:268
+msgid "Brightness flickering"
+msgstr ""
+
+#: ../src/app/qml/Terminal.qml:377
 msgid "Upload Crash Reports"
 msgstr ""
 
-#: ../src/app/qml/Terminal.qml:345
+#: ../src/app/qml/Terminal.qml:378
 msgid "Whoopsie;Apport;Debugging;Bugs"
 msgstr ""
 
-#: ../src/app/qml/Terminal.qml:349
+#: ../src/app/qml/Terminal.qml:382
 msgid "Make Image Writable"
 msgstr ""
 
-#: ../src/app/qml/Terminal.qml:350
+#: ../src/app/qml/Terminal.qml:383
 msgid "System Image;Install Deb"
 msgstr ""
 
-#: ../src/app/qml/Terminal.qml:354
+#: ../src/app/qml/Terminal.qml:387
 msgid "List Running Applications"
 msgstr ""
 
-#: ../src/app/qml/Terminal.qml:355
+#: ../src/app/qml/Terminal.qml:388
 msgid "Apps"
 msgstr ""
 
-#: ../src/app/qml/Terminal.qml:359
+#: ../src/app/qml/Terminal.qml:392
 msgid "Installed Click Packages"
 msgstr ""
 
-#: ../src/app/qml/Terminal.qml:360
+#: ../src/app/qml/Terminal.qml:393
 msgid "Packages;Applications;Utilities"
 msgstr ""
 
-#: ../src/app/qml/Terminal.qml:364
+#: ../src/app/qml/Terminal.qml:397
 msgid "System Image Information"
 msgstr ""
 
-#: ../src/app/qml/Terminal.qml:365
+#: ../src/app/qml/Terminal.qml:398
 msgid "Image;Version;Channel"
 msgstr ""
 
-#: ../src/app/qml/Terminal.qml:369
+#: ../src/app/qml/Terminal.qml:402
 msgid "System Kernel Version"
 msgstr ""
 
-#: ../src/app/qml/Terminal.qml:373
+#: ../src/app/qml/Terminal.qml:406
 msgid "Upstart Job Status"
 msgstr ""
 
-#: ../src/app/qml/Terminal.qml:374
+#: ../src/app/qml/Terminal.qml:407
 msgid "Init;Session;User Job"
 msgstr ""
 
-#: ../src/app/qml/Terminal.qml:378
+#: ../src/app/qml/Terminal.qml:411
 msgid "Hack into the NSA"
 msgstr ""
 
-#: ../src/app/qml/Terminal.qml:379
+#: ../src/app/qml/Terminal.qml:412
 msgid "Government;Secret;Cracking"
 msgstr ""
 
-#: ../src/app/qml/Terminal.qml:383
+#: ../src/app/qml/Terminal.qml:416
 msgid "Watch Running Processes"
 msgstr ""
 
-#: ../src/app/qml/Terminal.qml:384
+#: ../src/app/qml/Terminal.qml:417
 msgid "Top;Memory;Usage"
 msgstr ""
 
-#: ../src/app/qml/Terminal.qml:388
+#: ../src/app/qml/Terminal.qml:421
 msgid "Networking Status"
 msgstr ""
 
-#: ../src/app/qml/Terminal.qml:389
+#: ../src/app/qml/Terminal.qml:422
 msgid "Wireless;Ethernet;Access Points"
 msgstr ""
 
-#: ../src/app/qml/Terminal.qml:393
+#: ../src/app/qml/Terminal.qml:426
 msgid "Watch Star Wars Episode IV"
 msgstr ""
 
-#: ../src/app/qml/Terminal.qml:394
+#: ../src/app/qml/Terminal.qml:427
 msgid "Death Star;Skywalker;Leia;Darth Vader"
 msgstr ""
 
@@ -133,33 +177,30 @@
 msgid "END"
 msgstr ""
 
-#: ../src/app/qml/ubuntu-terminal-app.qml:29
 #: com.ubuntu.terminal.desktop.in.in.h:1
 msgid "Terminal"
 msgstr ""
 
-#: ../src/app/qml/ubuntu-terminal-app.qml:48
-#: ../src/app/qml/ubuntu-terminal-app.qml:85
+#: ../src/app/qml/ubuntu-terminal-app.qml:86
 msgid "Settings"
 msgstr ""
 
-#: ../src/app/qml/ubuntu-terminal-app.qml:54
+#: ../src/app/qml/ubuntu-terminal-app.qml:55
 msgid "Hide all key panels"
 msgstr ""
 
-#: ../src/app/qml/ubuntu-terminal-app.qml:61
+#: ../src/app/qml/ubuntu-terminal-app.qml:62
 msgid "Control keys"
 msgstr ""
 
-#: ../src/app/qml/ubuntu-terminal-app.qml:68
+#: ../src/app/qml/ubuntu-terminal-app.qml:69
 msgid "Function keys"
 msgstr ""
 
-#: ../src/app/qml/ubuntu-terminal-app.qml:75
+#: ../src/app/qml/ubuntu-terminal-app.qml:76
 msgid "Arrow keys"
 msgstr ""
 
-#: ../src/plugin/konsole/ColorScheme.cpp:276
 #: ../src/plugin/konsole/ColorScheme.cpp:291
 msgid "Un-named Color Scheme"
 msgstr ""
 
=== added file 'src/app/qml/ColorDialog.qml'
--- src/app/qml/ColorDialog.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/ColorDialog.qml	2014-08-26 15:24:15 +0000
@@ -0,0 +1,166 @@
+/*
+  This file is part of quick-memo
+  Copyright (C) 2014 Stefano Verzegnassi
+
+    This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 3 as published by
+  the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+  along with this program. If not, see http://www.gnu.org/licenses/.
+*/
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 1.0
+
+Dialog {
+    id: rootItem
+
+    title: i18n.tr("Pick a color")
+
+    property var colors: ["#0CCC68", "#ffffff", "#61E4FF", "#FFB361", "#FF61E3"]
+    property color selectedColor: colors[0]
+
+    property bool showTick: true
+    property bool askConfirmation: false
+
+    signal colorPicked(bool isChanged)
+
+    onSelectedColorChanged: view.setCurrentColor()
+    Component.onCompleted: internal.oldColor = rootItem.selectedColor
+
+    QtObject {
+        id: internal
+
+        property color oldColor
+    }
+
+    Grid {
+        id: grid
+        width: parent.width
+
+        columns: (width / cellWidth).toFixed(0)
+
+        property int cellHeight: units.gu(5)
+        property int cellWidth: units.gu(5)
+
+        Repeater {
+            id: view
+
+            width: parent.width
+
+            Component.onCompleted: setCurrentColor()
+
+            function setCurrentColor() {
+                if (rootItem.colors) {
+                    for (var i=0; i<rootItem.colors.length; i++) {
+                        if (rootItem.colors[i] == rootItem.selectedColor) {
+                            view.currentIndex = i
+                        }
+                    }
+                }
+            }
+
+            model: rootItem.colors
+
+            property int currentIndex: 0
+
+            delegate: AbstractButton {
+                id: delegate
+
+                height: grid.cellHeight
+                width: grid.cellWidth
+
+                onClicked: {
+                    view.currentIndex = model.index
+
+                    if (!rootItem.askConfirmation) {
+                        rootItem.selectedColor = rootItem.colors[view.currentIndex]
+
+                        if (internal.oldColor == rootItem.selectedColor) {
+                            rootItem.colorPicked(false)
+                        } else {
+                            rootItem.colorPicked(true)
+                        }
+
+                        rootItem.hide()
+                    }
+                }
+
+                UbuntuShape {
+                    anchors { fill: parent; margins: units.gu(0.5)}
+                    color: modelData
+                    clip: true
+
+                    Icon {
+                        id: tick
+                        anchors { fill: parent; margins: units.gu(0.5) }
+                        name: "tick"
+                        visible: view.currentIndex == model.index && rootItem.showTick
+                        color: getColor()
+
+                        function getColor() {
+                            return Qt.rgba(1 - parseInt(modelData.substr(1,2), 16) / 255, 1 - parseInt(modelData.substr(3,2), 16) / 255, 1 - parseInt(modelData.substr(5,2), 16) / 255)
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    Column {
+        width: parent.width
+        spacing: units.gu(2)
+
+        Loader {
+            width: parent.width
+            sourceComponent: if (askConfirmation) return confirmationButtons
+
+            Component {
+                id: confirmationButtons
+                Button {
+                    width: parent.width
+                    text: i18n.tr("OK")
+                    color: UbuntuColors.orange
+
+                    onClicked: {
+                        rootItem.selectedColor = rootItem.colors[view.currentIndex]
+
+                        if (internal.oldColor == rootItem.selectedColor) {
+                            rootItem.colorPicked(false)
+                        } else {
+                            rootItem.colorPicked(true)
+                        }
+
+                        rootItem.hide()
+                    }
+                }
+            }
+        }
+
+        Button {
+            width: parent.width
+            text: i18n.tr("Cancel")
+
+            onClicked: {
+                rootItem.hide()
+
+                for (var i=0; i<rootItem.colors.length; i++) {
+                    if (rootItem.colors[i] == internal.oldColor) {
+                        view.currentIndex = i
+                    }
+                }
+                rootItem.selectedColor = internal.oldColor
+            }
+        }
+    }
+
+
+
+}
 
=== modified file 'src/app/qml/Configs.qml'
--- src/app/qml/Configs.qml	2014-04-27 09:11:14 +0000
+++ src/app/qml/Configs.qml	2014-08-26 15:24:15 +0000
@@ -6,9 +6,18 @@
 Item {
     id: mparent
     JsConfig{id: jsConf }
+    ColorDialog{
+        id: colorDialog
+        selectedColor: jsConf.getScreenColor();
+        onSelectedColorChanged: {
+            jsConf.setScreenColor(selectedColor);
+            configChanged(true);
+        }
+    }
 
     property var  colorSchemes;
-    property bool  colorSchemeLoaded: false;
+    property bool colorSchemeLoaded: false;
+    property bool effectsEnabled: true
     //property int  headerHeight:  units.gu(10);
 
     signal configChanged (bool changed)
@@ -17,6 +26,13 @@
 
     Component.onCompleted: {
         slFont.value = jsConf.getFontSize();
+        effectsEnabled = jsConf.getEffectsEnabled();
+        slCurvature.value = jsConf.getScreenCurvature();
+        slBloom.value = jsConf.getBloom();
+        slNoise.value = jsConf.getNoiseStrenght();
+        slBrightnessFlickering.value = jsConf.getBrightnessFlickering();
+        slJitter.value = jsConf.getJitter();
+        slColorIntensity.value = jsConf.getColorIntensity();
     }
 
     onColorSchemesChanged: {
@@ -47,7 +63,7 @@
 
             text: i18n.tr("Color scheme") + ":"
             onSelectedIndexChanged: {
-                if(colorSchemeLoaded) { 
+                if(colorSchemeLoaded) {
                     var val = model[selectedIndex];
                     jsConf.setColorScheme(val);
                     configChanged(true);
@@ -83,7 +99,192 @@
 
         ListItem.ThinDivider { }
 
+        ListItem.Standard {
+            text: i18n.tr("Enable effects:")
+            control: Switch {
+                checked: effectsEnabled
+                onCheckedChanged: {
+                    effectsEnabled = checked;
+                    jsConf.setEffectsEnabled(checked);
+                    mparent.configChanged(true);
+                }
+            }
+        }
+
+        ListItem.Standard {
+            text: i18n.tr("Screen color")
+            control: Button{
+                color: colorDialog.selectedColor
+                onClicked: colorDialog.show();
+            }
+        }
+
+        Label {
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(2)
+            }
+
+            text: i18n.tr("Color intensity") + ":"
+        }
+
+        Slider{
+            id: slColorIntensity
+            objectName: "slColorIntensity"
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(2)
+                right: parent.right
+                rightMargin: units.gu(2)
+            }
+            minimumValue: 0.0;
+            maximumValue: 1.0;
+            onValueChanged: {
+                jsConf.setColorIntensity(value);
+                mparent.configChanged(true);
+            }
+            enabled: effectsEnabled
+            function formatValue(v){return v.toFixed(2);}
+        }
+
+        Label {
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(2)
+            }
+
+            text: i18n.tr("Bloom") + ":"
+        }
+
+        Slider{
+            id: slBloom
+            objectName: "slBloom"
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(2)
+                right: parent.right
+                rightMargin: units.gu(2)
+            }
+            minimumValue: 0.0;
+            maximumValue: 1.0;
+            onValueChanged: {
+                jsConf.setBloom(value);
+                mparent.configChanged(true);
+            }
+            enabled: effectsEnabled
+            function formatValue(v){return v.toFixed(2);}
+        }
+
+        Label {
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(2)
+            }
+
+            text: i18n.tr("Curvature") + ":"
+        }
+
+        Slider{
+            id: slCurvature
+            objectName: "slCurvature"
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(2)
+                right: parent.right
+                rightMargin: units.gu(2)
+            }
+            minimumValue: 0.0;
+            maximumValue: 1.0;
+            onValueChanged: {
+                jsConf.setScreenCurvature(value);
+                mparent.configChanged(true);
+            }
+            enabled: effectsEnabled
+            function formatValue(v){return v.toFixed(2);}
+        }
+
+        Label {
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(2)
+            }
+
+            text: i18n.tr("Noise") + ":"
+        }
+
+        Slider{
+            id: slNoise
+            objectName: "slNoise"
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(2)
+                right: parent.right
+                rightMargin: units.gu(2)
+            }
+            minimumValue: 0.0;
+            maximumValue: 1.0;
+            onValueChanged: {
+                jsConf.setNoiseStrength(value);
+                mparent.configChanged(true);
+            }
+            enabled: effectsEnabled
+            function formatValue(v){return v.toFixed(2);}
+        }
+
+        Label {
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(2)
+            }
+
+            text: i18n.tr("Jitter") + ":"
+        }
+
+        Slider{
+            id: slJitter
+            objectName: "slJitter"
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(2)
+                right: parent.right
+                rightMargin: units.gu(2)
+            }
+            minimumValue: 0.0;
+            maximumValue: 1.0;
+            onValueChanged: {
+                jsConf.setJitter(value);
+                mparent.configChanged(true);
+            }
+            enabled: effectsEnabled
+            function formatValue(v){return v.toFixed(2);}
+        }
+
+        Label {
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(2)
+            }
+
+            text: i18n.tr("Brightness flickering") + ":"
+        }
+
+        Slider{
+            id: slBrightnessFlickering
+            objectName: "slBrightnessFlickering"
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(2)
+                right: parent.right
+                rightMargin: units.gu(2)
+            }
+            minimumValue: 0.0;
+            maximumValue: 1.0;
+            onValueChanged: {
+                jsConf.setBrightnessFlickering(value);
+                mparent.configChanged(true);
+            }
+            enabled: effectsEnabled
+            function formatValue(v){return v.toFixed(2);}
+        }
     }
-
-
 }
 
=== added file 'src/app/qml/GraphicalTerminal.qml'
--- src/app/qml/GraphicalTerminal.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/GraphicalTerminal.qml	2014-08-26 15:24:15 +0000
@@ -0,0 +1,130 @@
+import QtQuick 2.2
+import QtGraphicalEffects 1.0
+
+Item{
+    property var mainSource
+    property alias color_intensity: shaderTerminal.color_intensity
+    property alias bloom: shaderTerminal.bloom
+    property alias noise_strength: shaderTerminal.noise_strength
+    property alias screen_curvature: shaderTerminal.screen_curvature
+    property alias jitter: shaderTerminal.jitter
+    property alias brightness_flickering: shaderTerminal.brightness_flickering
+    property alias screen_color: shaderTerminal.screen_color
+
+    anchors.fill: parent
+
+    ShaderTerminal {
+        id: shaderTerminal
+        z: 10
+        anchors.fill: parent
+        source: pgTermShaderSource
+        bloomSource: bloomSourceLoader.item
+        noiseSource: staticNoiseSourceLoader.item
+        randomSource: randTextureSourceLoader.item
+    }
+
+    ShaderEffectSource {
+        id: pgTermShaderSource
+        sourceItem: mainSource
+    }
+
+    Loader{
+        id: bloomEffectLoader
+        active: bloom != 0
+        anchors.fill: parent
+        sourceComponent: FastBlur{
+            radius: 48
+            source: mainSource
+            transparentBorder: true
+            smooth: false
+        }
+    }
+
+    Loader{
+        id: bloomSourceLoader
+        active: bloom != 0
+        sourceComponent: ShaderEffectSource{
+            sourceItem: bloomEffectLoader.item
+            hideSource: true
+            smooth: false
+        }
+    }
+
+    Loader{
+        id: staticNoiseEffectLoader
+        active: noise_strength != 0 || jitter != 0
+        anchors.fill: parent
+        sourceComponent: ShaderEffect {
+            anchors.fill: parent
+            property size virtual_resolution: Qt.size(width, height)
+
+            blending: false
+
+            fragmentShader:
+                "uniform lowp float qt_Opacity;
+             varying highp vec2 qt_TexCoord0;
+             uniform highp vec2 virtual_resolution;" +
+
+            "highp float noise(vec2 co)
+                {
+                    highp float a = 12.9898;
+                    highp float b = 78.233;
+                    highp float c = 43758.5453;
+                    highp float dt= dot(co.xy ,vec2(a,b));
+                    highp float sn= mod(dt,3.14);
+                    return fract(sin(sn) * c);
+                }
+
+                vec2 sw(vec2 p) {return vec2( floor(p.x) , floor(p.y) );}
+                vec2 se(vec2 p) {return vec2( ceil(p.x)  , floor(p.y) );}
+                vec2 nw(vec2 p) {return vec2( floor(p.x) , ceil(p.y)  );}
+                vec2 ne(vec2 p) {return vec2( ceil(p.x)  , ceil(p.y)  );}
+
+                float smoothNoise(vec2 p) {
+                    vec2 inter = smoothstep(0., 1., fract(p));
+                    float s = mix(noise(sw(p)), noise(se(p)), inter.x);
+                    float n = mix(noise(nw(p)), noise(ne(p)), inter.x);
+                    return mix(s, n, inter.y);
+                }" +
+
+            "void main() {" +
+            "   gl_FragColor.a = smoothNoise(qt_TexCoord0 * virtual_resolution);" +
+            "}"
+
+            onStatusChanged: if (log) console.log(log) //Print warning messages
+        }
+    }
+
+    Loader{
+        id: staticNoiseSourceLoader
+        active: noise_strength != 0 || jitter != 0
+        sourceComponent: ShaderEffectSource{
+            sourceItem: staticNoiseEffectLoader.item
+            wrapMode: ShaderEffectSource.Repeat
+            smooth: true
+        }
+    }
+
+    Loader{
+        id: randTextureLoader
+        active: brightness_flickering !== 0
+        width: 512
+        height: 512
+        sourceComponent: Image{
+            source: "images/randfunction.png"
+            sourceSize.width: 512
+            sourceSize.height: 256
+            fillMode: Image.TileVertically
+        }
+    }
+    Loader{
+        id: randTextureSourceLoader
+        active: brightness_flickering !== 0
+        sourceComponent: ShaderEffectSource{
+            sourceItem: randTextureLoader.item
+            live: false
+            hideSource: true
+            wrapMode: ShaderEffectSource.Repeat
+        }
+    }
+}
 
=== added file 'src/app/qml/ShaderTerminal.qml'
--- src/app/qml/ShaderTerminal.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/ShaderTerminal.qml	2014-08-26 15:24:15 +0000
@@ -0,0 +1,143 @@
+/*******************************************************************************
+* Copyright (c) 2013 "Filippo Scognamiglio"
+* https://github.com/Swordifish90/cool-old-term
+*
+* This file is part of cool-old-term.
+*
+* cool-old-term is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*******************************************************************************/
+
+import QtQuick 2.2
+import QtGraphicalEffects 1.0
+
+ShaderEffect {
+    property color screen_color
+    property real color_intensity
+
+    property variant source
+    property variant bloomSource
+    property variant noiseSource
+    property variant randomSource
+
+    property real bloom
+    property real jitter
+    property real noise_strength
+    property real screen_curvature
+    property real brightness_flickering
+
+    property real brightness: 0.5 * 1.5 + 0.5
+
+    property real time: 0
+    NumberAnimation on time {
+        from: 0;
+        to: 10000;
+        duration: 10000;
+        loops: Animation.Infinite;
+        running: noise_strength !== 0 || jitter !== 0 || brightness_flickering !== 0
+    }
+
+    blending: false
+
+    //Print the number with a reasonable precision for the shader.
+    function str(num){
+        return num.toFixed(8);
+    }
+
+    vertexShader: "
+        uniform highp mat4 qt_Matrix;
+        uniform highp float time;" +
+
+        (brightness_flickering !== 0 ?
+            "uniform sampler2D randomSource;" : "") + "
+
+        attribute highp vec4 qt_Vertex;
+        attribute highp vec2 qt_MultiTexCoord0;
+
+        varying highp vec2 qt_TexCoord0;
+        varying lowp float brightness;" +
+
+        (brightness_flickering !== 0.0 ?"
+            uniform lowp float brightness_flickering;" : "") +
+        "
+        void main() {
+            qt_TexCoord0 = qt_MultiTexCoord0;
+            brightness = 1.0;" +
+            (brightness_flickering !== 0.0 ? "
+                vec2 coords = vec2(fract(time/(1024.0*2.0)), fract(time/(1024.0*1024.0)));
+                brightness += (texture2D(randomSource, coords).g - 0.5) * brightness_flickering;"
+            :   "") +
+
+            "gl_Position = qt_Matrix * qt_Vertex;
+        }"
+
+    fragmentShader: "
+        uniform sampler2D source;
+        uniform highp float qt_Opacity;
+        uniform highp float time;
+        varying highp vec2 qt_TexCoord0;
+        varying highp float brightness;
+
+        uniform highp vec4 screen_color;" +
+
+        (bloom !== 0 ? "
+            uniform highp sampler2D bloomSource;" : "") +
+        (noise_strength !== 0 ? "
+            uniform highp float noise_strength;" : "") +
+        (noise_strength !== 0 || jitter !== 0 ? "
+            uniform lowp sampler2D noiseSource;" : "") +
+        (screen_curvature !== 0 ? "
+            uniform highp float screen_curvature;" : "")+
+
+        "float rgb2grey(vec3 v){
+            return dot(v, vec3(0.21, 0.72, 0.04));
+        }" +
+
+        "vec3 computeColor(vec3 color){
+            return mix(rgb2grey(color) * screen_color.rgb, color, "+str(color_intensity)+");
+        }" +
+
+        "void main() {" +
+            "vec2 cc = vec2(0.5) - qt_TexCoord0;" +
+            "float distance = length(cc);" +
+
+            (noise_strength ? "
+                float noise = noise_strength;" : "") +
+
+            (screen_curvature !== 0 ? "
+                float distortion = dot(cc, cc) * screen_curvature;
+                vec2 coords = (qt_TexCoord0 - cc * (1.0 + distortion) * distortion);"
+            :"
+                vec2 coords = qt_TexCoord0;") +
+
+            (jitter !== 0 ? "
+                vec2 offset = vec2(texture2D(noiseSource, coords + fract(time / 57.0)).a,
+                                   texture2D(noiseSource, coords + fract(time / 251.0)).a) - 0.5;
+                coords = coords + offset * "+str(jitter * 0.01)+";"
+            :  "") +
+
+            "vec3 color = computeColor(texture2D(source, coords).rgb);" +
+
+            (noise_strength !== 0 ? "
+                float noiseVal = texture2D(noiseSource, qt_TexCoord0 + vec2(fract(time / 51.0), fract(time / 237.0))).a;
+                color += computeColor(vec3(noiseVal * noise * (1.0 - distance * 1.3)));" : "") +
+
+            (bloom !== 0 ? "
+                vec4 bloomColor = texture2D(bloomSource, coords);
+                color += computeColor(bloomColor.rgb) * bloomColor.a * " + str(bloom * 2.8) + ";" : "") +
+
+            "gl_FragColor = vec4(color * brightness *"+str(brightness)+", qt_Opacity);
+        }"
+
+     onStatusChanged: if (log) console.log(log) //Print warning messages
+}
 
=== modified file 'src/app/qml/Terminal.qml'
--- src/app/qml/Terminal.qml	2014-08-10 12:51:08 +0000
+++ src/app/qml/Terminal.qml	2014-08-26 15:24:15 +0000
@@ -7,8 +7,7 @@
 
 Item {
     id: mparent
-    height: Qt.inputMethod.visible ? parent.height - Qt.inputMethod.keyboardRectangle.height : parent.height
-    width: parent.width
+    anchors.fill: parent
 
     function hideFocus(){
         kterm.focus = false;
@@ -188,7 +187,8 @@
                     objectName: "cmenu"
                     z: 99
                     visible: false
-                    anchors.centerIn: parent
+                    x: parent.x + (parent.width - width) / 2
+                    y: parent.y + (kterm.height - height) / 2
                     circleButtonLable: "CTRL +"
                     sideButtons: ["A", "C", "D", "S", "X", "Z"]
 
@@ -224,32 +224,65 @@
                     }
                 }
 
-                KTerminal {
-                    id: kterm
-                    objectName: "kterm"
-
-                    //////////////////////////////////////
-                    /// FONT SIZE = 24 (FINE FOR GNEXUS)
-                    /// FONT SIZE = 12 (FINE FOR DESKTOP)
-                    //////////////////////////////////////
-                    font.family: "Ubuntu Mono"
-                    font.pointSize: jsConf.getFontSize() //units.gu(1.5)
-
-                    colorScheme: jsConf.getColorScheme() //"DarkPastels"
-                    width:  parent.width
-                    height: parent.height
-
-                    session: KSession {
-                        id: ksession
-                        objectName: "ksession"
-                        kbScheme: "linux"
-
-                        onFinished: {
-                            Qt.quit()
+                Item{
+                    id: ktermContainer
+                    anchors.fill: parent
+
+                    KTerminal {
+                        id: kterm
+                        objectName: "kterm"
+
+                        //////////////////////////////////////
+                        /// FONT SIZE = 24 (FINE FOR GNEXUS)
+                        /// FONT SIZE = 12 (FINE FOR DESKTOP)
+                        //////////////////////////////////////
+                        font.family: "Ubuntu Mono"
+                        font.pointSize: jsConf.getFontSize() //units.gu(1.5)
+
+                        colorScheme: jsConf.getColorScheme() //"DarkPastels"
+                        width:  parent.width
+                        height: Qt.inputMethod.visible ? parent.height - Qt.inputMethod.keyboardRectangle.height : parent.height
+
+                        session: KSession {
+                            id: ksession
+                            objectName: "ksession"
+                            kbScheme: "linux"
+
+                            onFinished: {
+                                Qt.quit()
+                            }
                         }
                     }
                 }
 
+                Loader{
+                    id: graphicalTerminal
+                    z: 1.1
+                    active: true
+                    anchors.fill: ktermContainer
+                    source: "GraphicalTerminal.qml"
+                    onLoaded: {
+                        item.mainSource = ktermContainer;
+                        updateGraphicalParams();
+                    }
+
+                    function updateGraphicalParams(){
+                        active = jsConf.getEffectsEnabled();
+                        item.bloom = jsConf.getBloom();
+                        item.noise_strength = jsConf.getNoiseStrenght() * 0.8;
+                        item.screen_curvature = jsConf.getScreenCurvature() * 0.3;
+                        item.jitter = jsConf.getJitter();
+                        item.brightness_flickering = jsConf.getBrightnessFlickering() * 0.5;
+                        item.color_intensity = jsConf.getColorIntensity();
+                        item.screen_color = jsConf.getScreenColor();
+                    }
+
+                    Connections {
+                        target: pgConf
+                        onConfigChanged: graphicalTerminal.updateGraphicalParams();
+                    }
+                }
+
                 MouseArea {
                     anchors.fill: parent
                     enabled: true
 
=== modified file 'src/app/qml/config/JsConfig.qml'
--- src/app/qml/config/JsConfig.qml	2014-03-02 01:20:35 +0000
+++ src/app/qml/config/JsConfig.qml	2014-08-26 15:24:15 +0000
@@ -4,12 +4,19 @@
 Item{
     DbEngine{id: dbEngine}
 
+    function setSetting(name, strVal){
+        dbEngine.setConfig(name, strVal);
+    }
+
+    function getSetting(name, defaultVal){
+        dbEngine.initialize();
+        var res = dbEngine.getConfig(name);
+        return (res === "UNKNOWN" || res === "NaN" ) ? defaultVal : res;
+    }
+
     //ColorSchemes
     function getColorScheme(){
-        dbEngine.initialize()
-        var res = dbEngine.getConfig("colorScheme");
-        if( res === "UNKNOWN" ) return "DarkPastels";
-        return res;
+        return getSetting("colorScheme", "DarkPastels");
     }
 
     function setColorScheme(scheme){
@@ -19,14 +26,82 @@
 
     //FontSize
     function getFontSize(){
-        dbEngine.initialize()
-        var res =  dbEngine.getConfig("fontSize");
-        if( res === "UNKNOWN" || res === "NaN" ) return 14;
-        else return parseInt(res);
+        return parseInt(getSetting("fontSize", "14"));
     }
 
     function setFontSize(size){
-        dbEngine.setConfig("fontSize", Math.round(size).toString() );
-    }
-
+        setSetting("fontSize", Math.round(size).toString() );
+    }
+
+    //Effects global switch
+    function getEffectsEnabled(){
+        return getSetting("effectsEnabled", "true") === "true";
+    }
+
+    function setEffectsEnabled(enabled){
+        setSetting("effectsEnabled", enabled.toString() );
+    }
+
+    //Screen color
+    function getScreenColor(){
+        return getSetting("screenColor", "#FFFFFF");
+    }
+
+    function setScreenColor(color){
+        setSetting("screenColor", color.toString() );
+    }
+
+    //Color intensity
+    function getColorIntensity(){
+        return parseFloat(getSetting("colorIntensity", "0.2"));
+    }
+
+    function setColorIntensity(intensity){
+        setSetting("colorIntensity", intensity.toString() );
+    }
+
+    //Bloom effect
+    function getBloom(){
+        return parseFloat(getSetting("bloom", "0.4"));
+    }
+
+    function setBloom(bloom){
+        setSetting("bloom", bloom.toString());
+    }
+
+    //Noise strength
+    function getNoiseStrenght(){
+        return parseFloat(getSetting("noiseStrength", "0.0"));
+    }
+
+    function setNoiseStrength(noiseStrength){
+        setSetting("noiseStrength", noiseStrength.toString() );
+    }
+
+    //Screen curvature
+    function getScreenCurvature(){
+        return parseFloat(getSetting("screenCurvature", "0.2"));
+    }
+
+    function setScreenCurvature(screenCurvature){
+        setSetting("screenCurvature", screenCurvature.toString() )
+    }
+
+    //Jitter
+    function getJitter(){
+        return parseFloat(getSetting("jitter", "0.0"));
+    }
+
+    function setJitter(jitter){
+        setSetting("jitter", jitter.toString() )
+    }
+
+    //Brightness flickering
+    function getBrightnessFlickering(){
+        return parseFloat(getSetting("brightness_flickering", "0.0"));
+    }
+
+    function setBrightnessFlickering(brightness_flickering){
+        setSetting("brightness_flickering", brightness_flickering.toString() );
+    }
 }
 
=== added directory 'src/app/qml/images'
=== added file 'src/app/qml/images/randfunction.png'
 Binary files src/app/qml/images/randfunction.png	1970-01-01 00:00:00 +0000 and src/app/qml/images/randfunction.png	2014-08-26 15:24:15 +0000 differ
=== modified file 'src/app/qml/ubuntu-terminal-app.qml'
--- src/app/qml/ubuntu-terminal-app.qml	2014-08-10 12:55:23 +0000
+++ src/app/qml/ubuntu-terminal-app.qml	2014-08-26 15:24:15 +0000
@@ -1,4 +1,5 @@
-import QtQuick 2.0
+import QtQuick 2.2
+import QtGraphicalEffects 1.0
 import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 0.1
 
@@ -83,8 +84,11 @@
             id: settingsPage
             visible: false
             title: i18n.tr("Settings")
-            Configs { id: pgConf }
+            Flickable{
+                anchors.fill: parent
+                contentHeight: units.gu(110)
+                Configs { id: pgConf }
+            }
         }
     }
-
 }
 
=== modified file 'src/plugin/konsole/TerminalDisplay.cpp'
--- src/plugin/konsole/TerminalDisplay.cpp	2014-04-27 09:11:14 +0000
+++ src/plugin/konsole/TerminalDisplay.cpp	2014-08-26 15:24:15 +0000
@@ -1582,11 +1582,11 @@
     _contentHeight = height() - 2 * DEFAULT_TOP_MARGIN + /* mysterious */ 1;
 
     // ensure that display is always at least one column wide
-    _columns     = qMax(1, qRound(_contentWidth / _fontWidth));
+    _columns     = qMax(1, qFloor(_contentWidth / (double)_fontWidth));
     _usedColumns = qMin(_usedColumns,_columns);
 
     // ensure that display is always at least one line high
-    _lines     = qMax(1, qRound(_contentHeight / (double)_fontHeight));
+    _lines     = qMax(1, qFloor(_contentHeight / (double)_fontHeight));
     _usedLines = qMin(_usedLines,_lines);
 }