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

David Prévot taffit at alioth.debian.org
Tue Oct 8 20:41:26 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 51bd7f4a082296a7e5dfa3b97c04eff4025dd6e0
Author: frisch <frisch at 56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date:   Wed Jul 26 15:03:02 2006 +0000

    *** empty log message ***
    
    
    git-svn-id: http://nostalgy.googlecode.com/svn/trunk@13 56b81dcf-5a2f-0410-9db0-014be2e416ff
---
 content/NostalgyEditRule.xul   |   52 +++++++++
 content/NostalgyPref.xul       |   42 ++++++++
 content/folders.js             |  162 ++++++++++++++++++++++++++++
 content/messageOverlay.xul     |   30 +++++-
 content/overlay.js             |  227 +++++++++++++---------------------------
 content/pref.js                |   30 ++++++
 content/rule.js                |   35 +++++++
 content/thunderbirdOverlay.xul |   32 ++++--
 files                          |    5 +
 install.rdf                    |    1 +
 10 files changed, 447 insertions(+), 169 deletions(-)

diff --git a/content/NostalgyEditRule.xul b/content/NostalgyEditRule.xul
new file mode 100644
index 0000000..c705e2a
--- /dev/null
+++ b/content/NostalgyEditRule.xul
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<!DOCTYPE window>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<dialog
+        xmlns:html="http://www.w3.org/1999/xhtml"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="Edit Nostalgy Rule"
+	buttons="accept,cancel"
+	ondialogaccept="onAcceptChanges();"
+>
+
+ <script src="folders.js"/>
+ <script src="rule.js"/>
+
+<vbox>
+ <groupbox>
+
+<grid flex="1">
+  <columns>
+    <column flex="1"/>
+    <column flex="2"/>
+  </columns>
+
+  <rows>
+    <row>
+      <label value="If field"/>
+      <radiogroup id="field">
+      <hbox>
+        <radio id="sender" label="Sender"/>
+        <radio id="subject" selected="true" label="Subject"/>
+        <radio id="both" label="Both"/>
+      </hbox>
+      </radiogroup>
+   </row>
+
+    <row>
+      <label value="contains"/>
+      <textbox id="contains"/>
+    </row>
+    <row>
+      <label value="then save to"/>
+      <textbox type="autocomplete" tabScrolling="true" id="folderselect"
+             flex="3" maxrows="15" crop="end" ontextcommand="ChooseFolder();"/>
+    </row>
+  </rows>
+</grid>
+ </groupbox>
+
+</vbox>
+
+</dialog>
\ No newline at end of file
diff --git a/content/NostalgyPref.xul b/content/NostalgyPref.xul
new file mode 100644
index 0000000..8835bce
--- /dev/null
+++ b/content/NostalgyPref.xul
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!DOCTYPE window>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<window
+        xmlns:html="http://www.w3.org/1999/xhtml"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="Nostalgy Preferences">
+
+ <script src="folders.js"/>
+ <script src="pref.js"/>
+
+<vbox>
+ <groupbox>
+ <listbox flex="1" id="rules">
+  <listhead>
+   <listheader label="Field"/>
+   <listheader label="Contains"/>
+   <listheader label="Folder"/>
+  </listhead>
+  <listcols>
+   <listcol/>
+   <listcol/>
+   <listcol flex="1"/>
+  </listcols>
+  <listitem>
+   <listcell label="Both" value="both"/>
+   <listcell label="Bla"/>
+   <listcell label="Blablabla"/>
+  </listitem> 
+ </listbox>
+
+ <vbox align="center">
+  <hbox>
+  <button label="Edit" default="true" onclick="DoEdit();"/>
+  <button label="Done"/>
+  </hbox>
+ </vbox>
+ </groupbox>
+</vbox>
+
+</window>
\ No newline at end of file
diff --git a/content/folders.js b/content/folders.js
new file mode 100644
index 0000000..82343ba
--- /dev/null
+++ b/content/folders.js
@@ -0,0 +1,162 @@
+function NostalgyCrop(s,len) {
+  var l = s.length;
+  if (l < len) return s;
+  var l1 = len / 3;
+  return (s.substr(0,l1) + ".." + s.substr(l - 2 * l1, l));
+}
+
+function NostalgyMakeRegexp(s) {
+  return (new RegExp(s.replace(/\.\./g, ".*"), ""));
+}
+
+
+function folder_name(folder) {
+  var uri = folder.prettyName;
+  while (!folder.isServer) {
+    folder = folder.parent;
+    uri = folder.prettyName + "/" + uri;
+  }
+  return uri;
+}
+
+function LongestCommonPrefix(s1,s2) {
+  var i = 0;
+  var l = s1.length;
+  if (s2.length < l) { l = s2.length; }
+  for (i = 0; i < l; i++) {
+    if (s1.charAt(i) != s2.charAt(i)) { break; }
+  }
+  return (s1.substr(0,i));
+}
+
+/** Autocompletion of folders **/
+
+function myautocomplete() {
+ this.xresults = 
+  Components.classes[
+   "@mozilla.org/autocomplete/results;1"
+  ].getService(Components.interfaces.nsIAutoCompleteResults);
+}
+
+myautocomplete.prototype.onStartLookup = function(text, results, listener) {
+ var items = this.xresults.items;
+ items.Clear();
+ var ltext = NostalgyMakeRegexp(text.toLowerCase());
+
+ var addItem = function (folder) {
+  var fname = folder_name(folder);
+  if (! fname.toLowerCase().match(ltext)) { return; }
+  var newitem = 
+   Components.classes[
+    "@mozilla.org/autocomplete/item;1"
+   ].createInstance(Components.interfaces.nsIAutoCompleteItem);
+  newitem.value = NostalgyCrop(fname,120);
+
+  items.AppendElement(newitem);
+ };
+ IterateFolders(addItem);
+ this.xresults.searchString = text;
+ this.xresults.defaultItemIndex = 0;
+ listener.onAutoComplete(this.xresults, 1);
+}
+
+myautocomplete.prototype.onStopLookup = function() { }
+myautocomplete.prototype.onAutoComplete = function(text, results, listener){ }
+
+myautocomplete.prototype.QueryInterface = function(iid) {
+ if (iid.equals(Components.interfaces.nsIAutoCompleteSession)) return this;
+ throw Components.results.NS_NOINTERFACE;
+}
+
+/**  Folder traversal **/
+
+// If the completion is unique, return it. Otherwise, set
+// the value of the inputbox to the longest common prefix for all
+// the completions, and return null.
+
+function NostalgyCompleteUnique(s) {
+  var nb = 0;
+  var ret = "";
+
+  var rexp = NostalgyMakeRegexp(s.toLowerCase());
+  IterateFolders(function (f) {
+   var n = folder_name(f).toLowerCase();
+   if (n.search(rexp) == 0) { 
+     nb++;
+     if (nb == 1) { ret = n; } else { ret = LongestCommonPrefix(ret,n); }
+   }
+  });
+  if (ret) { return ret; } else { return s; }
+}
+
+function FirstCompletion(uri) {
+  var nb = 0;
+  var ret = null;
+
+  var rexp = NostalgyMakeRegexp(uri.toLowerCase());
+  IterateFolders(function (f) {
+   if (folder_name(f).toLowerCase().match(rexp)) { 
+     nb++;
+     if (nb == 1) { ret = f; }
+   }
+  });
+  return ret;
+}
+
+function NostalgyComplete(uri,box)
+{
+ return (FirstCompletion(uri));
+}
+
+function FindFolder(uri)
+{
+ var ret = null;
+ uri = uri.toLowerCase();
+ try {
+  IterateFolders(function (folder) {
+   if (folder_name(folder).toLowerCase() == uri) { ret = folder; throw(0); }
+  });
+  IterateFolders(function (folder) {
+   if (folder_name(folder).toLowerCase().indexOf(uri) >= 0) { ret = folder; throw(0); }
+  });
+ } catch (ex) { }
+ return ret;
+}
+
+function IterateFolders(f) {
+ var amService = 
+    Components.classes["@mozilla.org/messenger/account-manager;1"]
+              .getService(Components.interfaces.nsIMsgAccountManager);
+
+ var servers= amService.allServers;
+ var seen = { };
+ var i;
+ for (i = 0; i < servers.Count(); i++) {
+  var server = servers.GetElementAt(i).
+               QueryInterface(Components.interfaces.nsIMsgIncomingServer);
+  var root = server.rootMsgFolder;
+  var n = root.prettyName;
+  if (seen[n]) {
+    // Prevent duplicate folders in case of locally stored POP3 accounts
+  } else {
+    seen[n] = true;
+    IterateSubfolders(root,f);
+  }
+ }
+}
+
+function IterateSubfolders(folder,f) {
+ if (!folder.isServer) { f(folder); }
+ if (folder.hasSubFolders) {
+  var subfolders = folder.GetSubFolders();
+  var done = false;
+  while (!done) {
+   var subfolder = subfolders.currentItem().
+                   QueryInterface(Components.interfaces.nsIMsgFolder);
+   IterateSubfolders(subfolder,f);
+   try {subfolders.next();}
+   catch(e) {done = true;}
+  }
+ }
+}  
+
diff --git a/content/messageOverlay.xul b/content/messageOverlay.xul
index 6bd4243..282da76 100644
--- a/content/messageOverlay.xul
+++ b/content/messageOverlay.xul
@@ -3,15 +3,37 @@
 <overlay id="nostalgy-message-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
+ <script src="folders.js"/>
  <script src="overlay.js"/>
 
  <keyset id="mailKeys">
-  <key key="S" oncommand="NostalgyCmd('&nostalgy.move-memo;', MoveToFolder);"/>
-  <key key="C" oncommand="NostalgyCmd('&nostalgy.copy-memo;', CopyToFolder);"/>
+  <key key="S" oncommand="NostalgyCmd('&nostalgy.move-memo;', MoveToFolder, '');"/>
+  <key key="C" oncommand="NostalgyCmd('&nostalgy.copy-memo;', CopyToFolder, '');"/>
  </keyset>
 
 
- <statusbar id="status-bar">
+ <window id="messengerWindow">
+  <statusbar hidden="true" class="chromeclass-status" id="nostalgy-statusbar">
+  <statusbarpanel flex="1">
+   <label id="nostalgy-command-label"/>
+   <textbox id="nostalgy-folderbox" type="autocomplete" tabScrolling="true"
+	   ontextcommand="NostalgyRunCommand();"
+	   ontextrevert="NostalgyHide();"
+	   flex="1"
+	   maxrows="25" crop="center"
+           />
+  </statusbarpanel>
+  </statusbar>
+ </window>
+
+ <statusbar id="statusTextBox">
+  <statusbarpanel insertbefore="statusText" >
+  <label id="statusbar-nostalgy-label" 
+         value="&nostalgy.memomessage;"/>
+  </statusbarpanel>
+ </statusbar>
+
+<!-- <statusbar id="status-bar">
   <label id="statusbar-nostalgy-label" 
          position="1"
          value="&nostalgy.memomessage;"/>
@@ -24,6 +46,6 @@
 	   maxrows="15" crop="end"
            style="width: 300px;"/>
  </statusbar>
-
+-->
 
 </overlay>
diff --git a/content/overlay.js b/content/overlay.js
index 3a506f9..4d906df 100644
--- a/content/overlay.js
+++ b/content/overlay.js
@@ -1,49 +1,10 @@
-function folder_name(folder) {
-  var uri = folder.prettyName;
-  while (!folder.isServer) {
-    folder = folder.parent;
-    uri = folder.prettyName + "/" + uri;
-  }
-  return (uri);
-}
-
-/** Autocompletion of folders **/
-
-function myautocomplete() {
- this.xresults = 
-  Components.classes[
-   "@mozilla.org/autocomplete/results;1"
-  ].getService(Components.interfaces.nsIAutoCompleteResults);
-}
-
-myautocomplete.prototype.onStartLookup = function(text, results, listener) {
- var items = this.xresults.items;
- items.Clear();
- var ltext = text.toLowerCase();
-
- var addItem = function (folder) {
-  var fname = folder_name(folder);
-  if (fname.toLowerCase().indexOf(ltext) < 0) { return; }
-  var newitem = 
-   Components.classes[
-    "@mozilla.org/autocomplete/item;1"
-   ].createInstance(Components.interfaces.nsIAutoCompleteItem);
-  newitem.value = fname;
-  items.AppendElement(newitem);
- };
- IterateFolders(addItem);
- this.xresults.searchString = text;
- this.xresults.defaultItemIndex = 0;
- listener.onAutoComplete(this.xresults, 1);
-}
+function gEBI(s) { return document.getElementById(s); }
 
-myautocomplete.prototype.onStopLookup = function() { }
-myautocomplete.prototype.onAutoComplete = function(text, results, listener){ }
-
-myautocomplete.prototype.QueryInterface = function(iid) {
- if (iid.equals(Components.interfaces.nsIAutoCompleteSession)) return this;
- throw Components.results.NS_NOINTERFACE;
-}
+var nostalgy_folderBox = null;
+var nostalgy_statusBar = null;
+var nostalgy_label = null;
+var nostalgy_th_statusBar = null;
+var nostalgy_cmdLabel = null;
 
 /** Driver **/
 
@@ -53,112 +14,88 @@ var command = null;
 var last_folder_author = new Array();
 var last_folder_subject = new Array();
 var last_folder = null;
+var glast_folder = null;
 
 function onNostalgyLoad() {
- var nostalgyBox = document.getElementById("statusbar-nostalgy");
- nostalgyBox.addSession(new myautocomplete());
- var label = document.getElementById("statusbar-nostalgy-label");
- default_label = label.value;
- NostalgyHide();
-}
+ nostalgy_folderBox = gEBI("nostalgy-folderbox");
+ nostalgy_statusBar = gEBI("nostalgy-statusbar");
+ nostalgy_label = gEBI("statusbar-nostalgy-label");
+ nostalgy_th_statusBar = gEBI("status-bar");
+ nostalgy_cmdLabel = gEBI("nostalgy-command-label");
 
-function NostalgyCollapseFolderPane() {
- var fp = document.getElementById("folderPaneBox");
- fp.collapsed = !fp.collapsed;
-}
+ nostalgy_folderBox.addSession(new myautocomplete());
+ default_label = nostalgy_label.value;
 
-function NostalgyCmd(lab,cmd,init) {
- var nostalgyBox = document.getElementById("statusbar-nostalgy");
- focus_saved = document.commandDispatcher.focusedElement;
- if (!focus_saved) {
-  focus_saved = document.getElementById("messagepane").contentWindow;
- }
- nostalgyBox.hidden = false;
- nostalgyBox.value = init;
- setTimeout(function() { nostalgyBox.focus(); }, 50);
-   // For some unknown reason, doing nostalgyBox.focus immediatly
-   // sometimes does not work...
 
- var label = document.getElementById("statusbar-nostalgy-label");
- label.value = lab;
- command = cmd;
+ gEBI("threadTree").addEventListener("select", NostalgyDefLabel, false); 
+
+ var saved_str = "";
+ nostalgy_folderBox.addEventListener("keydown", 
+  function(ev){ 
+   if (ev.keyCode == 9) { saved_str = nostalgy_folderBox.value; } 
+ }, false);
+ nostalgy_folderBox.addEventListener("keypress", 
+  function(ev){ 
+   if (ev.keyCode == 9) { nostalgy_folderBox.value = 
+				NostalgyCompleteUnique(saved_str); } 
+ }, true);
 }
 
 function NostalgyHide() {
- var nostalgyBox = document.getElementById("statusbar-nostalgy");
- nostalgyBox.hidden = true;
+ nostalgy_statusBar.hidden = true;
+ nostalgy_th_statusBar.hidden = false;
+
  if (focus_saved) {
   focus_saved.focus ();
   focus_saved = null;
  }
- var label = document.getElementById("statusbar-nostalgy-label");
- label.value = default_label;
+ NostalgyDefLabel();
 }
 
-function NostalgyRunCommand() {
-  var nostalgyBox = document.getElementById("statusbar-nostalgy");
-  var folder = FindFolder(nostalgyBox.value);
-  if (folder) {
-   command(folder);
-  } else {
-   alert("No folder found");
-  }
-  NostalgyHide();
+
+
+function NostalgyDefLabel() { 
+ glast_folder = get_last_folder();
+ if (glast_folder) {
+   nostalgy_label.value = 
+       default_label + " [+Shift: ==> " + folder_name(glast_folder) + "]";
+ } else {
+   nostalgy_label.value = default_label;
+ }
 }
 
-/**  Folder traversal **/
-
-function FindFolder(uri)
-{
- var ret = null;
- uri = uri.toLowerCase();
- try {
-  IterateFolders(function (folder) {
-   if (folder_name(folder).toLowerCase() == uri) { ret = folder; throw(0); }
-  });
-  IterateFolders(function (folder) {
-   if (folder_name(folder).toLowerCase().indexOf(uri) >= 0) { ret = folder; throw(0); }
-  });
- } catch (ex) { }
- return ret;
+
+function NostalgyCollapseFolderPane() {
+ var fp = document.getElementById("folderPaneBox");
+ fp.collapsed = !fp.collapsed;
 }
 
-function IterateFolders(f) {
- var amService = 
-    Components.classes["@mozilla.org/messenger/account-manager;1"]
-              .getService(Components.interfaces.nsIMsgAccountManager);
-
- var servers= amService.allServers;
- var seen = { };
- var i;
- for (i = 0; i < servers.Count(); i++) {
-  var server = servers.GetElementAt(i).
-               QueryInterface(Components.interfaces.nsIMsgIncomingServer);
-  var root = server.rootMsgFolder;
-  var n = root.prettyName;
-  if (seen[n]) {
-    // Prevent duplicate folders in case of locally stored POP3 accounts
-  } else {
-    seen[n] = true;
-    IterateSubfolders(root,f);
-  }
- }
+
+function NostalgyCmd(lab,cmd,init) {
+ focus_saved = document.commandDispatcher.focusedElement;
+ if (!focus_saved) { focus_saved = gEBI("messagepane").contentWindow; }
+
+ nostalgy_cmdLabel.value = lab;
+ command = cmd;
+ nostalgy_statusBar.hidden = false;
+ nostalgy_th_statusBar.hidden = true;
+ nostalgy_folderBox.value = init;
+
+ setTimeout(function() { nostalgy_folderBox.focus(); }, 50);
+   // For some unknown reason, doing nostalgyBox.focus immediatly
+   // sometimes does not work...
 }
 
-function IterateSubfolders(folder,f) {
- if (!folder.isServer) { f(folder); }
- if (folder.hasSubFolders) {
-  var subfolders = folder.GetSubFolders();
-  var done = false;
-  while (!done) {
-   var subfolder = subfolders.currentItem().
-                   QueryInterface(Components.interfaces.nsIMsgFolder);
-   IterateSubfolders(subfolder,f);
-   try {subfolders.next();}
-   catch(e) {done = true;}
-  }
- }
-}  
+
+function NostalgyRunCommand() {
+  var f= NostalgyComplete(nostalgy_folderBox.value, nostalgy_folderBox);
+  if (f) { command(f); NostalgyHide(); }
+
+//  var folder = FindFolder(nostalgy_folderBox.value);
+//  if (folder) { command(folder); } 
+//  else { alert("No folder found"); }
+//  NostalgyHide();
+}
 
 function MailAuthor() {
  return(gDBView.hdrForFirstSelectedMessage.author);
@@ -200,32 +137,12 @@ function CopyToFolder(folder) {
 }
 
 function NostalgyAgain(lab,cmd) {
- var f = get_last_folder();
- if (f) {
-   var nostalgyBox = document.getElementById("statusbar-nostalgy");
-   NostalgyCmd(lab, cmd, folder_name(f));
+ if (glast_folder) {
+   cmd(glast_folder);
  }
 }
 
 
-/** Marking **/
-
-function NostalgyMark() {
- var tree = window.parent.GetThreadTree();			  
-// var dbview = tree.builderView;
-// alert("Focus = " + tree.currentIndex);
- var sel = tree.view.selection;
- //alert("Sel = " + sel);
- // sel.toggleSelect(1);
-// var i = sel.currentIndex;
-// sel.rangedSelect(i,i,true);
- sel.currentIndex++;
-// var i = sel.currentIndex;
-// sel.rangedSelect(i,i,true);
- tree.treeBoxObject.ensureRowIsVisible(sel.currentIndex);
- treeView.selectionChanged();
-}
-
 
 var NostalgyLastEscapeTimeStamp = 0;
 
@@ -241,4 +158,6 @@ function onNostalgyKeyPress(ev) {
 }
 
 window.addEventListener("load", onNostalgyLoad, false);
-if (SetFocusFolderPane) window.addEventListener("keypress", onNostalgyKeyPress, false);
\ No newline at end of file
+if (SetFocusFolderPane) {
+  window.addEventListener("keypress", onNostalgyKeyPress, false);
+}
\ No newline at end of file
diff --git a/content/pref.js b/content/pref.js
new file mode 100644
index 0000000..2ca1556
--- /dev/null
+++ b/content/pref.js
@@ -0,0 +1,30 @@
+function RuleOfItem(item) {
+ return ({ folder_name: item.childNodes.item(2).getAttribute("label"),
+	   contains: item.childNodes.item(1).getAttribute("label"),
+	   field: item.childNodes.item(0).getAttribute("value") });
+}
+
+function StrOfRule(rule) {
+  return ("{ folder_name: '" + rule.folder_name + 
+          "', contains: '" + rule.contains + 
+          "', field: '" + rule.field + "' }");
+}
+
+
+
+function DoEdit() {
+  var list = document.getElementById("rules");
+  var item = list.selectedItem;
+  if (item) {
+   window.openDialog("chrome://nostalgy/content/NostalgyEditRule.xul", 
+                     "", "centerscreen,chrome,modal,titlebar,resizable=yes",
+	             item);
+  }
+}
+
+function onNostalgyLoad() {
+  var o = {x : 1, y : 2};
+  alert(o.toString())
+}
+
+window.addEventListener("load", onNostalgyLoad, false);
\ No newline at end of file
diff --git a/content/rule.js b/content/rule.js
new file mode 100644
index 0000000..8a6b869
--- /dev/null
+++ b/content/rule.js
@@ -0,0 +1,35 @@
+function gEBI(id) { return (document.getElementById(id)); }
+function FolderSelect() { return (gEBI("folderselect")); }
+function ContainsSelect() { return (gEBI("contains")); }
+function FieldSelect() { return (gEBI("field")); }
+
+var gitem = null;
+
+function onNostalgyLoad() {
+ FolderSelect().addSession(new myautocomplete());
+
+ gitem = window.arguments[0];
+ if (gitem) {
+   FolderSelect().value = gitem.childNodes.item(2).getAttribute("label");
+   ContainsSelect().value = gitem.childNodes.item(1).getAttribute("label");
+   FieldSelect().selectedItem = 
+       gEBI(gitem.childNodes.item(0).getAttribute("value"));
+ }
+}
+
+function onAcceptChanges() {
+ gitem.childNodes.item(2).setAttribute("label", FolderSelect().value);
+ gitem.childNodes.item(1).setAttribute("label", ContainsSelect().value);
+ gitem.childNodes.item(0).setAttribute("label", 
+    FieldSelect().selectedItem.getAttribute("label"));
+ gitem.childNodes.item(0).setAttribute("value", 
+    FieldSelect().selectedItem.getAttribute("id"));
+}
+
+function ChooseFolder() {
+  var b = FolderSelect();
+  var folder = FindFolder(b.value);
+  if (folder) { b.value = folder_name(folder); }
+}
+
+window.addEventListener("load", onNostalgyLoad, false);
\ No newline at end of file
diff --git a/content/thunderbirdOverlay.xul b/content/thunderbirdOverlay.xul
index 67c641a..eeeacd6 100644
--- a/content/thunderbirdOverlay.xul
+++ b/content/thunderbirdOverlay.xul
@@ -3,8 +3,10 @@
 <overlay id="nostalgy-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
+ <script src="folders.js"/>
  <script src="overlay.js"/>
 
+
  <keyset id="mailKeys">
   <key key="G" oncommand="NostalgyCmd('&nostalgy.go-memo;', ShowFolder, '');"/>
   <key key="S" 
@@ -19,20 +21,28 @@
  </keyset>
 
 
- <textbox id="nostalgy-suggest" style="width: 300px;"/>
+ <window id="messengerWindow">
+  <statusbar hidden="true" class="chromeclass-status" id="nostalgy-statusbar">
+  <statusbarpanel flex="1">
+   <label id="nostalgy-command-label"/>
+   <textbox id="nostalgy-folderbox" type="autocomplete" tabScrolling="true"
+	   ontextcommand="NostalgyRunCommand();"
+	   ontextrevert="NostalgyHide();"
+	   flex="1"
+	   maxrows="25" crop="center"
+           />
+  </statusbarpanel>
+  </statusbar>
+ </window>
+
       
- <statusbar id="status-bar">
+ <statusbar id="statusTextBox">
+  <statusbarpanel insertbefore="statusText" >
   <label id="statusbar-nostalgy-label" 
-         position="1"
          value="&nostalgy.memo;"/>
-
-  <textbox id="statusbar-nostalgy" type="autocomplete" tabScrolling="true"
-	   ontextcommand="NostalgyRunCommand();"
-	   ontextrevert="NostalgyHide();"
-           position="2"
-	   maxlength="160" flex="3"
-	   maxrows="15" crop="end"
-           style="width: 300px;"/>
+  </statusbarpanel>
  </statusbar>
 
 </overlay>
+
+
diff --git a/files b/files
index 8e8d795..933e0ac 100644
--- a/files
+++ b/files
@@ -1,8 +1,13 @@
 content/about.xul
 content/overlay.js
 content/thunderbirdOverlay.xul
+content/NostalgyEditRule.xul
 content/messageOverlay.xul
 content/about.xhtml
+content/NostalgyPref.xul
+content/pref.js
+content/folders.js
+content/rule.js
 locale/en-US/nostalgy.dtd
 locale/en-US/nostalgy.properties
 defaults/preferences/nostalgy.js
diff --git a/install.rdf b/install.rdf
index 2a7ee5a..54d411a 100644
--- a/install.rdf
+++ b/install.rdf
@@ -9,6 +9,7 @@
     <em:description>Adds shortcuts to change folder, move message, with folder completion</em:description>
     <em:homepageURL>http://www.eleves.ens.fr/home/frisch/soft_mozilla.html</em:homepageURL>
     <em:aboutURL>chrome://nostalgy/content/about.xul</em:aboutURL>
+    <em:optionsURL>chrome://nostalgy/content/NostalgyPref.xul</em:optionsURL>
     <em:targetApplication>
       <Description>
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id> <!-- thunderbird -->

-- 
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