diff --git a/ui/Gen3-TODO.otl b/ui/Gen3-TODO.otl index 4412a389..a8ad76d1 100755 --- a/ui/Gen3-TODO.otl +++ b/ui/Gen3-TODO.otl @@ -1,12 +1,5 @@ -[_] 15% Gen 3 current todo - [_] 31% High priority - [_] split saving/loading into files and localStorage - | DATA - | - stored in localStorage - | - stored in file - | IMAGES - | - stored only in files (does not change) - | +[_] 18% Gen 3 current todo + [_] 37% High priority [_] BUG: sometimes duplicate images get loaded... | this happens when jumping back and forth on the mid ribbon until | the last element shows up and then moving left until the frame @@ -17,8 +10,6 @@ | [_] BUG: jumping screen images does not load the adjacent ribbons... | positioning is OK but ribbons are not fully visible... - [X] ASAP: rewrite binSearch!! - | linSearch obviously is not usable for large sets of data... [_] 6% mark-based operations [_] 33% cropping selection [X] marked @@ -67,6 +58,15 @@ [_] thresholds and frame size [_] remove extra and repetitive actions [_] caching config + [X] ASAP: rewrite binSearch!! + | linSearch obviously is not usable for large sets of data... + [X] split saving/loading into files and localStorage + | DATA + | - stored in localStorage + | - stored in file + | IMAGES + | - stored only in files (does not change) + | [X] 100% modes [X] ribbon [X] single-image diff --git a/ui/data.js b/ui/data.js index e2f4b7f0..de3e2d10 100755 --- a/ui/data.js +++ b/ui/data.js @@ -711,6 +711,19 @@ function saveFile(name){ } +function openImage(){ + // CEF + if(window.CEF_dumpJSON != null){ + // XXX if path is not present try and open the biggest preview... + return CEF_runSystem(IMAGES[getImageGID()].path) + + // PhoneGap + } else if(false) { + // XXX + } +} + + /********************************************************************** * Image caching... @@ -749,6 +762,7 @@ function preCacheAllRibbons(){ } + /********************************************************************** * Setup */ diff --git a/ui/keybindings3.js b/ui/keybindings3.js index 852e26bd..76f889fa 100755 --- a/ui/keybindings3.js +++ b/ui/keybindings3.js @@ -186,8 +186,9 @@ var KEYBOARD_CONFIG = { prevImage() } if($('.current.image').filter(':visible').length == 0){ - centerImage(focusImage(getImageBefore())) + centerView(focusImage(getImageBefore())) } + centerRibbons() }, // same as default but in reverse direction... shift: function(){ @@ -198,23 +199,12 @@ var KEYBOARD_CONFIG = { prevImage() } if($('.current.image').filter(':visible').length == 0){ - centerImage(focusImage(getImageBefore())) + centerView(focusImage(getImageBefore())) } + centerRibbons() }, ctrl: function(){ var action = toggleImageMark() - // focus an image instead of the one that just vanished... - if(action == 'off' && toggleMarkedOnlyView('?') == 'on'){ - if(DIRECTION == 'next'){ - nextImage() - } else { - prevImage() - } - if($('.current.image').filter(':visible').length == 0){ - centerImage(focusImage(getImageBefore())) - } - - } }, }, I: { @@ -250,6 +240,8 @@ var KEYBOARD_CONFIG = { toggleMarkedOnlyView() } }, + + F4: openImage, } }