From a8e095c09d1b9a911aa0599095de3622c755f3c3 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Mon, 27 Nov 2017 01:20:35 +0300 Subject: [PATCH] slideshow fixes + button... Signed-off-by: Alex A. Naanou --- ui (gen4)/features/ui-slideshow.js | 6 ++++++ ui (gen4)/features/ui-widgets.js | 13 +++++++++++++ 2 files changed, 19 insertions(+) diff --git a/ui (gen4)/features/ui-slideshow.js b/ui (gen4)/features/ui-slideshow.js index 5ed62ba1..0e1a2090 100755 --- a/ui (gen4)/features/ui-slideshow.js +++ b/ui (gen4)/features/ui-slideshow.js @@ -29,6 +29,8 @@ var overlay = require('lib/widget/overlay') // XXX would be a good idea to add provision for a timer to indicate // slideshow progress/status... // - make this a separate feature with a toggler +// XXX might be a good idea to add "slideshow hold", for example while +// mouse down... var SlideshowActions = actions.Actions({ config: { 'slideshow-looping': 'on', @@ -125,6 +127,7 @@ var SlideshowActions = actions.Actions({ } })], + // XXX should this reflect slideshow state???? (ready, running, paused???) slideshowDialog: ['Slideshow/Slideshow...', widgets.makeUIDialog(function(){ var that = this @@ -299,6 +302,9 @@ module.Slideshow = core.ImageGridFeatures.Feature({ } }], + ['load', + function(){ this.toggleSlideshow('off') }], + // - build the slideshow workspace for the first time if it's not // present yet (is null)... // - restore .config['single-image-toggle-on-click'] diff --git a/ui (gen4)/features/ui-widgets.js b/ui (gen4)/features/ui-widgets.js index 5e557cec..a6e2b009 100755 --- a/ui (gen4)/features/ui-widgets.js +++ b/ui (gen4)/features/ui-widgets.js @@ -1976,6 +1976,10 @@ var ButtonsActions = actions.Actions({ 'C': ['crop', 'browseActions: "Crop/" -- Crop menu...'], //'▤': ['collections', 'browseCollections -- Collections...'], //'⛶': ['view', 'toggleSingleImage -- Single image / ribbon toggle'], + '▷': ['slideshow', [ + 'toggleSlideshow -- Toggle slideshow', + 'slideshowDialog -- Slideshow menu...', + ]], }, // XXX not sure about these yet... @@ -2129,6 +2133,15 @@ module.Buttons = core.ImageGridFeatures.Feature({ .html(this.collection ? '●' : '') //*/ }], + // update slideshow status... + ['toggleSlideshow', + function(){ + $('.main-buttons.buttons .slideshow.button') + .html(this.toggleSlideshow('?') == 'on' ? + '◼' + //'◻' + : '▷') + }], // update zoom button status... ['viewScale', function(){