Complete serialization with pretty printing. Works both in FF and Webkit. This fixes...

[redakcja.git] / apps / toolbar / models.py

diff --git a/apps/toolbar/models.py b/apps/toolbar/models.py
index 0414622..0c40179 100644 (file)
--- a/apps/toolbar/models.py
+++ b/apps/toolbar/models.py
@@ -3,17 +3,24 @@ from django.utils.translation import ugettext_lazy as _
 
 
 class ButtonGroup(models.Model):
 
 
 class ButtonGroup(models.Model):

-    name = models.CharField(max_length=32)
+    name = models.CharField(max_length = 32)

     slug = models.SlugField()
     slug = models.SlugField()

-    position = models.IntegerField(default=0)
-    
+    position = models.IntegerField(default = 0)
+

     class Meta:
         ordering = ('position', 'name',)
         verbose_name, verbose_name_plural = _('button group'), _('button groups')
     class Meta:
         ordering = ('position', 'name',)
         verbose_name, verbose_name_plural = _('button group'), _('button groups')

-    
+

     def __unicode__(self):
         return self.name
 
     def __unicode__(self):
         return self.name
 

+    def to_dict(self, with_buttons = False):
+        d = {'name': self.name, 'position': self.position}
+
+        if with_buttons:
+            d['buttons'] = [ b.to_dict() for b in self.button_set.all() ]
+
+        return d

 
 #class ButtonGroupManager(models.Manager):
 #
 
 #class ButtonGroupManager(models.Manager):
 #


@@ -35,30 +42,32 @@ class ButtonGroup(models.Model):
 #        return result_list
 
 class Button(models.Model):
 #        return result_list
 
 class Button(models.Model):

-    label = models.CharField(max_length=32)
-    slug = models.SlugField(unique=True) #unused
+    label = models.CharField(max_length = 32)
+    slug = models.SlugField(unique = True) #unused

 
     # behaviour
 
     # behaviour

-    params = models.TextField(default='[]') # TODO: should be a JSON field
-    scriptlet = models.ForeignKey('Scriptlet', null=True, blank=True)
-    link = models.CharField(max_length=256, blank=True, default='')
+    params = models.TextField(default = '[]') # TODO: should be a JSON field
+    scriptlet = models.ForeignKey('Scriptlet', null = True, blank = True)
+    link = models.CharField(max_length = 256, blank = True, default = '')

 
     # ui related stuff
 
     # ui related stuff

-    key = models.CharField(blank=True, max_length=1)
-    key_mod = models.PositiveIntegerField(blank=True, default=1)
-    tooltip = models.CharField(blank=True, max_length=120)
+    key = models.CharField(blank = True, max_length = 1)
+    key_mod = models.PositiveIntegerField(blank = True, default = 1)
+    tooltip = models.CharField(blank = True, max_length = 120)

 
     # Why the button is restricted to have the same position in each group ?
     # position = models.IntegerField(default=0)   
     group = models.ManyToManyField(ButtonGroup)
 
     # Why the button is restricted to have the same position in each group ?
     # position = models.IntegerField(default=0)   
     group = models.ManyToManyField(ButtonGroup)

-    
+

     class Meta:
         ordering = ('slug',)
         verbose_name, verbose_name_plural = _('button'), _('buttons')
 
     class Meta:
         ordering = ('slug',)
         verbose_name, verbose_name_plural = _('button'), _('buttons')
 

+    @property

     def hotkey_code(self):
         return ord(self.key.upper()) | (self.key_mod << 8)
 
     def hotkey_code(self):
         return ord(self.key.upper()) | (self.key_mod << 8)
 

+    @property

     def hotkey_name(self):
         if not self.key:
             return ''
     def hotkey_name(self):
         if not self.key:
             return ''


@@ -67,18 +76,32 @@ class Button(models.Model):
         if self.key_mod & 0x01: mods.append('Alt')
         if self.key_mod & 0x02: mods.append('Ctrl')
         if self.key_mod & 0x04: mods.append('Shift')
         if self.key_mod & 0x01: mods.append('Alt')
         if self.key_mod & 0x02: mods.append('Ctrl')
         if self.key_mod & 0x04: mods.append('Shift')

-        mods.append('"'+self.key+'"')
-        return '+'.join(mods)
-    
+        mods.append(str(self.key))
+        return '[' + '+'.join(mods) + ']'
+
+    @property
+    def full_tooltip(self):
+        return self.tooltip + (' ' + self.hotkey_name if self.key else '')
+
+    def to_dict(self):
+        return {
+            'label': self.label,
+            'tooltip': (self.tooltip or '') + self.hotkey_name(),
+            'key': self.key,
+            'key_mod': self.key_mod,
+            'params': self.params,
+            'scriptlet_id': self.scriptlet_id
+        }
+

     def __unicode__(self):
         return self.label
 
 class Scriptlet(models.Model):
     def __unicode__(self):
         return self.label
 
 class Scriptlet(models.Model):

-    name = models.CharField(max_length=64, primary_key=True)
+    name = models.CharField(max_length = 64, primary_key = True)

     code = models.TextField()
 
     # TODO: add this later and remap code property to this
     # code_min = models.TextField()
 
     def __unicode__(self):
     code = models.TextField()
 
     # TODO: add this later and remap code property to this
     # code_min = models.TextField()
 
     def __unicode__(self):

-        return _(u'javascript')+u':'+self.name
+        return _(u'javascript') + u':' + self.name