flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-30 19:00:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed a bug in crop dialog and added this-and-above mode variant that keeps ribbons...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-11-18 17:44:16 +04:00
parent 1f026e72e7
commit 324a7f3394
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/modes.js
View File

@ -180,8 +180,9 @@ var toggleSingleRibbonMode = makeCropModeToggler(
}) })
var toggleCurrenAndAboveRibbonsMode = makeCropModeToggler( function makeCurrenAndAboveModeToggler(name, keep_ribbons){
'current-and-above-ribbons-mode', return makeCropModeToggler(
name,
function(){ function(){
var gids = [] var gids = []
var c = getRibbonIndex() var c = getRibbonIndex()
@ -194,8 +195,11 @@ var toggleCurrenAndAboveRibbonsMode = makeCropModeToggler(
gids.sort(imageOrderCmp) gids.sort(imageOrderCmp)
// do the crop... // do the crop...
cropDataTo(gids) cropDataTo(gids, keep_ribbons)
}) })
}
var toggleCurrenAndAboveRibbonMode = makeCurrenAndAboveModeToggler('current-and-above-ribbon-mode')
var toggleCurrenAndAboveRibbonsMode = makeCurrenAndAboveModeToggler('current-and-above-ribbons-mode', true)
// TODO transitions... // TODO transitions...

14
ui/ui.js
View File

@ -1065,7 +1065,8 @@ function cropImagesDialog(){
'Marked images', 'Marked images',
'Marked images (keep ribbons)', 'Marked images (keep ribbons)',
'Current ribbon', 'Current ribbon',
'Current ribbon and above' 'Current ribbon and above',
'Current ribbon and above (keep ribbons)'
] ]
formDialog(null, '', formDialog(null, '',
@ -1075,18 +1076,21 @@ function cropImagesDialog(){
.done(function(res){ .done(function(res){
res = res[alg] res = res[alg]
// NOTE: this must be before the "simpler" text version... // NOTE: these must be in order of least-specific last...
if(/Marked.*keep ribbons/i.test(res)){ if(/Marked.*keep ribbons/i.test(res)){
var method = toggleMarkedOnlyWithRibbonsView var method = toggleMarkedOnlyWithRibbonsView
} else if(/Marked/i.test(res)){ } else if(/Marked/i.test(res)){
var method = toggleMarkedOnlyView var method = toggleMarkedOnlyView
} else if(/Current ribbon/i.test(res)){ } else if(/Current ribbon and above.*keep ribbons/i.test(res)){
var method = toggleSingleRibbonMode var method = toggleCurrenAndAboveRibbonsMode
} else if(/Current ribbon and above/i.test(res)){ } else if(/Current ribbon and above/i.test(res)){
var method = toggleCurrenAndAboveRibbonsMode var method = toggleCurrenAndAboveRibbonMode
} else if(/Current ribbon/i.test(res)){
var method = toggleSingleRibbonMode
} }
showStatusQ('Cropped: '+res+'...') showStatusQ('Cropped: '+res+'...')