From bc91949196c98946206464b465878ea52baf3ef9 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Wed, 15 Jan 2014 06:50:34 +0400
Subject: [PATCH] added %(..)b to exporting + some tweaking...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 ui/crop.js  | 3 +++
 ui/files.js | 2 ++
 ui/ui.js    | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/ui/crop.js b/ui/crop.js
index c14d754b..63170dd0 100755
--- a/ui/crop.js
+++ b/ui/crop.js
@@ -299,6 +299,7 @@ function filterImagesDialog(){
 	cfg['Flipped'] = {select: [
 		'',
 		'no',
+		'any',
 		'vertical',
 		'horizontal'
 	]}
@@ -377,6 +378,8 @@ function filterImagesDialog(){
 				} else if(/^Flipped/.test(field) && res[field].trim() != ''){
 					if(res[field] == 'no'){
 						filter['flipped'] = 'undefined|null'
+					if(res[field] == 'any'){
+						filter['flipped'] = '.*'
 					} else {
 						filter['flipped'] = res[field]
 					}
diff --git a/ui/files.js b/ui/files.js
index 0956588b..6443aba2 100755
--- a/ui/files.js
+++ b/ui/files.js
@@ -750,6 +750,8 @@ function exportImageTo(gid, path, im_name, size){
 	dest = dest.replace('%e', '.'+src.split('.').pop())
 	// marked status...
 	dest = dest.replace(/%\(([^)]*)\)m/, MARKED.indexOf(gid) >= 0 ? '$1' : '')
+	// bookmarked status...
+	dest = dest.replace(/%\(([^)]*)\)b/, BOOKMARKS.indexOf(gid) >= 0 ? '$1' : '')
 	// gid...
 	dest = dest.replace('%gid', gid)
 	dest = dest.replace('%g', gid.slice(34))
diff --git a/ui/ui.js b/ui/ui.js
index 5170c800..c83347f8 100755
--- a/ui/ui.js
+++ b/ui/ui.js
@@ -1111,6 +1111,7 @@ function exportPreviewsDialog(state, dfl){
 				'%n - filename\n'+
 				'%e - extension (with leading dot)\n'+
 				'%(abc)m - if marked insert "abc"\n'+
+				'%(abc)b - if bookmarked insert "abc"\n'+
 				'%gid - log gid\n'+
 				'%g - short gid\n'+
 				'%I - global order\n'+
@@ -1123,6 +1124,7 @@ function exportPreviewsDialog(state, dfl){
 				'%n - filename\n'+
 				'%e - extension (with leading dot)\n'+
 				'%(abc)m - if marked insert "abc"\n'+
+				'%(abc)b - if bookmarked insert "abc"\n'+
 				'%gid - log gid\n'+
 				'%g - short gid\n'+
 				'\n'+