diff --git a/ui (gen4)/features/keyboard.js b/ui (gen4)/features/keyboard.js index e7557a1e..1bfc64fb 100755 --- a/ui (gen4)/features/keyboard.js +++ b/ui (gen4)/features/keyboard.js @@ -70,11 +70,11 @@ module.GLOBAL_KEYBOARD = { '#0', '#1', '#2', '#3', '#4', '#5', '#6', '#7', '#8', '#9', ], + '#1': 'fitScreen', // XXX use a means to scale that does not get affected by image // proportions... - '#1': 'fitScreen', - '#2': 'fitNormal', - '#3': 'fitSmall', + //'#2': 'fitNormal', + //'#3': 'fitSmall', Esc: 'toggleSingleImage: "off" -- Exit single image view', diff --git a/ui (gen4)/features/ui.js b/ui (gen4)/features/ui.js index 9ce10b41..59649c19 100755 --- a/ui (gen4)/features/ui.js +++ b/ui (gen4)/features/ui.js @@ -592,15 +592,14 @@ module.ViewerActions = actions.Actions({ this.ribbons.fitImage(count) this.refresh() }], + fitMax: ['Zoom/Fit the maximum number of images', function(){ this.fitImage(this.config['max-screen-images']) }], - - // XXX the question with these is how to make these relatively - // similar across platforms... - // ...for this we need to get display dpi... + // XXX make this viewer/image proportion independent.... fitSmall: ['Zoom/Show small image', function(){ this.fitImage(5, 0) }], + // XXX make this viewer/image proportion independent.... fitNormal: ['Zoom/Show normal image', function(){ this.fitImage(1.5, 0) }], fitScreen: ['Zoom/Fit image to screen', @@ -892,6 +891,8 @@ module.SortUI = core.ImageGridFeatures.Feature({ }) + +//--------------------------------------------------------------------- // XXX tag dialogs... // XXX