[Pkg-mozext-commits] [nostalgy] 17/235: *** empty log message ***
David Prévot
taffit at alioth.debian.org
Tue Oct 8 20:41:27 UTC 2013
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository nostalgy.
commit 3fbd3990ea064cd4ede367f9ddfa7a9891e0401a
Author: frisch <frisch at 56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date: Tue Aug 29 14:03:57 2006 +0000
*** empty log message ***
git-svn-id: http://nostalgy.googlecode.com/svn/trunk@17 56b81dcf-5a2f-0410-9db0-014be2e416ff
---
Makefile | 1 +
content/about.xhtml | 48 +++++++++++++++++++++++++++++++++++-----
content/edit_prefs.xul | 9 +++++++-
content/edit_rule.js | 5 +++--
content/edit_rule.xul | 4 ++--
content/messageOverlay.xul | 2 +-
content/nostalgy.js | 20 +++++++++++++++--
content/thunderbirdOverlay.xul | 3 ++-
8 files changed, 78 insertions(+), 14 deletions(-)
diff --git a/Makefile b/Makefile
index 762563d..014993c 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ pack:
clean:
rm -f nostalgy.jar nostalgy.xpi *~
+ (cd content; rm *~)
install:
diff --git a/content/about.xhtml b/content/about.xhtml
index 5af59c6..d941f8f 100644
--- a/content/about.xhtml
+++ b/content/about.xhtml
@@ -21,24 +21,62 @@
<h2>Nostalgy</h2>
+ Nostalgy adds several keyboard shortcuts to improve your
+ productivity with Thunderbird.
+
+ <h3>Folder commands</h3>
+
<table border="1">
<tr><th>Shortcut</th><th>Description</th></tr>
<tr><td>G</td><td>Open a specific folder</td></tr>
<tr><td>S</td><td>Move the current message to a specific folder</td></tr>
<tr><td>C</td><td>Copy the current message to a specific folder</td></tr>
+ </table>
+
+ <p>As a remainder and a sign of Nostalgy's presence, these shortcuts are
+ displayed in Thunderbird's status bar.</p>
+
+ <p>The G, S and C commands open an auto-completion box
+ (in place of the status bar)
+ where you can select a folder by typing part of its name. Regular
+ expressions are accepted as well (and .. is a short-hand for .*
+ meaning: any sequence of characters). You can choose the first
+ suggested completion with Return, or first choose another one with
+ the Up/Down keys. You can cancel the command with Escape.</p>
+ <p>The S and C commands also work in a standalone message window.</p>
+
+ <h3>3-pane navigation</h3>
+
+ <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>
</table>
- <p>The G, S and C commands open a box (in the status line) where
- you can select a folder by typing part of its name. You can cancel
- with Escape.</p>
- <p>The S and C commands also work in a standalone message window.</p>
+ <p>
+ When the thread pane is focused, you can scroll the currently
+ displayed message (up and down) by pressing Shift-Left/Shift-Right.
+ </p>
+
+ <p>
+ The rationale behind the L command is that thanks to Nostalgy's folder
+ commands, you rarely need the folder pane.
+ </p>
+
+ <h3>Rules</h3>
+ <p>Nostalgy has a notion of rule. A rule associates a folder to a
+ message by looking for a substring of the Sender or Subject (or both)
+ headers. When a rule selects a folder for a given message, Nostalgy
+ informs you in the status line. You can then use the Shift-S/Shift-C
+ shortcuts to move/copy directly the message to this folder.
+ Nostalgy's rules
+ can be edited from a command in the Tools menu.</p>
- <p>The Nostalgy extension has been written by <a href="mailto:Alain.Frisch at inria.fr">Alain Frisch</a> <tt>Alain.Frisch at inria.fr</tt>. Comments ands suggestions are welcome!</p>
+ <h3>About Nostalgy...</h3>
+ <p>The Nostalgy extension has been written by Alain Frisch (<tt>Alain.Frisch at inria.fr</tt>). Comments ands suggestions are welcome!</p>
</body>
</html>
diff --git a/content/edit_prefs.xul b/content/edit_prefs.xul
index 30d6877..06243a4 100644
--- a/content/edit_prefs.xul
+++ b/content/edit_prefs.xul
@@ -5,14 +5,21 @@
<dialog
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
- buttons="accept,cancel"
+ buttons="accept,cancel,extra2"
ondialogaccept="return onAcceptChanges();"
+ ondialogextra2="openDialog('chrome://nostalgy/content/about.xul', 'about_nostalgy', 'resizable');"
+ buttonlabelextra2="About Nostalgy..."
title="Nostalgy Preferences">
<script src="edit_prefs.js"/>
<vbox style="width:800px">
<groupbox>
+ <label>Rules associate folders to messages by looking for a
+substring of the Sender or Subject (or both) headers. When a folder
+is selected for a given message, Nostalgy informs you in the status line.
+You can then use the Shift-S/Shift-C
+shortcuts to move/copy the message to this folder.</label>
<listbox flex="1" id="rules">
<listhead>
<listheader label="Field"/>
diff --git a/content/edit_rule.js b/content/edit_rule.js
index 032f715..8b37bce 100644
--- a/content/edit_rule.js
+++ b/content/edit_rule.js
@@ -21,7 +21,8 @@ function onNostalgyLoad() {
}
function onAcceptChanges() {
- if (!FindFolderExact(gFolderSelect.value)) {
+ var folder = FirstCompletion(gFolderSelect.value);
+ if (!folder || (gFolderSelect.value == "")) {
alert("Please choose an existing folder");
return false;
}
@@ -32,7 +33,7 @@ function onAcceptChanges() {
var rule = {
field: gFieldSelect.selectedItem.getAttribute("id"),
contains: gContainsSelect.value,
- folder: gFolderSelect.value
+ folder: folder_name(folder)
};
(window.arguments[1])(rule);
diff --git a/content/edit_rule.xul b/content/edit_rule.xul
index 7058d85..b51be9a 100644
--- a/content/edit_rule.xul
+++ b/content/edit_rule.xul
@@ -24,12 +24,12 @@
<rows>
<row>
- <label value="If field"/>
+ <label value="If header"/>
<radiogroup id="field">
<hbox>
<radio id="sender" label="Sender"/>
<radio id="subject" selected="true" label="Subject"/>
- <radio id="any" label="Any"/>
+ <radio id="any" label="Sender or Subject"/>
</hbox>
</radiogroup>
</row>
diff --git a/content/messageOverlay.xul b/content/messageOverlay.xul
index cdda4cc..19853b4 100644
--- a/content/messageOverlay.xul
+++ b/content/messageOverlay.xul
@@ -4,7 +4,7 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script src="folders.js"/>
- <script src="overlay.js"/>
+ <script src="nostalgy.js"/>
<keyset id="mailKeys">
<key key="S" oncommand="NostalgyCmd('&nostalgy.move-memo;', MoveToFolder, '');"/>
diff --git a/content/nostalgy.js b/content/nostalgy.js
index eb3dce1..0774786 100644
--- a/content/nostalgy.js
+++ b/content/nostalgy.js
@@ -124,7 +124,7 @@ function NostalgyDefLabel() {
function NostalgyCollapseFolderPane() {
- var fp = document.getElementById("folderPaneBox");
+ var fp = gEBI("folderPaneBox");
fp.collapsed = !fp.collapsed;
}
@@ -210,6 +210,16 @@ function NostalgyAgain(lab,cmd) {
var NostalgyLastEscapeTimeStamp = 0;
+var NostalgyEscapeDown = false;
+
+function isThreadPaneFocused() {
+ return (WhichPaneHasFocus() == GetThreadTree());
+}
+
+function NostalgyScrollMsg(d) {
+ var b = gEBI("messagepane").contentDocument.getElementsByTagName("body")[0];
+ if (b) { b.scrollTop += d; }
+}
function onNostalgyKeyPress(ev) {
if (ev.keyCode == 27) {
@@ -219,9 +229,15 @@ function onNostalgyKeyPress(ev) {
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); }
}
+
+
window.addEventListener("load", onNostalgyLoad, false);
if (SetFocusFolderPane) {
window.addEventListener("keypress", onNostalgyKeyPress, false);
diff --git a/content/thunderbirdOverlay.xul b/content/thunderbirdOverlay.xul
index 0865b03..e74ec00 100644
--- a/content/thunderbirdOverlay.xul
+++ b/content/thunderbirdOverlay.xul
@@ -4,7 +4,7 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script src="folders.js"/>
- <script src="overlay.js"/>
+ <script src="nostalgy.js"/>
<commandset id="globalCommandset">
<command id="cmd_nostalgyconfig" label="Nostalgy rules..."
@@ -29,6 +29,7 @@
<key key="C" modifiers="shift"
oncommand="NostalgyAgain('&nostalgy.copy-memo;',CopyToFolder);"/>
<key key="L" oncommand="NostalgyCollapseFolderPane();"/>
+ <key key="X" oncommand="NostalgySelect();"/>
</keyset>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/nostalgy.git
More information about the Pkg-mozext-commits
mailing list