unity-notifications

Merge lp:~macslow/unity-notifications/minor-ui-tweaks into lp:unity-notifications

  1. minor-ui-tweaks
  2. Merge into trunk
Proposed by Mirco Müller
Status: Merged
Approved by: Michał Sawicz
Approved revision: 179
Merged at revision: 178
Proposed branch: lp:~macslow/unity-notifications/minor-ui-tweaks
Merge into: lp:unity-notifications
Diff against target: 85 lines (+11/-11)
2 files modified
examples/sd-example-password-entry.py (+5/-5)
examples/sd-example-user-auth.py (+6/-6)
To merge this branch: bzr merge lp:~macslow/unity-notifications/minor-ui-tweaks
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+189806@code.launchpad.net

Commit message

Made password-entry- and user-authentication-examples look more like the mockups in the Design-specs.

Description of the change

Made password-entry- and user-authentication-examples look more like the mockups in the Design-specs. This should go into trunk alongside lp:~macslow/unity8/minor-ui-tweaks, otherwise the changes don't look as nice/expected. It doesn't break anything, thus this is not a hard dependency... still it would be nice to have these two branches land close to each other.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:179
http://jenkins.qa.ubuntu.com/job/unity-notifications-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-saucy-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-saucy-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/unity-notifications-saucy-armhf-ci/17/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-saucy-i386-ci/15

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-notifications-ci/17/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'examples/sd-example-password-entry.py'
--- examples/sd-example-password-entry.py 2013-10-01 07:39:15 +0000
+++ examples/sd-example-password-entry.py 2013-10-08 10:15:22 +0000
@@ -55,12 +55,12 @@
55 else:55 else:
56 print "That should not have happened (cancel)!"56 print "That should not have happened (cancel)!"
5757
58def accept (notification, action, data):58def connect (notification, action, data):
59 if action == "accept":59 if action == "connect":
60 global password60 global password
61 print "password entered: " + password61 print "password entered: " + password
62 else:62 else:
63 print "That should not have happened (accept)!"63 print "That should not have happened (connect)!"
6464
65def password_changed (action, variant):65def password_changed (action, variant):
66 global password66 global password
@@ -95,7 +95,7 @@
9595
96 # NOTE: the order in which actions are added is important... positive96 # NOTE: the order in which actions are added is important... positive
97 # always comes first!97 # always comes first!
98 n.add_action ("accept", "Accept", accept, None, None);98 n.add_action ("connect", "Connect", connect, None, None);
99 n.add_action ("cancel", "Cancel", cancel, None, None);99 n.add_action ("cancel", "Cancel", cancel, None, None);
100100
101 # create the menu-model101 # create the menu-model
@@ -135,7 +135,7 @@
135 password = ""135 password = ""
136136
137 loop = GLib.MainLoop()137 loop = GLib.MainLoop()
138 n = pushNotification ("Enter password", "", "")138 n = pushNotification ("Connect to \"linksys\"", "", "image://theme/nm-signal-100")
139 n.connect('closed', quit_callback, loop)139 n.connect('closed', quit_callback, loop)
140 n.show ()140 n.show ()
141141
142142
=== modified file 'examples/sd-example-user-auth.py'
--- examples/sd-example-user-auth.py 2013-10-01 07:39:15 +0000
+++ examples/sd-example-user-auth.py 2013-10-08 10:15:22 +0000
@@ -55,14 +55,14 @@
55 else:55 else:
56 print "That should not have happened (cancel)!"56 print "That should not have happened (cancel)!"
5757
58def accept (notification, action, data):58def connect (notification, action, data):
59 if action == "accept":59 if action == "connect":
60 global login60 global login
61 print "login entered: " + login61 print "login entered: " + login
62 global password62 global password
63 print "password entered: " + password63 print "password entered: " + password
64 else:64 else:
65 print "That should not have happened (accept)!"65 print "That should not have happened (connect)!"
6666
67def login_changed (action, variant):67def login_changed (action, variant):
68 global login68 global login
@@ -76,7 +76,7 @@
76 # menu76 # menu
77 menu = Gio.Menu();77 menu = Gio.Menu();
7878
79 login_item = Gio.MenuItem.new ("Login:", "notifications.login");79 login_item = Gio.MenuItem.new ("Login name:", "notifications.login");
80 login_item.set_attribute_value ("x-canonical-type", GLib.Variant.new_string("com.canonical.snapdecision.textfield"));80 login_item.set_attribute_value ("x-canonical-type", GLib.Variant.new_string("com.canonical.snapdecision.textfield"));
81 login_item.set_attribute_value ('x-echo-mode-password', GLib.Variant.new_boolean(False))81 login_item.set_attribute_value ('x-echo-mode-password', GLib.Variant.new_boolean(False))
82 menu.append_item (login_item);82 menu.append_item (login_item);
@@ -109,7 +109,7 @@
109109
110 # NOTE: the order in which actions are added is important... positive110 # NOTE: the order in which actions are added is important... positive
111 # always comes first!111 # always comes first!
112 n.add_action ("accept", "Accept", accept, None, None);112 n.add_action ("connect", "Connect", connect, None, None);
113 n.add_action ("cancel", "Cancel", cancel, None, None);113 n.add_action ("cancel", "Cancel", cancel, None, None);
114114
115 # create the menu-model115 # create the menu-model
@@ -150,7 +150,7 @@
150 password = ""150 password = ""
151151
152 loop = GLib.MainLoop()152 loop = GLib.MainLoop()
153 n = pushNotification ("Authenticate yourself", "", "")153 n = pushNotification ("Connect to \"linksys\"", "", "image://theme/nm-signal-100")
154 n.connect('closed', quit_callback, loop)154 n.connect('closed', quit_callback, loop)
155 n.show ()155 n.show ()
156156

Subscribers

People subscribed via source and target branches

to all changes: