Merge branch 'master' of git@stigma:platforma

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

diff --git a/apps/toolbar/admin.py b/apps/toolbar/admin.py
index 4f03702..93fedbb 100644 (file)
--- a/apps/toolbar/admin.py
+++ b/apps/toolbar/admin.py
@@ -14,11 +14,11 @@ from toolbar import models
 class KeyModSelector(forms.MultiWidget):
     def __init__(self):
         super(KeyModSelector, self).__init__(
 class KeyModSelector(forms.MultiWidget):
     def __init__(self):
         super(KeyModSelector, self).__init__(

-            [forms.CheckboxInput() for x in xrange(0,3)])
+            [forms.CheckboxInput() for x in xrange(0, 3)])

 
     def decompress(self, v):
         if not v: v = 0
 
     def decompress(self, v):
         if not v: v = 0

-        r = [(v&0x01) != 0, (v&0x02) != 0, (v&0x04) != 0]
+        r = [(v & 0x01) != 0, (v & 0x02) != 0, (v & 0x04) != 0]

         print "DECOMPRESS: " , v, repr(r)
         return r
 
         print "DECOMPRESS: " , v, repr(r)
         return r
 


@@ -33,14 +33,14 @@ class KeyModField(forms.MultiValueField):
 
     def __init__(self):
         super(KeyModField, self).__init__(\
 
     def __init__(self):
         super(KeyModField, self).__init__(\

-            fields=tuple(forms.BooleanField() for x in xrange(0,3)), \
-            widget=KeyModSelector() )
+            fields = tuple(forms.BooleanField() for x in xrange(0, 3)), \
+            widget = KeyModSelector())

 
     def compress(self, dl):
         v = int(dl[0]) | (int(dl[1]) << 1) | (int(dl[2]) << 2)
         print "COMPRESS", v
         return v
 
     def compress(self, dl):
         v = int(dl[0]) | (int(dl[1]) << 1) | (int(dl[2]) << 2)
         print "COMPRESS", v
         return v

-    
+

 
 class ButtonAdminForm(forms.ModelForm):
     key_mod = KeyModField()
 
 class ButtonAdminForm(forms.ModelForm):
     key_mod = KeyModField()


@@ -55,11 +55,11 @@ class ButtonAdminForm(forms.ModelForm):
         except Exception, e:
             raise forms.ValidationError(e)
 
         except Exception, e:
             raise forms.ValidationError(e)
 

-
-

 class ButtonAdmin(admin.ModelAdmin):
     form = ButtonAdminForm
 class ButtonAdmin(admin.ModelAdmin):
     form = ButtonAdminForm

-    list_display = ('label', 'scriptlet', 'hotkey_name', 'params')
+    list_display = ('slug', 'label', 'tooltip', 'hotkey_name')
+    list_display_links = ('slug',)
+    list_editable = ('label', 'tooltip',)

     prepopulated_fields = {'slug': ('label',)}
 
 admin.site.register(models.Button, ButtonAdmin)
     prepopulated_fields = {'slug': ('label',)}
 
 admin.site.register(models.Button, ButtonAdmin)