From 9a7a0acd8966644439d899911b86d5119450c4ac Mon Sep 17 00:00:00 2001 From: rlx <0x0073@0x2620.org> Date: Fri, 2 Sep 2011 00:32:23 +0000 Subject: [PATCH] use svg video markers --- source/Ox.UI/css/Ox.UI.css | 9 ++++---- source/Ox.UI/js/Bar/Ox.Progressbar.js | 21 +++++++++--------- .../Ox.UI/js/Video/Ox.BlockVideoTimeline.js | 10 ++++----- .../Ox.UI/js/Video/Ox.LargeVideoTimeline.js | 6 ++--- .../Ox.UI/js/Video/Ox.SmallVideoTimeline.js | 10 ++++----- source/Ox.UI/js/Video/Ox.VideoPlayer.js | 2 +- source/Ox.UI/png/pluginChromeFrame128.png | Bin 0 -> 20936 bytes source/Ox.UI/png/videoMarkerCut.png | Bin 2813 -> 0 bytes source/Ox.UI/png/videoMarkerIn.png | Bin 2847 -> 0 bytes source/Ox.UI/png/videoMarkerInBottom.png | Bin 2840 -> 0 bytes source/Ox.UI/png/videoMarkerInTop.png | Bin 2838 -> 0 bytes source/Ox.UI/png/videoMarkerOut.png | Bin 2849 -> 0 bytes source/Ox.UI/png/videoMarkerOutBottom.png | Bin 2839 -> 0 bytes source/Ox.UI/png/videoMarkerOutTop.png | Bin 2840 -> 0 bytes source/Ox.UI/png/videoMarkerPlay.png | Bin 2855 -> 0 bytes source/Ox.UI/themes/classic/svg/markerCut.svg | 3 +++ source/Ox.UI/themes/classic/svg/markerIn.svg | 3 +++ .../themes/classic/svg/markerInBottom.svg | 3 +++ .../Ox.UI/themes/classic/svg/markerInTop.svg | 3 +++ source/Ox.UI/themes/classic/svg/markerOut.svg | 3 +++ .../themes/classic/svg/markerOutBottom.svg | 3 +++ .../Ox.UI/themes/classic/svg/markerOutTop.svg | 3 +++ .../Ox.UI/themes/classic/svg/markerPlay.svg | 3 +++ tools/build/build.py | 2 +- 24 files changed, 55 insertions(+), 29 deletions(-) create mode 100644 source/Ox.UI/png/pluginChromeFrame128.png delete mode 100644 source/Ox.UI/png/videoMarkerCut.png delete mode 100644 source/Ox.UI/png/videoMarkerIn.png delete mode 100644 source/Ox.UI/png/videoMarkerInBottom.png delete mode 100644 source/Ox.UI/png/videoMarkerInTop.png delete mode 100644 source/Ox.UI/png/videoMarkerOut.png delete mode 100644 source/Ox.UI/png/videoMarkerOutBottom.png delete mode 100644 source/Ox.UI/png/videoMarkerOutTop.png delete mode 100644 source/Ox.UI/png/videoMarkerPlay.png create mode 100644 source/Ox.UI/themes/classic/svg/markerCut.svg create mode 100644 source/Ox.UI/themes/classic/svg/markerIn.svg create mode 100644 source/Ox.UI/themes/classic/svg/markerInBottom.svg create mode 100644 source/Ox.UI/themes/classic/svg/markerInTop.svg create mode 100644 source/Ox.UI/themes/classic/svg/markerOut.svg create mode 100644 source/Ox.UI/themes/classic/svg/markerOutBottom.svg create mode 100644 source/Ox.UI/themes/classic/svg/markerOutTop.svg create mode 100644 source/Ox.UI/themes/classic/svg/markerPlay.svg diff --git a/source/Ox.UI/css/Ox.UI.css b/source/Ox.UI/css/Ox.UI.css index 312caccf..7e5cf72f 100644 --- a/source/Ox.UI/css/Ox.UI.css +++ b/source/Ox.UI/css/Ox.UI.css @@ -1815,9 +1815,9 @@ Video .OxTimelineLarge .OxCut { position: absolute; top: 66px; - width: 2px; + width: 4px; height: 4px; - margin-left: -1px; + margin-left: -2px; z-index: 10; } .OxTimelineLarge .OxMarkerPointIn { @@ -1839,7 +1839,7 @@ Video position: absolute; top: 2px; width: 9px; - height: 5px; + height: 9px; z-index: 10; } .OxTimelineLarge .OxSubtitle { @@ -1961,10 +1961,11 @@ Video } .OxVideoPlayer .OxPointMarker { + display: none; position: absolute; width: 16px; height: 16px; - display: none; + opacity: 0.5; } .OxVideoPlayer .OxPointMarkerInTop { left: 4px; diff --git a/source/Ox.UI/js/Bar/Ox.Progressbar.js b/source/Ox.UI/js/Bar/Ox.Progressbar.js index fb6a3d24..c5471cc2 100644 --- a/source/Ox.UI/js/Bar/Ox.Progressbar.js +++ b/source/Ox.UI/js/Bar/Ox.Progressbar.js @@ -79,8 +79,7 @@ Ox.Progressbar = function(options, self) { function cancel() { self.cancelled = true; - self.options.progress = 1; - setProgress(); + stop(); that.triggerEvent('cancel'); } @@ -119,17 +118,19 @@ Ox.Progressbar = function(options, self) { self.$progress.stop().animate({ width: Math.round(14 + self.options.progress * (self.trackWidth - 16)) + 'px' }, 250, function() { - if (self.options.progress == 1) { - pause(); - self.$time && self.$time - .addClass('OxSmall') - .html(self.cancelled ? 'Cancelled' : 'Complete'); - self.$pauseButton.options({disabled: true}); - self.$cancelButton.options({disabled: true}); - } + self.options.progress == 1 && stop(); }); } + function stop() { + pause(); + self.$time && self.$time + .addClass('OxSmall') + .html(self.cancelled ? 'Cancelled' : 'Complete'); + self.$pauseButton.options({disabled: true}); + self.$cancelButton.options({disabled: true}); + } + function togglePaused() { self.options.paused = !self.options.paused; if (self.options.paused) { diff --git a/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js b/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js index c98b7192..2b0c0c31 100644 --- a/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js +++ b/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js @@ -62,12 +62,12 @@ Ox.BlockVideoTimeline = function(options, self) { self.$positionMarker = $('') .attr({ - src: Ox.UI.PATH + 'png/videoMarkerPlay.png' + src: Ox.UI.getImageURL('markerPlay') }) .css({ position: 'absolute', width: '9px', - height: '5px', + height: '9px', zIndex: 10 }) .appendTo(that.$element); @@ -75,11 +75,11 @@ Ox.BlockVideoTimeline = function(options, self) { self.$pointMarker = {}; ['in', 'out'].forEach(function(point) { - var titleCase = Ox.toTitleCase(point); + var titlecase = Ox.toTitleCase(point); self.$pointMarker[point] = $('') - .addClass('OxPointMarker' + titleCase) + .addClass('OxPointMarker' + titlecase) .attr({ - src: Ox.UI.PATH + 'png/videoMarker' + titleCase + '.png' + src: Ox.UI.getImageURL('marker' + titlecase) }) .css({ position: 'absolute', diff --git a/source/Ox.UI/js/Video/Ox.LargeVideoTimeline.js b/source/Ox.UI/js/Video/Ox.LargeVideoTimeline.js index cdaab6cc..eaf6a64c 100644 --- a/source/Ox.UI/js/Video/Ox.LargeVideoTimeline.js +++ b/source/Ox.UI/js/Video/Ox.LargeVideoTimeline.js @@ -64,7 +64,7 @@ Ox.LargeVideoTimeline = function(options, self) { self.$cuts[i] = $('') .addClass('OxCut') .attr({ - src: Ox.UI.PATH + 'png/videoMarkerCut.png' + src: Ox.UI.getImageURL('markerCut') }) .css({ left: (v * self.fps) + 'px' @@ -75,7 +75,7 @@ Ox.LargeVideoTimeline = function(options, self) { self.$markerPosition = $('') .addClass('OxMarkerPosition') .attr({ - src: Ox.UI.PATH + 'png/videoMarkerPlay.png' + src: Ox.UI.getImageURL('markerPlay') }) .appendTo(that.$element); setMarker(); @@ -85,7 +85,7 @@ Ox.LargeVideoTimeline = function(options, self) { self.$pointMarker[point] = $('') .addClass('OxMarkerPoint' + titlecase) .attr({ - src: Ox.UI.PATH + 'png/videoMarker' + titlecase + '.png' + src: Ox.UI.getImageURL('marker' + titlecase) }) .appendTo(self.$timeline); setPointMarker(point); diff --git a/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js b/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js index 5a0aa762..c8039028 100644 --- a/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js +++ b/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js @@ -100,13 +100,13 @@ Ox.SmallVideoTimeline = function(options, self) { } else { self.$positionMarker = $('') .attr({ - src: Ox.UI.PATH + 'png/videoMarkerPlay.png' + src: Ox.UI.getImageURL('markerPlay') }) .css({ position: 'absolute', top: '2px', width: '9px', - height: '5px', + height: '9px', zIndex: 10 }) .appendTo(that.$element); @@ -116,11 +116,11 @@ Ox.SmallVideoTimeline = function(options, self) { if (self.options.type == 'editor') { self.$pointMarker = {}; ['in', 'out'].forEach(function(point) { - var titleCase = Ox.toTitleCase(point); + var titlecase = Ox.toTitleCase(point); self.$pointMarker[point] = $('') - .addClass('OxPointMarker' + titleCase) + .addClass('OxPointMarker' + titlecase) .attr({ - src: Ox.UI.PATH + 'png/videoMarker' + titleCase + '.png' + src: Ox.UI.getImageURL('marker' + titlecase) }) .css({ position: 'absolute', diff --git a/source/Ox.UI/js/Video/Ox.VideoPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPlayer.js index ff0d11bd..6f675503 100644 --- a/source/Ox.UI/js/Video/Ox.VideoPlayer.js +++ b/source/Ox.UI/js/Video/Ox.VideoPlayer.js @@ -410,7 +410,7 @@ Ox.VideoPlayer = function(options, self) { self.$pointMarker[point][edge] = $('') .addClass('OxPointMarker OxPointMarker' + titleCase) .attr({ - src: Ox.UI.PATH + 'png/videoMarker' + titleCase + '.png' + src: Ox.UI.getImageURL('marker' + titleCase) }) .appendTo(self.$videoContainer); }); diff --git a/source/Ox.UI/png/pluginChromeFrame128.png b/source/Ox.UI/png/pluginChromeFrame128.png new file mode 100644 index 0000000000000000000000000000000000000000..4e7493b3e1d102134696f2feb888a6e994d8c366 GIT binary patch literal 20936 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 v7a8Edbg literal 0 HcmV?d00001 diff --git a/source/Ox.UI/png/videoMarkerCut.png b/source/Ox.UI/png/videoMarkerCut.png deleted file mode 100644 index 22ed4e8c22015a25da3874aa9860051c656f5af0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2813 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 diff --git a/source/Ox.UI/png/videoMarkerOutBottom.png b/source/Ox.UI/png/videoMarkerOutBottom.png deleted file mode 100644 index f29ef4f57c71248d90faed784d28ebcb763373fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2839 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 diff --git a/source/Ox.UI/png/videoMarkerOutTop.png b/source/Ox.UI/png/videoMarkerOutTop.png deleted file mode 100644 index 9f5bfdcc09c95b5cf9fd3a1ad39c96404cd254df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2840 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 + + \ No newline at end of file diff --git a/source/Ox.UI/themes/classic/svg/markerIn.svg b/source/Ox.UI/themes/classic/svg/markerIn.svg new file mode 100644 index 00000000..9de97247 --- /dev/null +++ b/source/Ox.UI/themes/classic/svg/markerIn.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/Ox.UI/themes/classic/svg/markerInBottom.svg b/source/Ox.UI/themes/classic/svg/markerInBottom.svg new file mode 100644 index 00000000..89eab297 --- /dev/null +++ b/source/Ox.UI/themes/classic/svg/markerInBottom.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/Ox.UI/themes/classic/svg/markerInTop.svg b/source/Ox.UI/themes/classic/svg/markerInTop.svg new file mode 100644 index 00000000..65a50933 --- /dev/null +++ b/source/Ox.UI/themes/classic/svg/markerInTop.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/Ox.UI/themes/classic/svg/markerOut.svg b/source/Ox.UI/themes/classic/svg/markerOut.svg new file mode 100644 index 00000000..efb2df02 --- /dev/null +++ b/source/Ox.UI/themes/classic/svg/markerOut.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/Ox.UI/themes/classic/svg/markerOutBottom.svg b/source/Ox.UI/themes/classic/svg/markerOutBottom.svg new file mode 100644 index 00000000..6dd8cbb4 --- /dev/null +++ b/source/Ox.UI/themes/classic/svg/markerOutBottom.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/Ox.UI/themes/classic/svg/markerOutTop.svg b/source/Ox.UI/themes/classic/svg/markerOutTop.svg new file mode 100644 index 00000000..bae71347 --- /dev/null +++ b/source/Ox.UI/themes/classic/svg/markerOutTop.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/Ox.UI/themes/classic/svg/markerPlay.svg b/source/Ox.UI/themes/classic/svg/markerPlay.svg new file mode 100644 index 00000000..603ab190 --- /dev/null +++ b/source/Ox.UI/themes/classic/svg/markerPlay.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/tools/build/build.py b/tools/build/build.py index 0ad93d54..6b1170b0 100755 --- a/tools/build/build.py +++ b/tools/build/build.py @@ -49,7 +49,7 @@ files = ['Ox.UI/css/Ox.UI.css'] path = source_path + 'Ox.UI/themes/classic/svg/' for filename in os.listdir(path): svg = read_file(path + filename) - svg = svg.replace('#404040', '#FFFFFF').replace('#000000', '#FFFFFF') + svg = svg.replace('#000000', '#XXXXXX').replace('#404040', '#XXXXXX').replace('#FFFFFF', '#000000').replace('#XXXXXX', '#FFFFFF') write_file(path.replace('/classic/', '/modern/') + filename, svg) imageURLs = {}