Bazaar GTK+ Frontends

Merge lp:~andrewsomething/bzr-gtk/panel-icon into lp:bzr-gtk/gtk2

  1. panel-icon
  2. Merge into gtk2
Proposed by Andrew Starr-Bochicchio
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 707
Merged at revision: 711
Proposed branch: lp:~andrewsomething/bzr-gtk/panel-icon
Merge into: lp:bzr-gtk/gtk2
Diff against target: 163 lines (+127/-3)
3 files modified
bzr-notify (+3/-3)
icons/bzr-panel.svg (+123/-0)
setup.py (+1/-0)
To merge this branch: bzr merge lp:~andrewsomething/bzr-gtk/panel-icon
Reviewer Review Type Date Requested Status
Jelmer Vernooij (community) code Approve
Martin Pool (community) Approve
Review via email: mp+38903@code.launchpad.net

Commit message

Allow themeable/mono icon for bzr-notify.

To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) wrote :

looks plausible to me

review: Approve
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

This conflicts at the moment, any chance you can push an updated branch?

Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) wrote :

Done

Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve (code)
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Merged, thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzr-notify'
2--- bzr-notify 2010-12-17 21:26:37 +0000
3+++ bzr-notify 2011-02-15 00:24:41 +0000
4@@ -27,16 +27,16 @@
5 try:
6 import appindicator
7 except ImportError:
8- icon = gtk.status_icon_new_from_file(icon_path("bzr-icon-64.png"))
9+ icon = gtk.status_icon_new_from_icon_name("bzr-panel")
10 icon.connect('popup-menu', menu.display)
11 icon.set_visible(False)
12 hide_icon = lambda: icon.set_visible(False)
13 show_icon = lambda: icon.set_visible(True)
14 else:
15 indicator = appindicator.Indicator ("bzr-gtk-notify",
16- "bzr-icon-64", appindicator.CATEGORY_OTHER)
17+ "bzr-panel", appindicator.CATEGORY_OTHER)
18 indicator.set_status (appindicator.STATUS_PASSIVE)
19- indicator.set_attention_icon("bzr-icon-64")
20+ indicator.set_attention_icon("bzr-panel")
21 indicator.set_menu(menu)
22 hide_icon = lambda: indicator.set_status (appindicator.STATUS_PASSIVE)
23 show_icon = lambda: indicator.set_status (appindicator.STATUS_ATTENTION)
24
25=== added file 'icons/bzr-panel.svg'
26--- icons/bzr-panel.svg 1970-01-01 00:00:00 +0000
27+++ icons/bzr-panel.svg 2011-02-15 00:24:41 +0000
28@@ -0,0 +1,123 @@
29+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
30+<!-- Created with Inkscape (http://www.inkscape.org/) -->
31+<svg
32+ xmlns:dc="http://purl.org/dc/elements/1.1/"
33+ xmlns:cc="http://creativecommons.org/ns#"
34+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
35+ xmlns:svg="http://www.w3.org/2000/svg"
36+ xmlns="http://www.w3.org/2000/svg"
37+ xmlns:xlink="http://www.w3.org/1999/xlink"
38+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
39+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
40+ width="125.3576"
41+ height="127.96403"
42+ id="svg2393"
43+ sodipodi:version="0.32"
44+ inkscape:version="0.46"
45+ version="1.0"
46+ sodipodi:docname="bzr-logo.svg"
47+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
48+ <defs
49+ id="defs2395">
50+ <linearGradient
51+ id="linearGradient5444">
52+ <stop
53+ id="stop5446"
54+ offset="0"
55+ style="stop-color:#729fcf;stop-opacity:1;" />
56+ <stop
57+ style="stop-color:#3465a4;stop-opacity:1;"
58+ offset="0.5"
59+ id="stop4547" />
60+ <stop
61+ id="stop5448"
62+ offset="1"
63+ style="stop-color:#204ab7;stop-opacity:1;" />
64+ </linearGradient>
65+ <linearGradient
66+ inkscape:collect="always"
67+ xlink:href="#linearGradient5444"
68+ id="linearGradient2200"
69+ x1="372.24512"
70+ y1="69.037941"
71+ x2="372.24512"
72+ y2="0"
73+ gradientUnits="userSpaceOnUse"
74+ gradientTransform="matrix(1.027169,0,0,1,571.72345,145.71693)" />
75+ <inkscape:perspective
76+ sodipodi:type="inkscape:persp3d"
77+ inkscape:vp_x="0 : 526.18109 : 1"
78+ inkscape:vp_y="0 : 1000 : 0"
79+ inkscape:vp_z="744.09448 : 526.18109 : 1"
80+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
81+ id="perspective2401" />
82+ </defs>
83+ <sodipodi:namedview
84+ id="base"
85+ pagecolor="#ffffff"
86+ bordercolor="#666666"
87+ borderopacity="1.0"
88+ gridtolerance="10000"
89+ guidetolerance="10"
90+ objecttolerance="10"
91+ inkscape:pageopacity="0.0"
92+ inkscape:pageshadow="2"
93+ inkscape:zoom="0.35"
94+ inkscape:cx="375"
95+ inkscape:cy="520"
96+ inkscape:document-units="px"
97+ inkscape:current-layer="layer1"
98+ showgrid="false"
99+ inkscape:window-width="642"
100+ inkscape:window-height="716"
101+ inkscape:window-x="0"
102+ inkscape:window-y="26" />
103+ <metadata
104+ id="metadata2398">
105+ <rdf:RDF>
106+ <cc:Work
107+ rdf:about="">
108+ <dc:format>image/svg+xml</dc:format>
109+ <dc:type
110+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
111+ </cc:Work>
112+ </rdf:RDF>
113+ </metadata>
114+ <g
115+ inkscape:label="Layer 1"
116+ inkscape:groupmode="layer"
117+ id="layer1"
118+ transform="translate(-580.17834,-151.23731)">
119+ <path
120+ style="opacity:1;fill:url(#linearGradient2200);fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
121+ d="M 588.19225,214.74818 L 703.94225,214.74818 C 703.0194,210.71454 649.52368,155.39489 646.56725,155.46693 C 644.54816,155.51613 591.83132,209.09818 588.19225,214.74818 z"
122+ id="rect1307"
123+ inkscape:export-filename="/home/matt/BZR Header.png"
124+ inkscape:export-xdpi="96"
125+ inkscape:export-ydpi="96" />
126+ <g
127+ style="opacity:1;display:inline"
128+ id="g3653"
129+ transform="translate(754.85055,325.08453)"
130+ inkscape:export-filename="/home/matt/Projects/Ubuntu/Bazaar Website/bzr icon 64.png"
131+ inkscape:export-xdpi="45.012665"
132+ inkscape:export-ydpi="45.012665">
133+ <path
134+ id="path2749"
135+ d="M -143.51431,-75.4275 C -158.48768,-90.57687 -171.17625,-103.66019 -171.7111,-104.50153 C -174.63909,-109.10738 -172.34363,-112.16647 -143.7155,-141.81059 C -119.96256,-166.4065 -114.08422,-171.84722 -111.26302,-171.84722 C -108.45655,-171.84722 -102.57922,-166.49332 -79.566158,-142.97326 C -59.704508,-122.67403 -51.314608,-113.24681 -51.314608,-111.22876 C -51.314608,-107.03298 -109.21126,-47.88319 -113.31814,-47.88319 C -115.49463,-47.88319 -123.57621,-55.25503 -143.51431,-75.4275 z"
136+ style="opacity:1;fill:#fce94f;fill-opacity:1;stroke:#fce94f;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
137+ <path
138+ id="path2721"
139+ d="M -118.75152,-74.850683 C -119.22012,-75.319283 -119.60352,-85.958443 -119.60352,-98.493313 L -119.60352,-121.28395 L -124.85215,-121.28395 C -131.2088,-121.28395 -131.22918,-121.19503 -121.27316,-136.90004 C -116.77235,-143.99978 -113.38241,-148.09169 -112.19584,-147.85705 C -110.34853,-147.49175 -95.321883,-124.90849 -95.321883,-122.4975 C -95.321883,-121.83004 -97.640303,-121.28395 -100.47393,-121.28395 C -103.84689,-121.28395 -105.87693,-120.6299 -106.35276,-119.38989 C -107.55959,-116.24495 -103.45251,-106.32746 -97.296233,-97.520823 C -90.988133,-88.497013 -90.461803,-86.665103 -93.461883,-84.175253 C -95.128693,-82.791933 -96.185063,-83.268713 -100.25177,-87.239733 C -102.90055,-89.826193 -105.46285,-91.547323 -105.94572,-91.064423 C -106.42862,-90.581523 -106.8237,-86.544203 -106.8237,-82.092573 L -106.8237,-73.998703 L -112.36162,-73.998703 C -115.40746,-73.998703 -118.28294,-74.382103 -118.75152,-74.850683 z"
140+ style="opacity:1;fill:#c4a000;fill-opacity:1;stroke:#c4a000;display:inline" />
141+ <path
142+ id="path2727"
143+ d="M -120.75152,-76.85072 C -121.22012,-77.31932 -121.60352,-87.95848 -121.60352,-100.49335 L -121.60352,-123.28399 L -126.85215,-123.28399 C -133.2088,-123.28399 -133.22918,-123.19507 -123.27316,-138.90007 C -118.77235,-145.99981 -115.38241,-150.09172 -114.19584,-149.85708 C -112.34853,-149.49178 -97.321888,-126.90852 -97.321888,-124.49754 C -97.321888,-123.83008 -99.640308,-123.28399 -102.47393,-123.28399 C -105.84689,-123.28399 -107.87693,-122.62994 -108.35276,-121.38993 C -109.55959,-118.24499 -105.45251,-108.3275 -99.296238,-99.52086 C -92.988138,-90.49705 -92.461808,-88.66514 -95.461888,-86.17529 C -97.128698,-84.79197 -98.185068,-85.26875 -102.25177,-89.23977 C -104.90055,-91.82623 -107.46285,-93.54736 -107.94572,-93.06446 C -108.42862,-92.58156 -108.8237,-88.54424 -108.8237,-84.09261 L -108.8237,-75.99874 L -114.36162,-75.99874 C -117.40746,-75.99874 -120.28294,-76.38214 -120.75152,-76.85072 z"
144+ style="opacity:1;fill:#555753;fill-opacity:1;stroke:#2e3436;stroke-opacity:1;display:inline" />
145+ <path
146+ d="M -143.51431,-75.4275 C -158.48768,-90.57687 -171.17625,-103.66019 -171.7111,-104.50153 C -174.63909,-109.10738 -172.34363,-112.16647 -143.7155,-141.81059 C -119.96256,-166.4065 -114.08422,-171.84722 -111.26302,-171.84722 C -108.45655,-171.84722 -102.57922,-166.49332 -79.566162,-142.97326 C -59.704512,-122.67403 -51.314612,-113.24681 -51.314612,-111.22876 C -51.314612,-107.03298 -109.21126,-47.88319 -113.31814,-47.88319 C -115.49463,-47.88319 -123.57621,-55.25503 -143.51431,-75.4275 z M -82.734602,-78.80831 C -63.284082,-98.78654 -53.870592,-109.3496 -53.870592,-111.19708 C -53.870592,-114.35673 -108.28764,-170.68595 -111.26979,-170.61328 C -113.31427,-170.56346 -167.39892,-115.6112 -169.81635,-111.12752 C -171.82156,-107.40842 -170.53236,-105.76188 -145.24612,-79.74648 C -117.66227,-51.36719 -115.36413,-49.16116 -113.38369,-49.16116 C -112.40192,-49.16116 -98.609822,-62.50237 -82.734602,-78.80831 z"
147+ style="opacity:1;fill:#555753;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
148+ id="path2736" />
149+ </g>
150+ </g>
151+</svg>
152
153=== modified file 'setup.py'
154--- setup.py 2010-08-13 20:50:53 +0000
155+++ setup.py 2011-02-15 00:24:41 +0000
156@@ -155,6 +155,7 @@
157 'bzr-notify.desktop']),
158 ('share/application-registry', ['bzr-gtk.applications']),
159 ('share/pixmaps', ['icons/bzr-icon-64.png']),
160+ ('share/icons/hicolor/scalable/apps', ['icons/bzr-panel.svg']),
161 ('share/icons/hicolor/scalable/emblems',
162 ['icons/emblem-bzr-added.svg',
163 'icons/emblem-bzr-conflict.svg',

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: