git.iko.soy/unity8
on xenial help sign in
merge lp:~lukas-kde/unity8/osk-indicator-switch
bdcd7ebLukáš Tinkl
data/com.canonical.Unity8.gschema.xml+10
compare with xenial
unifiedsplit
@@ -58,6 +58,16 @@
58 <summary>The uri to the app store</summary>
58 <summary>The uri to the app store</summary>
59 <description>This will be used whenever the user triggers an action to open the app store.</description>
59 <description>This will be used whenever the user triggers an action to open the app store.</description>
60 </key>
60 </key>
61+ <key type="b" name="always-show-osk">
62+ <default>false</default>
63+ <summary>Force showing/hiding the OSK</summary>
64+ <description>Toggle the visibility of the On Screen Keyboard unconditionally</description>
65+ </key>
66+ <key type="b" name="osk-switch-visible">
67+ <default>false</default>
68+ <summary>Whether the OSK switch should be visible</summary>
69+ <description>Toggle the visibility of the OSK switch</description>
70+ </key>
61 </schema>
71 </schema>
62
72
63 <schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8">
73 <schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8">
qml/Greeter/GreeterPrompt.qml+29−10
@@ -16,6 +16,7 @@
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18import Ubuntu.Components 1.3
18import Ubuntu.Components 1.3
19+import GSettings 1.0
19import "../Components"
20import "../Components"
20
21
21FocusScope {
22FocusScope {
@@ -43,6 +44,11 @@ FocusScope {
43 }
44 }
44 }
45 }
45
46
47+ GSettings {
48+ id: unity8Settings
49+ schema.id: "com.canonical.Unity8"
50+ }
51+
46 StyledItem {
52 StyledItem {
47 id: d
53 id: d
48
54
@@ -154,14 +160,27 @@ FocusScope {
154 }
160 }
155
161
156 secondaryItem: [
162 secondaryItem: [
157− Icon {
163+ Row {
158− id: capsIcon
164+ id: extraIcons
165+ spacing: passwordInput.frameSpacing
166+ Icon {
159− name: "keyboard-caps-enabled"
167+ name: "keyboard-caps-enabled"
160− height: units.gu(3)
168+ height: units.gu(3)
161− width: units.gu(3)
169+ width: units.gu(3)
162− color: d.textColor
170+ color: d.textColor
163− visible: root.isSecret && false // TODO: detect when caps lock is on
171+ visible: root.isSecret && false // TODO: detect when caps lock is on
164− readonly property real visibleWidth: visible ? width + passwordInput.frameSpacing : 0
172+ }
173+ Icon {
174+ name: "input-keyboard-symbolic"
175+ height: units.gu(3)
176+ width: units.gu(3)
177+ color: d.textColor
178+ visible: !unity8Settings.alwaysShowOsk
179+ MouseArea {
180+ anchors.fill: parent
181+ onClicked: unity8Settings.alwaysShowOsk = true
182+ }
183+ }
165 }
184 }
166 ]
185 ]
167
186
@@ -199,7 +218,7 @@ FocusScope {
199 right: parent.right
218 right: parent.right
200 verticalCenter: parent.verticalCenter
219 verticalCenter: parent.verticalCenter
201 leftMargin: units.gu(1.5)
220 leftMargin: units.gu(1.5)
202− rightMargin: anchors.leftMargin + capsIcon.visibleWidth
221+ rightMargin: anchors.leftMargin + extraIcons.width
203 }
222 }
204 text: root.text
223 text: root.text
205 visible: passwordInput.text == "" && !passwordInput.inputMethodComposing
224 visible: passwordInput.text == "" && !passwordInput.inputMethodComposing
@@ -221,7 +240,7 @@ FocusScope {
221 anchors.left: parent.left
240 anchors.left: parent.left
222 anchors.right: parent.right
241 anchors.right: parent.right
223 anchors.leftMargin: passwordInput.frameSpacing * 2
242 anchors.leftMargin: passwordInput.frameSpacing * 2
224− anchors.rightMargin: passwordInput.frameSpacing * 2 + capsIcon.visibleWidth
243+ anchors.rightMargin: passwordInput.frameSpacing * 2 + extraIcons.width
225 color: d.drawColor
244 color: d.drawColor
226 text: passwordInput.displayText
245 text: passwordInput.displayText
227 visible: root.isPrompt && !root.interactive
246 visible: root.isPrompt && !root.interactive
qml/OrientedShell.qml+8−6
@@ -197,6 +197,12 @@ Item {
197 value: !shell.oskEnabled || shell.usageScenario == "desktop"
197 value: !shell.oskEnabled || shell.usageScenario == "desktop"
198 }
198 }
199
199
200+ Binding {
201+ target: unity8Settings
202+ property: "oskSwitchVisible"
203+ value: shell.hasKeyboard
204+ }
205+
200 readonly property int supportedOrientations: shell.supportedOrientations
206 readonly property int supportedOrientations: shell.supportedOrientations
201 & (deviceConfiguration.supportedOrientations == deviceConfiguration.useNativeOrientation
207 & (deviceConfiguration.supportedOrientations == deviceConfiguration.useNativeOrientation
202 ? orientations.native_
208 ? orientations.native_
@@ -268,12 +274,8 @@ Item {
268 mode: applicationArguments.mode
274 mode: applicationArguments.mode
269 hasMouse: pointerInputDevices > 0
275 hasMouse: pointerInputDevices > 0
270 hasKeyboard: keyboardsModel.count > 0
276 hasKeyboard: keyboardsModel.count > 0
271− // TODO: Factor in if the current screen is a touch screen and if the user wants to
277+
272− // have multiple keyboards around. For now we only enable one keyboard at a time
278+ oskEnabled: unity8Settings.alwaysShowOsk || !hasKeyboard || forceOSKEnabled
273− // thus hiding it here if there is a physical one around or if we have a second
274− // screen (the virtual touchpad & osk on the phone) attached.
275− oskEnabled: (keyboardsModel.count === 0 && screens.count === 1) ||
276− forceOSKEnabled
277
279
278 usageScenario: {
280 usageScenario: {
279 if (unity8Settings.usageMode === "Windowed") {
281 if (unity8Settings.usageMode === "Windowed") {
qml/Panel/Panel.qml+4−11
@@ -23,9 +23,6 @@ import Utils 0.1
23import Unity.ApplicationMenu 0.1
23import Unity.ApplicationMenu 0.1
24
24
25import QtQuick.Window 2.2
25import QtQuick.Window 2.2
26−// for indicator-keyboard
27−import AccountsService 0.1
28−import Unity.InputInfo 0.1
29
26
30import "../ApplicationMenus"
27import "../ApplicationMenus"
31import "../Components"
28import "../Components"
@@ -47,6 +44,7 @@ Item {
47 property bool fullscreenMode: false
44 property bool fullscreenMode: false
48 property real panelAreaShowProgress: 1.0
45 property real panelAreaShowProgress: 1.0
49 property bool greeterShown: false
46 property bool greeterShown: false
47+ property bool hasKeyboard: false
50
48
51 property string mode: "staged"
49 property string mode: "staged"
52
50
@@ -337,12 +335,12 @@ Item {
337 objectName: identifier+"-panelItem"
335 objectName: identifier+"-panelItem"
338
336
339 property int ownIndex: index
337 property int ownIndex: index
340− property bool overflow: parent.width - x > __indicators.overFlowWidth
338+ readonly property bool overflow: parent.width - x > __indicators.overFlowWidth
341− property bool hidden: !expanded && (overflow || !indicatorVisible || hideSessionIndicator || hideKeyboardIndicator)
339+ readonly property bool hidden: !expanded && (overflow || !indicatorVisible || hideSessionIndicator || hideKeyboardIndicator)
342 // HACK for indicator-session
340 // HACK for indicator-session
343 readonly property bool hideSessionIndicator: identifier == "indicator-session" && Math.min(Screen.width, Screen.height) <= units.gu(60)
341 readonly property bool hideSessionIndicator: identifier == "indicator-session" && Math.min(Screen.width, Screen.height) <= units.gu(60)
344 // HACK for indicator-keyboard
342 // HACK for indicator-keyboard
345− readonly property bool hideKeyboardIndicator: identifier == "indicator-keyboard" && (AccountsService.keymaps.length < 2 || keyboardsModel.count == 0)
343+ readonly property bool hideKeyboardIndicator: identifier == "indicator-keyboard" && !hasKeyboard
346
344
347 height: parent.height
345 height: parent.height
348 expanded: indicators.expanded
346 expanded: indicators.expanded
@@ -396,11 +394,6 @@ Item {
396 }
394 }
397 }
395 }
398
396
399− InputDeviceModel {
400− id: keyboardsModel
401− deviceFilter: InputInfo.Keyboard
402− }
403−
404 IndicatorsLight {
397 IndicatorsLight {
405 id: indicatorLights
398 id: indicatorLights
406 }
399 }
qml/Shell.qml+1
@@ -533,6 +533,7 @@ StyledItem {
533 fullscreenMode: (focusedSurfaceIsFullscreen && !LightDMService.greeter.active && launcher.progress == 0 && !stage.spreadShown)
533 fullscreenMode: (focusedSurfaceIsFullscreen && !LightDMService.greeter.active && launcher.progress == 0 && !stage.spreadShown)
534 || greeter.hasLockedApp
534 || greeter.hasLockedApp
535 greeterShown: greeter && greeter.shown
535 greeterShown: greeter && greeter.shown
536+ hasKeyboard: shell.hasKeyboard
536 }
537 }
537
538
538 Launcher {
539 Launcher {
tests/qmltests/Panel/tst_Panel.qml+6−3
@@ -272,6 +272,7 @@ PanelTest {
272 }
272 }
273
273
274 function cleanup() {
274 function cleanup() {
275+ panel.hasKeyboard = false;
275 panel.indicators.hide();
276 panel.indicators.hide();
276 panel.applicationMenus.hide();
277 panel.applicationMenus.hide();
277 waitForAllAnimationToComplete("initial");
278 waitForAllAnimationToComplete("initial");
@@ -713,8 +714,8 @@ PanelTest {
713 { tag: "No keyboard, no keymap", keyboard: false, keymaps: [], hidden: true },
714 { tag: "No keyboard, no keymap", keyboard: false, keymaps: [], hidden: true },
714 { tag: "No keyboard, one keymap", keyboard: false, keymaps: ["us"], hidden: true },
715 { tag: "No keyboard, one keymap", keyboard: false, keymaps: ["us"], hidden: true },
715 { tag: "No keyboard, 2 keymaps", keyboard: false, keymaps: ["us", "cs"], hidden: true },
716 { tag: "No keyboard, 2 keymaps", keyboard: false, keymaps: ["us", "cs"], hidden: true },
716− { tag: "Keyboard, no keymap", keyboard: true, keymaps: [], hidden: true },
717+ { tag: "Keyboard, no keymap", keyboard: true, keymaps: [], hidden: false },
717− { tag: "Keyboard, one keymap", keyboard: true, keymaps: ["us"], hidden: true },
718+ { tag: "Keyboard, one keymap", keyboard: true, keymaps: ["us"], hidden: false },
718 { tag: "Keyboard, 2 keymaps", keyboard: true, keymaps: ["us", "cs"], hidden: false }
719 { tag: "Keyboard, 2 keymaps", keyboard: true, keymaps: ["us", "cs"], hidden: false }
719 ];
720 ];
720 }
721 }
@@ -722,6 +723,7 @@ PanelTest {
722 function test_hidingKeyboardIndicator(data) {
723 function test_hidingKeyboardIndicator(data) {
723 var item = findChild(panel, "indicator-keyboard-panelItem");
724 var item = findChild(panel, "indicator-keyboard-panelItem");
724 AccountsService.keymaps = data.keymaps;
725 AccountsService.keymaps = data.keymaps;
726+ panel.hasKeyboard = data.keyboard;
725 if (data.keyboard) {
727 if (data.keyboard) {
726 MockInputDeviceBackend.addMockDevice("/indicator_kbd0", InputInfo.Keyboard);
728 MockInputDeviceBackend.addMockDevice("/indicator_kbd0", InputInfo.Keyboard);
727 } else {
729 } else {
@@ -734,11 +736,12 @@ PanelTest {
734 function test_visibleIndicators_data() {
736 function test_visibleIndicators_data() {
735 return [
737 return [
736 { visible: [true, false, true, false, true, true, false, true] },
738 { visible: [true, false, true, false, true, true, false, true] },
737− { visible: [false, false, false, false, false, false, true, false] }
739+ { visible: [true, false, false, false, false, false, true, false] }
738 ];
740 ];
739 }
741 }
740
742
741 function test_visibleIndicators(data) {
743 function test_visibleIndicators(data) {
744+ panel.hasKeyboard = true;
742 for (var i = 0; i < data.visible.length; i++) {
745 for (var i = 0; i < data.visible.length; i++) {
743 var visible = data.visible[i];
746 var visible = data.visible[i];
744 root.setIndicatorVisible(i, visible);
747 root.setIndicatorVisible(i, visible);