Icon server app updates

apps/icons/__init__.py

@@ -1,10 +1,8 @@
-from django.utils.translation import ugettext_lazy as _
+from __future__ import absolute_import
 
-from app_registry.models import App
+#from django.utils.translation import ugettext_lazy as _
+#from django.conf import settings
 
-try:
-    app = App.register('icons', _(u'Icons'))
-except App.UnableToRegister:
-    pass
-else:
-    app.set_dependencies(['app_registry'])
+from .classes import Icon
+#from storage.backends.filebasedstorage import FileBasedStorage
+#afrom app_registry.models import App

apps/icons/api.py

@@ -1,22 +0,0 @@
-from __future__ import absolute_import
-
-from .conf import settings
-from .sets import ICON_THEMES
-from .literals import ERROR
-
-
-def get_icon_name(icon):
-    try:
-        return ICON_THEMES[settings.ICON_SET][icon]
-    except KeyError:
-        return ICON_THEMES[settings.ICON_SET][ERROR]
-    except AttributeError:
-        pass
-
-def get_sprite_name(sprite):
-    try:
-        return ICON_THEMES[settings.ICON_SET][sprite]
-    except KeyError:
-        return ICON_THEMES[settings.ICON_SET][ERROR]
-    except AttributeError:
-        pass

apps/icons/classes.py

@@ -0,0 +1,38 @@
+from __future__ import absolute_import
+
+from django.utils.safestring import mark_safe
+from django.conf import settings
+
+from .settings import ICON_SET
+from .sets import ICON_THEMES
+from .literals import ERROR
+
+SIZE_SMALL = '16x16'
+SIZE_BIG = '32x32'
+
+
+class Icon(object):
+    _registry = {}
+
+    def __init__(self, literal):
+        self.literal = literal
+        self.__class__._registry[literal] = self
+
+    def get_file_name(self, size):
+        # TODO: Move name + size resolution to sets to support size/name and
+        # name_size filename conventions
+        try:
+            return '%s/%s/%s' % (ICON_THEMES[ICON_SET].path, size, ICON_THEMES[ICON_SET].dictionary[self.literal])
+        except KeyError:
+            return '%s/%s/%s' % (ICON_THEMES[ICON_SET].path, size, ICON_THEMES[ICON_SET].dictionary[ERROR])
+        except AttributeError:
+            pass
+
+    def display(self, size): # TODO: move to widgets?
+        return mark_safe(u'<img src="%sicons/%s" />' % (settings.STATIC_URL, self.get_file_name(self.literal)))
+
+    def display_small(self):
+        return self.display(SIZE_SMALL)
+
+    def display_big(self):
+        return self.display(SIZE_BIG)

apps/icons/conf/settings.py

@@ -1,24 +0,0 @@
-"""
-Configuration options for the documents app
-"""
-from __future__ import absolute_import
-
-from django.utils.translation import ugettext_lazy as _
-from django.conf import settings
-
-from storage.backends.filebasedstorage import FileBasedStorage
-from smart_settings.api import Setting, SettingNamespace
-from ..literals import DEFAULT_ICON_SET
-
-from .. import app
-print '__file__', __file__
-namespace = SettingNamespace(app.name, app.label, module='icons.conf.settings', sprite='page')
-
-# Saving
-
-Setting(
-    namespace=namespace,
-    name='ICON_SET',
-    global_name='ICONS_ICON_SET',
-    default=DEFAULT_ICON_SET,
-)

apps/icons/literals.py

@@ -3,8 +3,27 @@
 #DEFAULT_ICON_SET = fat_cow.ID
 DEFAULT_ICON_SET = 'fat_cow'
 
-APP = 'app'
-BACKUPS = 'backups'
+#APP = 'app'
+#BACKUPS = 'backups'
+#ERROR = 'error'
+#ICONS = 'icons'
+#SETTINGS = 'settings'
+   
+APPLICATION_VIEW_ICONS = 'application_view_icons'
+CD_BURN = 'cd_burn'
+COG = 'cog'
 ERROR = 'error'
-ICONS = 'icons'
+GROUP = 'user',
+GROUP_ADD = 'user_add'
+GROUP_EDIT = 'user_edit'
+GROUP_DELETE = 'user_delete'
+LOCK = 'lock'
+MEDAL_GOLD = 'medal_gold'
+MEDAL_GOLD_ADD = 'medal_gold_add'
+MEDAL_GOLD_DELETE = 'medal_gold_delete'
+PLUGIN = 'plugin'
+USER = 'user'
+USER_ADD = 'user_add'
+USER_EDIT = 'user_edit'
+USER_DELETE = 'user_delete'
 

apps/icons/registry.py

@@ -0,0 +1,5 @@
+from django.utils.translation import ugettext_lazy as _
+
+name = 'icons'
+label = _(u'Icons')
+#app.set_dependencies(['app_registry'])

apps/icons/sets/__init__.py

@@ -11,8 +11,8 @@ SET_CHOICES = (
 )
 
 ICON_THEMES = {
-    fat_cow.ID: fat_cow.DICTIONARY,
-    famfamfam.ID: famfamfam.DICTIONARY
+    fat_cow.ID: fat_cow,
+    famfamfam.ID: famfamfam,
 }
 
 

apps/icons/sets/famfamfam.py

@@ -6,6 +6,6 @@ ID = 'famfamfam'
 LABEL = _(u'FamFamFam')
 
 DICTIONARY = {
-    APP: 'plugin',
-    BACKUPS: 'cd_burn',
+    PLUGIN: 'plugin',
+    CD_BURN: 'cd_burn',
 }

apps/icons/sets/fat_cow.py

@@ -4,13 +4,21 @@ from django.utils.translation import ugettext_lazy as _
 
 from icons.literals import *
 
-PATH = os.path.join('Fat Cow', '32x32')
+PATH = os.path.join('fat_cow')
 ID = 'fat_cow'
 LABEL = _(u'Fat cow')
 
 DICTIONARY = {
-    APP: 'plugin.png',
-    BACKUPS: 'cd_burn.png',
+    APPLICATION_VIEW_ICONS: 'application_view_icons.png',
+    CD_BURN: 'cd_burn.png',
+    COG: 'cog.png',
     ERROR: 'error.png',
-    ICONS: 'application_view_icons.png',
+    GROUP: 'group.png',
+    GROUP_ADD: 'group_add.png',
+    GROUP_EDIT: 'group_edit.png',
+    GROUP_DELETE: 'group_delete.png',
+    MEDAL_GOLD: 'medal_gold_1.png',
+    MEDAL_GOLD_ADD: 'medal_gold_add.png',
+    MEDAL_GOLD_DELETE: 'medal_gold_delete.png',  
+    PLUGIN: 'plugin.png',
 }

apps/icons/settings.py

@@ -0,0 +1,13 @@
+from __future__ import absolute_import
+
+from .literals import DEFAULT_ICON_SET
+
+
+#
+#    #print '__file__', __file__
+#    ICON_SET = app.add_setting(
+#        name='ICON_SET',
+#        default=literals.DEFAULT_ICON_SET,
+#    )
+
+ICON_SET = DEFAULT_ICON_SET