X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/198be737937aec7259e81ba791bf7f4e401795eb..b0d77fd4dd2b177e77e2bb038a5864567adfd9df:/apps/toolbar/models.py

diff --git a/apps/toolbar/models.py b/apps/toolbar/models.py
index 1b986c3e..0c40179b 100644
--- a/apps/toolbar/models.py
+++ b/apps/toolbar/models.py
@@ -3,18 +3,18 @@ from django.utils.translation import ugettext_lazy as _
 
 
 class ButtonGroup(models.Model):
-    name = models.CharField(max_length=32)
+    name = models.CharField(max_length = 32)
     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')
-    
+
     def __unicode__(self):
         return self.name
 
-    def to_dict(self, with_buttons=False):
+    def to_dict(self, with_buttons = False):
         d = {'name': self.name, 'position': self.position}
 
         if with_buttons:
@@ -42,30 +42,32 @@ class ButtonGroup(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
-    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
-    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)
-    
+
     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)
 
+    @property
     def hotkey_name(self):
         if not self.key:
             return ''
@@ -77,6 +79,10 @@ class Button(models.Model):
         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,
@@ -86,16 +92,16 @@ class Button(models.Model):
             'params': self.params,
             'scriptlet_id': self.scriptlet_id
         }
-    
+
     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):
-        return _(u'javascript')+u':'+self.name
+        return _(u'javascript') + u':' + self.name