Merge lp:~hiroshidi/ubuntu-terminal-app/app-rev220513 into lp:ubuntu-terminal-app

[Dmitry Zagnoyko]

Version bump (0.5):
- Added landscape mode
- Fixed click effects on Circle Menu

Shader item replaced with equivalent Circular Gradient item: this fix issue with shader effects on some devices.

Added landscape mode.

[Michael Hall (mhall119)]

Looks good to me

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'Terminal.qml'
--- Terminal.qml	2013-05-20 10:09:26 +0000
+++ Terminal.qml	2013-05-24 16:32:27 +0000
@@ -9,8 +9,16 @@
     height: Qt.inputMethod.visible ? parent.height - Qt.inputMethod.keyboardRectangle.height : parent.height
     width: parent.width
 
+    function hideFocus(){
+        kterm.focus = false;
+    }
+
+    onWidthChanged: {
+        hideFocus();
+    }
+
     onHeightChanged: {
-        screenRow.vheight = height
+        screenRow.vheight = height;
     }
 
     //property int  headerHeight:  units.gu(10);
@@ -47,10 +55,15 @@
         target: pgConf
         onConfigChanged: {
             kterm.font.pointSize = jsConf.getFontSize();
-            kterm.colorScheme = jsConf.getColorSheme()
+            kterm.colorScheme = jsConf.getColorSheme();
         }
     }
 
+    Connections {
+        target: Qt.application
+        onActiveChanged: hideFocus();
+    }
+
     JsConfig{id: jsConf }
 
 
@@ -134,7 +147,7 @@
                     circleButtonLable: "CTRL +"
                     sideButtons: ["A", "C", "D", "S", "X", "Z"]
 
-                    //onOutsideClicked: visible = false;
+
                     onCircleButtonClicked: console.log("Circle button clicked")
                     onSideButtonClicked: {
                         switch (index) {

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-20 10:09:26 +0000
+++ debian/changelog	2013-05-24 16:32:27 +0000
@@ -1,3 +1,10 @@
+ubuntu-terminal-app (0.5) raring; urgency=low
+
+  * Added landscape mode
+  * Fixed click effect on Circle Menu
+
+ -- Dmitry Zagnoyko <[e-mail]>  Fri, 24 May 2013 19:07:40 +0300
+
 ubuntu-terminal-app (0.4) raring; urgency=low
 
   * Widget uses only available space

=== modified file 'extraPanel/CircleMenu.qml'
--- extraPanel/CircleMenu.qml	2013-05-20 10:09:26 +0000
+++ extraPanel/CircleMenu.qml	2013-05-24 16:32:27 +0000
@@ -1,5 +1,6 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import QtGraphicalEffects 1.0
 
 Item {
     id: mparent
@@ -21,6 +22,7 @@
           width: btnTorus.radius*2
           height: units.gu(0.25)
           color: "grey"
+          antialiasing: true
           x: 0
           y: btnTorus.radius - height/2
           rotation: (index * marea.anglePerSegment + marea.anglePerSegment/2) * 180 / Math.PI
@@ -56,66 +58,42 @@
         anchors.fill: parent
         radius: width/2
         color: "lightgrey"
+        antialiasing: true
     }
 
-    // For some reason won't works proper on device
-    // Works perfect on PC
-    ShaderEffect{
-            id: effect
-            anchors.fill: parent
-
-            property real    anglePerSegment: (2 * Math.PI) / sideButtons.length
-            property real    selSegment: -1
-            property real    segCount: sideButtons.length
-            property real    pi: Math.PI
-            property real    r: 1 //units.gu(1)
-            property color   color: "#85838388"
-
-            property variant source: ShaderEffectSource {
-                sourceItem: btnTorus;
-                hideSource: true
-            }
-
-            fragmentShader:
-               "varying highp vec2 qt_TexCoord0;
-                uniform sampler2D source;
-
-                uniform highp float anglePerSegment;
-                uniform highp float selSegment;
-                uniform highp float segCount;
-                uniform highp vec4  color;
-                uniform highp float pi;
-                uniform highp float r;
-
-                void main(void)
-                {
-                    highp float a = 0.0;
-
-                    if (qt_TexCoord0.x != 0.0 || qt_TexCoord0.y != 0.0) {
-                        a = atan((-1.0)*(qt_TexCoord0.y - r*0.5), qt_TexCoord0.x - r*0.5);
-                        if (a < 0.0) a = 2.0 * pi + a;
-                    }
-
-                    if ( selSegment >= 0.0 ) {
-                        if ( ( ( selSegment * anglePerSegment - anglePerSegment*0.5 ) < a &&
-                               ( (selSegment + 1.0) * anglePerSegment - anglePerSegment*0.5) > a ) ||
-                               ( selSegment == 0.0 && ( segCount * anglePerSegment - anglePerSegment*0.5 ) < a &&
-                               ( (segCount + 1.0) * anglePerSegment - anglePerSegment*0.5) > a ) )
-                        {
-                            gl_FragColor = color * texture2D(source, qt_TexCoord0);
-                        }
-                        else
-                            gl_FragColor = texture2D( source, qt_TexCoord0 );
-                    }
-                    else
-                        gl_FragColor = texture2D( source, qt_TexCoord0 );
-
-                }"
+    ConicalGradient {
+        id: effect
+        anchors.fill: parent
+        visible: selSegment != -1
+        source: btnTorus
+        rotation: {
+            var angel = marea.anglePerSegment * ( 180 / Math.PI);
+            return  ((sideButtons.length - selSegment) * angel  +
+                      (90 + angel/2)) - angel;
+        }
+
+        property real  posPerSegment: 1/sideButtons.length
+        property int   selSegment: -1
+        property color color: "#85838388"
+
+        gradient: Gradient {
+            GradientStop { position: 0; color: "transparent" }
+            GradientStop {
+                position: 0.001
+                color: effect.color
+            }
+            GradientStop {
+                position: effect.posPerSegment - 0.001
+                color: effect.color
+            }
+            GradientStop { position: effect.posPerSegment; color: "transparent" }
+        }
 
     }
 
     Rectangle {
         color: "grey"
+        antialiasing: true
         z: 91
         anchors{
             verticalCenter: parent.verticalCenter
@@ -130,6 +108,7 @@
     Rectangle {
         id: shdwCircle
         color: "#85838388"
+        antialiasing: true
         visible: false
         z: 93
         anchors{
@@ -145,6 +124,7 @@
     Rectangle {
         id: btnCircle
         color: "lightgrey"
+        antialiasing: true
         z: 92
         anchors{
             verticalCenter: parent.verticalCenter

=== modified file 'ubuntu-terminal-app.qml'
--- ubuntu-terminal-app.qml	2013-05-20 10:09:26 +0000
+++ ubuntu-terminal-app.qml	2013-05-24 16:32:27 +0000
@@ -8,8 +8,8 @@
     id: mview
     objectName: "terminal"
     applicationName: "ubuntu-terminal-app"
-    //automaticOrientation: true
-    
+    automaticOrientation: true
+
     width: units.gu(50)
     height: units.gu(75)
 
@@ -47,6 +47,10 @@
             title: i18n.tr("Terminal")
             page: Page {
 
+                onWidthChanged: {
+                    header.visible = width < height;
+                }
+
                 Terminal { id: pgTerm  }
 
                 tools: ToolbarActions {