insert_tag - inserts only end tag, when no text selected - fixed.

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

diff --git a/apps/toolbar/models.py b/apps/toolbar/models.py
index ae101e0..d1f4952 100644 (file)
--- a/apps/toolbar/models.py
+++ b/apps/toolbar/models.py
@@ -19,11 +19,13 @@ class Button(models.Model):
     slug = models.SlugField(unique=True) #unused
 
     # behaviour
     slug = models.SlugField(unique=True) #unused
 
     # behaviour

-    params = models.TextField() # TODO: should be a JSON field
-    scriptlet = models.ForeignKey('Scriptlet')
+    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)
 
     # 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)
 
     # Why the button is restricted to have the same position in each group ?
     tooltip = models.CharField(blank=True, max_length=120)
 
     # Why the button is restricted to have the same position in each group ?


@@ -31,8 +33,22 @@ class Button(models.Model):
     group = models.ManyToManyField(ButtonGroup)
     
     class Meta:
     group = models.ManyToManyField(ButtonGroup)
     
     class Meta:

-        ordering = ('label',)
+        ordering = ('slug',)

         verbose_name, verbose_name_plural = _('button'), _('buttons')
         verbose_name, verbose_name_plural = _('button'), _('buttons')

+
+    def hotkey_code(self):
+        return ord(self.key.upper()) | (self.key_mod << 8)
+
+    def hotkey_name(self):
+        if not self.key:
+            return ''
+
+        mods = []
+        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)

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