diff --git a/ui/TODO.otl b/ui/TODO.otl index 10a00c14..b09b511c 100755 --- a/ui/TODO.otl +++ b/ui/TODO.otl @@ -1,5 +1,9 @@ Priority work - [_] 89% Preview II + [_] 74% Preview II + [_] 0% save state + [_] minomal: Local Storage + [_] local JSON + [_] CouchDB [_] 49% native client [_] 33% Windows (CEF / CEFPython) [X] basic test diff --git a/ui/gallery-prototype.js b/ui/gallery-prototype.js index 0e753c37..2fc3c278 100755 --- a/ui/gallery-prototype.js +++ b/ui/gallery-prototype.js @@ -1644,6 +1644,7 @@ ImageGrid.GROUP('Zooming', var f = Math.min(H/h, W/w) + ImageGrid.centerCurrentImage() ImageGrid.setContainerScale(f) }), // the fit N image pack, for 1 <= N <= 9 diff --git a/ui/keybindings.js b/ui/keybindings.js index a4514f9c..5c709d16 100755 --- a/ui/keybindings.js +++ b/ui/keybindings.js @@ -30,9 +30,9 @@ var keybindings = { 189: ImageGrid.scaleContainerDown, // - // zoom presets... 48: { - 'default': ImageGrid.fitImage, // 0 + 'default': ImageGrid.centerCurrentImage, // 0 // XXX make this into a real action... - 'ctrl': function(){ImageGrid.setContainerScale(1)}, // ctrl+0 + 'ctrl': ImageGrid.fitImage, // ctrl+0 }, 49: ImageGrid.fitImage, // 1 50: ImageGrid.fitTwoImages, // 2 @@ -56,14 +56,14 @@ var keybindings = { 'alt': ImageGrid.prevScreenImages, // alt-Right }, 8: 37, // BkSp - 190: 37, // < + 188: 37, // < 39: { 'default': ImageGrid.nextImage, // Left 'ctrl': ImageGrid.nextScreenImages, // ctrl-Left 'alt': ImageGrid.nextScreenImages, // alt-Left }, 32: 39, // Space - 188: 39, // > + 190: 39, // > 186: ImageGrid.prevScreenImages, // ; 222: ImageGrid.nextScreenImages, // ' // move view... @@ -72,7 +72,8 @@ var keybindings = { 74: ImageGrid.moveViewDown, // j 72: ImageGrid.moveViewLeft, // h 76: ImageGrid.moveViewRight, // l - 79: ImageGrid.centerCurrentImage, // o + // XXX use this to open... + //79: ImageGrid.centerCurrentImage, // o // combined navigation with actions..