[Products.Silva][wim] updated service icons
[email protected] Fri, 30 Aug 2013 16:19:15 +0200
| Newsgroups | gmane.comp.web.zope.silva.cvs |
|---|---|
| Message-ID | <[email protected]> |
author: wim
date: Fri Aug 30 16:19:02 2013 +0200
revision: 11855:f1eccc429f64 in Products.Silva
branch: 2.4
details: https://hg.infrae.com/Products.Silva?cmd=changeset;node=f1eccc429f64
modified: Products/Silva/File/service.py Products/Silva/Ghost.py Products/Silva/GhostFolder.py Products/Silva/icon.py Products/Silva/icons/file.png Products/Silva/icons/file_aiff.png Products/Silva/icons/file_css.png Products/Silva/icons/file_doc.png Products/Silva/icons/file_html.png Products/Silva/icons/file_illustrator.png Products/Silva/icons/file_js.png Products/Silva/icons/file_pdf.png Products/Silva/icons/file_ppt.png Products/Silva/icons/file_quicktime.png Products/Silva/icons/file_txt.png Products/Silva/icons/file_xls.png Products/Silva/icons/file_xml.png Products/Silva/icons/file_zip.png Products/Silva/icons/generic.gif Products/Silva/icons/generic.png Products/Silva/icons/ghost.gif Products/Silva/icons/ghost.png Products/Silva/icons/ghost_broken.gif Products/Silva/icons/ghost_b
roken.png Products/Silva/icons/ghost_folder.gif Products/Silva/icons/ghost_folder.png Products/Silva/icons/ghost_publication.gif Products/Silva/icons/ghost_publication.png Products/Silva/ico
ns/member.png Products/Silva/icons/root.png Products/Silva/icons/service_extension.png Products/Silva/icons/service_files.gif Products/Silva/icons/service_files.png Products/Silva/icons/service_member.png Products/Silva/icons/service_message.png Products/Silva/tests/test_icon.py
added: Products/Silva/icons/generic.png Products/Silva/icons/ghost.png Products/Silva/icons/ghost_broken.png Products/Silva/icons/ghost_folder.png Products/Silva/icons/ghost_publication.png Products/Silva/icons/service_files.png
removed: Products/Silva/icons/generic.gif Products/Silva/icons/ghost.gif Products/Silva/icons/ghost_broken.gif Products/Silva/icons/ghost_folder.gif Products/Silva/icons/ghost_publication.gif Products/Silva/icons/service_files.gif
log: updated service icons
diffstat:
Products/Silva/File/service.py | 2 +-
Products/Silva/Ghost.py | 2 +-
Products/Silva/GhostFolder.py | 2 +-
Products/Silva/icon.py | 8 ++++----
Products/Silva/icons/file.png | Bin
Products/Silva/icons/file_aiff.png | Bin
Products/Silva/icons/file_css.png | Bin
Products/Silva/icons/file_doc.png | Bin
Products/Silva/icons/file_html.png | Bin
Products/Silva/icons/file_illustrator.png | Bin
Products/Silva/icons/file_js.png | Bin
Products/Silva/icons/file_pdf.png | Bin
Products/Silva/icons/file_ppt.png | Bin
Products/Silva/icons/file_quicktime.png | Bin
Products/Silva/icons/file_txt.png | Bin
Products/Silva/icons/file_xls.png | Bin
Products/Silva/icons/file_xml.png | Bin
Products/Silva/icons/file_zip.png | Bin
Products/Silva/icons/generic.gif | Bin
Products/Silva/icons/generic.png | Bin
Products/Silva/icons/ghost.gif | Bin
Products/Silva/icons/ghost.png | Bin
Products/Silva/icons/ghost_broken.gif | Bin
Products/Silva/icons/ghost_broken.png | Bin
Products/Silva/icons/ghost_folder.gif | Bin
Products/Silva/icons/ghost_folder.png | Bin
Products/Silva/icons/ghost_publication.gif | Bin
Products/Silva/icons/ghost_publication.png | Bin
Products/Silva/icons/member.png | Bin
Products/Silva/icons/root.png | Bin
Products/Silva/icons/service_extension.png | Bin
Products/Silva/icons/service_files.gif | Bin
Products/Silva/icons/service_files.png | Bin
Products/Silva/icons/service_member.png | Bin
Products/Silva/icons/service_message.png | Bin
Products/Silva/tests/test_icon.py | 10 +++++-----
36 files changed, 12 insertions(+), 12 deletions(-)
diffs (161 lines):
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/File/service.py
--- a/Products/Silva/File/service.py Fri Aug 30 15:59:11 2013 +0200
+++ b/Products/Silva/File/service.py Fri Aug 30 16:19:02 2013 +0200
@@ -44,7 +44,7 @@
grok.implements(IFilesService)
grok.name('service_files')
silvaconf.default_service()
- silvaconf.icon('icons/service_files.gif')
+ silvaconf.icon('icons/service_files.png')
security = ClassSecurityInfo()
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/Ghost.py
--- a/Products/Silva/Ghost.py Fri Aug 30 15:59:11 2013 +0200
+++ b/Products/Silva/Ghost.py Fri Aug 30 16:19:02 2013 +0200
@@ -187,7 +187,7 @@
security = ClassSecurityInfo()
grok.implements(IGhost)
- silvaconf.icon('icons/ghost.gif')
+ silvaconf.icon('icons/ghost.png')
silvaconf.version_class('GhostVersion')
security.declareProtected(
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/GhostFolder.py
--- a/Products/Silva/GhostFolder.py Fri Aug 30 15:59:11 2013 +0200
+++ b/Products/Silva/GhostFolder.py Fri Aug 30 16:19:02 2013 +0200
@@ -170,7 +170,7 @@
meta_type = 'Silva Ghost Folder'
grok.implements(IGhostFolder)
- silvaconf.icon('icons/ghost_folder.gif')
+ silvaconf.icon('icons/ghost_folder.png')
silvaconf.priority(0)
security = ClassSecurityInfo()
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icon.py
--- a/Products/Silva/icon.py Fri Aug 30 15:59:11 2013 +0200
+++ b/Products/Silva/icon.py Fri Aug 30 16:19:02 2013 +0200
@@ -159,12 +159,12 @@
'++static++/silva.icons/%s' % icon_name)
misc_icons = [
- ('default', None, 'generic.gif'),
+ ('default', None, 'generic.png'),
('meta_type', None, 'missing.png'),
- ('meta_type', 'Silva Ghost Folder', 'ghost_folder.gif'),
- ('meta_type', 'Silva Ghost Publication', 'ghost_publication.gif'),
+ ('meta_type', 'Silva Ghost Folder', 'ghost_folder.png'),
+ ('meta_type', 'Silva Ghost Publication', 'ghost_publication.png'),
('meta_type', 'Broken Silva Ghost Folder', 'ghost_broken.png'),
- ('meta_type', 'Silva Ghost', 'ghost.gif'),
+ ('meta_type', 'Silva Ghost', 'ghost.png'),
('meta_type', 'Broken Silva Ghost', 'ghost_broken.png'),
]
for cls, kind, icon_name in misc_icons:
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/file.png
Binary file Products/Silva/icons/file.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/file_aiff.png
Binary file Products/Silva/icons/file_aiff.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/file_css.png
Binary file Products/Silva/icons/file_css.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/file_doc.png
Binary file Products/Silva/icons/file_doc.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/file_html.png
Binary file Products/Silva/icons/file_html.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/file_illustrator.png
Binary file Products/Silva/icons/file_illustrator.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/file_js.png
Binary file Products/Silva/icons/file_js.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/file_pdf.png
Binary file Products/Silva/icons/file_pdf.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/file_ppt.png
Binary file Products/Silva/icons/file_ppt.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/file_quicktime.png
Binary file Products/Silva/icons/file_quicktime.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/file_txt.png
Binary file Products/Silva/icons/file_txt.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/file_xls.png
Binary file Products/Silva/icons/file_xls.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/file_xml.png
Binary file Products/Silva/icons/file_xml.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/file_zip.png
Binary file Products/Silva/icons/file_zip.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/generic.gif
Binary file Products/Silva/icons/generic.gif has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/generic.png
Binary file Products/Silva/icons/generic.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/ghost.gif
Binary file Products/Silva/icons/ghost.gif has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/ghost.png
Binary file Products/Silva/icons/ghost.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/ghost_broken.gif
Binary file Products/Silva/icons/ghost_broken.gif has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/ghost_broken.png
Binary file Products/Silva/icons/ghost_broken.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/ghost_folder.gif
Binary file Products/Silva/icons/ghost_folder.gif has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/ghost_folder.png
Binary file Products/Silva/icons/ghost_folder.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/ghost_publication.gif
Binary file Products/Silva/icons/ghost_publication.gif has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/ghost_publication.png
Binary file Products/Silva/icons/ghost_publication.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/member.png
Binary file Products/Silva/icons/member.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/root.png
Binary file Products/Silva/icons/root.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/service_extension.png
Binary file Products/Silva/icons/service_extension.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/service_files.gif
Binary file Products/Silva/icons/service_files.gif has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/service_files.png
Binary file Products/Silva/icons/service_files.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/service_member.png
Binary file Products/Silva/icons/service_member.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/icons/service_message.png
Binary file Products/Silva/icons/service_message.png has changed
diff -r caf1cc5b1bd4 -r f1eccc429f64 Products/Silva/tests/test_icon.py
--- a/Products/Silva/tests/test_icon.py Fri Aug 30 15:59:11 2013 +0200
+++ b/Products/Silva/tests/test_icon.py Fri Aug 30 16:19:02 2013 +0200
@@ -50,7 +50,7 @@
self.assertTrue(verifyObject(IIcon, icon))
self.assertEqual(
str(icon),
- '++static++/silva.icons/generic.gif')
+ '++static++/silva.icons/generic.png')
self.assertEqual(
resolver.get_content_url(self.root),
@@ -66,7 +66,7 @@
'http://localhost/root/++static++/silva.icons/missing.png')
self.assertEqual(
resolver.get_identifier_url('best content in the world'),
- 'http://localhost/root/++static++/silva.icons/generic.gif')
+ 'http://localhost/root/++static++/silva.icons/generic.png')
icon = resolver.get_content(self.root.pdf)
self.assertTrue(verifyObject(IIcon, icon))
@@ -103,7 +103,7 @@
'<img height="16" width="16" src="http://localhost/root/++resource++icon-Silva-Root.png" alt="Silva Root" />')
self.assertEqual(
resolver.get_tag(identifier='default'),
- '<img height="16" width="16" src="http://localhost/root/++static++/silva.icons/generic.gif" alt="default" />')
+ '<img height="16" width="16" src="http://localhost/root/++static++/silva.icons/generic.png" alt="default" />')
self.assertEqual(
resolver.get_tag(),
'<img height="16" width="16" src="http://localhost/root/++static++/silva.icons/missing.png" alt="Missing" />')
@@ -128,10 +128,10 @@
icon = resolver.get_identifier(('test-silva', 'missing'))
self.assertTrue(verifyObject(IIcon, icon))
- self.assertEqual(str(icon), '++static++/silva.icons/generic.gif')
+ self.assertEqual(str(icon), '++static++/silva.icons/generic.png')
self.assertEqual(
resolver.get_identifier_url(('test-silva', 'missing')),
- 'http://localhost/root/++static++/silva.icons/generic.gif')
+ 'http://localhost/root/++static++/silva.icons/generic.png')
icon = resolver.get_identifier(
('test-silva', 'missing'), default='test-silva')