Merge lp:~dobey/ubuntuone-client/notification-icon-size into lp:ubuntuone-client

Proposed by dobey
Status: Merged
Approved by: Rick McBride
Approved revision: 215
Merged at revision: not available
Proposed branch: lp:~dobey/ubuntuone-client/notification-icon-size
Merge into: lp:ubuntuone-client
Diff against target: None lines
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/notification-icon-size
Reviewer Review Type Date Requested Status
Rick McBride (community) Approve
Rodrigo Moya (community) Approve
Review via email: mp+11927@code.launchpad.net

Commit message

Change the notification icon size to 48 instead of 24

To post a comment you must log in.
Revision history for this message
Rodrigo Moya (rodrigo-moya) wrote :

Looks good

review: Approve
Revision history for this message
Rick McBride (rmcbride) wrote :

I like simple to review/test branches. +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/ubuntuone-client-applet'
--- bin/ubuntuone-client-applet 2009-09-14 21:01:03 +0000
+++ bin/ubuntuone-client-applet 2009-09-16 19:56:06 +0000
@@ -64,6 +64,8 @@
64OAUTH_CONSUMER = "ubuntuone"64OAUTH_CONSUMER = "ubuntuone"
65BOOKMARK_NAME = "Ubuntu One"65BOOKMARK_NAME = "Ubuntu One"
6666
67NOTIFY_ICON_SIZE = 48
68
67# Why thank you GTK+ for enforcing style-set and breaking API69# Why thank you GTK+ for enforcing style-set and breaking API
68RCSTYLE = """70RCSTYLE = """
69style 'dialogs' {71style 'dialogs' {
@@ -462,7 +464,7 @@
462 _("Updating files..."),464 _("Updating files..."),
463 _("Ubuntu One is now updating your files."))465 _("Ubuntu One is now updating your files."))
464 pixbuf = self.__theme.load_icon(466 pixbuf = self.__theme.load_icon(
465 "ubuntuone-client", 24,467 "ubuntuone-client", NOTIFY_ICON_SIZE,
466 gtk.ICON_LOOKUP_GENERIC_FALLBACK)468 gtk.ICON_LOOKUP_GENERIC_FALLBACK)
467 n.set_icon_from_pixbuf(pixbuf)469 n.set_icon_from_pixbuf(pixbuf)
468 n.show()470 n.show()
@@ -492,7 +494,7 @@
492 self.__total = 0494 self.__total = 0
493 self.__updating = 0495 self.__updating = 0
494 pixbuf = self.__theme.load_icon(496 pixbuf = self.__theme.load_icon(
495 "ubuntuone-client", 24,497 "ubuntuone-client", NOTIFY_ICON_SIZE,
496 gtk.ICON_LOOKUP_GENERIC_FALLBACK)498 gtk.ICON_LOOKUP_GENERIC_FALLBACK)
497 n.set_icon_from_pixbuf(pixbuf)499 n.set_icon_from_pixbuf(pixbuf)
498 n.show()500 n.show()
@@ -562,7 +564,7 @@
562 "A new version of the server should be accessible "564 "A new version of the server should be accessible "
563 "soon. Please be patient while we update."))565 "soon. Please be patient while we update."))
564 pixbuf = self.__theme.load_icon(566 pixbuf = self.__theme.load_icon(
565 "ubuntuone-client-error", 24,567 "ubuntuone-client-error", NOTIFY_ICON_SIZE,
566 gtk.ICON_LOOKUP_GENERIC_FALLBACK)568 gtk.ICON_LOOKUP_GENERIC_FALLBACK)
567 n.set_icon_from_pixbuf(pixbuf)569 n.set_icon_from_pixbuf(pixbuf)
568 n.set_urgency(pynotify.URGENCY_CRITICAL)570 n.set_urgency(pynotify.URGENCY_CRITICAL)
@@ -621,7 +623,7 @@
621 "Please click on the Ubuntu One icon " +623 "Please click on the Ubuntu One icon " +
622 "in your panel to report a bug."))624 "in your panel to report a bug."))
623 pixbuf = self.__theme.load_icon(625 pixbuf = self.__theme.load_icon(
624 "ubuntuone-client-error", 24,626 "ubuntuone-client-error", NOTIFY_ICON_SIZE,
625 gtk.ICON_LOOKUP_GENERIC_FALLBACK)627 gtk.ICON_LOOKUP_GENERIC_FALLBACK)
626 n.set_icon_from_pixbuf(pixbuf)628 n.set_icon_from_pixbuf(pixbuf)
627 n.set_urgency(pynotify.URGENCY_CRITICAL)629 n.set_urgency(pynotify.URGENCY_CRITICAL)

Subscribers

People subscribed via source and target branches