From 373322454b2a9a36c401ded340e0ceed3548c4b8 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Thu, 7 Apr 2016 05:41:06 +0300
Subject: [PATCH] some tweaking...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 ui (gen4)/features/keyboard.js     | 16 +++++++++-------
 ui (gen4)/features/ui-slideshow.js | 10 +++++-----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/ui (gen4)/features/keyboard.js b/ui (gen4)/features/keyboard.js
index f088f9b9..04ba31e6 100755
--- a/ui (gen4)/features/keyboard.js	
+++ b/ui (gen4)/features/keyboard.js	
@@ -197,7 +197,7 @@ module.GLOBAL_KEYBOARD = {
 			default: 'fitImage: 3 -- Fit 3 images',
 			shift: 'fitRibbon: 3.5 -- Fit 3.5 ribbons',
 		},
-		'#4': 'fitImage: 4',
+		'#4': 'fitImage: 4 -- Fit 4 images',
 		'#5': {
 			default: 'fitImage: 5 -- Fit 5 images',
 			shift: 'fitRibbon: 5.5 -- Fit 5.5 ribbons',
@@ -279,6 +279,8 @@ module.GLOBAL_KEYBOARD = {
 			// XXX for debug...
 			ctrl: function(){ $('.viewer').toggleClass('visible-gid') },
 		},
+
+		'?': 'showKeyboardBindings',
 	},
 }	
 
@@ -364,15 +366,15 @@ var KeyboardActions = actions.Actions({
 	showKeyboardBindings: ['Interface/Show keyboard bindings',
 		function(){
 			var widget = drawer.Drawer($('body'), 
-				$('<div>')
-					.css({
-						background: 'white',
-					})
-					.append(
-						keyboard.buildKeybindingsHelpHTML(this.__keyboard_config, this)),
+				keyboard.buildKeybindingsHelpHTML(this.__keyboard_config, this),
 				{
 					focusable: true,
 				})
+				.dom.find('.content')
+					// XXX move to CSS...
+					.css({
+						background: 'white',
+					})
 		}],
 
 })
diff --git a/ui (gen4)/features/ui-slideshow.js b/ui (gen4)/features/ui-slideshow.js
index 297867f7..c7f51c6e 100755
--- a/ui (gen4)/features/ui-slideshow.js	
+++ b/ui (gen4)/features/ui-slideshow.js	
@@ -66,7 +66,7 @@ var SlideshowActions = actions.Actions({
 	// 			click on the first option with a mouse...
 	// 		result:
 	// 			the top dialog is not focused...
-	slideshowDialog: ['Slideshow/Settings and start',
+	slideshowDialog: ['Slideshow/Slideshow settings and start',
 		function(){
 			var that = this
 
@@ -205,16 +205,16 @@ var SlideshowActions = actions.Actions({
 		}],
 	
 	// XXX add a custom time setting...
-	toggleSlideshowInterval: ['- Slideshow/Interval',
+	toggleSlideshowInterval: ['- Slideshow/Slideshow interval',
 		core.makeConfigToggler('slideshow-interval', 
 			function(){ return this.config['slideshow-intervals'] },
 			function(){ this.resetSlideshowTimer() })],
-	toggleSlideshowDirection: ['- Slideshow/Direction',
+	toggleSlideshowDirection: ['- Slideshow/Slideshow direction',
 		core.makeConfigToggler('slideshow-direction', ['forward', 'reverse'])],
-	toggleSlideshowLooping: ['- Slideshow/Looping',
+	toggleSlideshowLooping: ['- Slideshow/Slideshow looping',
 		core.makeConfigToggler('slideshow-looping', ['on', 'off'])],
 
-	toggleSlideshow: ['Slideshow/Quick toggle',
+	toggleSlideshow: ['Slideshow/Slideshow quick toggle',
 		toggler.CSSClassToggler(
 			function(){ return this.ribbons.viewer }, 
 			'slideshow-running',