[Pkg-mozext-commits] [nostalgy] 176/235: Fixes for Seamonkey 2.0.
David Prévot
taffit at alioth.debian.org
Tue Oct 8 20:42:17 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 39898b4ac949216a6acb28039d2f2a51dfeda8b8
Author: frisch <frisch at 56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date: Sun Nov 15 21:29:08 2009 +0000
Fixes for Seamonkey 2.0.
git-svn-id: http://nostalgy.googlecode.com/svn/trunk@176 56b81dcf-5a2f-0410-9db0-014be2e416ff
---
CHANGES | 2 +-
content/edit_prefs.xul | 10 +++++-----
content/messageOverlay.xul | 12 +++++++-----
content/nostalgy.js | 18 ++++++++++++++----
content/thunderbirdOverlay.xul | 12 +++++++-----
install.rdf | 22 +++++++++++++++++-----
6 files changed, 51 insertions(+), 25 deletions(-)
diff --git a/CHANGES b/CHANGES
index 51d48dc..ef94533 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
0.2.21
- improve the test to avoid capturing keys when an input field is focused
- various fixes for TB 3
- - allow to install on Postbox 1.1, TB 3.0pre, SeanMonkey 2.0
+ - allow to install on Postbox 1.1, TB 3.0pre, SeaMonkey 2.0
0.2.20
- repair the "`" thing
diff --git a/content/edit_prefs.xul b/content/edit_prefs.xul
index 216ba47..09312cf 100644
--- a/content/edit_prefs.xul
+++ b/content/edit_prefs.xul
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<!DOCTYPE window>
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<!DOCTYPE window>
<dialog
xmlns:html="http://www.w3.org/1999/xhtml"
@@ -27,7 +27,7 @@
<tabpanel>
<groupbox flex="1">
- <label>Rules associate folders to messages by looking for a
+ <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
is selected for a given message, Nostalgy informs you in the status line.
@@ -76,7 +76,7 @@ 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"/>
+ id="match_case_sensitive" accesskey="C"/>
<checkbox label="Tab triggers shell-like completion (otherwise, cycle through suggestions)"
id="tab_shell_completion" accesskey="T"/>
<checkbox label="Always include tags"
@@ -108,7 +108,7 @@ shortcuts to move/copy the message to this folder.</label>
<radio value="Copy" label="Copy"/>
<radio value="SaveGo" label="Save+Go"/>
</radiogroup>
- <textbox style="width:600px" type="autocomplete" id="folderselect"
+ <textbox style="width:600px" type="autocomplete" id="folderselect"
nostalgyfolderbox="SelectFolder();"/>
<button label="Create" oncommand="SelectFolder();"/>
</hbox>
@@ -117,4 +117,4 @@ shortcuts to move/copy the message to this folder.</label>
</tabpanels>
</tabbox>
-</dialog>
\ No newline at end of file
+</dialog>
diff --git a/content/messageOverlay.xul b/content/messageOverlay.xul
index 45f0bcd..d299cbd 100644
--- a/content/messageOverlay.xul
+++ b/content/messageOverlay.xul
@@ -37,11 +37,13 @@
</statusbar>
</window>
- <statusbar id="statusTextBox">
- <statusbarpanel insertbefore="statusText" >
- <label id="statusbar-nostalgy-label" crop="center" flex="1"
- value="&nostalgy.memomessage;"/>
- </statusbarpanel>
+ <statusbar id="status-bar">
+ <hbox id="statusTextBox" insertbefore="statusText">
+ <statusbarpanel insertbefore="statusText">
+ <label id="statusbar-nostalgy-label" crop="center" flex="1"
+ value="&nostalgy.memo;"/>
+ </statusbarpanel>
+ </hbox>
</statusbar>
<hbox id="expandedHeaderView">
diff --git a/content/nostalgy.js b/content/nostalgy.js
index a1ab4af..1dd70ea 100644
--- a/content/nostalgy.js
+++ b/content/nostalgy.js
@@ -415,8 +415,13 @@ function NostalgyDefLabel() {
function NostalgyCollapseFolderPane() {
var fp = gEBI("folderPaneBox");
- if (fp) { fp.collapsed = !fp.collapsed; return true; }
- else return false;
+ if (window.MsgToggleFolderPane)
+ { MsgToggleFolderPane(true); return true; }
+ else if (window.MsgToggleSplitter)
+ { MsgToggleSplitter("gray_vertical_splitter"); return true; }
+ else if (fp)
+ { fp.collapsed = !fp.collapsed; return true; }
+ return false;
}
@@ -656,7 +661,7 @@ function NostalgyShowFolder(folder) {
totry = window.gFolderTreeView._modeNames.length;
savedFolderView = window.gFolderTreeView._modeNames.indexOf(window.gFolderTreeView.mode);
}
- } else {
+ } else if (EnsureFolderIndex.length < 2) {
// Postbox
ChangeSelection(folderTree, EnsureFolderIndex(folder));
return;
@@ -788,7 +793,12 @@ function NostalgySaveSelection() {
}
function NostalgyRestoreSelection(msgids) {
- var msgs = gDBView.msgFolder.getMessages(msgWindow);
+ var msgs;
+ if (gDBView.msgFolder.getMessages)
+ msgs = gDBView.msgFolder.getMessages(msgWindow);
+ else if (gDBView.msgFolder.msgDatabase)
+ msgs = gDBView.msgFolder.msgDatabase.EnumerateMessages();
+
var selection = gDBView.selection;
selection.clearSelection();
while (msgs.hasMoreElements()) {
diff --git a/content/thunderbirdOverlay.xul b/content/thunderbirdOverlay.xul
index 62a73f1..3309c32 100644
--- a/content/thunderbirdOverlay.xul
+++ b/content/thunderbirdOverlay.xul
@@ -53,11 +53,13 @@
</window>
- <statusbar id="statusTextBox">
- <statusbarpanel insertbefore="statusText">
- <label id="statusbar-nostalgy-label" crop="center" flex="1"
- value="&nostalgy.memo;"/>
- </statusbarpanel>
+ <statusbar id="status-bar">
+ <hbox id="statusTextBox" insertbefore="statusText">
+ <statusbarpanel insertbefore="statusText">
+ <label id="statusbar-nostalgy-label" crop="center" flex="1"
+ value="&nostalgy.memo;"/>
+ </statusbarpanel>
+ </hbox>
</statusbar>
<hbox id="expandedHeaderView">
diff --git a/install.rdf b/install.rdf
index 80b8fcd..afa9794 100644
--- a/install.rdf
+++ b/install.rdf
@@ -2,10 +2,6 @@
<RDF:RDF xmlns:em="http://www.mozilla.org/2004/em-rdf#"
xmlns:NC="http://home.netscape.com/NC-rdf#"
xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <RDF:Description RDF:about="rdf:#$rVuKA2"
- em:id="{3550f703-e582-4d05-9a08-453d09bdfdc6}"
- em:minVersion="1.5"
- em:maxVersion="3.0pre" />
<RDF:Description RDF:about="urn:mozilla:install-manifest"
em:id="nostalgy at alain.frisch"
em:name="Nostalgy"
@@ -15,7 +11,23 @@
em:homepageURL="http://alain.frisch.fr/soft_mozilla.html"
em:optionsURL="chrome://nostalgy/content/edit_prefs.xul"
em:aboutURL="chrome://nostalgy/content/about.xul">
- <em:targetApplication RDF:resource="rdf:#$rVuKA2"/>
+
+ <em:targetApplication>
+ <!-- Thunderbird -->
+ <Description>
+ <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+ <em:minVersion>1.5</em:minVersion>
+ <em:maxVersion>3.0.*</em:maxVersion>
+ </Description>
+ </em:targetApplication>
+ <em:targetApplication>
+ <!-- SeaMonkey -->
+ <Description>
+ <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+ <em:minVersion>1.1</em:minVersion>
+ <em:maxVersion>2.0.*</em:maxVersion>
+ </Description>
+ </em:targetApplication>
<em:targetApplication>
<!-- Postbox -->
<Description>
--
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