X-Git-Url: http://git.scottworley.com/picsort/blobdiff_plain/eaa5e016a41682c1ccd99023bd346e0448fa0ca3..0799b4b31d5bf026078710ca7abf2dd79226dd31:/picsorter.js?ds=inline

diff --git a/picsorter.js b/picsorter.js
index 213a553..084831c 100644
--- a/picsorter.js
+++ b/picsorter.js
@@ -136,13 +136,18 @@ function rotate() {
   setpic(); 
 }
 
-function set_name() {
-  var name_input = $("#name").hide().get(0);
-  var name = name_input.value;
-  name_input.value = "";
+
+function set_name(name) {
   picinfo[files[input_index]].name = name;
   save_picinfo();
   say("Named " + name);
+  last_name = name;
+}
+
+function set_name_from_form() {
+  var name_input = $("#name").hide().get(0);
+  set_name(name_input.value);
+  name_input.value = "";
 }
 
 function shell_escape(x) {
@@ -152,7 +157,8 @@ function shell_escape(x) {
 function show_commands() {
   var commands = [];
   $.each(files, function(i, f) {
-    if ("name" in picinfo[f] && picinfo[f].name.length > 0) {
+    if ("name" in picinfo[f] && picinfo[f].name.length > 0 &&
+        !("deleted" in picinfo[f])) {
       var command = ["pic-mv"];
       if ("exposure" in picinfo[f]) {
         command.push("-e " + picinfo[f].exposure);
@@ -165,11 +171,12 @@ function show_commands() {
       commands.push(command.join(" "));
     }
   });
+  commands.push("");
   $("#shell_out").text(commands.join("\n")).show();
 }
 
 $(function() {
-  $("#name").hide().on("keyup", function(e) { e.which == 13 && set_name(); });
+  $("#name").hide().on("keyup", function(e) { e.which == 13 && set_name_from_form(); });
   move_to_nondeleted(1);
 });
 
@@ -186,6 +193,9 @@ Mousetrap.bind(['d', 'j'], function() { change_exposure(-1); });
 Mousetrap.bind('x', mark_deleted);
 Mousetrap.bind('X', mark_not_deleted);
 Mousetrap.bind('r', rotate);
+Mousetrap.bind('f', function() { say(files[input_index]); });
 Mousetrap.bind('c', function() { $("#name").show().focus(); return false; });
+Mousetrap.bind('C', function() { if (last_name) { set_name(last_name); } });
 Mousetrap.bind('%', function() { say((100 * input_index / files.length).toFixed(2) + "%"); });
 Mousetrap.bind('!', show_commands);
+Mousetrap.bind('esc', function() { $("#name").hide(); $("#shell_out").hide(); });