[Pkg-mozext-commits] [nostalgy] 26/235: *** empty log message ***

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository nostalgy.

commit cffb404165bc45e813aa8370e39ae975443406a3
Author: frisch <frisch at 56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date:   Fri Sep 1 09:59:09 2006 +0000

    *** empty log message ***
    
    
    git-svn-id: http://nostalgy.googlecode.com/svn/trunk@26 56b81dcf-5a2f-0410-9db0-014be2e416ff
---
 CHANGES                        |    1 +
 content/about.xhtml            |    9 +++++---
 content/nostalgy.js            |   50 ++++++++++++++++++++++------------------
 content/thunderbirdOverlay.xul |   10 +++++++-
 4 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/CHANGES b/CHANGES
index 56f9071..ce90e31 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
   - add the rule system (quick selection of a default folder for messages)
   - add the Shift-Left/Shift-Right keys (scroll the message while the
     thread pane is focused)
+  - change the pane-navigation commands (see about.xhtml)
 
 0.1.5
   - add the commands:
diff --git a/content/about.xhtml b/content/about.xhtml
index 0b633ff..d1352c8 100644
--- a/content/about.xhtml
+++ b/content/about.xhtml
@@ -59,11 +59,14 @@
    <table border="1">
     <tr><th>Shortcut</th><th>Description</th></tr>
     <tr><td>L</td><td>Hide/show the folder pane</td></tr>
-    <tr><td>Ctrl-Esc</td><td>Focus the folder pane</td></tr>
-    <tr><td>Alt-Esc</td><td>Focus the message pane</td></tr>
-    <tr><td>double Esc</td><td>Focus the thread pane</td></tr>
+    <tr><td>Esc-F</td><td>Focus the folder pane</td></tr>
+    <tr><td>Esc-M</td><td>Focus the message pane</td></tr>
+    <tr><td>Esc-Esc</td><td>Focus the thread pane</td></tr>
    </table>
 
+   <p>The Esc-X shortcuts means: press and release Escape, and then
+   press X within 300ms (Esc-Esc is thus like a double click on Escape).</p>
+
    <p>
    When the thread pane is focused, you can scroll the currently
    displayed message (up and down) by pressing Shift-Left/Shift-Right.
diff --git a/content/nostalgy.js b/content/nostalgy.js
index 7b8569b..c8ffb70 100644
--- a/content/nostalgy.js
+++ b/content/nostalgy.js
@@ -112,13 +112,20 @@ function onNostalgyLoad() {
  var saved_str = "";
  nostalgy_folderBox.addEventListener("keydown", 
   function(ev){ 
-   if (ev.keyCode == 9) { saved_str = nostalgy_folderBox.value; } 
+   if (ev.keyCode == 9) { 
+	saved_str = nostalgy_folderBox.value; 
+	ev.preventDefault(); 
+	ev.stopPropagation(); } 
  }, false);
+
  nostalgy_folderBox.addEventListener("keypress", 
   function(ev){ 
-   if (ev.keyCode == 9) { nostalgy_folderBox.value = 
-				NostalgyCompleteUnique(saved_str); } 
- }, true);
+   if (ev.keyCode == 9) { 
+    nostalgy_folderBox.value = NostalgyCompleteUnique(saved_str); 
+    ev.preventDefault(); 
+    ev.stopPropagation();
+   } 
+  }, true);
 }
 
 function NostalgyHide() {
@@ -161,7 +168,7 @@ function NostalgyCmd(lab,cmd,init) {
  nostalgy_th_statusBar.hidden = true;
  nostalgy_folderBox.value = init;
 
- setTimeout(function() { nostalgy_folderBox.focus(); }, 50);
+ setTimeout(function() { nostalgy_folderBox.focus(); }, 0);
    // For some unknown reason, doing nostalgyBox.focus immediatly
    // sometimes does not work...
 }
@@ -276,28 +283,27 @@ function isThreadPaneFocused() {
 }
 
 function NostalgyScrollMsg(d) {
- var b = gEBI("messagepane").contentDocument.getElementsByTagName("body")[0];
- if (b) { b.scrollTop += d; }
+ if (isThreadPaneFocused()) {
+  var b = gEBI("messagepane").contentDocument.getElementsByTagName("body")[0];
+  if (b) { b.scrollTop += d; }
+ }
 }
 
-function onNostalgyKeyPress(ev) {
-  if (ev.keyCode == 27) { 
-    if (ev.ctrlKey) { SetFocusFolderPane(); }
-    else if (ev.altKey) { SetFocusMessagePane(); }
-    else 
-    if (ev.timeStamp - NostalgyLastEscapeTimeStamp < 200) 
-     { SetFocusThreadPane(); }
-     else { NostalgyLastEscapeTimeStamp = ev.timeStamp; }
-  } 
-  else if (ev.keyCode == 39 && isThreadPaneFocused() && ev.shiftKey)
-    { NostalgyScrollMsg(20); }
-  else if (ev.keyCode == 37 && isThreadPaneFocused() && ev.shiftKey)
-    { NostalgyScrollMsg(-20); }
+function NostalgyEscape(ev) {
+  if (ev.timeStamp - NostalgyLastEscapeTimeStamp < 300) SetFocusThreadPane()
+  else NostalgyLastEscapeTimeStamp = ev.timeStamp;
 }
 
+function NostalgySelectFolderPane(ev) {
+  if (ev.timeStamp - NostalgyLastEscapeTimeStamp < 300) SetFocusFolderPane();
+}
 
+function NostalgySelectMessagePane(ev) {
+  if (ev.timeStamp - NostalgyLastEscapeTimeStamp < 300) SetFocusMessagePane();
+}
 
 window.addEventListener("load", onNostalgyLoad, false);
-if (!in_message_window) {
+/* if (!in_message_window) {
   window.addEventListener("keypress", onNostalgyKeyPress, false);
-}
\ No newline at end of file
+} */
+
diff --git a/content/thunderbirdOverlay.xul b/content/thunderbirdOverlay.xul
index a6dc1fa..53a8ab0 100644
--- a/content/thunderbirdOverlay.xul
+++ b/content/thunderbirdOverlay.xul
@@ -28,6 +28,14 @@
   <key key="C" modifiers="shift" 
        oncommand="NostalgySuggested('&nostalgy.copy-memo;',CopyToFolder);"/>
   <key key="L" oncommand="NostalgyCollapseFolderPane();"/>
+
+  <key keycode="VK_LEFT" modifiers="shift" 
+       oncommand="NostalgyScrollMsg(-20);"/>
+  <key keycode="VK_RIGHT" modifiers="shift" 
+       oncommand="NostalgyScrollMsg(20);"/>
+  <key keycode="VK_ESCAPE" oncommand="NostalgyEscape(event);"/>
+  <key key="F" oncommand="NostalgySelectFolderPane(event);"/>
+  <key key="M" oncommand="NostalgySelectMessagePane(event);"/>
  </keyset>
 
 
@@ -36,7 +44,7 @@
   <statusbarpanel flex="1">
    <label id="nostalgy-command-label"/>
    <textbox id="nostalgy-folderbox" type="autocomplete" tabScrolling="true"
-	   ontextcommand="NostalgyRunCommand();"
+	   ontextcommand="NostalgyRunCommand();" 
 	   ontextrevert="NostalgyHide();"
 	   flex="1"
 	   maxrows="25" crop="center"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/nostalgy.git