added %(..)b to exporting + some tweaking...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2014-01-15 06:50:34 +04:00
parent 6869baef54
commit bc91949196
3 changed files with 7 additions and 0 deletions

View File

@ -299,6 +299,7 @@ function filterImagesDialog(){
cfg['Flipped'] = {select: [ cfg['Flipped'] = {select: [
'', '',
'no', 'no',
'any',
'vertical', 'vertical',
'horizontal' 'horizontal'
]} ]}
@ -377,6 +378,8 @@ function filterImagesDialog(){
} else if(/^Flipped/.test(field) && res[field].trim() != ''){ } else if(/^Flipped/.test(field) && res[field].trim() != ''){
if(res[field] == 'no'){ if(res[field] == 'no'){
filter['flipped'] = 'undefined|null' filter['flipped'] = 'undefined|null'
if(res[field] == 'any'){
filter['flipped'] = '.*'
} else { } else {
filter['flipped'] = res[field] filter['flipped'] = res[field]
} }

View File

@ -750,6 +750,8 @@ function exportImageTo(gid, path, im_name, size){
dest = dest.replace('%e', '.'+src.split('.').pop()) dest = dest.replace('%e', '.'+src.split('.').pop())
// marked status... // marked status...
dest = dest.replace(/%\(([^)]*)\)m/, MARKED.indexOf(gid) >= 0 ? '$1' : '') dest = dest.replace(/%\(([^)]*)\)m/, MARKED.indexOf(gid) >= 0 ? '$1' : '')
// bookmarked status...
dest = dest.replace(/%\(([^)]*)\)b/, BOOKMARKS.indexOf(gid) >= 0 ? '$1' : '')
// gid... // gid...
dest = dest.replace('%gid', gid) dest = dest.replace('%gid', gid)
dest = dest.replace('%g', gid.slice(34)) dest = dest.replace('%g', gid.slice(34))

View File

@ -1111,6 +1111,7 @@ function exportPreviewsDialog(state, dfl){
'%n - filename\n'+ '%n - filename\n'+
'%e - extension (with leading dot)\n'+ '%e - extension (with leading dot)\n'+
'%(abc)m - if marked insert "abc"\n'+ '%(abc)m - if marked insert "abc"\n'+
'%(abc)b - if bookmarked insert "abc"\n'+
'%gid - log gid\n'+ '%gid - log gid\n'+
'%g - short gid\n'+ '%g - short gid\n'+
'%I - global order\n'+ '%I - global order\n'+
@ -1123,6 +1124,7 @@ function exportPreviewsDialog(state, dfl){
'%n - filename\n'+ '%n - filename\n'+
'%e - extension (with leading dot)\n'+ '%e - extension (with leading dot)\n'+
'%(abc)m - if marked insert "abc"\n'+ '%(abc)m - if marked insert "abc"\n'+
'%(abc)b - if bookmarked insert "abc"\n'+
'%gid - log gid\n'+ '%gid - log gid\n'+
'%g - short gid\n'+ '%g - short gid\n'+
'\n'+ '\n'+