Dużo poprawek :-)

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

diff --git a/apps/toolbar/models.py b/apps/toolbar/models.py
index ad4752a..0414622 100644 (file)
--- a/apps/toolbar/models.py
+++ b/apps/toolbar/models.py
@@ -8,25 +8,77 @@ class ButtonGroup(models.Model):
     position = models.IntegerField(default=0)
     
     class Meta:
     position = models.IntegerField(default=0)
     
     class Meta:

-        ordering = ['name']
+        ordering = ('position', 'name',)

         verbose_name, verbose_name_plural = _('button group'), _('button groups')
     
     def __unicode__(self):
         return self.name
 
 
         verbose_name, verbose_name_plural = _('button group'), _('button groups')
     
     def __unicode__(self):
         return self.name
 
 

+#class ButtonGroupManager(models.Manager):
+#
+#    def with_buttons(self):
+#        from django.db import connection
+#        cursor = connection.cursor()
+#        cursor.execute("""
+#            SELECT g.name, g.slug, CONCAT(b.slug),
+#            FROM toolbar_buttongroup as g LEFT JOIN toolbar_button as b
+#
+#            WHERE p.id = r.poll_id
+#            GROUP BY 1, 2, 3
+#            ORDER BY 3 DESC""")
+#        result_list = []
+#        for row in cursor.fetchall():
+#            p = self.model(id=row[0], question=row[1], poll_date=row[2])
+#            p.num_responses = row[3]
+#            result_list.append(p)
+#        return result_list
+

 class Button(models.Model):
     label = models.CharField(max_length=32)
 class Button(models.Model):
     label = models.CharField(max_length=32)

-    slug = models.SlugField()
-    tag = models.CharField(max_length=128)
-    key = models.IntegerField(blank=True, null=True)
-    position = models.IntegerField(default=0)
-    
+    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='')
+
+    # 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 ?
+    # position = models.IntegerField(default=0)   

     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

+
+class Scriptlet(models.Model):
+    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