ubuntu-touch-coreapps-reviewers team mailing list archive

[Florian Boucault <florian.boucault@xxxxxxxxxxxxx>]

Florian Boucault has proposed merging lp:ubuntu-terminal-app/staging into lp:ubuntu-terminal-app.

Commit message:
Ubuntu Terminal Release:
- entire UX revamped
- snap packaging introduced

Requested reviews:
  Ubuntu Terminal Developers (ubuntu-terminal-dev)
  Jenkins Bot (ubuntu-core-apps-jenkins-bot): continuous-integration
Related bugs:
  Bug #1672398 in unity8 (Ubuntu): "Newly launched Ubuntu Terminal doesn't have keyboard focus"
  https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1672398

For more details, see:
https://code.launchpad.net/~ubuntu-terminal-dev/ubuntu-terminal-app/staging/+merge/319832

Ubuntu Terminal Release:
- entire UX revamped
- snap packaging introduced
-- 
Your team Ubuntu Terminal Developers is requested to review the proposed merge of lp:ubuntu-terminal-app/staging into lp:ubuntu-terminal-app.

=== modified file 'debian/control'
--- debian/control	2017-03-10 15:18:06 +0000
+++ debian/control	2017-03-14 15:29:02 +0000
@@ -14,7 +14,8 @@
                xvfb,
                qml-module-qtquick2,
                qml-module-qttest,
-               qml-module-ubuntu-components
+               qml-module-ubuntu-components,
+               qtdeclarative5-gsettings1.0
 Standards-Version: 3.9.8
 Section: misc
 Homepage: https://launchpad.net/ubuntu-terminal-app
@@ -32,6 +33,7 @@
          qml-module-qt-labs-settings,
          qml-module-qtsysteminfo (>= 5.0~),
          qtdeclarative5-ubuntu-ui-extras0.2,
+         qtdeclarative5-gsettings1.0,
 Description: Terminal application
  Core Terminal application
 

=== modified file 'src/app/qml/TerminalPage.qml'
--- src/app/qml/TerminalPage.qml	2017-01-09 14:56:06 +0000
+++ src/app/qml/TerminalPage.qml	2017-03-14 15:29:02 +0000
@@ -20,6 +20,7 @@
 import Ubuntu.Components.Popups 1.3
 import Ubuntu.Components.Extras 0.3
 import QMLTermWidget 1.0
+import GSettings 1.0
 
 // For FastBlur
 import QtGraphicalEffects 1.0
@@ -180,9 +181,14 @@
         visible: terminalPage.narrowLayout
     }
 
+    GSettings {
+        id: unity8Settings
+        schema.id: "com.canonical.Unity8"
+    }
+
     Loader {
         id: keyboardButton
-        active: !QuickUtils.keyboardAttached
+        active: !QuickUtils.keyboardAttached || unity8Settings.alwaysShowOsk
         anchors {right: parent.right; margins: units.gu(1)}
 
         y: parent.height - height - units.gu(1) - keyboardBarLoader.height