[Pkg-mozext-commits] [nostalgy] 68/252: *** 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 4645e7208de7d05dc139941895d57790f27ce5ec
Author: frisch <frisch at 56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date:   Mon Apr 30 15:36:12 2007 +0000

    *** empty log message ***
---
 content/edit_prefs.js          | 30 ++++++++++++++++++++++++
 content/edit_prefs.xul         | 52 ++++++++++++++++++++++++++++++++++++++----
 content/nostalgy.js            | 15 +++++++++---
 content/thunderbirdOverlay.xul | 25 ++++++++++++++------
 4 files changed, 107 insertions(+), 15 deletions(-)

diff --git a/content/edit_prefs.js b/content/edit_prefs.js
index d55de4c..91a2a4f 100644
--- a/content/edit_prefs.js
+++ b/content/edit_prefs.js
@@ -202,5 +202,35 @@ function onKeyPress(ev) {
   if ((ev.keyCode == 46) || (ev.keyCode == 8)) { DoDelete(); }
 }
 
+
+function Recognize(event) {
+ event.preventDefault();
+ event.stopPropagation();
+
+ var gVKNames = [];
+
+ for (var property in KeyEvent) {
+  gVKNames[KeyEvent[property]] = property.replace("DOM_","");
+ }
+ gVKNames[8] = "VK_BACK";
+
+ var gEdit = event.target;
+
+ var modifiers = [];
+ if(event.altKey) modifiers.push("alt");
+ if(event.ctrlKey) modifiers.push("control");
+ if(event.metaKey) modifiers.push("meta");
+ if(event.shiftKey) modifiers.push("shift");
+
+ modifiers = modifiers.join(" ");
+
+ var key = ""; var keycode = "";
+ if(event.charCode) key = String.fromCharCode(event.charCode).toUpperCase();
+ else { keycode = gVKNames[event.keyCode]; if(!keycode) return;}
+
+ gEdit.value = modifiers + " " + key + keycode;
+}
+
+
 window.addEventListener("load", onNostalgyLoad, false);
 window.addEventListener("keypress", onKeyPress, false);
diff --git a/content/edit_prefs.xul b/content/edit_prefs.xul
index 6a2e772..720bcea 100644
--- a/content/edit_prefs.xul
+++ b/content/edit_prefs.xul
@@ -14,8 +14,18 @@
  <script src="folders.js"/>
  <script src="edit_prefs.js"/>
 
-<vbox style="width:800px">
- <groupbox flex="0">
+<!-- <vbox > -->
+
+ <tabbox style="width:800px">
+ <tabs>
+ <tab label="Rules"/>
+ <tab label="Completion"/>
+ <tab label="Keys"/>
+ </tabs>
+ <tabpanels>
+
+ <tabpanel>
+ <groupbox flex="0"  style="width:800px">
  <label>Rules associate folders to messages by looking for a 
 substring of the Sender or Subject (or both) headers. A rule can be
 restricted to match messages under a given server/folder. When a folder
@@ -50,7 +60,9 @@ shortcuts to move/copy the message to this folder.</label>
   </hbox>
  </vbox>
  </groupbox>
+ </tabpanel>
 
+ <tabpanel>
  <groupbox>
    <checkbox label="Restrict folder completion to the current server"
              id="restrict_to_current_server" accesskey="R"/>
@@ -59,11 +71,41 @@ shortcuts to move/copy the message to this folder.</label>
    <checkbox label="Sort folders alphabetically"
              id="sort_folders" accesskey="S"/>
    <checkbox label="Match folder names in a case sensitive way"
-             id="match_case_sensitive" accesskey="C"/>
-   <checkbox label="Tab triggers shell-like completion (otherwise, cycle through suggestions)"
+             id="match_case_sensitive" accesskey="C"/>   <checkbox label="Tab triggers shell-like completion (otherwise, cycle through suggestions)"
              id="tab_shell_completion" accesskey="T"/>
  </groupbox>
+ </tabpanel>
 
-</vbox>
+ <tabpanel>
+ <groupbox>
+   <hbox align="center">
+   <checkbox label="Change folder (Go)"/>
+   <deck align="end">
+   <label onclick="var p = this.parentNode;
+p.selectedIndex=1; p.selectedPanel.value = this.value; 
+p.selectedPanel.focus(); 
+">G</label>
+   <textbox flex="1"
+            onclick="this.select();" 
+            onkeypress="Recognize(event); this.parentNode.selectedIndex=0; this.parentNode.selectedPanel.value = this.value;"
+   />
+   </deck>
+   </hbox>
+<!--
+   <hbox>
+   <checkbox label="Save message"/>
+   <deck>
+   <label onclick="this.parentNode.selectedIndex=1; this.parentNode.selectedPanel.value = this.value; this.parentNode.selectedPanel.focus(); ">xxx</label>
+   <textbox flex="1" value="xxx"
+            onclick="this.select();" 
+            onkeypress="Recognize(event); this.parentNode.selectedIndex=0; this.parentNode.selectedPanel.value = this.value;"
+   />
+   </deck>
+   </hbox>
+-->
+ </groupbox>
+ </tabpanel>
+ </tabpanels>
+ </tabbox>
 
 </dialog>
\ No newline at end of file
diff --git a/content/nostalgy.js b/content/nostalgy.js
index 8c1328e..45758c0 100644
--- a/content/nostalgy.js
+++ b/content/nostalgy.js
@@ -187,6 +187,18 @@ function onNostalgyLoad() {
  var nsIFolderListener = Components.interfaces.nsIFolderListener;
  var notifyFlags = nsIFolderListener.added | nsIFolderListener.removed;
  mSession.AddFolderListener(NostalgyFolderListener, notifyFlags);
+
+ // NostalgyKeys();
+}
+
+function NostalgyKeys() {
+  var nodes = this.document.getElementsByTagName("key");
+  for (i = 0, l = nodes.length; i < l; i++) 
+   if (nodes[i].getAttribute("nostalgy_key")) {
+     alert(nodes[i].getAttribute("nostalgy_key") + " = " +
+           nodes[i].getAttribute("key"));
+     nodes[i].setAttribute("key","O");
+   }
 }
 
 function NostalgyHideIfBlurred() {
@@ -500,6 +512,3 @@ window.addEventListener("resize", onNostalgyResize, false);
 if (!in_message_window) {
   window.addEventListener("keypress", onNostalgyKeyPress, false);
 } 
-
-
-
diff --git a/content/thunderbirdOverlay.xul b/content/thunderbirdOverlay.xul
index 95a5c21..72ac5d5 100644
--- a/content/thunderbirdOverlay.xul
+++ b/content/thunderbirdOverlay.xul
@@ -18,17 +18,28 @@
 
 
  <keyset id="mailKeys">
-  <key key="G" oncommand="NostalgyCmd('&nostalgy.go-memo;', ShowFolder, '');"/>
-  <key key="S" 
+  <key id="NostalgyChangeFolder"
+       nostalgy_key = "Go (change folder)"
+       key="G" 
+       oncommand="NostalgyCmd('&nostalgy.go-memo;', ShowFolder, '');"/>
+  <key id = "NostalgySaveMessage"
+       key="S" 
        oncommand="NostalgyCmd('&nostalgy.move-memo;', MoveToFolder, '');"/>
-  <key key="S" modifiers="shift" 
+  <key id = "NostalgySaveMessageSuggested"
+       key="S" modifiers="shift" 
        oncommand="NostalgySuggested('&nostalgy.move-memo;',MoveToFolder);"/>
-  <key key="C" 
+  <key id = "NostalgyCopyMessage"
+       key="C" 
        oncommand="NostalgyCmd('&nostalgy.copy-memo;', CopyToFolder, '');"/>
-  <key key="C" modifiers="shift" 
+  <key id = "NostalgyCopyMessageSuggested"
+       key="C" modifiers="shift" 
        oncommand="NostalgySuggested('&nostalgy.copy-memo;',CopyToFolder);"/>
-  <key key="L" oncommand="NostalgyCollapseFolderPane();"/>
-  <key key="`" oncommand="NostalgySearchSender();"/>
+  <key id = "NostalgyCollapseFolderPane"
+       key="L" 
+       oncommand="NostalgyCollapseFolderPane();"/>
+  <key id = "NostalgySearchSender"
+       key="`" 
+       oncommand="NostalgySearchSender();"/>
 
   <key keycode="VK_LEFT" modifiers="control" 
        oncommand="NostalgyScrollMsg(-50);"/>

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