From 21fc25e7fd37bbc2abe6af896cedc39d607739b0 Mon Sep 17 00:00:00 2001 From: rolux Date: Sat, 17 Mar 2012 06:31:34 +0000 Subject: [PATCH] update timeline names --- pandora/0xdb.jsonc | 8 +++++++- pandora/padma.jsonc | 8 +++++++- static/js/pandora/menu.js | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/pandora/0xdb.jsonc b/pandora/0xdb.jsonc index 51b4cdb57..dca625f38 100644 --- a/pandora/0xdb.jsonc +++ b/pandora/0xdb.jsonc @@ -652,6 +652,12 @@ {"id": "rights", "title": "Rights Management"}, {"id": "contact", "title": "Contact"} ], + "timelines": [ + {"id": "antialias", "title": "Anti-Alias"}, + {"id": "slitscan", "title": "Slit-Scan"}, + {"id": "keyframes", "title": "Key Frames"}, + {"id": "audio", "title": "Audio"} + ], "totals": [ {"id": "items"}, {"id": "runtime"}, @@ -737,7 +743,7 @@ "videoScale": "fit", "videoSize": "small", "videoSubtitles": true, - "videoTimeline": "average", + "videoTimeline": "antialias", "videoView": "video", "videoVolume": 1 }, diff --git a/pandora/padma.jsonc b/pandora/padma.jsonc index 7c1bf7d49..22e1f38bb 100644 --- a/pandora/padma.jsonc +++ b/pandora/padma.jsonc @@ -568,6 +568,12 @@ {"id": "license", "title": "License"}, {"id": "contact", "title": "Contact"} ], + "timelines": [ + {"id": "antialias", "title": "Anti-Alias"}, + {"id": "slitscan", "title": "Slit-Scan"}, + {"id": "keyframes", "title": "Key Frames"}, + {"id": "audio", "title": "Audio"} + ], "totals": [ {"id": "items"}, {"id": "files", "admin": true}, @@ -657,7 +663,7 @@ "videoResolution": 240, "videoScale": "fit", "videoSize": "large", - "videoTimeline": "average", + "videoTimeline": "antialias", "videoView": "video", "videoVolume": 1 }, diff --git a/static/js/pandora/menu.js b/static/js/pandora/menu.js index e7827aa99..88008c29f 100644 --- a/static/js/pandora/menu.js +++ b/static/js/pandora/menu.js @@ -70,8 +70,8 @@ pandora.ui.mainMenu = function() { ] : [] ) }, { id: 'timelines', title: 'Timelines', items: [ - { group: 'viewtimelines', min: 1, max: 1, items: ['average', 'center', 'frames'].map(function(timelines) { - return {id: timelines, title: Ox.toTitleCase(timelines), checked: ui.videoTimeline == timelines}; + { group: 'viewtimelines', min: 1, max: 1, items: pandora.site.timelines.map(function(mode) { + return {id: mode.id, title: mode.title, checked: ui.videoTimeline == mode.id}; }) } ]}, { id: 'columns', title: 'Columns', items: [