Merge lp:~seb128/ubuntu-system-settings/give-focus-to-entry into lp:ubuntu-system-settings

Proposed by Sebastien Bacher on 2015-03-11
Status: Merged
Approved by: Jonas G. Drange on 2015-03-25
Approved revision: 1350
Merged at revision: 1381
Proposed branch: lp:~seb128/ubuntu-system-settings/give-focus-to-entry
Merge into: lp:ubuntu-system-settings
Diff against target: 37 lines (+4/-2)
3 files modified
plugins/bluetooth/ProvidePasskeyDialog.qml (+1/-1)
plugins/bluetooth/ProvidePinCodeDialog.qml (+1/-1)
plugins/phone/CallForwarding.qml (+2/-0)
To merge this branch: bzr merge lp:~seb128/ubuntu-system-settings/give-focus-to-entry
Reviewer Review Type Date Requested Status
Jonas G. Drange (community) 2015-03-11 Approve on 2015-03-11
PS Jenkins bot continuous-integration Approve on 2015-03-11
Review via email: mp+252594@code.launchpad.net

Commit Message

[bluetooth, sim] Get some dialogs to focus their text entry by default

Description of the Change

[bluetooth, sim] Get some dialogs to focus their text entry by default

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/bluetooth/ProvidePasskeyDialog.qml'
2--- plugins/bluetooth/ProvidePasskeyDialog.qml 2014-01-27 17:09:51 +0000
3+++ plugins/bluetooth/ProvidePasskeyDialog.qml 2015-03-11 14:58:56 +0000
4@@ -44,7 +44,7 @@
5 }
6 text: "000000"
7 focus: true
8- Component.onCompleted: selectAll()
9+ Component.onCompleted: { selectAll(); forceActiveFocus() }
10 inputMethodHints: Qt.ImhDigitsOnly | Qt.ImhNoPredictiveText
11 }
12
13
14=== modified file 'plugins/bluetooth/ProvidePinCodeDialog.qml'
15--- plugins/bluetooth/ProvidePinCodeDialog.qml 2014-01-27 17:09:51 +0000
16+++ plugins/bluetooth/ProvidePinCodeDialog.qml 2015-03-11 14:58:56 +0000
17@@ -44,7 +44,7 @@
18 }
19 text: "0000"
20 focus: true
21- Component.onCompleted: selectAll()
22+ Component.onCompleted: { selectAll(); forceActiveFocus() }
23 maximumLength: 16
24 inputMethodHints: Qt.ImhNoPredictiveText
25 }
26
27=== modified file 'plugins/phone/CallForwarding.qml'
28--- plugins/phone/CallForwarding.qml 2014-08-08 08:37:12 +0000
29+++ plugins/phone/CallForwarding.qml 2015-03-11 14:58:56 +0000
30@@ -125,6 +125,8 @@
31 color: "#DD4814"
32 visible: destNumberField.cursorVisible
33 }
34+ onVisibleChanged:
35+ if (visible === true) forceActiveFocus()
36 }
37 }
38

Subscribers

People subscribed via source and target branches