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 00000000..4e7493b3 Binary files /dev/null and b/source/Ox.UI/png/pluginChromeFrame128.png differ diff --git a/source/Ox.UI/png/videoMarkerCut.png b/source/Ox.UI/png/videoMarkerCut.png deleted file mode 100644 index 22ed4e8c..00000000 Binary files a/source/Ox.UI/png/videoMarkerCut.png and /dev/null differ diff --git a/source/Ox.UI/png/videoMarkerIn.png b/source/Ox.UI/png/videoMarkerIn.png deleted file mode 100644 index 0c2f94f9..00000000 Binary files a/source/Ox.UI/png/videoMarkerIn.png and /dev/null differ diff --git a/source/Ox.UI/png/videoMarkerInBottom.png b/source/Ox.UI/png/videoMarkerInBottom.png deleted file mode 100644 index 168c8c6d..00000000 Binary files a/source/Ox.UI/png/videoMarkerInBottom.png and /dev/null differ diff --git a/source/Ox.UI/png/videoMarkerInTop.png b/source/Ox.UI/png/videoMarkerInTop.png deleted file mode 100644 index c533819e..00000000 Binary files a/source/Ox.UI/png/videoMarkerInTop.png and /dev/null differ diff --git a/source/Ox.UI/png/videoMarkerOut.png b/source/Ox.UI/png/videoMarkerOut.png deleted file mode 100644 index c53c7395..00000000 Binary files a/source/Ox.UI/png/videoMarkerOut.png and /dev/null differ diff --git a/source/Ox.UI/png/videoMarkerOutBottom.png b/source/Ox.UI/png/videoMarkerOutBottom.png deleted file mode 100644 index f29ef4f5..00000000 Binary files a/source/Ox.UI/png/videoMarkerOutBottom.png and /dev/null differ diff --git a/source/Ox.UI/png/videoMarkerOutTop.png b/source/Ox.UI/png/videoMarkerOutTop.png deleted file mode 100644 index 9f5bfdcc..00000000 Binary files a/source/Ox.UI/png/videoMarkerOutTop.png and /dev/null differ diff --git a/source/Ox.UI/png/videoMarkerPlay.png b/source/Ox.UI/png/videoMarkerPlay.png deleted file mode 100644 index 4a32e48b..00000000 Binary files a/source/Ox.UI/png/videoMarkerPlay.png and /dev/null differ diff --git a/source/Ox.UI/themes/classic/svg/markerCut.svg b/source/Ox.UI/themes/classic/svg/markerCut.svg new file mode 100644 index 00000000..22b7e4a6 --- /dev/null +++ b/source/Ox.UI/themes/classic/svg/markerCut.svg @@ -0,0 +1,3 @@ + + + \ 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 = {}