Merge lp:~verzegnassi-stefano/ubuntu-terminal-app/device-detection into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

[Stefano Verzegnassi]

Added a context property which allows terminal-app to know whether a keyboard or a mouse is attached to the device.

This is required to workaround a gap in the Ubuntu UI Toolkit, which makes impossible to use some of the new convergence features (e.g. bottom edge) in desktop mode.
This also allows us to automatically hide some components which are only useful in a context where only a touchscreen is available as input device.

Hopefully, this patch shouldn't be required anymore with OTA-11, when the support for devices detection will be available through UITK.

*** REQUIRES OTA-10 ***

Added a context property which allows terminal-app to know whether a keyboard or a mouse is attached to the device.

This is required to workaround a gap in the Ubuntu UI Toolkit, which makes impossible to use some of the new convergence features (e.g. bottom edge) in desktop mode.
This also allows us to automatically hide some components which are only useful in a context where only a touchscreen is available as input device.

Hopefully, this patch shouldn't be required anymore with OTA-11, when the support for devices detection will be available through UITK.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:191
https://core-apps-jenkins.ubuntu.com/job/terminal-app-ci/52/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/800/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/terminal-app-ci/52/rebuild

review: Approve (continuous-integration)

[Evan McIntire (mcintire-evan)]

Code all looks reasonable to me, unfortunately, I can't test this as my Ubuntu is a tad messed up, and I don't have time to fix it before I leave for a trip.

[lp:~verzegnassi-stefano/ubuntu-terminal-app/device-detection]

192. By Stefano Verzegnassi on 2016-04-05

Removed keyboard bar setting. Automatically hide the bar by binding to QuickUtils.keyboardAttached instead.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:192
https://core-apps-jenkins.ubuntu.com/job/terminal-app-ci/56/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/846/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/terminal-app-ci/56/rebuild

review: Approve (continuous-integration)

[Stefano Verzegnassi (verzegnassi-stefano)]

I hope managers will decide to fix these problems with unmaintained projects. For now, let's suppose there has been a tacit approval.

=== modified file 'debian/control'
--- debian/control	2015-07-04 08:43:12 +0000
+++ debian/control	2016-04-05 13:26:21 +0000
@@ -24,6 +24,7 @@
          qtdeclarative5-pamauthentication0.1,
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
+         qml-module-qtsysteminfo (>= 5.0~),
 Description: Terminal application
  Core Terminal application
 

=== modified file 'src/app/qml/SettingsPage.qml'
--- src/app/qml/SettingsPage.qml	2016-02-07 18:30:11 +0000
+++ src/app/qml/SettingsPage.qml	2016-04-05 13:26:21 +0000
@@ -52,38 +52,6 @@
             }
 
             ListItem {
-                ListItemLayout {
-                    anchors.fill: parent
-                    title.text: i18n.tr("Show Keyboard Bar")
-
-                    Switch {
-                        id: keybBarSwitch
-                        SlotsLayout.position: SlotsLayout.Trailing
-                        onCheckedChanged: settings.showKeyboardBar = checked;
-                        Component.onCompleted: checked = settings.showKeyboardBar;
-                    }
-                }
-
-                onClicked: keybBarSwitch.trigger()
-            }
-
-            ListItem {
-                ListItemLayout {
-                    anchors.fill: parent
-                    title.text: i18n.tr("Show Keyboard Button")
-
-                    Switch {
-                        id: keybButtonSwitch
-                        SlotsLayout.position: SlotsLayout.Trailing
-                        onCheckedChanged: settings.showKeyboardButton = checked;
-                        Component.onCompleted: checked = settings.showKeyboardButton;
-                    }
-                }
-
-                onClicked: keybButtonSwitch.trigger()
-            }
-
-            ListItem {
                 height: units.gu(13)
 
                 Label {

=== modified file 'src/app/qml/TerminalPage.qml'
--- src/app/qml/TerminalPage.qml	2016-03-03 23:14:40 +0000
+++ src/app/qml/TerminalPage.qml	2016-04-05 13:26:21 +0000
@@ -146,7 +146,7 @@
         id: keyboardBarLoader
         height: active ? units.gu(5) : 0
         anchors {left: parent.left; right: parent.right}
-        active: settings.showKeyboardBar
+        active: !QuickUtils.keyboardAttached
 
         y: parent.height - height - Qt.inputMethod.keyboardRectangle.height
         z: parent.z + 0.1
@@ -227,7 +227,7 @@
 
     Loader {
         id: keyboardButton
-        active: settings.showKeyboardButton
+        active: !QuickUtils.keyboardAttached
         anchors {right: parent.right; margins: units.gu(1)}
 
         y: parent.height - height - units.gu(1) - keyboardBarLoader.height

=== modified file 'src/app/qml/TerminalSettings.qml'
--- src/app/qml/TerminalSettings.qml	2016-02-06 18:09:05 +0000
+++ src/app/qml/TerminalSettings.qml	2016-04-05 13:26:21 +0000
@@ -8,8 +8,6 @@
     property alias fontSize: innerSettings.fontSize
     property alias fontStyle: innerSettings.fontStyle
     property alias colorScheme: innerSettings.colorScheme
-    property alias showKeyboardBar: innerSettings.showKeyboardBar
-    property alias showKeyboardButton: innerSettings.showKeyboardButton
 
     readonly property int defaultFontSize: 10
     readonly property int minFontSize: 4
@@ -39,8 +37,6 @@
         property int fontSize: defaultFontSize
         property string fontStyle: "Ubuntu Mono"
         property string colorScheme: "Ubuntu"
-        property bool showKeyboardBar: true
-        property bool showKeyboardButton: true
         property string jsonVisibleProfiles: "[]"
     }
 

=== modified file 'src/app/qml/ubuntu-terminal-app.qml'
--- src/app/qml/ubuntu-terminal-app.qml	2016-03-06 00:27:33 +0000
+++ src/app/qml/ubuntu-terminal-app.qml	2016-04-05 13:26:21 +0000
@@ -5,6 +5,9 @@
 
 import QMLTermWidget 1.0
 
+// Mouse/Touchpad and keyboard support
+import QtSystemInfo 5.5
+
 MainView {
     // objectName for functional testing purposes (autopilot-qt5)
     id: mview
@@ -135,4 +138,33 @@
         width = 80 * terminalPage.terminal.fontMetrics.width + 2
         height = 24 * terminalPage.terminal.fontMetrics.height + 2
     }
+
+    InputDeviceManager {
+        id: keyboardsModel
+        filter: InputInfo.Keyboard
+    }
+
+    InputDeviceManager {
+        id: miceModel
+        filter: InputInfo.Mouse
+    }
+
+    InputDeviceManager {
+        id: touchpadsModel
+        filter: InputInfo.TouchPad
+    }
+
+    // WORKAROUND: Not yet implemented in the SDK
+    Binding {
+        target: QuickUtils
+        property: "mouseAttached"
+        value: miceModel.count > 0 || touchpadsModel.count > 0
+    }
+
+    // WORKAROUND: Not yet implemented in the SDK
+    Binding {
+        target: QuickUtils
+        property: "keyboardAttached"
+        value: keyboardsModel.count > 0
+    }
 }