[Pkg-mozext-commits] [nostalgy] 214/252: Remove the 'send rule by email' by a simple textual import/export.
David Prévot
taffit at moszumanska.debian.org
Tue Jun 14 15:25:00 UTC 2016
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository nostalgy.
commit 27ad52f19bbf35f9fbf45fe25ec48da6b261e505
Author: alain.frisch at gmail.com <alain.frisch at gmail.com@56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date: Sun Mar 11 08:11:35 2012 +0000
Remove the 'send rule by email' by a simple textual import/export.
---
content/edit_prefs.js | 70 ++++++++++++------------------------------
content/edit_prefs.xul | 3 +-
content/messageOverlay.xul | 10 ------
content/nostalgy.js | 53 --------------------------------
content/thunderbirdOverlay.xul | 9 ------
5 files changed, 22 insertions(+), 123 deletions(-)
diff --git a/content/edit_prefs.js b/content/edit_prefs.js
index a1d6335..133fb22 100644
--- a/content/edit_prefs.js
+++ b/content/edit_prefs.js
@@ -31,59 +31,29 @@ function NostalgyQuote(x) {
return '"' + x + '"';
};
-function NostalgySendRules() {
- var sAccountManager =
- Components.classes["@mozilla.org/messenger/account-manager;1"].
- getService(Components.interfaces.nsIMsgAccountManager);
-
- var identity =
- sAccountManager.allIdentities.GetElementAt(0).
- QueryInterface(Components.interfaces.nsIMsgIdentity);
-
- var to = prompt("Do you want to send a mail to yourself (or someone else)\n"
-+ "with your current set of Nostalgy's rules? If yes, choose the address.", identity.email);
- if (!to) return;
-
- var gMsgCompose =
- Components.classes["@mozilla.org/messengercompose/compose;1"].
- createInstance(Components.interfaces.nsIMsgCompose);
-
- var params =
- Components.classes["@mozilla.org/messengercompose/composeparams;1"].
- createInstance(Components.interfaces.nsIMsgComposeParams);
-
- var compfields =
- Components.classes["@mozilla.org/messengercompose/composefields;1"].
- createInstance(Components.interfaces.nsIMsgCompFields);
-
- var progress =
- Components.classes["@mozilla.org/messenger/progress;1"].
- createInstance(Components.interfaces.nsIMsgProgress);
-
- var account = sAccountManager.defaultAccount;
-
- compfields.to = to;
- compfields.subject = "Nostalgy Rules from " + identity.fullName;
- var rules = NostalgyMkPrefStr();
- compfields.body = "This e-mail was automatically generated by Nostalgy (Thunderbird Extension). It stores a set of Nostalgy rules.\nIf you read this message under Thunderbird, with Nostalgy installed, you can import these rules by clicking on the 'Extract Nostalgy rules' button that should appear above.\n\nFor more information about Nostalgy: http://alain.frisch.fr/soft_mozilla.html\n\nBEGIN RULES\n" + rules + "\nEND RULES\n\n";
-
- params.identity = identity;
- params.composeFields = compfields;
- params.format = 2; // PlainText
-
- var tmp_win =
- window.open("chrome://nostalgy/content/dummy_window.xul", "_blank",
- "chrome,dialog='no',width=0,height=0,centerscreen,alwaysLowered");
- setTimeout(function(){ tmp_win.minimize(); },2000);
-
- gMsgCompose.Initialize(tmp_win, params );
+function NostalgyExportRules() {
+ var rules = NostalgyMkPrefStr();
+ alert(rules);
+};
- gMsgCompose.SendMsg(Components.interfaces.nsIMsgCompDeliverMode.Now,
- identity, account.key, null, progress);
+function NostalgyImportRules() {
+ var rules = NostalgyMkPrefStr();
+ var s = prompt("You can paste here a set of rules created with the 'Export Rules' button.", rules);
+ if (!s) return;
+
+ s = s.replace(/([\x00-\x20>])/g,function(a,b){ return "" });
+ if (confirm(
+ "Do you want to install these rules?\n"+
+ "This will overwrite your current set of rules.\n"
+ )) {
+ var r = NostalgyJSONEval(s);
+ while (nostalgy_gList.getRowCount() > 0)
+ nostalgy_gList.removeItemAt(0);
+ var i;
+ for (i = 0; i < r.length; i++) { NostalgyCreateItem(r[i]); }
+ }
}
-
-
function NostalgySetItem(item, rule) {
var f = item.childNodes.item(0);
var lab = "";
diff --git a/content/edit_prefs.xul b/content/edit_prefs.xul
index 3fe2369..bf4b087 100644
--- a/content/edit_prefs.xul
+++ b/content/edit_prefs.xul
@@ -60,7 +60,8 @@ shortcuts to move/copy the message to this folder.</label>
<button label="Move up" oncommand="NostalgyDoMoveUp();"/>
<button label="Move down" oncommand="NostalgyDoMoveDown();"/>
<separator orient="vertical"/>
- <button label="Send rules by email" oncommand="NostalgySendRules();"/>
+ <button label="Export rules" oncommand="NostalgyExportRules();"/>
+ <button label="Import rules" oncommand="NostalgyImportRules();"/>
</hbox>
</vbox>
</groupbox>
diff --git a/content/messageOverlay.xul b/content/messageOverlay.xul
index d299cbd..666270a 100644
--- a/content/messageOverlay.xul
+++ b/content/messageOverlay.xul
@@ -45,14 +45,4 @@
</statusbarpanel>
</hbox>
</statusbar>
-
- <hbox id="expandedHeaderView">
- <vbox insertafter="editMessageBox" class="header-part1">
- <spacer flex="1"/>
- <button id="nostalgy_extract_rules_buttons"
- label="Import Nostalgy rules" oncommand="NostalgyExtractRules();" hidden="true"/>
- <spacer flex="1"/>
- </vbox>
- </hbox>
-
</overlay>
diff --git a/content/nostalgy.js b/content/nostalgy.js
index 423bbf5..32c9f1c 100644
--- a/content/nostalgy.js
+++ b/content/nostalgy.js
@@ -6,7 +6,6 @@ var nostalgy_label = null;
var nostalgy_th_statusBar = null;
var nostalgy_th_statusBar_orig_hidden = true;
var nostalgy_cmdLabel = null;
-var nostalgy_extracted_rules = "";
var nostalgy_active_keys = { };
var nostalgy_timeout_regkey = 0;
var nostalgy_on_move_completed = null;
@@ -163,18 +162,6 @@ var NostalgyRules =
NostalgyRules.register();
-function NostalgyExtractRules() {
- var s = nostalgy_extracted_rules;
- if (s == "") return;
- // remove characters that should have been escaped
- s = s.replace(/([\x00-\x20>])/g,function(a,b){ return "" });
- if (confirm(
-"Do you want to install the rules contained in this message?\n"+
-"This will overwrite your current set of rules.\n"+
-"IMPORTANT: do this only if you trust the sender of this e-mail.\n"
-))
- NostalgyRules._branch.setCharPref("rules", s)
-}
/** Driver **/
@@ -255,53 +242,13 @@ function onNostalgyLoad() {
if (mSession)
mSession.AddFolderListener(NostalgyFolderListener,
nsIFolderListener.added | nsIFolderListener.removed | nsIFolderListener.event);
-
- Components.classes["@mozilla.org/observer-service;1"].
- getService(Components.interfaces.nsIObserverService).
- addObserver(NostalgyObserver, "MsgMsgDisplayed", false);
}
-function NostalgyOnMsgParsed() {
- if (nostalgy_extracted_rules != "") {
- var button = NostalgyEBI("nostalgy_extract_rules_buttons");
- nostalgy_extracted_rules = "";
- button.hidden = true;
- }
-
- var doc = document.getElementById('messagepane').contentDocument;
- var content = doc.body.textContent;
- var b = "BEGIN RULES\n";
- var i = content.indexOf(b);
- if (i < 0) return;
- i += b.length;
- var j = content.indexOf("END RULES\n", i);
- if (j < 0) return;
-
- nostalgy_extracted_rules = content.substr(i, j - i);
- if (nostalgy_extracted_rules != "") {
- var button = NostalgyEBI("nostalgy_extract_rules_buttons");
- button.hidden = false;
- }
-}
-
-var NostalgyObserver = {
- observe: function (subject, topic, state) {
- if (!state) return;
- // NostalgyDebug("OnMsgParsed");
- subject = subject.QueryInterface(Components.interfaces.nsIMsgHeaderSink);
- if (subject != msgWindow.msgHeaderSink) return; // another window
- NostalgyOnMsgParsed();
- }
-};
function onNostalgyUnload() {
var mSession = NostalgyMailSession();
if (mSession) mSession.RemoveFolderListener(NostalgyFolderListener);
NostalgyRules.unregister();
-
- Components.classes["@mozilla.org/observer-service;1"].
- getService(Components.interfaces.nsIObserverService).
- removeObserver(NostalgyObserver, "MsgMsgDisplayed");
}
function NostalgyHideIfBlurred() {
diff --git a/content/thunderbirdOverlay.xul b/content/thunderbirdOverlay.xul
index c69aa69..d668c4c 100644
--- a/content/thunderbirdOverlay.xul
+++ b/content/thunderbirdOverlay.xul
@@ -60,15 +60,6 @@
</hbox>
</statusbar>
- <hbox id="expandedHeaderView">
- <vbox insertafter="editMessageBox" class="header-part1">
- <spacer flex="1"/>
- <button id="nostalgy_extract_rules_buttons"
- label="Import Nostalgy rules" oncommand="NostalgyExtractRules();" hidden="true"/>
- <spacer flex="1"/>
- </vbox>
- </hbox>
-
<menupopup id="quick-search-menupopup" ignorekeys="true"/>
</overlay>
--
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