0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

new clip sort key scheme; fix for info line(s) in icon lists

Browse source
This commit is contained in:
rolux 2011-10-09 12:46:35 +00:00
commit 7fd64740aa
8 changed files with 64 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

19
pandora/0xdb.json
View file

@ -10,13 +10,13 @@
"canSeeExtraItemViews": {"friend": true, "staff": true, "admin": true}
},
"clipKeys": [
{"id": "clip:text", "title": "Text", "type": "string"},
{"id": "clip:position", "title": "Position", "type": "float"},
{"id": "clip:duration", "title": "Duration", "type": "float"},
{"id": "clip:hue", "title": "Hue", "type": "hue"},
{"id": "clip:saturation", "title": "Saturation", "type": "float"},
{"id": "clip:lightness", "title": "Lightness", "type": "float"},
{"id": "clip:volume", "title": "Volume", "type": "float"}
{"id": "text", "title": "Text", "type": "string"},
{"id": "position", "title": "Position", "type": "float", "sortOperator": "-"},
{"id": "duration", "title": "Duration", "type": "float"},
{"id": "hue", "title": "Hue", "type": "float", "sortOperator": "-"},
{"id": "saturation", "title": "Saturation", "type": "float"},
{"id": "lightness", "title": "Lightness", "type": "float"},
{"id": "volume", "title": "Volume", "type": "float"}
],
"groups": [
{"id": "director", "title": "Director", "type": "string"},
@ -298,9 +298,10 @@
{
"id": "hue",
"title": "Hue",
"type": "hue",
"type": "float",
"columnWidth": 90,
"format": {"type": "color", "args": ["hue"]}
"format": {"type": "color", "args": ["hue"]},
"sortOperator": "-"
},
{
"id": "saturation",

3
pandora/clip/views.py
View file

@ -31,9 +31,10 @@ def order_query(qs, sort):
operator = e['operator']
if operator != '-':
operator = ''
clip_keys = ('start', 'end', 'hue', 'saturation', 'lightness', 'volume'
clip_keys = ('public_id', 'start', 'end', 'hue', 'saturation', 'lightness', 'volume'
'annotations__value')
key = {
'id': 'public_id',
'in': 'start',
'out': 'end',
'position': 'start',