From 154802c314dc4edb64910c2c28ea4ef4b1ef85d9 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Fri, 21 Jun 2013 17:47:44 +0400 Subject: [PATCH] added export ui... Signed-off-by: Alex A. Naanou --- ui/Makefile | 10 ++++++++-- ui/keybindings.js | 21 +-------------------- ui/ui.js | 21 +++++++++++++++++++++ 3 files changed, 30 insertions(+), 22 deletions(-) diff --git a/ui/Makefile b/ui/Makefile index c805fba1..4a6bebff 100755 --- a/ui/Makefile +++ b/ui/Makefile @@ -38,6 +38,7 @@ JS_MIN_FILES := $(patsubst %.js,%.min.js,$(wildcard *.js)) LOGS := *.log +NODE_DIR=node_modules BUILD_DIR=build WIN_BUILD_DIR=build/Win32 MAC_BUILD_DIR=build/MacOSX @@ -67,6 +68,8 @@ minify: $(JS_MIN_FILES) # build dependencies... # XXX can make auto-create directories??? +$(NODE_DIR): + mkdir -p $(NODE_DIR) $(BUILD_DIR): mkdir -p $(BUILD_DIR) $(WIN_BUILD_DIR): @@ -82,14 +85,17 @@ $(DIST_DIR): mkdir -p $(DIST_DIR) -$(APP_ZIP): $(CSS_FILES) $(BUILD_DIR) - zip -r $(APP_ZIP) $(NW_PROJECT_FILE) $(JS_FILES) $(CSS_FILES) $(HTML_FILES) $(LIB_DIR) $(EXT_LIB_DIR) +$(APP_ZIP): $(CSS_FILES) $(BUILD_DIR) $(NODE_DIR) node-deps + zip -r $(APP_ZIP) $(NW_PROJECT_FILE) $(JS_FILES) $(CSS_FILES) $(HTML_FILES) $(LIB_DIR) $(EXT_LIB_DIR) $(NODE_DIR) #********************************************************************** # dev env... +node-deps: + npm install fs.extra + dev: $(CSS_FILES) unzip -uj $(wildcard targets/node-webkit/node-webkit-*-win-ia32.zip) -d . chmod +x *.{exe,dll} diff --git a/ui/keybindings.js b/ui/keybindings.js index c4a54d7c..6ee28445 100755 --- a/ui/keybindings.js +++ b/ui/keybindings.js @@ -484,26 +484,7 @@ var KEYBOARD_CONFIG = { }), 'ctrl+shift': doc('Export', function(){ - // XXX a dialog with alternatives... - // Export modes: - // - source: - // - all (default) - // - current ribbon only - // - marked only (can be combined with current ribbon) - // - structure - // - flat - // - fav dirs - // - naming - // - fav dir name (default: fav) - // - image file name (default: %f) - // (add several presets like %f for filename, - // %(tag) for metadata tag values, etc.) - // - common metadata - // - comment - // - ... - // - destination - // - ndir with current path as default - // - dir to create (default: "") + exportPreviews() }), }, Z: { diff --git a/ui/ui.js b/ui/ui.js index 85fc20d2..dfbafa99 100755 --- a/ui/ui.js +++ b/ui/ui.js @@ -642,6 +642,27 @@ function getDir(message, dfl, btn){ } +// XXX do reporting... +function exportPreviews(dfl){ + dfl = dfl == null ? BASE_URL : dfl + var res = $.Deferred() + + formDialog(null, 'Export previews', { + 'Image name pattern': '%f', + 'Fav directory name': 'fav', + 'Destination': {ndir: dfl}, + }, 'OK', 'exportPreviews') + .done(function(data){ + exportTo(data['Destination'], data['Image name pattern'], data['Fav directory name']) + + res.resolve(data['']) + }) + .fail(function(){ res.reject() }) + + return res +} + + /************************************************ Specific dialogs ***/