Merge lp:~10068660/openoffice.org-human-icons/tango+human into lp:~openoffice.org-human-icons/openoffice.org-human-icons/tango+human
- tango+human
- Merge into tango+human
Proposed by
Munchkinguy
Status: | Merged |
---|---|
Merge reported by: | Chris Cheney |
Merged at revision: | not available |
Proposed branch: | lp:~10068660/openoffice.org-human-icons/tango+human |
Merge into: | lp:~openoffice.org-human-icons/openoffice.org-human-icons/tango+human |
Diff against target: |
196 lines (+43/-25) 1 file modified
CopyrightsHuman (+43/-25) |
To merge this branch: | bzr merge lp:~10068660/openoffice.org-human-icons/tango+human |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chris Cheney | Approve | ||
Review via email: mp+22996@code.launchpad.net |
Commit message
Replaced the most visible icons with Humanity theme.
Description of the change
I have updated many of the icons to match the new Humanity icon theme. More will follow in the future.
To post a comment you must log in.
Revision history for this message
Chris Cheney (ccheney) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'CopyrightsHuman' |
2 | --- CopyrightsHuman 2008-05-18 23:50:22 +0000 |
3 | +++ CopyrightsHuman 2010-04-08 04:36:20 +0000 |
4 | @@ -12,17 +12,6 @@ |
5 | res/commandimagelist/lc_moveupsubitems.png |
6 | |
7 | Copyright 2004-2006 by Canonical Ltd. Available under the terms of the Creative Commons Attribution-ShareAlike 2.5 License (Source: human-icon-theme, tangerine-icon-theme) |
8 | -/res/commandimagelist/sc_printpreview.png |
9 | -/res/commandimagelist/lc_undo.png |
10 | -/res/commandimagelist/lc_redo.png |
11 | -/res/commandimagelist/sc_undo.png |
12 | -/res/commandimagelist/sc_redo.png |
13 | -/res/commandimagelist/lc_print.png |
14 | -/res/commandimagelist/sc_print.png |
15 | -/res/commandimagelist/lc_printdefault.png |
16 | -/res/commandimagelist/sc_printdefault.png |
17 | -/res/commandimagelist/lc_open.png |
18 | -/res/commandimagelist/sc_open.png |
19 | /res/commandimagelist/lc_browsebackward.png |
20 | /res/commandimagelist/sc_browsebackward.png |
21 | /res/commandimagelist/lc_browseforward.png |
22 | @@ -42,17 +31,9 @@ |
23 | /res/commandimagelist/sc_outlineup.png |
24 | /res/commandimagelist/lc_outlinedown.png |
25 | /res/commandimagelist/sc_outlinedown.png |
26 | -/res/commandimagelist/sc_savebasicas.png |
27 | /res/commandimagelist/lc_helpsearch.png |
28 | /res/commandimagelist/sc_helpsearch.png |
29 | /res/commandimagelist/lch_helpindex.png |
30 | -/res/commandimagelist/lc_save.png |
31 | -/res/commandimagelist/sc_save.png |
32 | -/res/commandimagelist/lc_helpindex.png |
33 | -/res/commandimagelist/sc_helpindex.png |
34 | -/res/commandimagelist/sc_saveas.png |
35 | -/res/commandimagelist/lc_recsearch.png |
36 | -/res/fileopen.png |
37 | /res/foldercl.png |
38 | /res/folderop.png |
39 | /res/fp015.png |
40 | @@ -77,11 +58,42 @@ |
41 | /res/sc06301.png |
42 | /res/sc06331.png |
43 | |
44 | +Copyright 2009 by Daniel Foré <Daniel.p.Fore@gmail.com>, Jonian Guveli <jonian.guveli@gmail.com>, and K.Vishnoo Charan Reddy<foo.mac.v@gmail.com>. Available under the terms of the GPL (Source: humanity-icon-theme) |
45 | +/res/commandimagelist/sc_printpreview.png |
46 | +/res/commandimagelist/lc_undo.png |
47 | +/res/commandimagelist/lc_redo.png |
48 | +/res/commandimagelist/sc_undo.png |
49 | +/res/commandimagelist/sc_redo.png |
50 | +/res/commandimagelist/lc_print.png |
51 | +/res/commandimagelist/sc_print.png |
52 | +/res/commandimagelist/lc_printdefault.png |
53 | +/res/commandimagelist/sc_printdefault.png |
54 | +/res/commandimagelist/lc_open.png |
55 | +/res/commandimagelist/sc_open.png |
56 | +/res/commandimagelist/lc_save.png |
57 | +/res/commandimagelist/sc_save.png |
58 | +/res/commandimagelist/lc_helpindex.png |
59 | +/res/commandimagelist/sc_helpindex.png |
60 | +/res/commandimagelist/sc_saveas.png |
61 | +/res/commandimagelist/sc_savebasicas.png |
62 | +/res/commandimagelist/lc_copy.png |
63 | +/res/commandimagelist/sc_copy.png |
64 | +/res/commandimagelist/lc_paste.png |
65 | +/res/commandimagelist/sc_paste.png |
66 | +/res/commandimagelist/lc_paste.png |
67 | +/res/commandimagelist/sc_paste.png |
68 | +/res/fileopen.png |
69 | + |
70 | Copyright 2004-2006 by Canonical Ltd, Modifications Copyright 2007 by Gabriel Hurley. Available under the terms of the Creative Commons Attribution-ShareAlike 2.5 License (Source: human-icon-theme) |
71 | /res/lc05508.png |
72 | /res/sc05508.png |
73 | res/commandimagelist/lc_printpreview.png |
74 | |
75 | +Copyright 2009 by Daniel Foré <Daniel.p.Fore@gmail.com>, Jonian Guveli <jonian.guveli@gmail.com>, and K.Vishnoo Charan Reddy<foo.mac.v@gmail.com>. , Modifications Copyright 2009 by Gabriel Hurley. Available under the terms of the GPL (Source: humanity-icon-theme) |
76 | +/res/commandimagelist/lc_recsearch.png |
77 | +/res/commandimagelist/sc_recsearch.png |
78 | + |
79 | + |
80 | Copyright 2005-2006 by Jakub Steiner and Novell Inc., Copyright 2004-2006 by Canonical Ltd., Combined by Gabriel Hurley 2006. Available under the terms of the LGPL (combination of human-icon-theme and OpenOffice Industrial Icons) |
81 | /res/commandimagelist/lc_convertinto3d.png |
82 | /res/commandimagelist/lc_extrusiontoggle.png |
83 | @@ -91,7 +103,8 @@ |
84 | /res/commandimagelist/lc_dbformopen.png |
85 | /res/commandimagelist/lc_insertctrl.png |
86 | /res/commandimagelist/lc_insertfieldctrl.png |
87 | -/res/commandimagelist/lc_recsave.png |
88 | +/res/commandimagelist/lc_recsave.png |
89 | +/res/commandimagelist/sc_recsave.png |
90 | /res/commandimagelist/lc_formproperties.png |
91 | /res/commandimagelist/lc_gotoendofdoc.png |
92 | /res/commandimagelist/lc_gotostartofdoc.png |
93 | @@ -103,18 +116,23 @@ |
94 | /res/sc10724.png |
95 | |
96 | Copyright 2005-2006 by Jakub Steiner and Novell Inc., Copyright 2004-2006 by Canonical Ltd., Combined by Gabriel Hurley 2006. Available under the terms of the LGPL (combination of human-icon-theme and OpenOffice Tango Icons) |
97 | -/res/commandimagelist/lc_recundo.png |
98 | -/res/commandimagelist/sc_recundo.png |
99 | /res/commandimagelist/lc_changebezier.png |
100 | /res/commandimagelist/lc_changepolygon.png |
101 | /res/commandimagelist/lc_convertinto3dlathefast.png |
102 | -/res/commandimagelist/lc_printersetup.png |
103 | -/res/commandimagelist/lc_previewprintoptions.png |
104 | -/res/commandimagelist/lc_printpagepreview.png |
105 | /res/commandimagelist/lc_savebasicas.png |
106 | /res/commandimagelist/lc_saveas.png |
107 | /res/commandimagelist/lc_refresh.png |
108 | |
109 | +Copyright 2005-2006 by Jakub Steiner and Novell Inc., Copyright 2009 by Daniel Foré <Daniel.p.Fore@gmail.com>, Jonian Guveli <jonian.guveli@gmail.com>, and K.Vishnoo Charan Reddy<foo.mac.v@gmail.com>, Combined by Gabriel Hurley 2006. Available under the terms of the GPL (combination of humanity-icon-theme and OpenOffice Tango Icons) |
110 | +/res/commandimagelist/lc_printersetup.png |
111 | +/res/commandimagelist/lc_previewprintoptions.png |
112 | +/res/commandimagelist/lc_printpagepreview.png |
113 | +/res/commandimagelist/sc_printersetup.png |
114 | +/res/commandimagelist/sc_previewprintoptions.png |
115 | +/res/commandimagelist/sc_printpagepreview.png |
116 | +/res/commandimagelist/lc_recundo.png |
117 | +/res/commandimagelist/sc_recundo.png |
118 | + |
119 | Copyright 2005-2006 by Jakub Steiner and Novell Inc., Copyright 2004-2006 by Canonical Ltd., Combined by Gabriel Hurley 2007. Available under the terms of the LGPL Available under the terms of the LGPL (combination of human-icon-theme and OpenOffice Industrial Icons) |
120 | /res/commandimagelist/sc_changebezier.png |
121 | /res/commandimagelist/lc_filecontrol.png |
122 | |
123 | === modified file 'res/commandimagelist/lc_beziercutline.png' |
124 | Binary files res/commandimagelist/lc_beziercutline.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/lc_beziercutline.png 2010-04-08 04:36:20 +0000 differ |
125 | === modified file 'res/commandimagelist/lc_copy.png' |
126 | Binary files res/commandimagelist/lc_copy.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/lc_copy.png 2010-04-08 04:36:20 +0000 differ |
127 | === modified file 'res/commandimagelist/lc_cut.png' |
128 | Binary files res/commandimagelist/lc_cut.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/lc_cut.png 2010-04-08 04:36:20 +0000 differ |
129 | === modified file 'res/commandimagelist/lc_open.png' |
130 | Binary files res/commandimagelist/lc_open.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/lc_open.png 2010-04-08 04:36:20 +0000 differ |
131 | === modified file 'res/commandimagelist/lc_paste.png' |
132 | Binary files res/commandimagelist/lc_paste.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/lc_paste.png 2010-04-08 04:36:20 +0000 differ |
133 | === modified file 'res/commandimagelist/lc_previewprintoptions.png' |
134 | Binary files res/commandimagelist/lc_previewprintoptions.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/lc_previewprintoptions.png 2010-04-08 04:36:20 +0000 differ |
135 | === modified file 'res/commandimagelist/lc_print.png' |
136 | Binary files res/commandimagelist/lc_print.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/lc_print.png 2010-04-08 04:36:20 +0000 differ |
137 | === modified file 'res/commandimagelist/lc_printdefault.png' |
138 | Binary files res/commandimagelist/lc_printdefault.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/lc_printdefault.png 2010-04-08 04:36:20 +0000 differ |
139 | === modified file 'res/commandimagelist/lc_printersetup.png' |
140 | Binary files res/commandimagelist/lc_printersetup.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/lc_printersetup.png 2010-04-08 04:36:20 +0000 differ |
141 | === modified file 'res/commandimagelist/lc_printpagepreview.png' |
142 | Binary files res/commandimagelist/lc_printpagepreview.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/lc_printpagepreview.png 2010-04-08 04:36:20 +0000 differ |
143 | === modified file 'res/commandimagelist/lc_printpreview.png' |
144 | Binary files res/commandimagelist/lc_printpreview.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/lc_printpreview.png 2010-04-08 04:36:20 +0000 differ |
145 | === modified file 'res/commandimagelist/lc_recundo.png' |
146 | Binary files res/commandimagelist/lc_recundo.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/lc_recundo.png 2010-04-08 04:36:20 +0000 differ |
147 | === modified file 'res/commandimagelist/lc_redo.png' |
148 | Binary files res/commandimagelist/lc_redo.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/lc_redo.png 2010-04-08 04:36:20 +0000 differ |
149 | === modified file 'res/commandimagelist/lc_save.png' |
150 | Binary files res/commandimagelist/lc_save.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/lc_save.png 2010-04-08 04:36:20 +0000 differ |
151 | === modified file 'res/commandimagelist/lc_saveas.png' |
152 | Binary files res/commandimagelist/lc_saveas.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/lc_saveas.png 2010-04-08 04:36:20 +0000 differ |
153 | === modified file 'res/commandimagelist/lc_savebasicas.png' |
154 | Binary files res/commandimagelist/lc_savebasicas.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/lc_savebasicas.png 2010-04-08 04:36:20 +0000 differ |
155 | === modified file 'res/commandimagelist/lc_symbolshapes.png' (properties changed: +x to -x) |
156 | Binary files res/commandimagelist/lc_symbolshapes.png 2009-10-12 01:10:18 +0000 and res/commandimagelist/lc_symbolshapes.png 2010-04-08 04:36:20 +0000 differ |
157 | === removed file 'res/commandimagelist/lc_symbolshapes.png*' |
158 | Binary files res/commandimagelist/lc_symbolshapes.png* 2009-10-12 01:10:18 +0000 and res/commandimagelist/lc_symbolshapes.png* 1970-01-01 00:00:00 +0000 differ |
159 | === modified file 'res/commandimagelist/lc_undo.png' |
160 | Binary files res/commandimagelist/lc_undo.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/lc_undo.png 2010-04-08 04:36:20 +0000 differ |
161 | === modified file 'res/commandimagelist/sc_copy.png' |
162 | Binary files res/commandimagelist/sc_copy.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/sc_copy.png 2010-04-08 04:36:20 +0000 differ |
163 | === modified file 'res/commandimagelist/sc_cut.png' |
164 | Binary files res/commandimagelist/sc_cut.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/sc_cut.png 2010-04-08 04:36:20 +0000 differ |
165 | === modified file 'res/commandimagelist/sc_open.png' |
166 | Binary files res/commandimagelist/sc_open.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/sc_open.png 2010-04-08 04:36:20 +0000 differ |
167 | === modified file 'res/commandimagelist/sc_paste.png' |
168 | Binary files res/commandimagelist/sc_paste.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/sc_paste.png 2010-04-08 04:36:20 +0000 differ |
169 | === modified file 'res/commandimagelist/sc_previewprintoptions.png' |
170 | Binary files res/commandimagelist/sc_previewprintoptions.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/sc_previewprintoptions.png 2010-04-08 04:36:20 +0000 differ |
171 | === modified file 'res/commandimagelist/sc_print.png' |
172 | Binary files res/commandimagelist/sc_print.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/sc_print.png 2010-04-08 04:36:20 +0000 differ |
173 | === modified file 'res/commandimagelist/sc_printdefault.png' |
174 | Binary files res/commandimagelist/sc_printdefault.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/sc_printdefault.png 2010-04-08 04:36:20 +0000 differ |
175 | === modified file 'res/commandimagelist/sc_printersetup.png' |
176 | Binary files res/commandimagelist/sc_printersetup.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/sc_printersetup.png 2010-04-08 04:36:20 +0000 differ |
177 | === modified file 'res/commandimagelist/sc_printpagepreview.png' |
178 | Binary files res/commandimagelist/sc_printpagepreview.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/sc_printpagepreview.png 2010-04-08 04:36:20 +0000 differ |
179 | === modified file 'res/commandimagelist/sc_printpreview.png' |
180 | Binary files res/commandimagelist/sc_printpreview.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/sc_printpreview.png 2010-04-08 04:36:20 +0000 differ |
181 | === modified file 'res/commandimagelist/sc_recsave.png' |
182 | Binary files res/commandimagelist/sc_recsave.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/sc_recsave.png 2010-04-08 04:36:20 +0000 differ |
183 | === modified file 'res/commandimagelist/sc_recundo.png' |
184 | Binary files res/commandimagelist/sc_recundo.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/sc_recundo.png 2010-04-08 04:36:20 +0000 differ |
185 | === modified file 'res/commandimagelist/sc_redo.png' |
186 | Binary files res/commandimagelist/sc_redo.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/sc_redo.png 2010-04-08 04:36:20 +0000 differ |
187 | === modified file 'res/commandimagelist/sc_save.png' |
188 | Binary files res/commandimagelist/sc_save.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/sc_save.png 2010-04-08 04:36:20 +0000 differ |
189 | === modified file 'res/commandimagelist/sc_saveas.png' |
190 | Binary files res/commandimagelist/sc_saveas.png 2008-05-18 23:50:22 +0000 and res/commandimagelist/sc_saveas.png 2010-04-08 04:36:20 +0000 differ |
191 | === modified file 'res/commandimagelist/sc_savebasicas.png' |
192 | Binary files res/commandimagelist/sc_savebasicas.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/sc_savebasicas.png 2010-04-08 04:36:20 +0000 differ |
193 | === modified file 'res/commandimagelist/sc_undo.png' |
194 | Binary files res/commandimagelist/sc_undo.png 2008-02-25 18:58:08 +0000 and res/commandimagelist/sc_undo.png 2010-04-08 04:36:20 +0000 differ |
195 | === modified file 'res/fileopen.png' |
196 | Binary files res/fileopen.png 2008-02-25 18:58:08 +0000 and res/fileopen.png 2010-04-08 04:36:20 +0000 differ |