[Pkg-mozext-commits] [nostalgy] 116/252: *** empty log message ***
David Prévot
taffit at moszumanska.debian.org
Tue Jun 14 15:24:47 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 dc6224a0b2087ef723ffbcc4ae7a34dffc65969c
Author: frisch <frisch at 56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date: Wed Jun 6 11:00:36 2007 +0000
*** empty log message ***
---
CHANGES | 14 ++++++++++----
content/edit_prefs.xul | 17 +++++++++++++----
content/folders.js | 5 ++++-
content/nostalgy.js | 38 ++++++++++++++++++++------------------
content/thunderbirdOverlay.xul | 12 ------------
5 files changed, 47 insertions(+), 39 deletions(-)
diff --git a/CHANGES b/CHANGES
index 3283c1f..79cd749 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,12 @@
Since 0.2.13
- a system to export and import Nostalgy's rules (through e-mails)
- - when showing a folder, if no message is currently selected,
- select either the first unread one, if any, or the last message otherwise
- change the behavior of the QuickSearch box:
- * always show the popup menu to select/show the current search criterion
- * UP/DOWN: change the criterion (the view is automatically updated)
+ * the search criterion can be changed with UP/DOWN and the view
+ is automatically updated
+ * the menu that shows the current search criterion is shown
+ when one of CONTROL or ALT is pressed (when the QuickSearch box
+ if focused); an option in the preference dialog will force
+ the menu to be always displayed when the QuickSearch box is focused
* RETURN (customizable): start the search, select the last result,
focus thread pane
* CTRL-RETURN (customizable): same, but select all results
@@ -24,6 +26,10 @@ Since 0.2.13
- bug fix: custom shortcuts with no modifier are not recognized when typing
in a text box (QuickSearch or Nostalgy's completion box)
- bug fix: better detection of when Nostalgy's completion box loses focus
+ - (currently disabled:
+ when showing a folder, if no message is currently selected,
+ select either the first unread one, if any, or the last message otherwise
+ )
0.2.12
- bug fix: use the mime-decoded version for the subject (for matching
diff --git a/content/edit_prefs.xul b/content/edit_prefs.xul
index 160bfb7..2efd64b 100644
--- a/content/edit_prefs.xul
+++ b/content/edit_prefs.xul
@@ -16,16 +16,17 @@
<script src="nostalgy_keys.js"/>
<script src="edit_prefs.js"/>
- <tabbox style="width:800px">
+ <tabbox flex="0" style="width:600px">
<tabs>
<tab label="Rules"/>
<tab label="Completion"/>
+ <tab label="UI"/>
<tab label="Keys"/>
</tabs>
<tabpanels>
<tabpanel>
- <groupbox flex="0" style="width:800px">
+ <groupbox flex="1">
<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
@@ -65,7 +66,7 @@ shortcuts to move/copy the message to this folder.</label>
</tabpanel>
<tabpanel>
- <groupbox>
+ <groupbox flex="1">
<checkbox label="Restrict folder completion to the current server"
id="restrict_to_current_server" accesskey="R"/>
<checkbox label="Match only on folder name, not on the full path"
@@ -82,7 +83,15 @@ shortcuts to move/copy the message to this folder.</label>
</tabpanel>
<tabpanel>
- <groupbox style="width:800px">
+ <groupbox flex="1">
+ <checkbox label="Always show the criterion selection menu when Quick Search is focused"
+ id="always_show_search_mode"/>
+ </groupbox>
+ </tabpanel>
+
+
+ <tabpanel>
+ <groupbox flex="1">
<grid style="overflow:auto; height:300px">
<columns> <column/> <column width="150"/> <column/> </columns>
<rows id="key_rows"/>
diff --git a/content/folders.js b/content/folders.js
index 73b10ce..6b7c992 100644
--- a/content/folders.js
+++ b/content/folders.js
@@ -4,7 +4,10 @@ var nostalgy_completion_options = {
sort_folders : false,
match_case_sensitive : false,
tab_shell_completion : false,
- always_include_tags : false
+ always_include_tags : false,
+
+ /* not related to completion: should move to somewhere else */
+ always_show_search_mode : false
};
diff --git a/content/nostalgy.js b/content/nostalgy.js
index 233d61d..a00f0c8 100644
--- a/content/nostalgy.js
+++ b/content/nostalgy.js
@@ -12,7 +12,6 @@ var nostalgy_on_search_done = null;
var nostalgy_search_focused = false;
var nostalgy_on_move_completed = null;
var nostalgy_selection_saved = null;
-var nostalgy_always_show_mode = true;
function NostalgyCurrentSearchMode() {
var input = GetSearchInput();
@@ -286,17 +285,21 @@ function onNostalgyLoad() {
onSearchInputFocus = function(ev) {
old_f1(ev);
NostalgyEnterSearch();
- if (nostalgy_always_show_mode) NostalgyShowSearchMode();
+ if (nostalgy_completion_options.always_show_search_mode) NostalgyShowSearchMode();
};
- onSearchInputBlur = NostalgyLeaveSearch;
-
- if (nostalgy_always_show_mode)
- gEBI("quick-search-menupopup").addEventListener
- ("popuphiding",
- function() {
- if (nostalgy_search_focused) setTimeout(NostalgyShowSearchMode,0);
- },
- false);
+ var old_f2 = onSearchInputBlur;
+ onSearchInputBlur = function(ev) {
+ old_f2(ev);
+ NostalgyLeaveSearch();
+ };
+
+ gEBI("quick-search-menupopup").addEventListener
+ ("popuphiding",
+ function() {
+ if (nostalgy_completion_options.always_show_search_mode &&
+ nostalgy_search_focused) setTimeout(NostalgyShowSearchMode,0);
+ },
+ false);
}
}
@@ -778,7 +781,8 @@ function NostalgySearchSelectAll(select) {
initializeSearchBar();
nostalgy_on_search_done = function() {
nostalgy_on_search_done = null;
- if (select) gDBView.selection.selectAll();
+ if (select) setTimeout(gDBView.selection.selectAll,1000);
+ /* selectAll does not work? */
else NostalgySelectLastMsg();
SetFocusThreadPane();
};
@@ -796,12 +800,9 @@ function NostalgyEnterSearch() {
var o = gEBI("quick-search-menupopup");
if (!o) return;
InitQuickSearchPopup();
- /* nostalgy_search_focused = false;
- o.showPopup(gEBI("searchInput"),-1,-1,"tooltip", "bottomright", "topright");
- */
nostalgy_search_focused = true;
}
-function NostalgyLeaveSearch(ev) {
+function NostalgyLeaveSearch() {
nostalgy_search_focused = false;
var o = gEBI("quick-search-menupopup");
if (!o) return;
@@ -816,6 +817,7 @@ function NostalgySearchMode(current,dir) {
if (!oldmode) oldmode = popup.firstChild;
var newmode = dir > 0 ? oldmode.nextSibling : oldmode.previousSibling;
if (!newmode || !newmode.value) newmode = oldmode;
+ oldmode.setAttribute('checked','false');
newmode.setAttribute('checked','true');
input.searchMode = newmode.value;
popup.setAttribute("value",newmode.value);
@@ -868,7 +870,7 @@ function onNostalgyKeyPress(ev) {
}
if (ev.keyCode == KeyEvent.DOM_VK_ESCAPE && nostalgy_search_focused) {
Search("");
- SetFocusThreadPane();
+ setTimeout(SetFocusThreadPane,0);
NostalgyStopEvent(ev);
return;
}
@@ -929,7 +931,7 @@ function onNostalgyKeyUp(ev) {
if ((ev.keyCode == KeyEvent.DOM_VK_ALT ||
ev.keyCode == KeyEvent.DOM_VK_CONTROL)
&& nostalgy_search_focused
- && !nostalgy_always_show_mode) {
+ && !nostalgy_completion_options.always_show_search_mode) {
var o = gEBI("quick-search-menupopup");
o.hidePopup();
}
diff --git a/content/thunderbirdOverlay.xul b/content/thunderbirdOverlay.xul
index f08ee1a..d1a8bf3 100644
--- a/content/thunderbirdOverlay.xul
+++ b/content/thunderbirdOverlay.xul
@@ -67,18 +67,6 @@
</hbox>
<menupopup id="quick-search-menupopup" ignorekeys="true"/>
- <statusbar id="statusTextBox">
- <statusbarpanel insertbefore="statusText">
- <button label="XXX" type="menu-button">
- <menupopup popupalign="topleft" popupanchor="bottomleft">
- <menuitem value="0" label="ABC" type="radio"/>
- <menuitem value="0" label="DEF" type="radio"/>
- </menupopup>
- </button>
- </statusbarpanel>
- </statusbar>
- <!-- <button id="quick-search-button" hidden="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