Ubuntu Settings Components

Merge lp:~seb128/ubuntu-settings-components/define-text-hint-property into lp:~registry/ubuntu-settings-components/trunk

  1. define-text-hint-property
  2. Merge into trunk
Proposed by Sebastien Bacher on 2014-11-05
Status: Merged
Approved by: Nick Dedekind on 2015-01-22
Approved revision: 84
Merged at revision: 84
Proposed branch: lp:~seb128/ubuntu-settings-components/define-text-hint-property
Merge into: lp:~registry/ubuntu-settings-components/trunk
Diff against target: 56 lines (+9/-4)
3 files modified
Ubuntu/Settings/Components/ActionTextField.qml (+1/-4)
Ubuntu/Settings/Menus/TextMessageMenu.qml (+2/-0)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~seb128/ubuntu-settings-components/define-text-hint-property
Reviewer Review Type Date Requested Status
Nick Dedekind (community) Approve on 2015-01-22
PS Jenkins bot (community) continuous-integration Approve on 2014-11-12
Michał Sawicz (community) 2014-11-05 Needs Fixing on 2014-11-11
Review via email: mp+240706@code.launchpad.net

Commit Message

Use a property for the text entry hint, that way the text can be defined
directly by e.g unity8. That should also let the string be properly
translated on the caller side.

Description of the Change

Use a property for the text entry hint, that way the text can be defined
directly by e.g unity8. That should also let the string be properly
translated on the caller side.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Michał Sawicz (saviq) wrote :

Please bump the upstream version in debian/changelog so we can reliably depend on this new piece of API.

review: Needs Fixing
Sebastien Bacher (seb128) wrote :

> Please bump the upstream version in debian/changelog so we can reliably depend on this new piece of API.

done

lp:~seb128/ubuntu-settings-components/define-text-hint-property updated on 2014-11-12
84. By Sebastien Bacher on 2014-11-12

Use a property for the text entry hint, that way the text can be defined
directly by e.g unity8. That should also let the string be properly
translated on the caller side.

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Nick Dedekind (nick-dedekind) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Ubuntu/Settings/Components/ActionTextField.qml'
2--- Ubuntu/Settings/Components/ActionTextField.qml 2014-11-05 08:45:26 +0000
3+++ Ubuntu/Settings/Components/ActionTextField.qml 2014-11-12 10:50:20 +0000
4@@ -27,6 +27,7 @@
5 property alias text: replyField.text
6 property alias buttonText: sendButton.text
7 property bool activateEnabled: false
8+ property alias textHint: replyField.placeholderText
9
10 signal activated(var value)
11
12@@ -44,10 +45,6 @@
13 id: replyField
14 objectName: "replyText"
15
16- /* Get the string translation from telephony-service, that's a
17- workaround but ubuntu-settings-components is not currently
18- setup for translations, see bug #1389234 */
19- placeholderText: i18n.dtr("telephony-service", "Reply")
20 hasClearButton: false
21
22 Layout.fillWidth: true
23
24=== modified file 'Ubuntu/Settings/Menus/TextMessageMenu.qml'
25--- Ubuntu/Settings/Menus/TextMessageMenu.qml 2014-08-14 11:51:14 +0000
26+++ Ubuntu/Settings/Menus/TextMessageMenu.qml 2014-11-12 10:50:20 +0000
27@@ -27,6 +27,7 @@
28
29 property bool replyEnabled: true
30 property string replyButtonText: i18n.tr("Send")
31+ property string replyHintText
32
33 signal replied(string value)
34
35@@ -34,6 +35,7 @@
36
37 activateEnabled: menu.replyEnabled
38 buttonText: menu.replyButtonText
39+ textHint: menu.replyHintText
40
41 onActivated: {
42 menu.replied(value);
43
44=== modified file 'debian/changelog'
45--- debian/changelog 2014-11-05 08:45:40 +0000
46+++ debian/changelog 2014-11-12 10:50:20 +0000
47@@ -1,3 +1,9 @@
48+ubuntu-settings-components (0.5-0ubuntu1) UNRELEASED; urgency=medium
49+
50+ * Updated version, so the users of the new property can update their depends
51+
52+ -- Sebastien Bacher <seb128@ubuntu.com> Wed, 12 Nov 2014 11:43:04 +0100
53+
54 ubuntu-settings-components (0.4+15.04.20141105-0ubuntu1) vivid; urgency=low
55
56 [ Sebastien Bacher ]

Subscribers

People subscribed via source and target branches

to all changes: