Unity 8

Merge lp:~macslow/unity8/extended-snap-decision-pw-checkmark into lp:unity8

  1. extended-snap-decision-pw-checkmark
  2. Merge into trunk
Proposed by Mirco Müller
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 483
Merged at revision: 504
Proposed branch: lp:~macslow/unity8/extended-snap-decision-pw-checkmark
Merge into: lp:unity8
Diff against target: 72 lines (+26/-3)
2 files modified
Notifications/NotificationMenuItemFactory.qml (+20/-1)
po/unity8.pot (+6/-2)
To merge this branch: bzr merge lp:~macslow/unity8/extended-snap-decision-pw-checkmark
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Albert Astals Cid (community) Approve
Review via email: mp+193439@code.launchpad.net

Commit message

Added checkbox for toggling between echo-modes of password-entryfields in ext. snap-decisions.

Description of the change

Added checkbox for toggling between echo-modes of password-entryfields in ext. snap-decisions.

To post a comment you must log in.
Revision history for this message
Mirco Müller (macslow) wrote :

I'm still waiting on Design-feedback, as I've not seen any mockups for this interface-change yet.

Revision history for this message
Mirco Müller (macslow) wrote :

Here's a screencast for your convenience http://www.youtube.com/watch?v=cTwHcesdIaM to see what's it about and what the layout currently looks like.

Revision history for this message
Mirco Müller (macslow) wrote :

Design (mpt) is ok with the current state of this, so I'll flip the switch to needs-review.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:482
http://jenkins.qa.ubuntu.com/job/unity8-ci/1555/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/371
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/359
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/79
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/79
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/79/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/79
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/347
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/371
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/371/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/359
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/359/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2941
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3025
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/964
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/961

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1555/rebuild

review: Approve (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

the text needs i18n and you need to also update the pot file (make pot_file)

review: Needs Fixing
Revision history for this message
Mirco Müller (macslow) wrote :

Will add that right away.

lp:~macslow/unity8/extended-snap-decision-pw-checkmark updated
483. By Mirco Müller

Made "Show password"-message translatable and updated .pot file.

Revision history for this message
Mirco Müller (macslow) wrote :

BTW, I used the script unity8/po/update-unity-pot as there's no "pot_file" make-target.

Revision history for this message
Albert Astals Cid (aacid) wrote :

Looks good :-)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:483
http://jenkins.qa.ubuntu.com/job/unity8-ci/1582/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/460
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/448
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/106
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/106/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/423
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/460
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/460/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/448
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/448/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3103
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1073

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1582/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Notifications/NotificationMenuItemFactory.qml'
--- Notifications/NotificationMenuItemFactory.qml 2013-10-09 18:24:16 +0000
+++ Notifications/NotificationMenuItemFactory.qml 2013-11-05 16:55:28 +0000
@@ -54,7 +54,8 @@
5454
55 Component.onCompleted: {55 Component.onCompleted: {
56 menuModel.loadExtendedAttributes(menuIndex, {"x-echo-mode-password": "bool"});56 menuModel.loadExtendedAttributes(menuIndex, {"x-echo-mode-password": "bool"});
57 textfield.echoMode = menuData.ext.xEchoModePassword ? TextInput.Password : TextInput.Normal57 checkBox.checked = menuData.ext.xEchoModePassword ? false : true
58 checkBoxRow.visible = menuData.ext.xEchoModePassword
58 }59 }
5960
60 Label {61 Label {
@@ -65,11 +66,29 @@
65 id: textfield66 id: textfield
6667
67 anchors.left: parent.left; anchors.right: parent.right68 anchors.left: parent.left; anchors.right: parent.right
69 echoMode: checkBox.checked ? TextInput.Normal : TextInput.Password
68 height: units.gu(5)70 height: units.gu(5)
69 onTextChanged: {71 onTextChanged: {
70 menuModel.changeState(menuIndex, text);72 menuModel.changeState(menuIndex, text);
71 }73 }
72 }74 }
75
76 Row {
77 id: checkBoxRow
78
79 spacing: units.gu(.5)
80
81 CheckBox {
82 id: checkBox
83
84 checked: false
85 }
86
87 Label {
88 anchors.verticalCenter: checkBox.verticalCenter
89 text: i18n.tr("Show password")
90 }
91 }
73 }92 }
74 }93 }
7594
7695
=== modified file 'po/unity8.pot'
--- po/unity8.pot 2013-10-11 10:12:35 +0000
+++ po/unity8.pot 2013-11-05 16:55:28 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: unity8\n"9"Project-Id-Version: unity8\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2013-10-11 12:12+0200\n"11"POT-Creation-Date: 2013-11-05 17:53+0100\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -205,11 +205,15 @@
205msgid "Speaking..."205msgid "Speaking..."
206msgstr ""206msgstr ""
207207
208#: Notifications/NotificationMenuItemFactory.qml:89
209msgid "Show password"
210msgstr ""
211
208#: Panel/SearchIndicator.qml:27212#: Panel/SearchIndicator.qml:27
209msgid "Search"213msgid "Search"
210msgstr ""214msgstr ""
211215
212#: plugins/Unity/scope.cpp:398216#: plugins/Unity/scope.cpp:408
213msgid "Sorry, there is nothing that matches your search."217msgid "Sorry, there is nothing that matches your search."
214msgstr ""218msgstr ""
215219

Subscribers

People subscribed via source and target branches