Online Accounts: GNOME Control Center

Merge lp:~snwh/gnome-control-center-signon/high-contrast-icons into lp:gnome-control-center-signon

  1. high-contrast-icons
  2. Merge into trunk
Proposed by Sam Hewitt
Status: Needs review
Proposed branch: lp:~snwh/gnome-control-center-signon/high-contrast-icons
Merge into: lp:gnome-control-center-signon
Diff against target: 120 lines (+28/-8)
1 file modified
Makefile.am (+28/-8)
To merge this branch: bzr merge lp:~snwh/gnome-control-center-signon/high-contrast-icons
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) Needs Fixing
Review via email: mp+170933@code.launchpad.net

Description of the change

Online Accounts was missing an icon for the high contrast accessibility theme; icon was added to solve LP #1082097.

To post a comment you must log in.
Revision history for this message
Alberto Mardegan (mardy) wrote :

Thanks Sam for working on this. Your patch however doesn't work: the "HighContrast" icons are correctly added to the resulting debian package, but the "hicolor" ones don't get installed anymore.
I think this is due to changing the value of the "iconthemedir" variable on the fly; maybe using a variable with a different name could help.

review: Needs Fixing
Reply

Unmerged revisions

162. By Sam Hewitt

Added high contrast icons.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2013-06-05 09:01:13 +0000
3+++ Makefile.am 2013-06-22 04:30:40 +0000
4@@ -428,15 +428,35 @@
5 icon64dir = $(iconthemedir)/64x64/apps
6 icon128dir = $(iconthemedir)/128x128/apps
7
8-dist_icon16_DATA = icons/16x16/$(credentialsicon)
9-dist_icon22_DATA = icons/22x22/$(credentialsicon)
10-dist_icon24_DATA = icons/24x24/$(credentialsicon)
11+dist_icon16_DATA = icons/hicolor/16x16/$(credentialsicon)
12+dist_icon22_DATA = icons/hicolor/22x22/$(credentialsicon)
13+dist_icon24_DATA = icons/hicolor/24x24/$(credentialsicon)
14 dist_icon32_DATA = \
15- icons/32x32/$(credentialsicon) \
16- icons/32x32/credentials-add-account.png
17-dist_icon48_DATA = icons/48x48/$(credentialsicon)
18-dist_icon64_DATA = icons/64x64/$(credentialsicon)
19-dist_icon128_DATA = icons/128x128/$(credentialsicon)
20+ icons/hicolor/32x32/$(credentialsicon) \
21+ icons/hicolor/32x32/credentials-add-account.png
22+dist_icon48_DATA = icons/hicolor/48x48/$(credentialsicon)
23+dist_icon64_DATA = icons/hicolor/64x64/$(credentialsicon)
24+dist_icon128_DATA = icons/hicolor/128x128/$(credentialsicon)
25+
26+update_icon_cache = gtk-update-icon-cache --ignore-theme-index --force $(iconthemedir)
27+
28+iconthemedir = $(datadir)/icons/HighContrast
29+credentialsicon = credentials-preferences.png
30+
31+icon16dir = $(iconthemedir)/16x16/apps
32+icon22dir = $(iconthemedir)/22x22/apps
33+icon24dir = $(iconthemedir)/24x24/apps
34+icon32dir = $(iconthemedir)/32x32/apps
35+icon48dir = $(iconthemedir)/48x48/apps
36+icon64dir = $(iconthemedir)/64x64/apps
37+icon256dir = $(iconthemedir)/256x256/apps
38+
39+dist_icon16_DATA = icons/HighContrast/16x16/apps/$(credentialsicon)
40+dist_icon22_DATA = icons/HighContrast/22x22/apps/$(credentialsicon)
41+dist_icon24_DATA = icons/HighContrast/24x24/apps/$(credentialsicon)
42+dist_icon32_DATA = icons/HighContrast/32x32/apps/$(credentialsicon)
43+dist_icon48_DATA = icons/HighContrast/48x48/apps/$(credentialsicon)
44+dist_icon256_DATA = icons/HighContrast/256x256/apps/$(credentialsicon)
45
46 update_icon_cache = gtk-update-icon-cache --ignore-theme-index --force $(iconthemedir)
47
48
49=== removed directory 'icons/128x128'
50=== removed file 'icons/128x128/credentials-preferences.png'
51Binary files icons/128x128/credentials-preferences.png 2012-07-09 12:20:45 +0000 and icons/128x128/credentials-preferences.png 1970-01-01 00:00:00 +0000 differ
52=== removed directory 'icons/16x16'
53=== removed file 'icons/16x16/credentials-preferences.png'
54Binary files icons/16x16/credentials-preferences.png 2012-07-09 12:20:45 +0000 and icons/16x16/credentials-preferences.png 1970-01-01 00:00:00 +0000 differ
55=== removed directory 'icons/22x22'
56=== removed file 'icons/22x22/credentials-preferences.png'
57Binary files icons/22x22/credentials-preferences.png 2012-07-09 12:20:45 +0000 and icons/22x22/credentials-preferences.png 1970-01-01 00:00:00 +0000 differ
58=== removed directory 'icons/24x24'
59=== removed file 'icons/24x24/credentials-preferences.png'
60Binary files icons/24x24/credentials-preferences.png 2012-07-09 12:20:45 +0000 and icons/24x24/credentials-preferences.png 1970-01-01 00:00:00 +0000 differ
61=== removed directory 'icons/32x32'
62=== removed file 'icons/32x32/credentials-add-account.png'
63Binary files icons/32x32/credentials-add-account.png 2012-07-09 11:19:21 +0000 and icons/32x32/credentials-add-account.png 1970-01-01 00:00:00 +0000 differ
64=== removed file 'icons/32x32/credentials-preferences.png'
65Binary files icons/32x32/credentials-preferences.png 2012-07-09 12:20:45 +0000 and icons/32x32/credentials-preferences.png 1970-01-01 00:00:00 +0000 differ
66=== removed directory 'icons/48x48'
67=== removed file 'icons/48x48/credentials-preferences.png'
68Binary files icons/48x48/credentials-preferences.png 2012-07-09 12:20:45 +0000 and icons/48x48/credentials-preferences.png 1970-01-01 00:00:00 +0000 differ
69=== removed directory 'icons/64x64'
70=== removed file 'icons/64x64/credentials-preferences.png'
71Binary files icons/64x64/credentials-preferences.png 2012-07-09 12:20:45 +0000 and icons/64x64/credentials-preferences.png 1970-01-01 00:00:00 +0000 differ
72=== added directory 'icons/HighContrast'
73=== added directory 'icons/HighContrast/16x16'
74=== added directory 'icons/HighContrast/16x16/apps'
75=== added file 'icons/HighContrast/16x16/apps/credentials-preferences.png'
76Binary files icons/HighContrast/16x16/apps/credentials-preferences.png 1970-01-01 00:00:00 +0000 and icons/HighContrast/16x16/apps/credentials-preferences.png 2013-06-22 04:30:40 +0000 differ
77=== added directory 'icons/HighContrast/22x22'
78=== added directory 'icons/HighContrast/22x22/apps'
79=== added file 'icons/HighContrast/22x22/apps/credentials-preferences.png'
80Binary files icons/HighContrast/22x22/apps/credentials-preferences.png 1970-01-01 00:00:00 +0000 and icons/HighContrast/22x22/apps/credentials-preferences.png 2013-06-22 04:30:40 +0000 differ
81=== added directory 'icons/HighContrast/24x24'
82=== added directory 'icons/HighContrast/24x24/apps'
83=== added file 'icons/HighContrast/24x24/apps/credentials-preferences.png'
84Binary files icons/HighContrast/24x24/apps/credentials-preferences.png 1970-01-01 00:00:00 +0000 and icons/HighContrast/24x24/apps/credentials-preferences.png 2013-06-22 04:30:40 +0000 differ
85=== added directory 'icons/HighContrast/256x256'
86=== added directory 'icons/HighContrast/256x256/apps'
87=== added file 'icons/HighContrast/256x256/apps/credentials-preferences.png'
88Binary files icons/HighContrast/256x256/apps/credentials-preferences.png 1970-01-01 00:00:00 +0000 and icons/HighContrast/256x256/apps/credentials-preferences.png 2013-06-22 04:30:40 +0000 differ
89=== added directory 'icons/HighContrast/32x32'
90=== added directory 'icons/HighContrast/32x32/apps'
91=== added file 'icons/HighContrast/32x32/apps/credentials-preferences.png'
92Binary files icons/HighContrast/32x32/apps/credentials-preferences.png 1970-01-01 00:00:00 +0000 and icons/HighContrast/32x32/apps/credentials-preferences.png 2013-06-22 04:30:40 +0000 differ
93=== added directory 'icons/HighContrast/48x48'
94=== added directory 'icons/HighContrast/48x48/apps'
95=== added file 'icons/HighContrast/48x48/apps/credentials-preferences.png'
96Binary files icons/HighContrast/48x48/apps/credentials-preferences.png 1970-01-01 00:00:00 +0000 and icons/HighContrast/48x48/apps/credentials-preferences.png 2013-06-22 04:30:40 +0000 differ
97=== added directory 'icons/hicolor'
98=== added directory 'icons/hicolor/128x128'
99=== added file 'icons/hicolor/128x128/credentials-preferences.png'
100Binary files icons/hicolor/128x128/credentials-preferences.png 1970-01-01 00:00:00 +0000 and icons/hicolor/128x128/credentials-preferences.png 2013-06-22 04:30:40 +0000 differ
101=== added directory 'icons/hicolor/16x16'
102=== added file 'icons/hicolor/16x16/credentials-preferences.png'
103Binary files icons/hicolor/16x16/credentials-preferences.png 1970-01-01 00:00:00 +0000 and icons/hicolor/16x16/credentials-preferences.png 2013-06-22 04:30:40 +0000 differ
104=== added directory 'icons/hicolor/22x22'
105=== added file 'icons/hicolor/22x22/credentials-preferences.png'
106Binary files icons/hicolor/22x22/credentials-preferences.png 1970-01-01 00:00:00 +0000 and icons/hicolor/22x22/credentials-preferences.png 2013-06-22 04:30:40 +0000 differ
107=== added directory 'icons/hicolor/24x24'
108=== added file 'icons/hicolor/24x24/credentials-preferences.png'
109Binary files icons/hicolor/24x24/credentials-preferences.png 1970-01-01 00:00:00 +0000 and icons/hicolor/24x24/credentials-preferences.png 2013-06-22 04:30:40 +0000 differ
110=== added directory 'icons/hicolor/32x32'
111=== added file 'icons/hicolor/32x32/credentials-add-account.png'
112Binary files icons/hicolor/32x32/credentials-add-account.png 1970-01-01 00:00:00 +0000 and icons/hicolor/32x32/credentials-add-account.png 2013-06-22 04:30:40 +0000 differ
113=== added file 'icons/hicolor/32x32/credentials-preferences.png'
114Binary files icons/hicolor/32x32/credentials-preferences.png 1970-01-01 00:00:00 +0000 and icons/hicolor/32x32/credentials-preferences.png 2013-06-22 04:30:40 +0000 differ
115=== added directory 'icons/hicolor/48x48'
116=== added file 'icons/hicolor/48x48/credentials-preferences.png'
117Binary files icons/hicolor/48x48/credentials-preferences.png 1970-01-01 00:00:00 +0000 and icons/hicolor/48x48/credentials-preferences.png 2013-06-22 04:30:40 +0000 differ
118=== added directory 'icons/hicolor/64x64'
119=== added file 'icons/hicolor/64x64/credentials-preferences.png'
120Binary files icons/hicolor/64x64/credentials-preferences.png 1970-01-01 00:00:00 +0000 and icons/hicolor/64x64/credentials-preferences.png 2013-06-22 04:30:40 +0000 differ

Subscribers

People subscribed via source and target branches

to all changes: