Merge lp:~macslow/unity-notifications/combo-button-support into lp:unity-notifications

[Mirco Müller]

Updated calling snap-decision examples to show off new combo-button support in notifications frontend (unity8). Updated the incoming-call example to use 7 actions to be inline with design-requirements.

Updated calling snap-decision examples to show off new combo-button support in notifications frontend (unity8). Updated the incoming-call example to use 7 actions to be inline with design-requirements.

- Are there any related MPs required for this MP to build/function as expected?
No

- Did you perform an exploratory manual test run of your code change and any related functionality?
Yes, but only on desktop not yet on the device/phone since cross-compiling currently doesn't work for me (Malta-sprint)

- Did you make sure that your branch does not contain spurious tags?
Yes

- If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Yes

- If you changed the UI, has there been a design review?
not applicable

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:209
http://jenkins.qa.ubuntu.com/job/unity-notifications-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-utopic-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-utopic-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/unity-notifications-utopic-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-utopic-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-notifications-ci/62/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

This looks fine, we just need a changelog bump so that autopilot tests in the unity8 counterpart can depend on this change.

review: Needs Fixing

[lp:~macslow/unity-notifications/combo-button-support]

210. By Mirco Müller on 2014-06-16

Bumped version to indicate the updated maximum number of supported actions.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:210
http://jenkins.qa.ubuntu.com/job/unity-notifications-ci/65/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-utopic-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-utopic-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/unity-notifications-utopic-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-utopic-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-notifications-ci/65/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

Yup.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-02 10:58:29 +0000
+++ debian/changelog	2014-06-16 14:26:40 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 unity-notifications (0.1.1+14.10.20140602-0ubuntu1) utopic; urgency=low
 
   [ Mirco Müller ]
@@ -6,6 +7,16 @@
 
  -- Ubuntu daily release <[e-mail]>  Mon, 02 Jun 2014 10:58:29 +0000
 
+=======
+unity-notifications (0.1.2-0ubuntu1) UNRELEASED; urgency=low
+
+  [ Mirco Müller ]
+  * Changed maximum number of allowed actions to be 7. Updated related examples accordingly. 
+  * Bump version to indicate support for maximum of 7 actions.
+
+ -- Mirco Müller <[e-mail]>  Mon, 16 Jun 2014 15:59:37 +0200
+
+>>>>>>> MERGE-SOURCE
 unity-notifications (0.1.1+14.10.20140514.1-0ubuntu1) utopic; urgency=low
 
   [ Antti Kaijanmäki ]

=== modified file 'examples/sd-example-incoming-call-canceled.py'
--- examples/sd-example-incoming-call-canceled.py	2013-12-02 17:18:13 +0000
+++ examples/sd-example-incoming-call-canceled.py	2014-06-16 14:26:40 +0000
@@ -45,27 +45,33 @@
 
 def action_decline_2 (notification, action):
 	if action == "action_decline_2":
-		print "\"Dude, my wife is here!\""
+		print "Reject with SMS"
 	else:
 		print "That should not have happened (action_decline_2)!"
 
 def action_decline_3 (notification, action):
 	if action == "action_decline_3":
-		print "\"I'm sleeping.\""
+		print "Dude, my wife is here!"
 	else:
 		print "That should not have happened (action_decline_3)!"
 
 def action_decline_4 (notification, action):
 	if action == "action_decline_4":
-		print "\"No time... I'm riding!\""
+		print "I'm sleeping."
 	else:
 		print "That should not have happened (action_decline_4)!"
 
 def action_decline_5 (notification, action):
 	if action == "action_decline_5":
+		print "No time... I'm riding!"
+	else:
+		print "That should not have happened (action_decline_5)!"
+
+def action_decline_6 (notification, action):
+	if action == "action_decline_6":
 		print "Send SMS..."
 	else:
-		print "That should not have happened (action_decline_5)!"
+		print "That should not have happened (action_decline_6)!"
 
 def action_accept (notification, action):
 	if action == "action_accept":
@@ -78,12 +84,13 @@
 
 	# NOTE: the order in which actions are added is important... positive
 	# always comes first!
-	n.add_action ("action_accept",    "Pick up",                    action_accept);
-	n.add_action ("action_decline_1", "Hang up",                    action_decline_1);
-	#n.add_action ("action_decline_2", "\"Dude, my wife is here!\"", action_decline_2);
-	#n.add_action ("action_decline_3", "\"I'm sleeping.\"",          action_decline_3);
-	#n.add_action ("action_decline_4", "\"No time... I'm riding!\"", action_decline_4);
-	#n.add_action ("action_decline_5", "Send SMS...",                action_decline_5);
+	n.add_action ("action_accept",    "Pick up", action_accept);
+	n.add_action ("action_decline_1", "Hang up", action_decline_1);
+	n.add_action ("action_decline_2", "Reject with SMS", action_decline_2);
+	n.add_action ("action_decline_3", "messages:Dude, my wife is here!", action_decline_3);
+	n.add_action ("action_decline_4", "messages:I'm sleeping.", action_decline_4);
+	n.add_action ("action_decline_5", "messages:No time... I'm riding!", action_decline_5);
+	n.add_action ("action_decline_6", "edit:Send SMS...", action_decline_6);
 
 	# indicate to the notification-daemon, that we want to use snap-decisions
 	n.set_hint_string ("x-canonical-snap-decisions", "true");

=== modified file 'examples/sd-example-incoming-call.py'
--- examples/sd-example-incoming-call.py	2013-12-02 17:18:13 +0000
+++ examples/sd-example-incoming-call.py	2014-06-16 14:26:40 +0000
@@ -39,31 +39,43 @@
 
 def action_decline_1 (notification, action):
 	if action == "action_decline_1":
-		print "Decline"
+		print "End + Answer"
 	else:
 		print "That should not have happened (action_decline_1)!"
 
 def action_decline_2 (notification, action):
 	if action == "action_decline_2":
-		print "\"Can't talk now, what's up?\""
+		print "Decline"
 	else:
 		print "That should not have happened (action_decline_2)!"
 
 def action_decline_3 (notification, action):
 	if action == "action_decline_3":
-		print "\"I call you back.\""
+		print "I missed your call - can you call me now?"
 	else:
 		print "That should not have happened (action_decline_3)!"
 
 def action_decline_4 (notification, action):
 	if action == "action_decline_4":
-		print "Send custom message..."
+		print "I'm running late. I'm on my way."
 	else:
 		print "That should not have happened (action_decline_4)!"
 
+def action_decline_5 (notification, action):
+	if action == "action_decline_5":
+		print "I'm busy at the moment. I'll call later."
+	else:
+		print "That should not have happened (action_decline_5)!"
+
+def action_decline_6 (notification, action):
+	if action == "action_decline_6":
+		print "Custom"
+	else:
+		print "That should not have happened (action_decline_6)!"
+
 def action_accept (notification, action):
 	if action == "action_accept":
-		print "Accepting call"
+		print "Hold + Answer"
 	else:
 		print "That should not have happened (action_accept)!"
 
@@ -72,11 +84,13 @@
 
 	# NOTE: the order in which actions are added is important... positive
 	# always comes first!
-	n.add_action ("action_accept",    "Accept",                         action_accept);
-	n.add_action ("action_decline_1", "Decline",                        action_decline_1);
-	n.add_action ("action_decline_2", "\"Can't talk now, what's up?\"", action_decline_2);
-	n.add_action ("action_decline_3", "\"I call you back.\"",           action_decline_3);
-	n.add_action ("action_decline_4", "Send custom message...",         action_decline_4);
+	n.add_action ("action_accept", "Hold + Answer", action_accept);
+	n.add_action ("action_decline_1", "End + Answer", action_decline_1);
+	n.add_action ("action_decline_2", "Decline", action_decline_2);
+	n.add_action ("action_decline_3", "messages:I missed your call - can you call me now?", action_decline_3);
+	n.add_action ("action_decline_4", "messages:I'm running late. I'm on my way.", action_decline_4);
+	n.add_action ("action_decline_5", "messages:I'm busy at the moment. I'll call later.", action_decline_5);
+	n.add_action ("action_decline_6", "edit:Custom", action_decline_6);
 
 	# indicate to the notification-daemon, that we want to use snap-decisions
 	n.set_hint_string ("x-canonical-snap-decisions", "true");

=== modified file 'src/NotificationServer.cpp'
--- src/NotificationServer.cpp	2014-06-02 10:58:21 +0000
+++ src/NotificationServer.cpp	2014-06-16 14:26:40 +0000
@@ -104,7 +104,7 @@
         const QStringList &actions, const Hints &hints, int expire_timeout) {
     const unsigned int FAILURE = 0; // Is this correct?
     const int minActions = 4;
-    const int maxActions = 12;
+    const int maxActions = 14;
     //QImage icon(app_icon);
     int currentId = idCounter;
     QSharedPointer<Notification> notification;