some tweaking...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2016-04-07 05:41:06 +03:00
parent 42298eee7b
commit 373322454b
2 changed files with 14 additions and 12 deletions

View File

@ -197,7 +197,7 @@ module.GLOBAL_KEYBOARD = {
default: 'fitImage: 3 -- Fit 3 images', default: 'fitImage: 3 -- Fit 3 images',
shift: 'fitRibbon: 3.5 -- Fit 3.5 ribbons', shift: 'fitRibbon: 3.5 -- Fit 3.5 ribbons',
}, },
'#4': 'fitImage: 4', '#4': 'fitImage: 4 -- Fit 4 images',
'#5': { '#5': {
default: 'fitImage: 5 -- Fit 5 images', default: 'fitImage: 5 -- Fit 5 images',
shift: 'fitRibbon: 5.5 -- Fit 5.5 ribbons', shift: 'fitRibbon: 5.5 -- Fit 5.5 ribbons',
@ -279,6 +279,8 @@ module.GLOBAL_KEYBOARD = {
// XXX for debug... // XXX for debug...
ctrl: function(){ $('.viewer').toggleClass('visible-gid') }, ctrl: function(){ $('.viewer').toggleClass('visible-gid') },
}, },
'?': 'showKeyboardBindings',
}, },
} }
@ -364,15 +366,15 @@ var KeyboardActions = actions.Actions({
showKeyboardBindings: ['Interface/Show keyboard bindings', showKeyboardBindings: ['Interface/Show keyboard bindings',
function(){ function(){
var widget = drawer.Drawer($('body'), var widget = drawer.Drawer($('body'),
$('<div>') keyboard.buildKeybindingsHelpHTML(this.__keyboard_config, this),
.css({
background: 'white',
})
.append(
keyboard.buildKeybindingsHelpHTML(this.__keyboard_config, this)),
{ {
focusable: true, focusable: true,
}) })
.dom.find('.content')
// XXX move to CSS...
.css({
background: 'white',
})
}], }],
}) })

View File

@ -66,7 +66,7 @@ var SlideshowActions = actions.Actions({
// click on the first option with a mouse... // click on the first option with a mouse...
// result: // result:
// the top dialog is not focused... // the top dialog is not focused...
slideshowDialog: ['Slideshow/Settings and start', slideshowDialog: ['Slideshow/Slideshow settings and start',
function(){ function(){
var that = this var that = this
@ -205,16 +205,16 @@ var SlideshowActions = actions.Actions({
}], }],
// XXX add a custom time setting... // XXX add a custom time setting...
toggleSlideshowInterval: ['- Slideshow/Interval', toggleSlideshowInterval: ['- Slideshow/Slideshow interval',
core.makeConfigToggler('slideshow-interval', core.makeConfigToggler('slideshow-interval',
function(){ return this.config['slideshow-intervals'] }, function(){ return this.config['slideshow-intervals'] },
function(){ this.resetSlideshowTimer() })], function(){ this.resetSlideshowTimer() })],
toggleSlideshowDirection: ['- Slideshow/Direction', toggleSlideshowDirection: ['- Slideshow/Slideshow direction',
core.makeConfigToggler('slideshow-direction', ['forward', 'reverse'])], core.makeConfigToggler('slideshow-direction', ['forward', 'reverse'])],
toggleSlideshowLooping: ['- Slideshow/Looping', toggleSlideshowLooping: ['- Slideshow/Slideshow looping',
core.makeConfigToggler('slideshow-looping', ['on', 'off'])], core.makeConfigToggler('slideshow-looping', ['on', 'off'])],
toggleSlideshow: ['Slideshow/Quick toggle', toggleSlideshow: ['Slideshow/Slideshow quick toggle',
toggler.CSSClassToggler( toggler.CSSClassToggler(
function(){ return this.ribbons.viewer }, function(){ return this.ribbons.viewer },
'slideshow-running', 'slideshow-running',