Merge lp:~bdrung/firefox-extensions/mozgest.ubuntu into lp:~ubuntu-dev/firefox-extensions/mozgest.ubuntu

[Benjamin Drung]

[Benjamin Drung (bdrung)]

New upstream release 2.1.4

[lp:~bdrung/firefox-extensions/mozgest.ubuntu]

28. By Benjamin Drung on 2009-07-26

RELEASE version 2.1.4-0ubuntu1 to ubuntu/karmic

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2009-07-25 23:01:05 +0000
@@ -0,0 +1,4 @@
+[BUILDDEB]
+merge = True
+export-upstream-revision = revid:[e-mail]-20090725215038-wfimnbref3p8h3ev
+export-upstream = .

=== modified file 'chrome.manifest'
--- chrome.manifest	2008-02-27 03:41:55 +0000
+++ chrome.manifest	2009-07-25 21:50:38 +0000
@@ -1,6 +1,4 @@
 overlay chrome://browser/content/browser.xul chrome://mozgest/content/mozgestOverlay.xul
-overlay chrome://browser/content/bookmarks/bookmarksProperties.xul chrome://mozgest/content/bmPropsOverlay.xul
-overlay chrome://browser/content/places/bookmarkProperties.xul chrome://mozgest/content/bmPropsOverlay.xul
 
 overlay chrome://global/content/viewSource.xul chrome://mozgest/content/mozgestOverlay.xul
 overlay chrome://global/content/viewPartialSource.xul chrome://mozgest/content/mozgestOverlay.xul
@@ -12,7 +10,6 @@
 overlay chrome://navigator/content/navigator.xul chrome://mozgest/content/mozgestOverlay.xul
 overlay chrome://navigator/content/viewSource.xul chrome://mozgest/content/mozgestOverlay.xul
 overlay chrome://navigator/content/viewPartialSource.xul chrome://mozgest/content/mozgestOverlay.xul
-overlay chrome://communicator/content/bookmarks/bm-props.xul chrome://mozgest/content/bmPropsOverlay.xul
 
 content mozgest jar:chrome/mozgest.jar!/content/
 skin mozgest classic/1.0 jar:chrome/mozgest.jar!/skin/classic/
@@ -21,18 +18,19 @@
 style chrome://global/content/customizeToolbar.xul chrome://mozgest/skin/mozgest.css
 
 locale mozgest en-US jar:chrome/mozgest.jar!/locale/en-US/
-locale mozgest ca-AD jar:chrome/mozgest.jar!/locale/ca-AD/
-locale mozgest cs-CZ jar:chrome/mozgest.jar!/locale/cs-CZ/
 locale mozgest de-DE jar:chrome/mozgest.jar!/locale/de-DE/
-locale mozgest el-GR jar:chrome/mozgest.jar!/locale/el-GR/
+locale mozgest da-DK jar:chrome/mozgest.jar!/locale/da-DK/
 locale mozgest es-ES jar:chrome/mozgest.jar!/locale/es-ES/
 locale mozgest fr-FR jar:chrome/mozgest.jar!/locale/fr-FR/
-locale mozgest hu-HU jar:chrome/mozgest.jar!/locale/hu-HU/
+locale mozgest it-IT jar:chrome/mozgest.jar!/locale/it-IT/
 locale mozgest ja-JP jar:chrome/mozgest.jar!/locale/ja-JP/
+locale mozgest ko-KR jar:chrome/mozgest.jar!/locale/ko-KR/
 locale mozgest lt-LT jar:chrome/mozgest.jar!/locale/lt-LT/
 locale mozgest nl-NL jar:chrome/mozgest.jar!/locale/nl-NL/
 locale mozgest pl-PL jar:chrome/mozgest.jar!/locale/pl-PL/
 locale mozgest pt-PT jar:chrome/mozgest.jar!/locale/pt-PT/
 locale mozgest ru-RU jar:chrome/mozgest.jar!/locale/ru-RU/
 locale mozgest sk-SK jar:chrome/mozgest.jar!/locale/sk-SK/
-locale mozgest zh-CN jar:chrome/mozgest.jar!/locale/zh-CN/
\ No newline at end of file
+locale mozgest sv-SE jar:chrome/mozgest.jar!/locale/sv-SE/
+locale mozgest zh-CN jar:chrome/mozgest.jar!/locale/zh-CN/
+locale mozgest zh-TW jar:chrome/mozgest.jar!/locale/zh-TW/
\ No newline at end of file

=== removed file 'chrome/content/bmPropsOverlay.xul'
--- chrome/content/bmPropsOverlay.xul	2008-02-27 03:41:55 +0000
+++ chrome/content/bmPropsOverlay.xul	1970-01-01 00:00:00 +0000
@@ -1,144 +0,0 @@
-<?xml version="1.0"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is MozGest Bookmarkproperties.
-   -
-   - The Initial Developer of the Original Code is Jochen Schlehuber.
-   - Portions created by the Initial Developer are Copyright (C) 2004
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s) (alphabetical order):
-   -  Jochen <[e-mail]>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!DOCTYPE overlay SYSTEM "chrome://mozgest/locale/mozgest.dtd">
-
-<overlay id="mozgest"
-         xmlns:html="http://www.w3.org/1999/xhtml"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <script type="application/x-javascript" src="defaults.js"/>
-  <script type="application/x-javascript" src="mozgestCommon.js"/>
-  <script type="application/x-javascript" src="componentLoader.js"/>
-
-  <script type="application/x-javascript">
-  <![CDATA[
-    var mozgestOverlay = {
-      mgMappingsObserver : {
-        observe: function(subject, topic, data) {
-          if (topic == "mozgestControl" && data == "mappingsUpdated")
-            mozgestOverlay.mgBMinit();
-        }
-      },
-
-      mgAddObserver : function() {
-        Components.classes["@mozilla.org/observer-service;1"]
-         .getService(Components.interfaces.nsIObserverService)
-         .addObserver(mozgestOverlay.mgMappingsObserver, "mozgestControl", false);
-      },
-
-      mgRemoveObserver : function() {
-        Components.classes["@mozilla.org/observer-service;1"]
-         .getService(Components.interfaces.nsIObserverService)
-         .removeObserver(mozgestOverlay.mgMappingsObserver, "mozgestControl");
-      },
-
-      mgBMinit : function() {
-        if (document.getElementById("keywordRow")) {
-          this.sRow = document.getElementById("keywordRow");
-          this.bm = mgBMService.plBook.getItemGUID(window.arguments[0].bookmarkId);
-        }
-        else {
-          this.sRow = document.getElementById("shortcutrow")
-          this.bm = window.arguments[0];
-        }
-        document.argss=window.arguments;
-
-        if (this.sRow.getAttribute("hidden"))
-          return;
-
-        if (!this.mgList) {
-          this.mgRow = document.createElement("row")
-          this.mgRow.id = "mozgestRow"
-          this.mgRow.align = "center"
-
-          this.mgLabel = document.createElement("label")
-          this.mgLabel.setAttribute("value", mgGetString("bmPropsLabel"))
-          this.mgRow.appendChild(this.mgLabel)
-
-          this.mgList = document.createElement("menulist")
-          this.mgLabel = mgGetString("editGesture")
-          this.mgList.setAttribute("label", this.mgLabel)
-          this.mgRow.appendChild(this.mgList)
-
-          this.sRow.parentNode.insertBefore(this.mgRow, this.sRow.nextSibling)
-          sizeToContent()
-        }
-
-        this.mgList.removeAllItems()
-
-        var mapTable = _mgMS.activeMappings["browser"]
-        var gestureFound = false
-
-        for (mapping in mapTable) {
-          if (mapTable[mapping].func == this.bm) {
-            gestureFound = true
-            var aCode = mgMappingLocalizer.localize(mapping)
-            this.mItem = this.mgList
-                             .appendItem(aCode + " " + decodeURIComponent(mapTable[mapping].name), mapping)
-
-            this.mItem.setAttribute("oncommand",
-                       "mozgestOverlay.mgEditMapping('directEdit', this.value)");
-          }
-        }
-        if (gestureFound)
-          this.mgList.menupopup.appendChild(document.createElement("menuseparator"));
-
-        this.mItem = this.mgList.appendItem(mgGetString("newGesture"), this.bm);
-        this.mItem.setAttribute("oncommand",
-                   "mozgestOverlay.mgEditMapping('New', this.value)");
-        this.mgList.setAttribute("label", this.mgLabel)
-      },
-
-      mgEditMapping : function(editMode, mgValue) {
-        if (editMode == "New")
-          _mgMS.curBookmark = this.bm;
-
-        this.mgList.selectedIndex = -1
-        this.mgList.setAttribute("label", this.mgLabel)
-        mgCommon.openDialog("chrome://mozgest/content/pref/mappings.xul", [editMode, "browser", mgValue])
-        _mgMS.curBookmark = null
-      }
-    }
-
-    addEventListener("load", function() {mozgestOverlay.mgBMinit()}, true)
-    addEventListener("unload", function() {mozgestOverlay.mgRemoveObserver()}, true)
-    mozgestOverlay.mgAddObserver()
-  ]]>
-  </script>
-
-</overlay>
\ No newline at end of file

=== removed file 'chrome/content/componentLoader.js'
--- chrome/content/componentLoader.js	2008-02-27 03:41:55 +0000
+++ chrome/content/componentLoader.js	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mouse Gestures (Component loader).
- *
- * The Initial Developer of the Original Code is Jochen Schlehuber.
- * Portions created by the Initial Developer are Copyright (C) 2005
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s) (alphabetical order):
- *  Jochen <[e-mail]>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// global variables
-var mgMouseService = false;
-var mgNativeTrails = false;
-var mgMouseEvents = false;
-
-var mgComponentLoader = {
-  init : false,
-
-  initMouseService : function(setMain) {
-    if (this.init)
-      return;
-
-    this.init = true;
-
-    if (("@mousegestures.org/mgMouseService;1" in Components.classes)) {
-      try {
-        mgMouseService = Components.classes["@mousegestures.org/mgMouseService;1"]
-                         .getService().QueryInterface(Components.interfaces.mgIMouseService);
-
-        mgNativeTrails = mgMouseService.supports("nativeTrails");
-        mgMouseEvents = mgMouseService.supports("mouseEvents");
-
-        //if (setMain) {
-          var baseWin = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                        .getInterface(Components.interfaces.nsIWebNavigation)
-                        .QueryInterface(Components.interfaces.nsIBaseWindow);
-
-          mgMouseService.setMainWin(baseWin, null);
-        //}
-      }
-      catch (e) {}
-    }
-  }
-}
-
-var _mgMS = Components.classes["@mousegestures.org/mgMappingsService;1"].getService();
-_mgMS = _mgMS.wrappedJSObject;
-_mgMS.initMappings();
\ No newline at end of file

=== added file 'chrome/content/contextOverlay.xul'
--- chrome/content/contextOverlay.xul	1970-01-01 00:00:00 +0000
+++ chrome/content/contextOverlay.xul	2009-07-25 21:50:38 +0000
@@ -0,0 +1,123 @@
+<?xml-stylesheet href="chrome://mozgest/skin/mozgest.css" type="text/css"?>
+<!DOCTYPE overlay SYSTEM "chrome://mozgest/locale/mozgest.dtd" >
+
+<overlay id="mozgestContextOverlay"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+ <script type="application/x-javascript">
+ <![CDATA[
+  function mgUpdateQuickSettings(target) {
+    var items = target.getElementsByAttribute("mgPref", "*");
+
+    for (var x = 0; x < items.length; x++)
+      items[x].setAttribute("checked", mgPrefs.prefs.getBoolPref(items[x].getAttribute("mgPref")));
+
+    var trailItem = target.getElementsByAttribute("mgPref", "trails.enabled");
+    trailItem[0].hidden = (window.mgNativeTrails) ? false : true;
+
+    var item = target.ownerDocument.getElementById("mgQuickButton" + mgPrefs.prefs.getIntPref("mousebutton"));
+    item.setAttribute("checked", true);
+  }
+
+  function mgToggleQuickSettings(target) {
+    if (!target.hasAttribute("id")) {
+      var qPref = target.getAttribute("mgPref");
+      mgPrefs.prefs.setBoolPref(qPref, !mgPrefs.prefs.getBoolPref(qPref));
+    }
+    else
+      mgPrefs.prefs.setIntPref("mousebutton", target.id.substring(13));
+  }
+
+  function mgUpdateGestureHistory(target) {
+    while (target.childNodes.length > 1)
+      target.removeChild(target.firstChild);
+
+    var h
+
+    if ("mgState" in window)
+      h = mgState.history;
+    else if (parent && parent.mgState)
+      h = parent.mgState.history;
+    else
+      h = _mgMS.history;
+
+    for (var x = 0; x < h.length; x++) {
+      var item = document.createElement("menuitem");
+      item.setAttribute("label", h[x][0] + "  ");
+      item.setAttribute("acceltext", h[x][1]);
+      item.setAttribute("disabled", true);
+      target.insertBefore(item, target.lastChild);
+    }
+  }
+ ]]>
+ </script>
+
+ <popup id="mgSidebarContext">
+  <menuitem position="1"
+            oncommand="mgCommon.openDialog('chrome://mozgest/content/pref/mappings.xul',['winTypeEdit', mgWindowType, null])"
+            label="&btnMappings;"
+            accesskey="&sidebar.mappings.key;"/>
+  <menuitem insertbefore="mgSidebarSettingsSep"
+            oncommand="mgCommon.openDialog('chrome://mozgest/content/pref/pref-mozgest.xul')"
+            label="&sidebar.settings;"
+            accesskey="&sidebar.settings.key;" />
+
+  <menu insertbefore="mgSidebarSettingsSep"
+        label="&sidebar.quicksettings;"
+        accesskey="&sidebar.quicksettings.key;">
+   <menupopup id="mgQuickSettingsPopup"
+              onpopupshowing="mgUpdateQuickSettings(this)"
+              oncommand="mgToggleQuickSettings(event.target)">
+    <menuitem type="radio" label="&condition.LMB;" id="mgQuickButton0"/>
+    <menuitem type="radio" label="&condition.MMB;" id="mgQuickButton1"/>
+    <menuitem type="radio" label="&condition.RMB;" id="mgQuickButton2"/>
+    <menuseparator/>
+    <menuitem label="&additional.strokesEnabled;"
+              type="checkbox"
+              mgPref="enableStrokes"/>
+    <menuitem label="&additional.rockersEnabled;"
+              type="checkbox"
+              mgPref="enableRockers"/>
+    <menuitem label="&additional.wheelRockersEnabled;"
+              type="checkbox"
+              mgPref="enableWheelRockers"/>
+    <menuseparator/>
+    <menuitem label="&trails.enabled;"
+              type="checkbox"
+              mgPref="trails.enabled"/>
+    <menuitem label="&status.enabled;"
+              type="checkbox"
+              mgPref="status.isEnabled"/>
+    <menuseparator/>
+    <menuitem label="&condition.left;"
+              type="checkbox"
+              mgPref="lefthanded"/>
+   </menupopup>
+  </menu>
+
+  <menuseparator insertbefore="mgSidebarSettingsSep"/>
+
+  <menu id="historyMenu" insertbefore="mgSidebarSettingsSep"
+        label="&sidebar.history;"
+        accesskey="&sidebar.history.key;">
+
+   <menupopup id="mgHistoryPopup"
+              onpopupshowing="mgUpdateGestureHistory(this)">
+    <menuitem label="&sidebar.history.more;"
+              mgMenuItem="true"
+              disabled="true"/>
+    </menupopup>
+  </menu>
+
+  <menuitem insertbefore="mgSidebarSortSep"
+            oncommand="mgCommon.showWebPage('http://www.mousegestures.org')"
+            label="&visit.home;"
+            accesskey="&sidebar.visit.home.key;"/>
+
+  <menuitem insertbefore="mgSidebarSortSep"
+            oncommand="mgCommon.showWebPage('http://www.mousegestures.org/exchange/')"
+            label="&visit.exchange;"
+            accesskey="&sidebar.visit.exchange.key;"/>
+ </popup>
+</overlay>
\ No newline at end of file

=== modified file 'chrome/content/defaults.js'
--- chrome/content/defaults.js	2008-02-27 03:41:55 +0000
+++ chrome/content/defaults.js	2009-07-25 21:50:38 +0000
@@ -8,99 +8,109 @@
      mailcompose : new Array()
   },
 
-  /* =================================================================================
+  /* ============================================================================
      func: is important!
      func can be: built-in-function, script-code, keyboard-shortcut, bookmark-id
-     =================================================================================
-     x[mapping] = {func:xxx, type:xxx, name:xxx, count:xxx}
-          type = 0  -> normal gesture
-                       func is predefined (no name)
-                       note: 0 will never be stored
-          type = 1  -> custom gesture
-                       func is a JavaScript snippet (evaled)
-          type = 2  -> keyboard gesture
-                       func is a mixture of ctrl|alt|shift|meta and keyCode|charcode
-                       and will be fired to document.documentElement
-          type = 9x -> bookmark gesture
-                       func is a unique bookmark id
-                       90 -> current Window
-                       91 -> new Window
-                       92 -> current Tab
-                       93 -> new Tab
-                       94 -> Sidebar
-     ================================================================================= */
+     ============================================================================
+     x[mapping] = {func:xxx, type:xxx, name:xxx, count:xxx, cat:xxx}
+       type = 0  -> normal gesture
+                    func is predefined (no name)
+                    note: 0 will never be stored
+       type = 1  -> custom gesture
+                    func is a JavaScript snippet (evaled)
+       type = 2  -> keyboard gesture
+                    func is a mixture of ctrl|alt|shift|meta and keyCode|charcode
+                    and will be fired to document.documentElement
+       type = 9x -> bookmark gesture
+                    func is a unique bookmark id
+                    90 -> current Window
+                    91 -> new Window
+                    92 -> current Tab
+                    93 -> new Tab
+                    94 -> Sidebar
+     ============================================================================
+     cat: The category of the gesture
+       0: Miscellaneous (everything that is not 1-6)
+       1: Navigation (e.g. back)
+       2: Tabbed Browsing (e.g. mgB_OpenTab)
+       3: Window Management (e.g. mgW_CloseWin)
+       4: Zooming, Scrolling, DOM-Manipulation (e.g. mgB_ZoomIn)
+       5: Links and Bookmarks (e.g. mgB_LinksInWindows)
+       6: Message Management (e.g. mgM_NextMessage, only TB and SM)
+     ============================================================================ */
 
   init : function() {
     // "b" == browser
     var b = this.mappings.browser;
-    b[":02"]   = {func: "mgB_Forward"}
-    b[":20"]   = {func: "mgB_Back"}
-    b[":12"]   = {func: "mgB_NextTab"}
-    b[":10"]   = {func: "mgB_PreviousTab"}
-    b[":2+"]   = {func: "mgB_NextTab"}
-    b[":2-"]   = {func: "mgB_PreviousTab"}
-    b["L"]     = {func: "mgB_Back"}
-    b["R"]     = {func: "mgB_Forward"}
-    b["LU"]    = {func: "mgB_Stop"}
-    b["DURD"]  = {func: "mgB_Home"}
-    b["D"]     = {func: "mgB_OpenNewDocument"}
-    b["U"]     = {func: "mgB_OpenTab"}
-    b["UR"]    = {func: "mgB_NextTab"}
-    b["UL"]    = {func: "mgB_PreviousTab"}
-    b["ULU"]   = {func: "mgB_UpDir"}
-    b["DR"]    = {func: "mgB_CloseTab"}
-    b["RD"]    = {func: "mgB_ViewPageInfo"}
-    b["LDRDL"] = {func: "mgB_ViewPageSource"}
-    b["DRDLU"] = {func: "mgB_AddBookmark"}
-    b["RUDR"]  = {func: "mgB_DoubleStackWin"}
-    b["9"]     = {func: "mgB_HideImage"}
-    b["3"]     = {func: "mgB_ZoomIn_DoubleImage"}
-    b["7"]     = {func: "mgB_ZoomOut_HalveImage"}
-    b["1"]     = {func: "mgB_ResetZoom"}
-    b["31"]    = {func: "mgB_ZoomIn"}
-    b["13"]    = {func: "mgB_ZoomOut"}
-    b["*RU"]   = {func: "mgB_LinksInWindows"}
-    b["*RUL"]  = {func: "mgB_LinksInTabs"}
+    b[":02"]   = {func: "mgB_Forward", cat: 1}
+    b[":20"]   = {func: "mgB_Back", cat: 1}
+    b[":12"]   = {func: "mgB_NextTab", cat: 2}
+    b[":10"]   = {func: "mgB_PreviousTab", cat: 2}
+    b[":2+"]   = {func: "mgB_NextTab", cat: 2}
+    b[":2-"]   = {func: "mgB_PreviousTab", cat: 2}
+    b["L"]     = {func: "mgB_Back", cat: 1}
+    b["R"]     = {func: "mgB_Forward", cat: 1}
+    b["LU"]    = {func: "mgB_Stop", cat: 1}
+    b["DURD"]  = {func: "mgB_Home", cat: 1}
+    b["D"]     = {func: "mgB_OpenNewDocument", cat: 3}
+    b["U"]     = {func: "mgB_OpenTab", cat: 2}
+    b["UR"]    = {func: "mgB_NextTab", cat: 2}
+    b["UL"]    = {func: "mgB_PreviousTab", cat: 2}
+    b["UD"]    = {func: "mgB_Reload", cat: 1}
+    b["ULU"]   = {func: "mgB_UpDir", cat: 1}
+    b["DR"]    = {func: "mgB_CloseTab", cat: 2}
+    b["RD"]    = {func: "mgB_ViewPageInfo", cat: 3}
+    b["LDRDL"] = {func: "mgB_ViewPageSource", cat: 3}
+    b["DRDLU"] = {func: "mgB_AddBookmark", cat: 5}
+    b["RUDR"]  = {func: "mgB_DoubleStackWin", cat: 3}
+    b["9"]     = {func: "mgB_HideImage", cat: 4}
+    b["3"]     = {func: "mgB_ZoomIn_DoubleImage", cat: 4}
+    b["7"]     = {func: "mgB_ZoomOut_HalveImage", cat: 4}
+    b["1"]     = {func: "mgB_ResetZoom", cat: 4}
+    b["31"]    = {func: "mgB_ZoomIn", cat: 4}
+    b["13"]    = {func: "mgB_ZoomOut", cat: 4}
+    b["*RU"]   = {func: "mgB_LinksInWindows", cat: 5}
+    b["*RUL"]  = {func: "mgB_LinksInTabs", cat: 5}
 
     //"vs" == viewsource
     var vs = this.mappings.viewsource;
-    vs["3"]    = {func: "mgB_ZoomIn"}
-    vs["7"]    = {func: "mgB_ZoomOut"}
-    vs["1"]    = {func: "mgB_ResetZoom"}
+    vs["3"]    = {func: "mgB_ZoomIn", cat:4}
+    vs["7"]    = {func: "mgB_ZoomOut", cat: 4}
+    vs["1"]    = {func: "mgB_ResetZoom", cat: 4}
 
     //"w" == generic (for all window types)
     var w = this.mappings.window;
-    w["9L3"]   = {func: "mgW_Cut"}
-    w["93"]    = {func: "mgW_Copy"}
-    w["39"]    = {func: "mgW_Paste"}
-    w["DRD"]   = {func: "mgW_CloseWin"}
-    w["DL"]    = {func: "mgW_MinWin"}
-    w["RU"]    = {func: "mgW_RestMaxWin"}
-    w["U1"]    = {func: "mgW_ScrollUp"}
-    w["D7"]    = {func: "mgW_ScrollDown"}
-    w["R7"]    = {func: "mgW_ScrollRight"}
-    w["L9"]    = {func: "mgW_ScrollLeft"}
+    w["9L3"]   = {func: "mgW_Cut", cat: 0}
+    w["93"]    = {func: "mgW_Copy", cat: 0}
+    w["39"]    = {func: "mgW_Paste", cat: 0}
+    w["DRD"]   = {func: "mgW_CloseWin", cat: 3}
+    w["DL"]    = {func: "mgW_MinWin", cat: 3}
+    w["RU"]    = {func: "mgW_RestMaxWin", cat: 3}
+    w["U1"]    = {func: "mgW_ScrollUp", cat: 4}
+    w["D7"]    = {func: "mgW_ScrollDown", cat: 4}
+    w["R7"]    = {func: "mgW_ScrollRight", cat: 4}
+    w["L9"]    = {func: "mgW_ScrollLeft", cat: 4}
 
     //"m" == messenger
     var m = this.mappings.messenger;
-    m[":20"]   = {func: "mgM_PrevMessage"}
-    m[":02"]   = {func: "mgM_NextMessage"}
-    m["L"]     = {func: "mgM_PrevMessage"}
-    m["R"]     = {func: "mgM_NextMessage"}
-    m["DRU"]   = {func: "mgM_DeleteMessage"}
-    m["DUR"]   = {func: "mgM_ReplyMessage"}
-    m["DURL"]  = {func: "mgM_ForwardMessage"}
-    m["UD"]    = {func: "mgM_Reload"}
-    m["DURD"]  = {func: "mgM_Home"}
-    m["D"]     = {func: "mgM_NewMessage"}
-    m["*RUL"]  = {func: "mgM_OpenLinks"}
-    m["URD"]   = {func: "mgM_ViewSource"}
-    m["9"]     = {func: "mgB_HideImage"}
-    m["3"]     = {func: "mgB_ZoomIn_DoubleImage"}
-    m["7"]     = {func: "mgB_ZoomOut_HalveImage"}
-    m["1"]     = {func: "mgB_ResetZoom"}
-    m["31"]    = {func: "mgB_ZoomIn"}
-    m["13"]    = {func: "mgB_ZoomOut"}
+    m[":20"]   = {func: "mgM_PrevMessage", cat: 6}
+    m[":02"]   = {func: "mgM_NextMessage", cat: 6}
+    m["L"]     = {func: "mgM_PrevMessage", cat: 6}
+    m["R"]     = {func: "mgM_NextMessage", cat: 6}
+    m["DRU"]   = {func: "mgM_DeleteMessage", cat: 6}
+    m["DUR"]   = {func: "mgM_ReplyMessage", cat: 6}
+    m["DURL"]  = {func: "mgM_ForwardMessage", cat: 6}
+    m["UD"]    = {func: "mgM_Reload", cat: 1}
+    m["DURD"]  = {func: "mgM_Home", cat: 1}
+    m["D"]     = {func: "mgM_NewMessage", cat: 6}
+    m["*RUL"]  = {func: "mgM_OpenLinks", cat: 5}
+    m["URD"]   = {func: "mgM_ViewSource", cat: 3}
+    m["9"]     = {func: "mgB_HideImage", cat: 4}
+    m["3"]     = {func: "mgB_ZoomIn_DoubleImage", cat: 4}
+    m["7"]     = {func: "mgB_ZoomOut_HalveImage", cat: 4}
+    m["1"]     = {func: "mgB_ResetZoom", cat: 4}
+    m["31"]    = {func: "mgB_ZoomIn", cat: 4}
+    m["13"]    = {func: "mgB_ZoomOut", cat: 4}
 
     //"mc" == mailcompose
     var mc     = this.mappings.mailcompose;
@@ -128,60 +138,61 @@
     will work in (B)rowser, (M)essenger and (V)iew(S)ource
     ====================================================== */
     var b = this.functions.browser;
-    b["mgB_AddBookmark"] = ["B"]
-    b["mgB_Back"] = ["B"]
-    b["mgB_CloseDoc"] = ["B"]
-    b["mgB_CloseTab"] = ["B"]
-    b["mgB_DoubleImageSize"] = ["B", "M"]
-    b["mgB_DoubleStackWin"] = ["B"]
-    b["mgB_Forward"] = ["B"]
-    b["mgB_HalveImageSize"] = ["B", "M"]
-    b["mgB_HideImage"] = ["B", "M"]
-    b["mgB_Home"] = ["B"]
-    b["mgB_LinksInTabs"] = ["B"]
-    b["mgB_LinksInWindows"] = ["B"]
-    b["mgB_NextTab"] = ["B"]
-    b["mgB_OpenNewDocument"] = ["B"]
-    b["mgB_OpenTab"] = ["B"]
-    b["mgB_PreviousTab"] = ["B"]
-    b["mgB_Reload"] = ["B"]
-    b["mgB_ResetZoom"] = ["B", "M", "VS"]
-    b["mgB_Stop"] = ["B"]
-    b["mgB_UpDir"] = ["B"]
-    b["mgB_ViewPageInfo"] = ["B"]
-    b["mgB_ViewPageSource"] = ["B"]
-    b["mgB_ZoomIn"] = ["B", "M", "VS"]
-    b["mgB_ZoomIn_DoubleImage"] = ["B", "M"]
-    b["mgB_ZoomOut"] = ["B", "M", "VS"]
-    b["mgB_ZoomOut_HalveImage"] = ["B", "M"]
+    b["mgB_AddBookmark"] = ["B", "cat5"]
+    b["mgB_Back"] = ["B", "cat1"]
+    b["mgB_CloseDoc"] = ["B", "cat3"]
+    b["mgB_CloseTab"] = ["B", "cat2"]
+    b["mgB_DoubleImageSize"] = ["B", "M", "cat4"]
+    b["mgB_DoubleStackWin"] = ["B", "cat3"]
+    b["mgB_Forward"] = ["B", "cat1"]
+    b["mgB_HalveImageSize"] = ["B", "M", "cat4"]
+    b["mgB_HideImage"] = ["B", "M", "cat4"]
+    b["mgB_Home"] = ["B", "cat1"]
+    b["mgB_LinksInTabs"] = ["B", "cat5"]
+    b["mgB_LinksInWindows"] = ["B", "cat5"]
+    b["mgB_NextTab"] = ["B", "cat2"]
+    b["mgB_OpenNewDocument"] = ["B", "cat3"]
+    b["mgB_OpenTab"] = ["B", "cat2"]
+    b["mgB_PreviousTab"] = ["B", "cat2"]
+    b["mgB_Reload"] = ["B", "cat1"]
+    b["mgB_ReloadSkipCache"] = ["B", "cat1"]
+    b["mgB_ResetZoom"] = ["B", "M", "VS", "cat4"]
+    b["mgB_Stop"] = ["B", "cat1"]
+    b["mgB_UpDir"] = ["B", "cat1"]
+    b["mgB_ViewPageInfo"] = ["B", "cat3"]
+    b["mgB_ViewPageSource"] = ["B", "cat3"]
+    b["mgB_ZoomIn"] = ["B", "M", "VS", "cat4"]
+    b["mgB_ZoomIn_DoubleImage"] = ["B", "M", "cat4"]
+    b["mgB_ZoomOut"] = ["B", "M", "VS", "cat4"]
+    b["mgB_ZoomOut_HalveImage"] = ["B", "M", "cat4"]
 
     // "w" == functions for all window types (generic)
     var w = this.functions.window;
-    w["mgW_CloseWin"] = ["W"]
-    w["mgW_Copy"] = ["W"]
-    w["mgW_Cut"] = ["W"]
-    w["mgW_MinWin"] = ["W"]
-    w["mgW_Paste"] = ["W"]
-    w["mgW_RestMaxWin"] = ["W"]
-    w["mgW_ScrollDown"] = ["W"]
-    w["mgW_ScrollUp"] = ["W"]
-    w["mgW_ScrollRight"] = ["W"]
-    w["mgW_ScrollLeft"] = ["W"]
+    w["mgW_CloseWin"] = ["W", "cat3"]
+    w["mgW_Copy"] = ["W", "cat0"]
+    w["mgW_Cut"] = ["W", "cat0"]
+    w["mgW_MinWin"] = ["W", "cat3"]
+    w["mgW_Paste"] = ["W", "cat0"]
+    w["mgW_RestMaxWin"] = ["W", "cat3"]
+    w["mgW_ScrollDown"] = ["W", "cat4"]
+    w["mgW_ScrollUp"] = ["W", "cat4"]
+    w["mgW_ScrollRight"] = ["W", "cat4"]
+    w["mgW_ScrollLeft"] = ["W", "cat4"]
 
     // "m" == functions for messenger
     var m = this.functions.messenger;
-    m["mgM_DeleteMessage"] = ["M"]
-    m["mgM_ForwardMessage"] = ["M"]
-    m["mgM_Home"] = ["M"]
-    m["mgM_NewMessage"] = ["M"]
-    m["mgM_NextMessage"] = ["M"]
-    m["mgM_NextUnreadMessage"] = ["M"]
-    m["mgM_OpenLinks"] = ["M"]
-    m["mgM_PrevMessage"] = ["M"]
-    m["mgM_PrevUnreadMessage"] = ["M"]
-    m["mgM_Reload"] = ["M"]
-    m["mgM_ReplyMessage"] = ["M"]
-    m["mgM_ViewSource"] = ["M"]
+    m["mgM_DeleteMessage"] = ["M", "cat6"]
+    m["mgM_ForwardMessage"] = ["M", "cat6"]
+    m["mgM_Home"] = ["M", "cat1"]
+    m["mgM_NewMessage"] = ["M", "cat6"]
+    m["mgM_NextMessage"] = ["M", "cat6"]
+    m["mgM_NextUnreadMessage"] = ["M", "cat6"]
+    m["mgM_OpenLinks"] = ["M", "cat5"]
+    m["mgM_PrevMessage"] = ["M", "cat6"]
+    m["mgM_PrevUnreadMessage"] = ["M", "cat6"]
+    m["mgM_Reload"] = ["M", "cat1"]
+    m["mgM_ReplyMessage"] = ["M", "cat6"]
+    m["mgM_ViewSource"] = ["M", "cat3"]
 
     // "mc" == functions for mailcompose
     var mc = this.functions.mailcompose;
@@ -202,14 +213,15 @@
     p["grid"] = [15, 4, 500]
     p["delay"] = [1000, 200, 10000]
     p["lmbGestureLimit"] = [500, 100, 10000]
-    p["dragdropDelay"] = [400, 100, 10000]
     p["staticRockersDelay"] = [1000, 200, 10000]
     p["diagonalTolerance"] = [60, 0, 75]
     p["mousebutton"] = navigator.platform.indexOf("Mac") == 0 ? [0, 0, 2] : [2, 0, 2]
     p["trails.width"] = [4, 1, 100]
     p["trails.interval"] = [2, 1, 100]
+    p["status.align"] = [0, 0, 3]
     p["status.timeout"] = [1000, 0, 5000]
     p["selectedTabIndex"] = [3, 0, 3]
+    p["scrollBy"] = [200, 1, 1000000]
 
     // bool
     p["browser"] = [true]
@@ -228,13 +240,15 @@
     p["modifier.shift"] = [false]
     p["modifier.meta"] = [false]
     p["trails.enabled"] = [false]
-    p["status.enabled"] = [true]
+    p["status.isEnabled"] = [false]
     p["status.rockers.enabled"] = [false]
-    p["sideBarToolTip"] = [true]
+    p["sideBar.canvas"] = [true]
+    p["sideBar.toolTip"] = [true]
 
     // char
     p["trails.color"] = ["#FF9900"]
-    p["sideBarSort"] = ["sortByUsage"]
+    p["status.anchorElement"] = ["document.documentElement"]
+    p["sideBar.sort"] = ["sortByUsage"]
     p["importFrom"] = ["www.mousegestures.org"]
   },
 

=== modified file 'chrome/content/gestimp.js'
--- chrome/content/gestimp.js	2008-02-27 03:41:55 +0000
+++ chrome/content/gestimp.js	2009-07-25 21:50:38 +0000
@@ -59,18 +59,28 @@
 }
 
 function mgB_AddBookmark() {
-  addBookmarkAs(document.getElementById('content'));
+  setTimeout(function () {document.getElementById("Browser:AddBookmarkAs").doCommand()}, 50);
 }
 
 function mgB_CloseDoc() {
   if (gBrowser.mTabs.length > 1)
-    gBrowser.removeCurrentTab();
-  else
+    mgB_CloseTab();
+  else if (!mgB_ClosePrintPreview())
     mgW_CloseWin();
 }
 
 function mgB_CloseTab() {
-  getBrowser().removeCurrentTab();
+  if (!mgB_ClosePrintPreview())
+    getBrowser().removeCurrentTab();
+}
+
+function mgB_ClosePrintPreview() {
+  if (document.getElementById("print-preview-toolbar")) {
+    PrintUtils.exitPrintPreview();
+    return true;
+  }
+
+  return false;
 }
 
 function mgB_DoubleImageSize() {
@@ -83,7 +93,7 @@
     window.moveTo(screen.availLeft, screen.availTop);
     window.resizeTo(screen.availWidth/2, screen.availHeight);
     tempW = mgNewBrowserWindow();
-    tempW.loadURI(globalOnLink[0].href, mgGetReferrer());
+    tempW.loadURI(globalOnLink[0].href, mgGetReferrer(globalOnLink[0]));
     tempW.moveTo(screen.availWidth/2 + (screen.width - screen.availWidth),
                  screen.availTop);
     tempW.resizeTo(screen.availWidth/2, screen.availHeight);
@@ -106,12 +116,12 @@
 function mgB_LinksInTabs() {
   var browser = getBrowser();
   for (var i = 0; i < globalOnLink.length; i++)
-    tab = browser.addTab(globalOnLink[i].href, mgGetReferrer());
+    tab = browser.addTab(globalOnLink[i].href, mgGetReferrer(globalOnLink[i]));
 }
 
 function mgB_LinksInWindows() {
   for (var i = 0; i < globalOnLink.length; i++)
-    mgNewBrowserWindow().loadURI(globalOnLink[i].href, mgGetReferrer());
+    mgNewBrowserWindow().loadURI(globalOnLink[i].href, mgGetReferrer(globalOnLink[i]));
 }
 
 function mgB_NextTab() {
@@ -120,7 +130,7 @@
 
 function mgB_OpenNewDocument() {
   if(globalOnLink) // open link in new window
-    mgNewBrowserWindow().loadURI(globalOnLink[0].href, mgGetReferrer());
+    mgNewBrowserWindow().loadURI(globalOnLink[0].href, mgGetReferrer(globalOnLink[0]));
   else {
     if (globalOnImage) // Open image in new window
       window.open(globalOnImage.src);
@@ -142,6 +152,11 @@
   mgResetRocker();
 }
 
+function mgB_ReloadSkipCache() {
+  BrowserReloadSkipCache();
+  mgResetRocker();
+}
+
 function mgB_Stop() {
   BrowserStop();
 }
@@ -224,9 +239,9 @@
 
 /*** HELPER FUNCTIONS ***/
 
-function mgGetReferrer() {
+function mgGetReferrer(aLink) {
   try {
-    var mgRefURL = globalSrcEvent.target.ownerDocument.location.href;
+    var mgRefURL = aLink.ownerDocument.location.href;
 
     if (mgRefURL) {
       var ioService = Components.classes["@mozilla.org/network/io-service;1"]
@@ -242,8 +257,8 @@
   return (globalSrcEvent.view != null) ? globalSrcEvent.view.getSelection() : "";
 }
 
-function mgLinkInTab(url) {
-  var tab = getBrowser().addTab(url, mgGetReferrer());
+function mgLinkInTab(url, aLink) {
+  var tab = getBrowser().addTab(url, mgGetReferrer(aLink));
   if (!mgPrefs.root.getBoolPref("browser.tabs.loadInBackground"))
     getBrowser().selectedTab = tab;
 }
@@ -266,11 +281,11 @@
 
 function mgOpenTab() {
   if (globalOnLink && globalOnLink.length > 0)
-    mgLinkInTab(globalOnLink[0].href);
+    mgLinkInTab(globalOnLink[0].href, globalOnLink[0]);
   else {
     var sel = mgGetSelection().toString();
     if (sel.match(/^(http)|(ftp):/))
-      mgLinkInTab(sel);
+      mgLinkInTab(sel, null);
     else
       BrowserOpenTab();
   }
@@ -298,15 +313,6 @@
   }
 }
 
-function mgViewPartialSource() {
-  var docCharset = null;
-  docCharset = "charset=" + globalSrcEvent.view.document.characterSet;
-  openDialog("chrome://global/content/viewPartialSource.xul", "_blank",
-             "scrollbars,resizable,chrome,dialog=no",
-              null, docCharset, mgGetSelection(), "selection");
-}
-
-
 /*** GENERIC FUNCTIONS ***/
 
 function mgW_RestMaxWin() {
@@ -318,8 +324,10 @@
 }
 
 function mgW_MinWin() {
-  if (window.minimize != 'undefined')
+  if (window.minimize != 'undefined') {
     window.minimize();
+    mgResetRocker(true);
+  }
 }
 
 function mgW_CloseWin() {
@@ -342,19 +350,19 @@
 }
 
 function mgW_ScrollDown() {
-  globalSrcEvent.view.scrollBy(0, 200);
+  globalSrcEvent.view.scrollBy(0, mgPrefs.scrollBy);
 }
 
 function mgW_ScrollUp() {
-  globalSrcEvent.view.scrollBy(0, -200);
+  globalSrcEvent.view.scrollBy(0, -mgPrefs.scrollBy);
 }
 
 function mgW_ScrollRight() {
-  globalSrcEvent.view.scrollBy(200, 0);
+  globalSrcEvent.view.scrollBy(mgPrefs.scrollBy, 0);
 }
 
 function mgW_ScrollLeft() {
-  globalSrcEvent.view.scrollBy(-200, 0);
+  globalSrcEvent.view.scrollBy(-mgPrefs.scrollBy, 0);
 }
 
 /*** MESSENGER FUNCTIONS ***/

=== modified file 'chrome/content/gestures.js'
--- chrome/content/gestures.js	2008-02-27 03:41:55 +0000
+++ chrome/content/gestures.js	2009-07-25 21:50:38 +0000
@@ -59,12 +59,8 @@
    where the ending of the gesture matches a specific pattern. */
 function mgFireGesture(aGesture){
   if (!mgFireGestureFromTable(aGesture)) {
-    if (!mgFireOnLinkGesture()) {
-      if (mgPrefs["status.enabled"])
-        mgStatusPopup.firstChild.value = mgGetString("g.unknown") + " " + mgState.localizedGesture;
-
-      mgCommon.dump("MozGest: Unknown Gesture: " + aGesture + "\n");
-    }
+    if (!mgFireOnLinkGesture())
+      mgShowStatus(null, mgGetString("g.unknown") + " " + mgState.localizedGesture);
   }
   // clear global variables
   globalOnLink = globalOnImage = globalSrcEvent = false;
@@ -79,15 +75,27 @@
     mapping = mgGetMapping(aGesture)[0];
 
   if (mapping) {
-    if (mgPrefs.mousebutton == 0 && mgState.previousSelection && globalSrcEvent) {
-      mgGetSelection().removeAllRanges();
-      mgGetSelection().addRange(mgState.previousSelection);
-      mgState.previousSelection = null;
-    }
-
     mgState.gestureDone = true;
     var message = mgGetMapping(aGesture)[1];
-    mgCommon.dump("MozGest: Invoking '" + message + "'\n");
+    mgCommon.dump("Invoking '" + message + "'");
+
+    if (mgPrefs.mousebutton == 0) {
+      try {
+        if (mgState.inputField) {
+          if (mgState.selStart != mgState.selEnd)
+            mgState.inputField.setSelectionRange(mgState.selStart, mgState.selEnd);
+          else
+            mgState.inputField.setSelectionRange(mgState.inputField.selectionStart, mgState.inputField.selectionStart);
+        }
+
+        if (mgState.previousSelection && globalSrcEvent) {
+          mgGetSelection().removeAllRanges();
+          mgGetSelection().addRange(mgState.previousSelection);
+          mgState.previousSelection = null;
+        }
+      }
+      catch (e) {}
+    }
 
     try {
       var mType = (mapping.type) ? parseInt(mapping.type) : 0;
@@ -98,14 +106,7 @@
         mgFunctionToFire();
       }
       else if (mType == 2) {
-        var mData = mapping.func.split("|");
-        var ev = document.createEvent('KeyEvents');
-
-        ev.initKeyEvent('keypress', true, true, null,
-                        eval(mData[0]), eval(mData[1]), eval(mData[2]),
-                        eval(mData[3]), parseInt(mData[4]), parseInt(mData[5]));
-
-        document.documentElement.dispatchEvent(ev);
+        setTimeout(mgFireKeyEvent, 10, mapping.func.split("|"))
       }
       else if (mgBMService.enabled || mgBMService.plEnabled) {
         mgBmInfo.get(mapping.func);
@@ -113,54 +114,54 @@
         var mgPostData = { };
 
         if (mgLocation) {
-           var mgLoadIn = parseInt(mapping.type.substring(1,2));
-
-           if (mgBMService.makeURI(mgLocation).scheme == "javascript")
-             mgLoadIn = 0;
-           else {
-             var selString = mgGetSelection().toString().replace(/\s$/, "");
-
-             var mgKeyW = mgBmInfo.key;
-
-             if (mgKeyW) // if bookmark has a keyword, use browser-function to replace %s
-               mgLocation = getShortcutOrURI(mgKeyW + " " + selString, mgPostData);
-
-             else if (mgLocation.match(/%s/))
-               mgLocation = mgLocation.replace(/%s/g, encodeURIComponent(selString));
-           }
-
-           if (mgLoadIn == 4 && mgAppInfo.name != "Firefox")
-             mgLoadIn = 0;
-
-           switch (mgLoadIn) {
-             case 4:
-               var mgPanelTitle = mgBmInfo.title;
-               openWebPanel(mgPanelTitle, mgLocation);
-
-               if (mgPostData.value)
-                 setTimeout(mgLoadSideBar, 100, mgLocation, mgPostData.value);
-               break;
-
-             case 3:
-               getBrowser().selectedTab = getBrowser().addTab(mgLocation, null, null, mgPostData.value);
-               break;
-
-             case 2:
-               getBrowser().addTab(mgLocation, null, null, mgPostData.value);
-               break;
-
-             case 1:
-               mgNewBrowserWindow().loadURI(mgLocation, null, mgPostData.value);
-               break;
-
-             case 0:
-               loadURI(mgLocation, null, mgPostData.value);
-               break;
-           }
+          var mgLoadIn = parseInt(mapping.type.substring(1,2));
+
+          if (mgBMService.makeURI(mgLocation).scheme == "javascript")
+            mgLoadIn = 0;
+          else {
+            var selString = mgGetSelection().toString().replace(/\s$/, "");
+
+            var mgKeyW = mgBmInfo.key;
+
+            if (mgKeyW) // if bookmark has a keyword, use browser-function to replace %s
+              mgLocation = getShortcutOrURI(mgKeyW + " " + selString, mgPostData);
+
+            else if (mgLocation.match(/%s/))
+              mgLocation = mgLocation.replace(/%s/g, encodeURIComponent(selString));
+          }
+
+          if (mgLoadIn == 4 && mgAppInfo.name != "Firefox")
+            mgLoadIn = 0;
+
+          switch (mgLoadIn) {
+            case 4:
+              var mgPanelTitle = mgBmInfo.title;
+              openWebPanel(mgPanelTitle, mgLocation);
+
+              if (mgPostData.value)
+                setTimeout(mgLoadSideBar, 100, mgLocation, mgPostData.value);
+              break;
+
+            case 3:
+              getBrowser().selectedTab = getBrowser().addTab(mgLocation, null, null, mgPostData.value);
+              break;
+
+            case 2:
+              getBrowser().addTab(mgLocation, null, null, mgPostData.value);
+              break;
+
+            case 1:
+              mgNewBrowserWindow().loadURI(mgLocation, null, mgPostData.value);
+              break;
+
+            case 0:
+              loadURI(mgLocation, null, mgPostData.value);
+              break;
+          }
         }
         else {
-           alert(mgGetString("unknownBookmark"))
-           return true;
+          mgShowStatus(null, mgGetString("unknownBookmark"));
+          return true;
         }
       }
     }
@@ -180,7 +181,8 @@
       if (source == null || source.indexOf("chrome://mozgest/") == 0) {
         var msg = mgGetString("errorInGestureFunction");
         msg = msg.replace(/%MESSAGE%/, errorMessage);
-        alert(msg);
+        mgState.lastError = errorMessage;
+        mgShowStatus(null, msg);
       }
       return true;
     }
@@ -189,6 +191,12 @@
       mgState.history.pop();
 
     mgState.history.unshift([message, mgMappingLocalizer.localize(aGesture)]);
+
+    if (_mgMS.history.length > 9)
+      _mgMS.history.pop();
+
+    _mgMS.history.unshift([message, mgMappingLocalizer.localize(aGesture)]);
+
     mapping.count ? mapping.count++ : mapping.count = 1;
     return true;
   }
@@ -201,8 +209,8 @@
     var g = mgState.gesture.join("");
     var twoStroke = g.substr(g.length-2,2);
     var threeStroke = g.substr(g.length-3,3);
-    mgCommon.dump("MozGest: Multiple link spawn: " + g
-      + ' spotted... \n  ...Looking for Finishing Move\n');
+
+    mgCommon.dump("Found " + globalOnLink.length + " link(s)");
 
     if (!mgFireGestureFromTable("*" + twoStroke))
       return mgFireGestureFromTable("*" + threeStroke);
@@ -216,11 +224,6 @@
   if (!mgPrefs.enableRockers && !mgPrefs.enableWheelRockers)
     return false;
 
-  if (mgState.rockerAborted) {
-     mgState.rockerCode = "";
-     mgState.rockerAborted = false;
-  }
-
   if (mgState.rockerCode == "")
     mgState.rockerCode = ":";
 
@@ -233,18 +236,8 @@
   return mgFireRocker(mgState.rockerCode, e);
 }
 
-function mgFireRocker(code, e, map, byTimer, time) {
-  mgFireStatic.clearTimer();
-  // sometimes the timeout is wrong
-  if (byTimer) {
-    var tD = (new Date).getTime() - time;
-    if (tD < mgPrefs.staticRockersDelay/1.5) {
-      mgFireStatic.setTimer(code, map, mgPrefs.staticRockersDelay - tD);
-      return null;
-    }
-  }
-
-  var mapping = map ? map : mgGetMapping(code)[0];
+function mgFireRocker(code, e) {
+  var mapping = mgGetMapping(code)[0];
 
   if (mapping) {
     gestureInProgress = mgState.gestureStartTime = false;
@@ -261,51 +254,33 @@
     }
 
     if (mgPrefs["status.rockers.enabled"])
-      mgShowStatus(code, true, byTimer);
-      
+      mgShowStatus(code);
+
     mgFireGestureFromTable(code, mapping);
-
-    if (mgMouseEvents) {
-      var isWheel = isNaN(code.substring(1));
-
-      if ((isWheel && mgPrefs.staticWheelRockers) || (!isWheel && mgPrefs.staticRockers))
-        mgFireStatic.setTimer(code, mapping);
-    }
-
     return true;
   }
   else
     return false;
 }
 
-var mgFireStatic = {
-  timeout : null,
-
-  setTimer : function(code, mapping, tO) {
-    var timer = tO ? tO : mgPrefs.staticRockersDelay;
-    this.timeout = setTimeout(mgFireRocker, timer, code, false, mapping, true, (new Date).getTime());
-  },
-
-  clearTimer : function() {
-    clearTimeout(this.timeout);
-  }
-}
-
 function mgReleaseRocker(e) {
-  mgFireStatic.clearTimer();
   if (e) {
     var button = mgPrefs.lefthanded ? Math.abs(e.button - 2) : e.button;
     eval("mgState.rockerCode = mgState.rockerCode.replace(/" + button + "/g, '');");
   }
 }
 
-function mgResetRocker() {
-  if (!mgMouseEvents)
+function mgResetRocker(force) {
+  if (mgState.rockerCode.length > 1 && (!mgMouseEvents || force)) {
     mgState.rockerCode = "";
+
+    if (mgMouseEvents)
+      mgObserver.mgClearInterval();
+  }
 }
 
 function mgMousewheelHandler(e) {
-  if (mgState.rockerAborted)
+  if (mgState.rockerCode.length < 2)
     return;
 
   var dir = e.detail > 0 ? "+" : "-";
@@ -313,7 +288,19 @@
   if (mgState.rockerCode && mgGetMapping(mgState.rockerCode+dir)[0]) {
     e.preventDefault();
     e.stopPropagation();
+    mgFireRocker(mgState.rockerCode + dir);
+
+    if (mgMouseEvents && mgPrefs.staticWheelRockers)
+      mgObserver.mgSetInterval(null, mgState.rockerCode + dir);
   }
-
-  mgFireRocker(mgState.rockerCode + dir);
+}
+
+function mgFireKeyEvent(mData) {
+  var ev = document.createEvent('KeyEvents');
+
+  ev.initKeyEvent('keypress', true, true, null,
+                  eval(mData[0]), eval(mData[1]), eval(mData[2]),
+                  eval(mData[3]), parseInt(mData[4]), parseInt(mData[5]));
+
+  document.documentElement.dispatchEvent(ev);
 }
\ No newline at end of file

=== modified file 'chrome/content/mozgestCommon.js'
--- chrome/content/mozgestCommon.js	2008-02-27 03:41:55 +0000
+++ chrome/content/mozgestCommon.js	2009-07-25 21:50:38 +0000
@@ -45,7 +45,7 @@
   init : function() {
     if (!this.prefs) {
       var prefService = Components.classes["@mozilla.org/preferences-service;1"]
-                                .getService(Components.interfaces.nsIPrefService);
+                        .getService(Components.interfaces.nsIPrefService);
 
       this.root = prefService.getBranch(null);   // root preferences branch
       this.prefs = prefService.getBranch("mozgest."); // mozgest preferences branch
@@ -68,11 +68,10 @@
       p.gestureCondition += " && e.altKey";
     if (g("modifier.shift"))
       p.gestureCondition += " && e.shiftKey";
-    if (navigator.platform == "MacPPC" && g("modifier.meta"))
+    if (navigator.platform.indexOf("Mac") == 0 && g("modifier.meta"))
       p.gestureCondition += " && e.metaKey";
 
     g("sideBarSort");
-    g("sideBarToolTip");
     g("importFrom");
     g("selectedTabIndex");
   },
@@ -132,8 +131,8 @@
 
   dump : function(aText) {
     try {
-      if (mgPrefs.prefs.getBoolPref("enableDump"))
-        dump(aText);
+      if (mgPrefs["enableDump"])
+        dump("Mozgest: " + aText + "\n");
     }
     catch (e) {}
   },
@@ -143,28 +142,17 @@
     var locale = null;
     try {
       locale = Components.classes["@mozilla.org/chrome/chrome-registry;1"]
-                         .getService(Components.interfaces.nsIXULChromeRegistry)
-                         .getSelectedLocale("global");
+               .getService(Components.interfaces.nsIXULChromeRegistry)
+               .getSelectedLocale("global");
     }
     catch (e) {}
 
-    if (locale != null)
+    if (locale != null && pageUrl.indexOf("http://www.mousegestures.org") == 0)
       pageUrl = pageUrl + "?language=" + locale;
 
-    //Thunderbird
-    if (mgAppInfo.name == "Thunderbird") {
-      var uri = Components.classes["@mozilla.org/network/standard-url;1"]
-                          .createInstance(Components.interfaces.nsIURI);
-      uri.spec = pageUrl;
-
-      var protocolSvc = Components.classes["@mozilla.org/uriloader/external-protocol-service;1"]
-                        .getService(Components.interfaces.nsIExternalProtocolService);
-      protocolSvc.loadUrl(uri);
-      return;
-    }
-
     //check for an existing browser window
     var browserWindow = this.winMediator.getMostRecentWindow("navigator:browser");
+
     if (browserWindow) {
       try {
         browserWindow.delayedOpenTab(pageUrl);
@@ -173,8 +161,15 @@
         browserWindow.loadURI(pageUrl);
       }
     }
-    else
-      window.open(pageUrl);
+    else {
+      var uri = Components.classes["@mozilla.org/network/standard-url;1"]
+                .createInstance(Components.interfaces.nsIURI);
+      uri.spec = pageUrl;
+
+      var protocolSvc = Components.classes["@mozilla.org/uriloader/external-protocol-service;1"]
+                        .getService(Components.interfaces.nsIExternalProtocolService);
+      protocolSvc.loadUrl(uri);
+    }
   },
 
   compactCode : function(aCode) {
@@ -187,15 +182,18 @@
     return compacted;
   },
 
-  addTreeRow : function(tChildren, args, mozgestGeneric) {
+  addTreeRow : function(tChildren, args, id, isCount) {
     var ti = document.createElement("treeitem");
+    ti.id = id;
     var row = document.createElement("treerow");
 
     for (var i = 0; i < args.length; i++) {
       var cell = document.createElement("treecell");
       cell.setAttribute("label", args[i]);
-      if (mozgestGeneric)
-        cell.setAttribute("properties", mozgestGeneric);
+
+      if (isCount) {
+        cell.setAttribute("properties", "mozgestCount");
+      }
       row.appendChild(cell);
     }
     ti.appendChild(row);
@@ -222,9 +220,7 @@
       try {
         if (win.document.location == aURL) {
           retVal = true;
-          var errText = mgGetString("windowAlreadyOpen");
-          errText = errText.replace(/%MGWIN%/g, win.document.title);
-          alert(errText);
+          win.focus();
         }
       }
       catch (e) {}
@@ -242,54 +238,140 @@
 
   notifyObservers : function(aboutWhat) {
     Components.classes["@mozilla.org/observer-service;1"]
-              .getService(Components.interfaces.nsIObserverService)
-              .notifyObservers(null, "mozgestControl", aboutWhat);
-  }
-}
-
-
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mouse Gesture for Mozilla.
- *
- * The Initial Developer of the Original Code is Jochen Schlehuber.
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s) (alphabetical order):
- *  Jochen <[e-mail]>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+    .getService(Components.interfaces.nsIObserverService)
+    .notifyObservers(null, "mozgestControl", aboutWhat);
+  }
+}
+
+var mgStorage = {
+  processURL : function (url, docLoc) {
+    url = url.substr(10);
+    var parts = url.split("/");
+    document.aaa = parts;
+    // check whether command is valid
+    switch (parts[0]) {
+      case "addmapping":
+        this.importMapping(parts, docLoc);
+        break;
+      case "addgestureset":
+        this.importSet(url.substring(14), docLoc);
+        break;
+      default:
+        var msg = mgGetString("unknownCommand");
+        msg = msg.replace(/%COMMAND%/, parts[0]);
+        alert(msg);
+    }
+  },
+
+  importSet : function (url) {
+    try {
+      mgBMService.makeURI(url);
+    }
+    catch (e) {
+      return;
+    }
+    mgCommon.openDialog("chrome://mozgest/content/pref/importSet.xul", [url]);
+  },
+
+  importMapping : function (parts, docLoc) {
+    if (mgCommon.checkWindowOpen("chrome://mozgest/content/pref/mappings.xul"))
+      return;
+
+    var validCode = false;
+    var code = "";
+    var appearance = null;
+
+    var gestureRegExp = /^(\*{0,1}[1379DLUR]+){1}(;\*{0,1}[1379DLUR]+){0,1}$/;
+    if (parts[2].match(/^:[0-2][0-2\+\-]$/)) {
+      validCode = true;
+      code = parts[2];
+    }
+    else if (gestureRegExp.exec(parts[2])) {
+      validCode = true;
+      code = RegExp.$1;
+      appearance = RegExp.$2.substr(1);
+      var cC = mgCommon.compactCode;
+      if (cC(code) != code || (appearance && cC(appearance) != code))
+        validCode = false;
+    }
+
+    if (!validCode) {
+      alert(mgGetString("invalidCode"));
+      return;
+    }
+
+    var func = null;
+    var name = null;
+    var custom = null;
+    var check = 0;
+
+    if (parts[3] == "custom") {
+      name = decodeURIComponent(parts[4]);
+      custom = decodeURIComponent(parts[5]);
+      check = this.checkFunc(parts[1], null);
+    }
+    else {
+      check = this.checkFunc(parts[1], parts[3]);
+      func = parts[3];
+    }
+
+    if (check == -1) {
+      this.msg = mgGetString("unknownWindowType");
+      this.msg = this.msg.replace(/%WINDOWTYPE%/, parts[1]);
+      alert(this.msg);
+      return;
+    }
+    if (check == -2) {
+      this.msg = mgGetString("unknownFunction");
+      this.msg = this.msg.replace(/%FUNCTION%/, parts[3]);
+      alert(this.msg);
+      return;
+    }
+
+    _mgMS.importLocation = docLoc;
+    _mgMS.importWinType = parts[1];
+    _mgMS.importCode = code;
+    _mgMS.importAppearance = appearance;
+    _mgMS.importName = name;
+    _mgMS.importFunc = func;
+    _mgMS.importCustom = custom;
+
+    if (parts.length >= 6 && parts[6].indexOf("cat") == 0)
+      _mgMS.importCat = parts[6];
+    else
+      _mgMS.importCat = "cat0";
+
+    mgCommon.openDialog("chrome://mozgest/content/pref/mappings.xul",
+                        ["Import", parts[1], code]);
+  },
+
+  checkFunc : function(winType, aFunc) {
+    var retVal = 0;
+
+    if (!((winType in _mgMS.supportedWindows) || winType == "window"))
+      return -1;
+
+    if (aFunc) {
+      if (!(aFunc in _mgMS.functions[winType]) &&
+          !(aFunc in _mgMS.functions["window"]))
+        return -2;
+    }
+
+    return retVal;
+  }
+}
 
 var mgAppInfo = {
   init : function() {
     var em = Components.classes["@mozilla.org/extensions/manager;1"]
              .getService(Components.interfaces.nsIExtensionManager);
 
-    this.mozgestVersion = em.getItemForID("{FFA36170-80B1-4535-B0E3-A4569E497DD0}").version;
+    this.mozgestID = "{FFA36170-80B1-4535-B0E3-A4569E497DD0}";
+    this.mozgestVersion = em.getItemForID(this.mozgestID).version;
+    var instLoc = em.getInstallLocation(this.mozgestID);
+    var itemLoc = instLoc.getItemLocation(this.mozgestID);
+    this.installPath = itemLoc.path;
+    mgPrefs.prefs.setCharPref("installLocation", this.installPath);
 
     var pHandler = Components.classes['@mozilla.org/network/io-service;1']
                   .getService(Components.interfaces.nsIIOService)
@@ -297,6 +379,7 @@
                   .QueryInterface(Components.interfaces.nsIHttpProtocolHandler);
 
     this.geckoVersion = pHandler.misc.substring(3);
+    this.geckoShortVersion = this.geckoVersion.substring(0,3);
     this.oscpu = pHandler.oscpu;
     this.platform = pHandler.platform;
 
@@ -404,48 +487,7 @@
   },
 
   manualImport : function() {
-    var importWarning = confirm(mgGetString("impWarning"));
-
-    if (!importWarning)
-      return;
-
-    var title = mgGetString("impTitle");
-    var cc = Components.classes;
-    var ci = Components.interfaces;
-
-    var profile = cc['@mozilla.org/file/directory_service;1'].getService(ci.nsIProperties);
-
-    var filePath = profile.get('ProfD', ci.nsILocalFile);
-
-    var fp = cc["@mozilla.org/filepicker;1"].createInstance(ci.nsIFilePicker);
-    fp.init(window, title, ci.nsIFilePicker.modeOpen);
-
-    var retVal = fp.show();
-
-    if (retVal == ci.nsIFilePicker.returnOK) {
-      var mgPath = profile.get('ProfD', ci.nsILocalFile);
-      mgPath.appendRelativePath("mousegestures.js");
-
-      try {
-        mgPath.remove(false);
-        fp.file.copyTo(filePath, "mousegestures.js");
-        _mgMS.getActiveMappings();
-        mgCommon.notifyObservers("mappingsUpdated");
-        alert(mgGetString("impSuccess"))
-      }
-      catch (e) {
-        try {
-          mgPath.remove(false);
-        }
-        catch (e) {}
-
-        _mgMS.removedDefaultMappings = new Array();
-        _mgMS.cleanUp();
-        _mgMS.getActiveMappings();
-        mgCommon.notifyObservers("mappingsUpdated");
-        alert(mgGetString("impCorrupt"))
-      }
-    }
+    mgCommon.openDialog('chrome://mozgest/content/pref/importSet.xul');
   }
 }
 
@@ -467,8 +509,7 @@
       this.KeyW = this.RDFS.GetResource("http://home.netscape.com/NC-rdf#ShortcutURL");
       this.Post = this.RDFS.GetResource("http://home.netscape.com/NC-rdf#PostData");
     }
-
-    if ("@mozilla.org/browser/nav-history-service;1" in Components.classes) {
+    else if ("@mozilla.org/browser/nav-history-service;1" in Components.classes) {
       this.plEnabled = true;
 
       this.plHist = Components.classes["@mozilla.org/browser/nav-history-service;1"]
@@ -500,7 +541,7 @@
 
     if ("@mozilla.org/browser/bookmarks-service;1" in Components.classes) {
       this.uri = mgBMService.Book.GetTarget(mgBMService.RDFS
-                            .GetResource(bmId), mgBMService.Href, true);
+                 .GetResource(bmId), mgBMService.Href, true);
 
       if (this.uri) {
         this.uri = this.uri.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
@@ -508,7 +549,7 @@
       }
 
       this.title = mgBMService.Book.GetTarget(mgBMService.RDFS
-                              .GetResource(bmId), mgBMService.Name, true)
+                   .GetResource(bmId), mgBMService.Name, true)
       if (this.title)
         this.title = this.title.QueryInterface(
                                 Components.interfaces.nsIRDFLiteral).Value;
@@ -516,7 +557,10 @@
         this.title = "";
 
       this.key = mgBMService.Book.GetTarget(mgBMService.RDFS
-                            .GetResource(bmId), mgBMService.KeyW, true);
+                 .GetResource(bmId), mgBMService.KeyW, true);
+
+      if (this.key)
+        this.key = this.key.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
     }
 
     if ("@mozilla.org/browser/nav-history-service;1" in Components.classes) {
@@ -532,4 +576,44 @@
 mgCommon.init();
 mgAppInfo.init();
 mgMappingLocalizer.init();
-mgBMService.init();
\ No newline at end of file
+mgBMService.init();
+
+// ================================= component loader ====================================
+// global variables
+var mgMouseService = false;
+var mgNativeTrails = false;
+var mgMouseEvents = false;
+
+var mgComponentLoader = {
+  init : false,
+
+  initMouseService : function(setMain) {
+    if (this.init)
+      return;
+
+    this.init = true;
+
+    if (("@mousegestures.org/mgMouseService;1" in Components.classes)) {
+      try {
+        mgMouseService = Components.classes["@mousegestures.org/mgMouseService;1"]
+                         .getService().QueryInterface(Components.interfaces.mgIMouseService);
+
+        mgNativeTrails = mgMouseService.supports("nativeTrails");
+        mgMouseEvents = mgMouseService.supports("mouseEvents");
+
+        if (setMain) {
+          var baseWin = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+                        .getInterface(Components.interfaces.nsIWebNavigation)
+                        .QueryInterface(Components.interfaces.nsIBaseWindow);
+
+          mgMouseService.setMainWin(baseWin);
+        }
+      }
+      catch (e) {}
+    }
+  }
+}
+
+var _mgMS = Components.classes["@mousegestures.org/mgMappingsService;1"].getService();
+_mgMS = _mgMS.wrappedJSObject;
+_mgMS.initMappings();
\ No newline at end of file

=== removed file 'chrome/content/mozgestImport.js'
--- chrome/content/mozgestImport.js	2008-02-27 03:41:55 +0000
+++ chrome/content/mozgestImport.js	1970-01-01 00:00:00 +0000
@@ -1,236 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mouse Gestures for Mozilla.
- *
- * The Initial Developer of the Original Code is Jens Bannmann.
- * Portions created by the Initial Developer are Copyright (C) 2003
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s) (alphabetical order):
- *  Jens Bannmann <[e-mail]>
- *  Jochen <[e-mail]>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-var mgStorage = {
-  processURL : function (url, docLoc) {
-    url = url.substr(10);
-    var parts = url.split("/");
-    // check whether command is valid
-    switch (parts[0]) {
-      case "addmapping":
-        this.importMapping(parts, docLoc);
-        break;
-      default:
-        var msg = mgGetString("unknownCommand");
-        msg = msg.replace(/%COMMAND%/, parts[0]);
-        alert(msg);
-    }
-  },
-
-  importMapping : function (parts, docLoc) {
-    if (mgCommon.checkWindowOpen("chrome://mozgest/content/pref/mappings.xul"))
-      return;
-
-    var validCode = false;
-    var code = "";
-    var appearance = null;
-
-    var gestureRegExp = /^(\*{0,1}[1379DLUR]+){1}(;\*{0,1}[1379DLUR]+){0,1}$/;
-    if (parts[2].match(/^:[0-2][0-2\+\-]$/)) {
-      validCode = true;
-      code = parts[2];
-    }
-    else if (gestureRegExp.exec(parts[2])) {
-      validCode = true;
-      code = RegExp.$1;
-      appearance = RegExp.$2.substr(1);
-      var cC = mgCommon.compactCode;
-      if (cC(code) != code || (appearance && cC(appearance) != code))
-        validCode = false;
-    }
-
-    if (!validCode) {
-      alert(mgGetString("invalidCode"));
-      return;
-    }
-
-    var func = null;
-    var name = null;
-    var custom = null;
-    var check = 0;
-
-    if (parts[3] == "custom") {
-      name = decodeURIComponent(parts[4]);
-      custom = unescape(parts[5]);
-      check = this.checkFunc(parts[1], null);
-    }
-    else {
-      check = this.checkFunc(parts[1], parts[3]);
-      func = parts[3];
-    }
-
-    if (check == -1) {
-      this.msg = mgGetString("unknownWindowType");
-      this.msg = this.msg.replace(/%WINDOWTYPE%/, parts[1]);
-      alert(this.msg);
-      return;
-    }
-    if (check == -2) {
-      this.msg = mgGetString("unknownFunction");
-      this.msg = this.msg.replace(/%FUNCTION%/, parts[3]);
-      alert(this.msg);
-      return;
-    }
-
-    _mgMS.importLocation = docLoc;
-    _mgMS.importWinType = parts[1];
-    _mgMS.importCode = code;
-    _mgMS.importAppearance = appearance;
-    _mgMS.importName = name;
-    _mgMS.importFunc = func;
-    _mgMS.importCustom = custom;
-
-    mgCommon.openDialog("chrome://mozgest/content/pref/mappings.xul",
-                        ["Import", parts[1], code]);
-  },
-
-  checkFunc : function(winType, aFunc) {
-    var retVal = 0;
-
-    if (!((winType in _mgMS.supportedWindows) || winType == "window"))
-      return -1;
-
-    if (aFunc) {
-      if (!(aFunc in _mgMS.functions[winType]) &&
-          !(aFunc in _mgMS.functions["window"]))
-        return -2;
-    }
-
-    return retVal;
-  }
-}
-
-//Import mousegestures.rdf
-
-var importer = {
-  RDF : Components.classes["@mozilla.org/rdf/rdf-service;1"]
-                  .getService(Components.interfaces.nsIRDFService),
-
-  NS : "http://optimoz.mozdev.org/gestures-rdf#",
-
-  actTemp : new Array(),
-
-  initImport : function() {
-    var retVal = false;
-    try {
-      var wTypeArray = new Array("browser", "viewsource", "window", "messenger");
-
-      var dirService   = Components.classes['@mozilla.org/file/directory_service;1']
-                                   .getService(Components.interfaces.nsIProperties);
-      var mappingsFile = dirService.get('ProfD', Components.interfaces.nsILocalFile);
-      mappingsFile.append("mousegestures.rdf");
-
-      var ioService  = Components.classes["@mozilla.org/network/io-service;1"]
-                                 .getService(Components.interfaces.nsIIOService);
-      var mgFileSpec = ioService.newFileURI(mappingsFile).spec
-
-      var dsource = this.RDF.GetDataSourceBlocking(mgFileSpec);
-      // if dsource is corrupted, we don't receive the error,
-      // although it is in the console. so let us test...
-      var lastTest = dsource.GetAllResources();
-
-      if (!lastTest.hasMoreElements())
-        throw("MozGest: Stopping import! Something is wrong with mousegestures.rdf\n");
-
-      for (var x = 0; x < wTypeArray.length; x++)
-        this.importRDFGestures(dsource, wTypeArray[x]);
-    }
-    catch (e) {
-      retVal = e;
-    }
-
-    return retVal;
-  },
-
-  importRDFGestures : function(dsource, winType) {
-    var mappingsContainer =  Components.classes['@mozilla.org/rdf/container;1'].createInstance()
-                             .QueryInterface(Components.interfaces.nsIRDFContainer);
-
-    var rootnode = this.RDF.GetResource("urn:mozgest:mappings:" + winType);
-
-    try {
-      mappingsContainer.Init(dsource, rootnode);
-    }
-    catch (e) {
-      // no existing mappings
-      return;
-    }
-
-    var enumerator = mappingsContainer.GetElements();
-
-    if (!enumerator.hasMoreElements())
-      return;
-
-    this.actTemp[winType] = new Array();
-
-    while (enumerator.hasMoreElements()) {
-      var mapping = enumerator.getNext()
-                    .QueryInterface(Components.interfaces.nsIRDFResource);
-
-      var code = this.getProperty(dsource, mapping, "code");
-
-      if (code == "UUUUUU")
-        continue;
-
-      var func = this.getProperty(dsource, mapping, "function");
-      var custom = this.getProperty(dsource, mapping, "custom");
-      var bmOpenIn = this.getProperty(dsource, mapping, "bmOpenIn");
-      var count = Math.abs(this.getProperty(dsource, mapping, "count")) || 0;
-      var type = null;
-      var name = null;
-
-      if (custom) {
-        type = "1";
-        func = custom;
-        name = this.getProperty(dsource, mapping, "name");
-      }
-      if (bmOpenIn)
-        type = "2" + bmOpenIn;
-
-      this.actTemp[winType][code] = {type:type, name:name, func:func, count:count};
-    }
-    return;
-  },
-
-  getProperty : function (dsource, obj, propName) {
-    var literal = dsource.GetTarget(obj, this.RDF.GetResource(this.NS + propName), true);
-    if (literal)
-      return literal.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
-    else
-      return null;
-  }
-}
\ No newline at end of file

=== modified file 'chrome/content/mozgestOverlay.js'
--- chrome/content/mozgestOverlay.js	2008-02-27 03:41:55 +0000
+++ chrome/content/mozgestOverlay.js	2009-07-25 21:50:38 +0000
@@ -50,20 +50,19 @@
 //-- Global variables --
 //----------------------
 var mgStatusPopup;
-var mgContext = null;
-var mgContextVis = false;
-var mgPopupBox;
+var mgPopup = null;
 var mgContent = null;
-var mgString; // array holding localized stroke names
+var mgString; //array holding localized stroke names
 var gestureInProgress = false;
-var globalOnLink = false; // array that holds a list of all the links traversed during gesture
-var globalOnImage = false; // string containing an image href or false
-var globalSrcEvent = false; // event which started the active gesture.
+var globalOnLink = false; //array that holds a list of all the links traversed during gesture
+var globalOnImage = false; //string containing an image href or false
+var globalSrcEvent = false; //event which started the active gesture.
 
 var mgState = {
-  gestureStartTime : 0 ,
+  inputField : null,
+  currentNode : null,
+  gestureStartTime : 0,
   gestureDone : false,
-  rockerAborted : false,
   previousSelection : null,
   oX : 0, oY : 0,
   gridMoves : new Array(),
@@ -74,16 +73,17 @@
   gestureTimeout : null,
   statusTimer : null,
   allowContext : false,
-  autoScrollAborted : false,
   history : new Array(),
   rockerCode : "",
-  linkTemp : null
+  linkTemp : null,
+  lastError : ""
 };
 
 var mgObserver = {
-  mgPrefTimeout   : null,
-  obs             : Components.classes["@mozilla.org/observer-service;1"]
-                    .getService(Components.interfaces.nsIObserverService),
+  mgPrefTimeout    : null,
+  mgRockerInterval : null,
+  obs              : Components.classes["@mozilla.org/observer-service;1"]
+                     .getService(Components.interfaces.nsIObserverService),
 
   createEvt : function(what, data) {
     var mData = data.split("|");
@@ -95,10 +95,10 @@
   },
 
   observe : function(subject, topic, data) {
-    // when MozGest pref was changed, we reinitialize
-    // (except when sidebar settings changed)
-    // use a timeout to avoid multiple inits if more than
-    // one pref was changed. Not bullet proof.
+    /*when MozGest pref was changed, we reinitialize
+     (except when sidebar settings changed)
+     use a timeout to avoid multiple inits if more than
+     one pref was changed. Not bullet proof. */
     if (topic.indexOf("nsPref") == 0) {
       if (data.indexOf("sideBar") == 0 || data == "selectedTabIndex" ||
           data == "importFrom" || data == "firstStart")
@@ -108,51 +108,60 @@
       mgObserver.mgPrefTimeout = setTimeout(mozgestInit, 200);
     }
 
-    if (topic == "mozgestGetBaseWin") {
-      if (mgCommon.winWatcher.activeWindow != window)
-        return;
-
-      mgMouseService.setBaseWin(mgGetBaseWin());
-    }
+    if (topic == "domwindowopened")
+      mgResetRocker(true);
 
     if (topic == "mozgestButtonUp") {
-      if (mgCommon.winWatcher.activeWindow != window)
+      mgObserver.mgClearInterval();
+
+      if (mgCommon.winWatcher.activeWindow != window) {
+        mgResetRocker(true);
         return;
+      }
 
       try {
         mgEndGesture(this.createEvt("mouseup", data), true);
+        gestureInProgress = false;
       }
       catch (e) {}
     }
 
+    if (mgCommon.winWatcher.activeWindow != window)
+      return;
+
     if (topic == "mozgestButtonDown") {
-      if (mgCommon.winWatcher.activeWindow != window)
-        return;
-
+      mgObserver.mgClearInterval();
       try {
-        if (navigator.platform != "Win32" &&
-            this.createEvt("mousedown", data).button == mgPrefs.mousebutton)
-          mgContext.hidePopup();
+        if (navigator.platform != "Win32" && mgMouseInContent(this.createEvt("mousedown", data)))
+          mgPopup.hidePopup();
       }
       catch (e) {}
-
     }
 
     if (topic == "mozgestRockerDown") {
-      if (mgCommon.winWatcher.activeWindow != window)
-        return;
+      mgObserver.mgClearInterval();
+      gestureInProgress = false;
 
       try {
-        mgStartGesture(this.createEvt("mousedown", data));
+        var evt = this.createEvt("mousedown", data);
+        setTimeout(mgStartGesture, 0, evt);
+
+        if (mgPrefs.staticRockers)
+          mgObserver.mgSetInterval(evt);
       }
       catch (e) {}
     }
+
+    if (topic == "mozgestGetBaseWin")
+      mgMouseService.setBaseWin(mgGetBaseWin());
   },
 
   register : function() {
     mgPrefs.prefs.QueryInterface(Components.interfaces.nsIPrefBranch2)
            .addObserver("", this, false);
 
+    mgCommon.winWatcher.registerNotification(this);
+
     if (mgMouseEvents) {
       this.obs.addObserver(this, "mozgestGetBaseWin", false);
       this.obs.addObserver(this, "mozgestRockerDown", false);
@@ -165,12 +174,30 @@
     mgPrefs.prefs.QueryInterface(Components.interfaces.nsIPrefBranch2)
            .removeObserver("", this);
 
+    mgCommon.winWatcher.unregisterNotification(this);
+
     if (mgMouseEvents) {
       this.obs.removeObserver(this, "mozgestGetBaseWin");
       this.obs.removeObserver(this, "mozgestRockerDown");
       this.obs.removeObserver(this, "mozgestButtonUp");
       this.obs.removeObserver(this, "mozgestButtonDown");
     }
+  },
+
+  mgSetInterval : function(e, wheelCode) {
+    mgObserver.mgClearInterval();
+
+    if (e) {
+      mgObserver.mgRockerInterval = setInterval(mgStartGesture, mgPrefs.staticRockersDelay, e);
+    }
+    else if (wheelCode) {
+      mgObserver.mgRockerInterval = setInterval(mgFireRocker, mgPrefs.staticRockersDelay, wheelCode);
+    }
+  },
+
+  mgClearInterval : function() {
+    clearInterval(mgObserver.mgRockerInterval);
+    mgObserver.mgRockerInterval = null;
   }
 }
 
@@ -179,32 +206,27 @@
 //--------------------------------
 function mgStartup(e) {
   window.removeEventListener("load", mgStartup, false);
-  mgComponentLoader.initMouseService(true);
+  document.loadOverlay("chrome://mozgest/content/contextOverlay.xul", null);
   mgInitNotification();
 
-  // Hack! get our keyset
-  var mgKeySet = document.getElementById("openMozgestSettings");
-  if (!mgKeySet) {
-    mgKeySet = document.getElementsByAttribute("id", "openMozgestSettings")[0].parentNode;
-    document.documentElement.appendChild(mgKeySet);
-  }
-
   //this comes from windowTypes.js
   mgWindowTypes.init();
   mgWindowType = mgWindowTypes.getWindowType(document.location);
 
   if (mgWindowType) {
-    mgCommon.dump("MozGest: ---- Startup ----\n");
+    mgCommon.dump("Startup");
+    mgLoadStrings();
+    mozgestInit();
     mgObserver.register();
     window.addEventListener("unload", function () {mgObserver.unregister()}, false);
-    mgLoadStrings();
-    mozgestInit();
   }
 }
 
 function mozgestInit() {
   mgPrefs.init();
-  // turn gestures recognition on/off
+  mgComponentLoader.initMouseService(true);
+
+  //turn gestures recognition on/off
   if (mgPrefs.get(mgWindowType))
     mgAddWindowWatch();
   else
@@ -216,12 +238,12 @@
   catch (e) {
     mgPrefs.prefs.setBoolPref("firstStart", true);
     mgPrefs.prefs.setIntPref("selectedTabIndex", 3);
-    setTimeout("mgCommon.openDialog('chrome://mozgest/content/pref/pref-mozgest.xul')", 500);
+    setTimeout("openDialog('chrome://mozgest/content/pref/pref-mozgest.xul','','chrome,resizable,centerscreen')", 500);
   }
 }
 
 function mgLoadStrings() {
-  // load localized strings and cache often used strings
+  //load localized strings and cache often used strings
   mgString = new Array();
   mgString["R"] = mgGetString("a.right");
   mgString["L"] = mgGetString("a.left");
@@ -235,7 +257,7 @@
 }
 
 function mgAddWindowWatch() {
-  mgCommon.dump("MozGest: ---- Get Contentarea ---\n");
+  mgCommon.dump("Get Contentarea");
 
   if (document.documentElement.getAttribute("windowtype") == "navigator:browser")
     mgContent = mgGetContentArea().mPanelContainer;
@@ -243,23 +265,35 @@
     mgContent = mgGetContentArea();
 
   mgRemoveWindowWatch();
-  mgCommon.dump("MozGest: Adding Listeners\n");
+  mgCommon.dump("Adding Listeners");
 
-  mgContent.addEventListener("mousedown", mgStartGesture, false);
+  mgContent.addEventListener("mousedown", mgStartGesture, true);
   mgContent.addEventListener("draggesture", mgOnDragGestureEvent, true);
 
   if (mgPrefs.enableWheelRockers)
-    mgContent.addEventListener("DOMMouseScroll", mgMousewheelHandler, false);
+    mgContent.addEventListener("DOMMouseScroll", mgMousewheelHandler, true);
 
-  window.addEventListener("mouseup", mgEndGesture, false);
+  window.addEventListener("mouseup", mgEndGesture, true);
   window.addEventListener("keydown", mgAllowContextByKeyPress, true);
   window.addEventListener("mousemove", mgProcessCoordinates, true);
+  window.addEventListener("popupshowing", mgPopupListener, true);
   mgContent.addEventListener("contextmenu", mgContextMenuListener, true);
   mgContent.addEventListener("click", mgOnClickHandler, true);
   mgContent.addEventListener("dblclick", mgOnClickHandler, true);
+}
 
-  if (navigator.platform != "Win32")
-    window.addEventListener("popupshowing", mgAutoScrollHandler, true);
+function mgRemoveWindowWatch() {
+  mgCommon.dump("Removing Listeners");
+  mgContent.removeEventListener("mousedown", mgStartGesture, true);
+  mgContent.removeEventListener("draggesture", mgOnDragGestureEvent, true);
+  mgContent.removeEventListener("DOMMouseScroll", mgMousewheelHandler, true);
+  mgContent.removeEventListener("contextmenu", mgContextMenuListener, true);
+  window.removeEventListener("mouseup", mgEndGesture, true);
+  window.removeEventListener("keydown", mgAllowContextByKeyPress, true);
+  window.removeEventListener("mousemove", mgProcessCoordinates, true);
+  window.removeEventListener("popupshowing", mgPopupListener, true);
+  mgContent.removeEventListener("click", mgOnClickHandler, true);
+  mgContent.removeEventListener("dblclick", mgOnClickHandler, true);
 }
 
 function mgInitNotification() {
@@ -267,7 +301,9 @@
     var mgSet = document.createElement("popupset");
     mgStatusPopup = document.createElement("tooltip");
     mgStatusPopup.id = "mgStatusPopup";
-    mgStatusPopup.setAttribute("onpopuphidden", "this.hidden=true;setTimeout('mgStatusPopup.hidden=false',0)");
+    mgStatusPopup.setAttribute("onpopupshown", "this.mgOpen=true");
+    mgStatusPopup.setAttribute("onpopuphidden", "this.mgOpen=false;this.hidden=true;setTimeout('mgStatusPopup.hidden=false',0)");
+    mgStatusPopup.setAttribute("onmouseover", "if (!gestureInProgress) this.hidePopup()");
     var mgStatusLabel = document.createElement("label");
     mgStatusLabel.id = "mgStatusLabel";
     mgStatusLabel.setAttribute("crop", "end");
@@ -276,45 +312,31 @@
     mgSet.appendChild(mgStatusPopup);
     document.documentElement.appendChild(mgSet);
     window.addEventListener("blur", function () {
-                                     if (mgPrefs["status.enabled"])
+                                     if (mgPrefs["status.isEnabled"])
                                        mgStatusPopup.hidePopup()
                                     }, true);
   }
 }
 
-function mgRemoveWindowWatch() {
-  mgCommon.dump("MozGest: Removing Listeners\n");
-  mgContent.removeEventListener("mousedown", mgStartGesture, false);
-  mgContent.removeEventListener("draggesture", mgOnDragGestureEvent, true);
-  mgContent.removeEventListener("DOMMouseScroll", mgMousewheelHandler, false);
-  mgContent.removeEventListener("contextmenu", mgContextMenuListener, true);
-  window.removeEventListener("mouseup", mgEndGesture, false);
-  window.removeEventListener("keydown", mgAllowContextByKeyPress, true);
-  window.removeEventListener("mousemove", mgProcessCoordinates, true);
-  mgContent.removeEventListener("click", mgOnClickHandler, true);
-  mgContent.removeEventListener("dblclick", mgOnClickHandler, true);
-  window.removeEventListener("popupshowing", mgAutoScrollHandler, true);
-}
-
 //-----------------------
 //-- Integration hooks --
+//-- everything needed for co-existing with or disabling regular app functions
 //-----------------------
-// (everything needed for co-existing with or disabling regular app functions)
-
 function mgContextMenuListener(e) {
-  if (mgAppInfo.geckoVersion.substring(0,3) > 1.8) {
+  if (mgAppInfo.platform == "Windows" || mgAppInfo.geckoShortVersion > 1.8) {
     if (!mgState.allowContext) {
       e.preventDefault();
       e.stopPropagation();
     }
   }
-
-  addEventListener("popupshowing", mgDisableContextMenu, true);
-  setTimeout("removeEventListener('popupshowing', mgDisableContextMenu, true)", 5);
+  else {
+    addEventListener("popupshowing", mgDisableContextMenu, true);
+    setTimeout("removeEventListener('popupshowing', mgDisableContextMenu, true)", 5);
+  }
 }
 
 function mgDisableContextMenu(e) {
-  mgContext=e.originalTarget;
+  mgPopup = e.originalTarget;
 
   if (!mgState.allowContext)
     e.preventDefault();
@@ -327,9 +349,12 @@
   }
 }
 
-function mgAutoScrollHandler(e) {
-  if (e.target.id=="autoscroller") {
-    mgContext=e.originalTarget;
+function mgPopupListener(e) {
+  if (e.originalTarget.nodeName.indexOf("tooltip") != -1)
+    return;
+
+  mgPopup = e.originalTarget;
+  if (e.target.id == "autoscroller") {
     if (!e.target.hasAttribute("mozgestWasHere")) {
       e.target.addEventListener("mousedown", function(e) {mgStartGesture(e, true)}, true);
       e.target.setAttribute("mozgestWasHere", true);
@@ -339,73 +364,59 @@
 
 function mgOnClickHandler(e) {
   if (mgState.gestureDone) {
-    mgCommon.dump("MozGest: Stopping " + e.type + " event caused by last gesture.\n");
+    mgCommon.dump("Stopping " + e.type + " event caused by last gesture");
     e.preventDefault();
     e.stopPropagation();
     return false;
   }
 
-  var node = e.originalTarget;
-
-  if (!node.getAttribute || !node.hasAttribute("href"))
-    return null;
-
-  var tagname = node.nodeName.toLowerCase();
-  var href = node.getAttribute("href");
-
-  if (tagname == "a" && href.indexOf("mozgest://") == 0 && e.button < 2) {
-    mgCommon.dump("MozGest: Link click " + href + "\n");
-    mgStorage.processURL(href, node.ownerDocument.location);
-    e.stopPropagation();
-    e.preventDefault();
+  if (e.button < 2) {
+    var node = e.originalTarget;
+
+    if (node.localName.toLowerCase() != "a")
+      return null;
+
+    if (!node.getAttribute || !node.hasAttribute("href"))
+      return null;
+
+    var href = node.getAttribute("href");
+
+    if (href.indexOf("mozgest://") == 0) {
+      mgCommon.dump("Link click " + href);
+      mgStorage.processURL(href, node.ownerDocument.location);
+      e.stopPropagation();
+      e.preventDefault();
+    }
   }
   return null;
 }
 
 function mgOnDragGestureEvent(e) {
-  var draggedElement = e.originalTarget.nodeName.toUpperCase();
-  if (gestureInProgress && draggedElement != "HTML") {
-    if (mgState.lastMoveTime-mgState.gestureStartTime > mgPrefs.dragdropDelay) {
-      mgCommon.dump("MozGest: '" + draggedElement
-           + "' drag encountered, canceling gesture\n");
-      mgEndGesture("drag");
-    } else {
-      mgCommon.dump("MozGest: canceling '" + draggedElement
-           + "' drag event, continuing gesture\n");
-      e.stopPropagation();
-    }
+  if (gestureInProgress) {
+    e.preventDefault();
+    e.stopPropagation();
   }
-  if (mgState.gestureDone)
-    e.stopPropagation();
 }
 
 //---------------------------------
 //-- The gesture recognizer core --
 //---------------------------------
 function mgProcessCoordinates(e) {
-  if (e.screenX < mgState.oX -25 || e.screenX > mgState.oX +25 ||
-      e.screenY < mgState.oY -25 || e.screenY > mgState.oY +25)
-    mgState.rockerAborted = true;
+  if (mgState.rockerCode.length > 1 &&
+      (e.screenX < mgState.oX -25 || e.screenX > mgState.oX +25 ||
+       e.screenY < mgState.oY -25 || e.screenY > mgState.oY +25))
+    mgResetRocker(true);
 
-  if (!gestureInProgress)
+  if (!mgPrefs.enableStrokes || !gestureInProgress)
     return;
 
   var now = (new Date).getTime();
 
-  if (mgPrefs.mousebutton == 1 && !mgState.autoScrollAborted &&
-      (e.screenX != mgState.oX || e.screenY != mgState.oY)) {
-     mgState.autoScrollAborted = true;
-     if (mgStopAutoScroll())
-       return;
-  }
-
-  if (!mgPrefs.enableStrokes)
-    return;
-
-  var g = mgState.gesture.join("");
-  if (mgPrefs.gestureCondition == "e.button==0" && (g == "L" || g == "R")
-      && (now - mgState.gestureStartTime) > mgPrefs.lmbGestureLimit) {
-    mgEndGesture(null);
+  if (mgState.gesture.length < 1) {
+    if (mgPrefs.mousebutton == 1 && (e.screenX != mgState.oX || e.screenY != mgState.oY)) {
+      if (mgStopAutoScroll())
+        return;
+    }
   }
 
   var x_dir = e.screenX - mgState.oX;
@@ -414,9 +425,9 @@
   var y = Math.abs(y_dir);
 
   if (x >= mgPrefs.grid/2 || y >= mgPrefs.grid/2) { // process each half-grid
-    // diagonal movement:
-    // mgPrefs.diagonalTolerance = 75 means that a movement is recognized as diagonal when
-    // x/y or y/x is between 0.25 and 1
+    //diagonal movement:
+    //mgPrefs.diagonalTolerance = 75 means that a movement is recognized as diagonal when
+    //x/y or y/x is between 0.25 and 1
     if ( mgPrefs.diagonalTolerance != 0 && ( (x/y >= (1-mgPrefs.diagonalTolerance/100) && x/y <= 1)
         || (y/x >= (1-mgPrefs.diagonalTolerance/100) && y/x <= 1) ) ) {
 
@@ -429,14 +440,14 @@
       else if (x_dir > 0 && y_dir < 0)
         mgPush("9");
     }
-    // horizontal move:
+    //horizontal move:
     else if (x > y) {
       if (x_dir > 0)
         mgPush("R");
       else if (x_dir < 0)
         mgPush("L");
     }
-    // vertical move:
+    //vertical move:
     else if (x < y) {
       if (y_dir > 0)
         mgPush("D");
@@ -444,19 +455,18 @@
         mgPush("U");
     }
 
-    mgShowStatus(mgState.gesture.join(""));
     mgState.lastGestureTime = now;
-
-    if (mgState.gestureTimeout)
-      window.clearTimeout(mgState.gestureTimeout);
-
-    mgState.gestureTimeout = window.setTimeout("mgEndGesture(null);", mgPrefs.delay);
-
+    clearTimeout(mgState.gestureTimeout);
+    mgState.gestureTimeout = setTimeout("mgEndGesture(null);", mgPrefs.delay);
     mgState.oX = e.screenX;
     mgState.oY = e.screenY;
   }
   mgState.lastMoveTime = now;
-  mgExamineHoveredElement(e.originalTarget);
+
+  if (mgState.currentNode != e.originalTarget)
+    mgExamineHoveredElement(e.originalTarget);
+
+  mgState.currentNode = e.originalTarget;
 }
 
 function mgPush(code) {
@@ -473,9 +483,8 @@
   if (mgState.gesture[mgState.gesture.length-1] != code) {
     mgState.gesture.push(code);
     mgState.localizedGesture.push(mgString[code]);
+    mgShowStatus(mgState.gesture.join(""));
   }
-  if (mgState.gesture.length == 1)
-    mgResetRocker();
 }
 
 function mgExamineHoveredElement(node, inContentCheck) {
@@ -492,9 +501,7 @@
     for (checkNode; checkNode; checkNode = checkNode.parentNode) {
       var n = checkNode.nodeName.toLowerCase();
 
-      if (n == "scrollbar" || n == "select" ||
-          n == "input" || n == "textarea" ||
-          n == "textbox" || n == "object" || n == "embed")
+      if (n == "scrollbar" || n == "object" || n == "embed")
         return false;
     }
   }
@@ -512,7 +519,6 @@
       if (!(node.href in mgState.linkTemp)) {
         mgState.linkTemp[node.href] = node.href;
         globalOnLink.push(node);
-        mgCommon.dump("Mozgest: hovered link '" + node.href + "'\n");
       }
       break;
     }
@@ -521,7 +527,6 @@
   for (imgNode; imgNode; imgNode = imgNode.parentNode) {
     if (!globalOnImage && imgNode instanceof CI.nsIDOMHTMLImageElement) {
       globalOnImage = imgNode;
-      mgCommon.dump("Mozgest: found image.\n");
       break;
     }
   }
@@ -537,119 +542,123 @@
 
   if (mgExamineHoveredElement(e.originalTarget, true) && !mgCheckForRocker(e) && !isPopup) {
     globalSrcEvent = e;
+    mgState.currentNode = e.originalTarget;
 
     if (!gestureInProgress && mgPrefs.enableStrokes && eval(mgPrefs.gestureCondition)) {
       // check if it's possible to draw trails
-      if (mgPrefs["trails.enabled"] && mgNativeTrails)
-        mgMouseService.initTrails(mgGetBaseWin(), mgPrefs["trails.width"], mgPrefs["trails.interval"],
-                                  mgPrefs.grid, mgPrefs["trails.color"].substring(1));
+      if (mgNativeTrails && mgPrefs["trails.enabled"])
+        mgMouseService.initTrails(mgGetBaseWin());
 
       gestureInProgress = true;
       mgState.gestureStartTime = mgState.lastGestureTime = (new Date).getTime();
       mgState.lastMoveTime = mgState.gesture.length = mgState.localizedGesture.length = 0;;
 
-      var sel = mgGetSelection();
-      if (mgPrefs.mousebutton == 0 && sel && sel.rangeCount > 0)
-        mgState.previousSelection = sel.getRangeAt(0);
+      if (mgPrefs.mousebutton == 0) {
+        mgState.inputField = null;
+        var nodeName = globalSrcEvent.target.nodeName.toLowerCase();
+
+        if (nodeName == "input" || nodeName == "textarea") {
+          mgState.inputField = globalSrcEvent.target;
+          mgState.selStart = mgState.inputField.selectionStart;
+          mgState.selEnd = mgState.inputField.selectionEnd;
+        }
+
+        mgState.previousSelection = null;
+        var sel = mgGetSelection();
+
+        if (sel && sel.rangeCount > 0)
+          mgState.previousSelection = sel.getRangeAt(0);
+
+        mgState.gestureTimeout = setTimeout("mgEndGesture(null);", mgPrefs.lmbGestureLimit);
+      }
     }
   }
 }
 
 function mgEndGesture(e, synth) {
   mgReleaseRocker(e);
-  mgState.rockerAborted = false;
-  mgState.autoScrollAborted = false;
   clearTimeout(mgState.statusTimer);
+  clearTimeout(mgState.gestureTimeout);
 
   if (gestureInProgress) {
-    gestureInProgress = mgState.gestureStartTime = false;
+    gestureInProgress = false;
+    mgState.gestureStartTime = false;
 
     if (mgNativeTrails)
       mgMouseService.stopTrails();
 
-    window.clearTimeout(mgState.gestureTimeout);
+    mgState.gestureDone = (mgState.gesture.join("") != "") ? true : false;
 
-    // check if we've been called via a timeout; see mgProcessCoordinates()
     if (e == null) {
-      mgCommon.dump("gesture timeouted\n");
-
-      if (mgPrefs["status.enabled"])
-        mgStatusPopup.firstChild.value = mgGetString("g.aborted");
-
-      mgState.gestureDone = true;
-    }
-    else if (mgState.gesture.join("") != "") {
-      mgState.gestureDone = true;
-      window.setTimeout(mgFireGesture, 0, mgState.gesture.join(""));
-    }
+      if (mgState.gestureDone)
+        mgShowStatus(null, mgGetString("g.aborted"));
+    }
+    else if (mgState.gestureDone)
+      setTimeout(mgFireGesture, 0, mgState.gesture.join(""));
   }
 
-  if (mgPrefs["status.enabled"])
+  if (mgPrefs["status.isEnabled"])
     mgState.statusTimer = setTimeout("mgStatusPopup.hidePopup();", mgPrefs["status.timeout"]);
 
   if (!synth && e && !mgState.gestureDone && (e.button == 2 ||
       (navigator.platform.indexOf("Mac") == 0 && e.button == 0 && e.ctrlKey))) {
     mgState.allowContext = true;
-    //==================== contextmenu on mousedown =============================
+
+    //contextmenu on mousedown
     if (navigator.platform != "Win32") {
-      var ctBox = mgContent.boxObject;
-
-      if (e.screenY >= ctBox.screenY &&
-          e.screenY <= ctBox.screenY + ctBox.height &&
-          e.screenX >= ctBox.screenX &&
-          e.screenX <= ctBox.screenX + ctBox.width) {
-
+      if (e.originalTarget.ownerDocument && e.originalTarget.ownerDocument == document)
+        return;
+
+      if (mgMouseInContent(e)) {
         document.popupNode = e.target;
+        document.mozgestPopupRangeParent = e.rangeParent;
+        document.mozgestPopupRangeOffset = e.rangeOffset;
 
-        if (mgAppInfo.geckoVersion.substring(0,3) > 1.8) {
+        if (mgAppInfo.geckoShortVersion > 1.8) {
           var ev = e.view.document.createEvent ('MouseEvents');
           ev.initMouseEvent('contextmenu', true, true, e.view, 1, e.screenX, e.screenY,
                             e.pageX, e.pageY, 0, 0, 0, 0, 2, null);
 
-          e.originalTarget.dispatchEvent(ev);
+          try {
+            e.originalTarget.dispatchEvent(ev);
+          }
+          catch (err) {
+            e.target.dispatchEvent(ev);
+          }
 
-          if (gContextMenu) {
+          if ("gContextMenu" in window) {
             try {
               gContextMenu.setTarget(document.popupNode, e.rangeParent, e.rangeOffset);
               gContextMenu.initItems();
             }
-            catch (e) {}
+            catch (err) {}
           }
           return;
         }
 
-        var mgPopupBox = mgContext.boxObject
-                     .QueryInterface(Components.interfaces.nsIPopupBoxObject);
-
-        if (mgContextVis)
-          return;
-
-        if (e.target.ownerDocument && e.target.ownerDocument == document)
-          return;
-
-        if (!mgContext.hasAttribute("mozgestWasHere")) {
-          mgContext.addEventListener("popupshown", mgObserveContext, true);
-          mgContext.addEventListener("popuphidden", mgObserveContext, true);
-          mgContext.setAttribute("mozgestWasHere", true);
-        }
+        var mgPopupBox = mgPopup.boxObject.QueryInterface(Components.interfaces.nsIPopupBoxObject);
+        document.popupNode = e.originalTarget;
 
         try {
-          mgPopupBox.showPopup(mgContext.ownerDocument.documentElement, mgContext,
+          mgPopupBox.showPopup(mgPopup.ownerDocument.documentElement, mgPopup,
                                e.clientX, e.clientY, "context", "bottomleft", "topleft");
         }
-        catch (e) {}
+        catch (err) {}
       }
     }
   }
 }
 
-function mgObserveContext(e) {
-  if (e.type == "popupshown") {
-    if (e.target == mgContext)
-      mgContextVis = true;
-  }
-  else if (e.target == mgContext)
-    mgContextVis = false;
+function mgMouseInContent(e) {
+  var ctBox = mgContent.boxObject;
+
+  if (e.screenY >= ctBox.screenY &&
+      e.screenY <= ctBox.screenY + ctBox.height &&
+      e.screenX >= ctBox.screenX &&
+      e.screenX <= ctBox.screenX + ctBox.width)
+    return true;
+  else
+    return false;
 }
 
 function mgGetBaseWin() {
@@ -657,18 +666,66 @@
   return mgDocShell.QueryInterface(Components.interfaces.nsIBaseWindow);
 }
 
-function mgShowStatus(code, isRocker, byTimer) {
-  if (mgPrefs["status.enabled"]) {
+function mgShowStatus(code, errorMSG) {
+  if (mgPrefs["status.isEnabled"]) {
     clearTimeout(mgState.statusTimer);
-    var statusText = mgString["gesture"] + " " +
-                     ((isRocker) ? (code + ((byTimer) ? unescape("%u221E") : "")) : mgState.localizedGesture);
-    var nameTemp = mgGetMapping(code)[1];
-
-    if (nameTemp)
-      statusText += " (" + nameTemp + ")";
+    var statusText;
+
+    if (!errorMSG) {
+      statusText = mgString["gesture"] + " " +
+                   ((code.toString().indexOf(":") == 0) ? code : mgState.localizedGesture);
+      var nameTemp = mgGetMapping(code)[1];
+
+      if (nameTemp)
+        statusText += " (" + nameTemp + ")";
+    }
+    else
+      statusText = errorMSG;
 
     mgStatusPopup.firstChild.setAttribute("value", statusText);
-    mgStatusPopup.showPopup(document.documentElement, -1 , -1, "tooltip", "topleft", "bottomleft");
+
+    var isOpen = false;
+
+    if (mgStatusPopup.boxObject.popupState) {
+      if (mgStatusPopup.boxObject.popupState == "open")
+        isOpen = true;
+    }
+    else if (mgStatusPopup.mgOpen)
+      isOpen = true;
+
+    if (!isOpen) {
+      var width = 500;
+
+      try {
+        width = parseInt(document.defaultView.getComputedStyle(mgStatusPopup, null).getPropertyValue("max-width"));
+      }
+      catch (e) {}
+
+      var elt = mgPrefs["status.anchorElement"];
+      elt = eval(elt);
+
+      if (!elt)
+        elt = document.documentElement;
+
+      var box = elt.boxObject;
+
+      switch(mgPrefs["status.align"]) {
+        case 0: //topLeft
+          mgStatusPopup.showPopup(elt, -1 , -1, "tooltip", "topleft", "bottomleft");
+          break;
+        case 1: //topRight
+          mgStatusPopup.showPopup(elt, -1 , -1, "tooltip", "topright", "bottomright");
+          break;
+        case 2: //bottomLeft
+          mgStatusPopup.showPopup(elt, box.screenX, box.screenY + box.height, "tooltip", null, null);
+          break;
+        case 3: //bottomRight
+          mgStatusPopup.showPopup(elt, box.screenX + box.width - width, box.screenY + box.height, "tooltip", null, null);
+          break;
+      }
+    }
+    if (errorMSG)
+      mgState.statusTimer = setTimeout("mgStatusPopup.hidePopup();", mgPrefs["status.timeout"]);
   }
 }
 
@@ -690,4 +747,23 @@
   }
 
   return [mapping, name];
+}
+
+//--------------------
+//-- Ugly Overrides --
+//--------------------
+function openEditorContextMenu (popup) {
+  InlineSpellCheckerUI.clearSuggestionsFromMenu();
+  InlineSpellCheckerUI.initFromEvent((document.mozgestPopupRangeParent) ? document.mozgestPopupRangeParent : document.popupRangeParent,
+                                     (document.mozgestPopupRangeOffset) ? document.mozgestPopupRangeOffset : document.popupRangeOffset);
+  var onMisspelling = InlineSpellCheckerUI.overMisspelling;
+  document.getElementById('spellCheckSuggestionsSeparator').hidden = !onMisspelling;
+  document.getElementById('spellCheckAddToDictionary').hidden = !onMisspelling;
+  document.getElementById('spellCheckIgnoreWord').hidden = !onMisspelling;
+  var separator = document.getElementById('spellCheckAddSep');
+  separator.hidden = !onMisspelling;
+  document.getElementById('spellCheckNoSuggestions').hidden = !onMisspelling ||
+      InlineSpellCheckerUI.addSuggestionsToMenu(popup, separator, 5);
+
+  updateEditItems();
 }
\ No newline at end of file

=== modified file 'chrome/content/mozgestOverlay.xul'
--- chrome/content/mozgestOverlay.xul	2008-02-27 03:41:55 +0000
+++ chrome/content/mozgestOverlay.xul	2009-07-25 21:50:38 +0000
@@ -39,84 +39,105 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet href="chrome://mozgest/skin/mozgest.css" type="text/css"?>
-
 <!DOCTYPE overlay SYSTEM "chrome://mozgest/locale/mozgest.dtd" >
 
 <overlay id="mozgest"
          xmlns:html="http://www.w3.org/1999/xhtml"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
- <keyset>
-  <key id="openMozgestSettings"
-       key="&settings.commandkey;"
-       modifiers="&settings.commandmodifiers;"
-       oncommand="mgCommon.openDialog('chrome://mozgest/content/pref/pref-mozgest.xul')"/>
- </keyset>
-
  <script type="application/x-javascript" src="defaults.js"/>
  <script type="application/x-javascript" src="mozgestCommon.js"/>
- <script type="application/x-javascript" src="componentLoader.js"/>
  <script type="application/x-javascript" src="windowTypes.js"/>
- <script type="application/x-javascript" src="mozgestImport.js"/>
  <script type="application/x-javascript" src="mozgestOverlay.js"/>
  <script type="application/x-javascript" src="gestures.js"/>
  <script type="application/x-javascript" src="gestimp.js"/>
 
  <script type="application/x-javascript">
-  // Register mgStartup as an onload listener. To avoid getting called
-  // multiple times, register in non-capturing mode (3rd param = false).
   window.addEventListener("load", mgStartup, false);
  </script>
 
- <!-- Firefox Sidebar -->
- <menupopup id="viewSidebarMenu">
-  <menuitem key="viewMozgestSidebarKB" observes="viewMozgestSidebar"/>
- </menupopup>
-
- <keyset id="mainKeyset">
+ <window id="main-window">
+  <keyset id="mozgestKeyset"/>
+  <popupset id="mozgestPopupset"/>
+ </window>
+
+ <window id="viewSource">
+  <keyset id="mozgestKeyset"/>
+ </window>
+
+ <window id="messengerWindow">
+  <keyset id="mozgestKeyset"/>
+  <popupset id="mozgestPopupset"/>
+ </window>
+
+ <window id="msgcomposeWindow">
+  <keyset id="mozgestKeyset"/>
+  <popupset id="mozgestPopupset"/>
+ </window>
+
+ <keyset id="mozgestKeyset">
+  <key id="openMozgestSettings"
+       key="&settings.commandkey;"
+       modifiers="&settings.commandmodifiers;"
+       oncommand="mgCommon.openDialog('chrome://mozgest/content/pref/pref-mozgest.xul')"/>
+
   <key id="viewMozgestSidebarKB"
        key="&sidebar.commandkey;"
        modifiers="&sidebar.commandmodifiers;"
-       oncommand="try {toggleSidebar('viewMozgestSidebar');} catch (e) {}"
-       insertbefore="viewBookmarksSidebarKb"/>
+       oncommand="try {
+                    toggleSidebar('viewMozgestSidebar');
+                  }
+                  catch (e) {
+                    mgCommon.openDialog('chrome://mozgest/content/sidebar/mozgestSidebar.xul');
+                  }"/>
  </keyset>
 
+ <popupset id="mozgestPopupset">
+  <popup id="mgSidebarContext">
+   <menuseparator id="mgSidebarSettingsSep"/>
+  </popup>
+ </popupset>
+
+ <!-- Firefox Sidebar -->
+ <menupopup id="viewSidebarMenu">
+  <menuitem key="viewMozgestSidebarKB"
+            observes="viewMozgestSidebar"
+            context="mgSidebarContext"/>
+ </menupopup>
+
  <broadcasterset id="mainBroadcasterSet">
   <broadcaster id="viewMozgestSidebar" autoCheck="false" label="&mozgest.label;"
                type="checkbox" group="sidebar" sidebartitle="&sidebar.title;"
                sidebarurl="chrome://mozgest/content/sidebar/mozgestSidebar.xul"
-               oncommand="toggleSidebar('viewMozgestSidebar');"/>
+               oncommand="try {
+                            toggleSidebar('viewMozgestSidebar');
+                          }
+                          catch (e) {
+                            mgCommon.openDialog('chrome://mozgest/content/sidebar/mozgestSidebar.xul')
+                          }"/>
  </broadcasterset>
+ <!-- Firefox Sidebar -->
 
  <toolbarpalette id="BrowserToolbarPalette">
   <toolbarbutton id="mgSidebarButton"
-                 class="toolbarbutton-1 chromeclass-toolbar-additional"
-                 observes="viewMozgestSidebar"
-                 context="mgButtonContext"
-                 tooltiptext="&sidebar.title;"/>
- </toolbarpalette>
- <!-- Firefox Sidebar -->
-
- <popupset id="mainPopupSet">
-  <popup id="mgButtonContext">
-   <menuitem oncommand="mgCommon.openDialog('chrome://mozgest/content/pref/mappings.xul')"
-             label="&btnMappings;"
-             accesskey="&sidebar.mappings.key;" />
-
-   <menuitem oncommand="mgCommon.openDialog('chrome://mozgest/content/pref/pref-mozgest.xul')"
-             label="&sidebar.settings;"
-             accesskey="&sidebar.settings.key;" />
-
-   <menuseparator/>
-
-   <menuitem oncommand="mgCommon.showWebPage('http://www.mousegestures.org')"
-             label="&visit.home;"
-             accesskey="&sidebar.visit.home.key;" />
-
-   <menuitem oncommand="mgCommon.showWebPage('http://www.mousegestures.org/exchange/')"
-             label="&visit.exchange;"
-             accesskey="&sidebar.visit.exchange.key;" />
-  </popup>
- </popupset>
+                 observes="viewMozgestSidebar"/>
+ </toolbarpalette>
+
+ <toolbarpalette id="MailToolbarPalette">
+  <toolbarbutton id="mgSidebarButton"
+                 label="&mozgest.label;"
+                 oncommand="mgCommon.openDialog('chrome://mozgest/content/sidebar/mozgestSidebar.xul')"/>
+ </toolbarpalette>
+
+ <toolbarpalette id="MsgComposeToolbarPalette">
+  <toolbarbutton id="mgSidebarButton"
+                 label="&mozgest.label;"
+                 oncommand="mgCommon.openDialog('chrome://mozgest/content/sidebar/mozgestSidebar.xul')"/>
+ </toolbarpalette>
+
+ <toolbarbutton id="mgSidebarButton"
+                class="toolbarbutton-1 chromeclass-toolbar-additional"
+                context="mgSidebarContext"
+                tooltiptext="&sidebar.title;"/>
 
 </overlay>
\ No newline at end of file

=== modified file 'chrome/content/pref/edit-mapping.js'
--- chrome/content/pref/edit-mapping.js	2008-02-27 03:41:55 +0000
+++ chrome/content/pref/edit-mapping.js	2009-07-25 21:50:38 +0000
@@ -37,8 +37,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 var docTitle, dialogMode, acceptButton, actTemp, wType, docLoc, mgStatusPopup;
-var gestureType, codeBox, wheelBtn, wheelDir, functionType, functionsTree, ftChildren, mappingName, customBox, keyBox, keyMappingName;
-var startType, startCode, startName, startFunc, startCount;
+var gestureType, codeBox, wheelBtn, wheelDir, mgCategory, mgCatLen, catCol, allFuncs;
+var functionType, functionsTree, mappingName, customBox, keyBox, keyMappingName;
+var startType, startCode, startName, startFunc, startCount, startCat;
 var bmMappingName, bmTree, bmSelected, bmOpenIn, bmInfo, bmImage;
 var mgRow1, mgRow2, mgRow3;
 var bmDeleted = false;
@@ -67,7 +68,7 @@
     }
 
     document.getElementById("mgPlacesTree").setAttribute("place",
-    "place:queryType=1&excludeReadOnlyFolders=1&folder=" + PlacesUtils.allBookmarksFolderId);
+    "place:queryType=1&excludeReadOnlyFolders=1&onlyBookmarked=1&folder=1");
     document.getElementById("mgPlacesTree").setAttribute("type", "places");
     initEditor();
   }
@@ -79,9 +80,10 @@
   codeBox        = document.getElementById("codeBox");
   wheelBtn       = document.getElementById("wheelRockerButton");
   wheelDir       = document.getElementById("wheelDirection");
+  mgCategory     = document.getElementById("mgCategory");
+  mgCatLen       = mgCategory.firstChild.childNodes.length;
   functionType   = document.getElementById("functionType");
   functionsTree  = document.getElementById("functionsTree");
-  ftChildren     = document.getElementById("ftChildren");
   mappingName    = document.getElementById("mappingName");
   bmMappingName  = document.getElementById("bmMappingName");
   keyMappingName = document.getElementById("keyMappingName");
@@ -90,6 +92,7 @@
   bmInfo         = document.getElementById("bmInfo");
   bmImage        = document.getElementById("bmImage");
   bmOpenIn       = document.getElementById("bmOpenIn");
+  catCol         = document.getElementById("catCol");
   mgRow1         = document.getElementById("mgRow1");
   mgRow2         = mgRow1.nextSibling;
   mgRow3         = mgRow2.nextSibling;
@@ -99,9 +102,6 @@
   document.getElementById("mgRegcognizeButton").hidden = !mgNativeTrails;
   mgInitNotification();
 
-  if (mgAppInfo.name != "Firefox")
-    document.getElementById("sidebarItem").hidden = true;
-
   // get passed arguments
   // [0] == dialogMode (Edit, New or Import)
   // [1] == wType (window, browser, etc.)
@@ -109,6 +109,11 @@
   dialogMode = window.arguments[0];
   wType = window.arguments[1];
 
+  if (mgAppInfo.name != "Firefox") {
+    document.getElementById("sidebarItem").hidden = true;
+    document.getElementById("cat6").hidden = false;
+  }
+
   if (dialogMode != "Import")
     document.getElementById("mgPermissionButton").hidden = true;
 
@@ -120,15 +125,48 @@
 
   // fill function list
   var curFuncts = _mgMS.functions[wType];
-
-  for (func in curFuncts)
-    mgCommon.addTreeRow(ftChildren, new Array(func, mgGetString(func)));
+  var funcTemp1 = new Array();
+  allFuncs = new Array();
+
+  mgDefaultFunctions.init()
+  funcTemp1 = mgDefaultFunctions.getFunctions();
+
+  for (win in funcTemp1) {
+    for (each in funcTemp1[win]) {
+      cat = funcTemp1[win][each];
+      cat = cat.toString().substring(cat.toString().length -4);
+      allFuncs[each] = cat;
+    }
+  }
+
+  var cat = 0;
+  var tc;
+
+  for (func in curFuncts) {
+    if (func in allFuncs)
+      cat = allFuncs[func];
+
+    tc = document.getElementById("tr" + cat)
+    mgCommon.addTreeRow(tc, new Array(func, mgGetString(func)), func);
+  }
 
   if (wType != "window") {
     curFuncts = _mgMS.functions["window"];
 
-    for (func in curFuncts)
-      mgCommon.addTreeRow(ftChildren, new Array(func,mgGetString(func)), "mozgestGeneric");
+    for (func in curFuncts) {
+      if (func in allFuncs)
+        cat = allFuncs[func];
+
+      tc = document.getElementById("tr" + cat);
+      mgCommon.addTreeRow(tc, new Array(func, mgGetString(func)), func);
+    }
+  }
+
+  for (var x = 0; x < mgCatLen; x++) {
+    var tCat = document.getElementById("trcat" + x);
+
+    if (tCat.childNodes.length < 1)
+      tCat.parentNode.setAttribute("hidden", true);
   }
 
   // prepare for bookmark mappings
@@ -146,21 +184,8 @@
 
   actTemp = _mgMS.actTemp;
 
-  if (dialogMode == "New") {
-    if (_mgMS.curBookmark) {
-      bmSelected = _mgMS.curBookmark;
-      _mgMS.curBookmark = null;
-      bmMappingName.value = _mgMS.curBookmarkName;
-
-      if (mgBMService.enabled)
-        bmInit();
-      else if (mgBMService.plEnabled)
-        setTimeout(plInit, 0);
-
-      functionType.selectedTab = functionType.getElementsByAttribute("gestureType", "9")[0];
-    }
-  return;
-  }
+  if (dialogMode == "New")
+    return;
 
   if (dialogMode == "Edit") {
     startCode = curMapping;
@@ -170,24 +195,16 @@
 
     startFunc = actTemp[wType][curMapping].func;
     startCount = actTemp[wType][curMapping].count;
+    startCat = actTemp[wType][curMapping].cat;
+    mgCategory.selectedItem = document.getElementById("cat" + actTemp[wType][curMapping].cat);
+
     setGestureType();
 
     var fType = startType = actTemp[wType][curMapping].type;
 
     if (!fType) {
       fType = startType = "";
-      try {
-        for (var x = 0; x < ftChildren.childNodes.length; x++) {
-          var funcName = functionsTree.view.getCellText(x, functionsTree.columns["ftFuncCol"]);
-
-          if (funcName == actTemp[wType][curMapping].func) {
-            functionsTree.view.selection.select(x);
-            functionsTree.boxObject.ensureRowIsVisible(x);
-            break;
-          }
-        }
-      }
-      catch (e) {}
+      selectTreeItem(actTemp[wType][curMapping].cat, actTemp[wType][curMapping].func);
     }
     else {
       fType = fType.toString();
@@ -221,6 +238,7 @@
   }
 
   if (dialogMode == "Import") {
+    functionType._tabs.removeChild(functionType._tabs.lastChild);
     setGestureType();
     importGesture();
   }
@@ -239,21 +257,21 @@
 
   // if _mgMS.importFunc is null than it is a custom gesture!
   if (!_mgMS.importFunc) {
+    mgCategory.selectedItem = document.getElementById(_mgMS.importCat)
     customBox.value = _mgMS.importCustom;
     functionType.selectedIndex = 1;
   }
-  else {
-    try {
-      for (var x = 0; x < ftChildren.childNodes.length; x++) {
-        var funcName = functionsTree.view.getCellText(x, functionsTree.columns["ftFuncCol"]);
-        if (funcName == _mgMS.importFunc) {
-          functionsTree.view.selection.select(x);
-          break;
-        }
-      }
-    }
-    catch (e) {}
-  }
+  else
+    selectTreeItem(allFuncs[_mgMS.importFunc].substring(3), _mgMS.importFunc);
+}
+
+function selectTreeItem(aCat, aFunc) {
+  document.getElementById("trItemcat" + aCat).setAttribute("open", true);
+
+  var item = document.getElementById(aFunc);
+  functionsTree.view.selection.select(functionsTree.view.getIndexOfItem(item));
+  functionsTree.boxObject.ensureRowIsVisible(functionsTree.view.getIndexOfItem(item));
+  functionsTree.focus();
 }
 
 function bmInit() {
@@ -352,9 +370,12 @@
 
   var target = bmTree.selectedNode;
 
-  if (!target || target.type != 0)
+  if (!target)
+    return;
+
+  if (target.type != 0)
     bmSelected = "";
-  else if (target) {
+  else {
     try {
       bmSelected = mgBMService.plBook.getItemGUID(target.itemId);
     }
@@ -503,6 +524,19 @@
           .selectedIndex = gestureType.selectedIndex;
 }
 
+function updateCat(aIndex) {
+  document.getElementById("catBox").hidden = (aIndex == 0) ? true : false;
+}
+
+function setTreeSel(tree) {
+  var sel = tree.view.selection;
+  var index = sel.currentIndex;
+  var tc = tree.view.getItemAtIndex(index)
+
+  if (sel.isSelected(index) && tree.view.isContainer(index))
+    sel.clearRange(index, index);
+}
+
 function updateSecondRocker(r1) {
   var r2 = document.getElementById("rocker2");
   var c = r2.menupopup.childNodes;
@@ -599,10 +633,11 @@
     code = ":" +        wb + ((wd == 1) ? "+" : "-");
   }
 
-  var type   = parseInt(functionType.selectedTab.getAttribute("gestureType"));
-  var name   = null;
-  var func   = null;
-  var count  = 0;
+  var type  = parseInt(functionType.selectedTab.getAttribute("gestureType"));
+  var name  = null;
+  var func  = null;
+  var count = 0;
+  var cat   = mgCategory.selectedItem.id.substring(3);
 
   if (type == 1) { // custom gesture
     name = mappingName.value;
@@ -654,13 +689,20 @@
     type = type.toString() + bmOpenIn.selectedIndex.toString();
   }
   else { // normal gesture
-    var row = functionsTree.contentView.selection.currentIndex;
-    if (row == -1) {
-      alert(mgGetString("chooseFunction"));
-      return false;
-    }
-
-    func = functionsTree.view.getCellText(row, functionsTree.columns["ftFuncCol"]);
+    if (functionsTree.view.selection.count < 1) {
+      alert(mgGetString("chooseFunction"));
+      return false;
+    }
+
+    var item = functionsTree.contentView.getItemAtIndex(functionsTree.contentView.selection.currentIndex);
+
+    if (!item.id || (item.id && !(item.id in allFuncs))) {
+      alert(mgGetString("chooseFunction"));
+      return false;
+    }
+
+    func = item.id;
+    cat = allFuncs[func].substring(3);
   }
 
   var conf = true;
@@ -683,8 +725,8 @@
   if (conf) {
     if (dialogMode == "Edit") {
       // let us check if there were changes
-      if (type != startType || code != startCode ||
-          name != startName || func != startFunc) {
+      if (type != startType || code != startCode || name != startName ||
+          func != startFunc || cat != startCat) {
         // if code was changed, we have to remove the original gesture
         if (code != startCode) {
           //rebuild actTemp without startCode
@@ -713,7 +755,7 @@
       _mgMS.defTemp[wType][code] = _mgMS.defaultMappings[wType][code];
 
     // add the mapping to actTemp
-    _mgMS.addMapping(wType, code, type, name, func, count);
+    _mgMS.addMapping(wType, code, type, name, func, count, cat);
   }
   else
     return false;

=== modified file 'chrome/content/pref/edit-mapping.xul'
--- chrome/content/pref/edit-mapping.xul	2008-02-27 03:41:55 +0000
+++ chrome/content/pref/edit-mapping.xul	2009-07-25 21:50:38 +0000
@@ -38,6 +38,7 @@
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://mozgest/skin/mozgest.css" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarks.css" type="text/css"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://mozgest/locale/mozgest.dtd">
 <?xul-overlay href="compassOverlay.xul"?>
@@ -53,6 +54,13 @@
         mgviewsource="&windowtypes.viewsource;"
         mgmessenger="&windowtypes.messenger;"
         mgmailcompose="&windowtypes.mailcompose;"
+        cat0="&cat0;"
+        cat1="&cat1;"
+        cat2="&cat2;"
+        cat3="&cat3;"
+        cat4="&cat4;"
+        cat5="&cat5;"
+        cat6="&cat6;"
         buttons="accept,cancel"
         onload="initMain();"
         onunload="removeObserver();"
@@ -61,7 +69,6 @@
 
  <script type="application/x-javascript" src="../defaults.js"/>
  <script type="application/x-javascript" src="../mozgestCommon.js"/>
- <script type="application/x-javascript" src="../componentLoader.js"/>
  <script type="application/x-javascript" src="../mozgestOverlay.js"/>
  <script type="application/x-javascript" src="edit-mapping.js"/>
 
@@ -108,6 +115,7 @@
            <row align="center">
             <textbox id="codeBox"/>
             <toolbarbutton id="mgRegcognizeButton"
+                           tooltiptext="&recognizer.windowTitle;"
                            oncommand="showRecognizer(true);"/>
            </row>
           </rows>
@@ -166,6 +174,25 @@
        <spacer height="5"/>
       </groupbox>
 
+      <spacer height="5"/>
+
+      <vbox id="catBox">
+       <label value="&colDescCat;" class="header"/>
+       <menulist id="mgCategory" selectedIndex="0">
+        <menupopup>
+         <menuitem id="cat1" label="&cat1;"/>
+         <menuitem id="cat2" label="&cat2;"/>
+         <menuitem id="cat3" label="&cat3;"/>
+         <menuitem id="cat4" label="&cat4;"/>
+         <menuitem id="cat5" label="&cat5;"/>
+         <menuitem id="cat6" label="&cat6;" hidden="true"/>
+         <menuitem id="cat0" label="&cat0;"/>
+        </menupopup>
+       </menulist>
+      </vbox>
+
+      <spacer height="10"/>
+
       <vbox flex="1">
        <spacer flex="1"/>
        <hbox>
@@ -183,7 +210,7 @@
   </vbox>
 
   <vbox flex="3">
-   <tabbox id="functionType" flex="1">
+   <tabbox id="functionType" flex="1" onselect="updateCat(this.selectedIndex)">
     <tabs>
      <tab label="&mEditor.miBuiltIn;" gestureType="0"/>
      <tab label="&mEditor.miCustom;" gestureType="1"/>
@@ -194,14 +221,70 @@
     <tabpanels flex="1" id="functionDeck">
      <tabpanel orient="vertical" flex="1">
       <vbox flex="1">
-       <tree id="functionsTree" hidecolumnpicker="true" style="width:25em;" flex="1" seltype="single">
+       <tree id="functionsTree"
+             hidecolumnpicker="true"
+             style="width:25em;"
+             flex="1"
+             seltype="single"
+             onselect="setTreeSel(this)">
         <treecols>
-         <treecol id="ftFuncCol" label="&mEditor.colFunc;" style="min-width:12em;" persist="width"/>
+         <treecol id="mEditorColFunc" label="&mEditor.colFunc;" primary="true" flex="1" persist="width"/>
          <splitter class="tree-splitter"/>
-         <treecol id="ftDescCol" label="&colDescription;" flex="1"/>
+         <treecol id="mEditorColDesc" label="&colDescription;" flex="1" persist="width"/>
         </treecols>
-        <treechildren id="ftChildren"/>
+
+        <treechildren>
+         <treeitem container="true" id="trItemcat1" persist="open">
+          <treerow>
+           <treecell label="&cat1;"/>
+          </treerow>
+          <treechildren id="trcat1"/>
+         </treeitem>
+
+         <treeitem container="true" id="trItemcat2" persist="open">
+          <treerow>
+           <treecell label="&cat2;"/>
+          </treerow>
+          <treechildren id="trcat2"/>
+         </treeitem>
+
+         <treeitem container="true" id="trItemcat3" persist="open">
+          <treerow>
+           <treecell label="&cat3;"/>
+          </treerow>
+          <treechildren id="trcat3"/>
+         </treeitem>
+
+         <treeitem container="true" id="trItemcat4" persist="open">
+          <treerow>
+           <treecell label="&cat4;"/>
+          </treerow>
+          <treechildren id="trcat4"/>
+         </treeitem>
+
+         <treeitem container="true" id="trItemcat5" persist="open">
+          <treerow>
+           <treecell label="&cat5;"/>
+          </treerow>
+          <treechildren id="trcat5"/>
+         </treeitem>
+
+         <treeitem container="true" id="trItemcat6" persist="open">
+          <treerow>
+           <treecell label="&cat6;"/>
+          </treerow>
+          <treechildren id="trcat6"/>
+         </treeitem>
+
+         <treeitem container="true" id="trItemcat0" persist="open">
+          <treerow>
+           <treecell label="&cat0;"/>
+          </treerow>
+          <treechildren id="trcat0"/>
+         </treeitem>
+        </treechildren>
        </tree>
+
       </vbox>
      </tabpanel>
 
@@ -284,7 +367,7 @@
         </treecols>
        </tree>
 
-       <tree id="mgPlacesTree" class="placesTree"
+       <tree id="mgPlacesTree" class="placesTree" ondraggesture="event.preventDefault()"
              flex="1" hidecolumnpicker="true" seltype="single" hidden="true" rows="7"
              onselect="plSelect(event)" ondblclick="plSelect(event)">
         <treecols>

=== modified file 'chrome/content/pref/help.xul'
--- chrome/content/pref/help.xul	2008-02-27 03:41:55 +0000
+++ chrome/content/pref/help.xul	2009-07-25 21:50:38 +0000
@@ -44,7 +44,7 @@
         width="400"
         onload="initHelp();"
         hidechrome="true"
-        style="-moz-appearance:tooltip"
+        style="-moz-appearance: tooltip"
         onclick="close();"
         buttons="accept">
 

=== added file 'chrome/content/pref/importSet.xul'
--- chrome/content/pref/importSet.xul	1970-01-01 00:00:00 +0000
+++ chrome/content/pref/importSet.xul	2009-07-25 21:50:38 +0000
@@ -0,0 +1,250 @@
+<?xml version="1.0"?>
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://mozgest/skin/mozgest.css" type="text/css"?>
+
+<!DOCTYPE dialog SYSTEM "chrome://mozgest/locale/mozgest.dtd">
+
+<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        id="mgImportGestureSetWindow"
+        persist="width,height,screenX,screenY"
+        width="350"
+        height="500"
+        onload="document.title = mgGetString('impTitle');"
+        onunload="removeObserver();"
+        buttons="accept,cancel"
+        ondialogcancel="return persist.cancelSave();"
+        ondialogaccept="return persist.cancelSave();">
+
+ <script type="application/x-javascript" src="../defaults.js"/>
+ <script type="application/x-javascript" src="../mozgestCommon.js"/>
+
+ <vbox flex="1">
+  <description id="warningLabel">Warning</description>
+  <spacer height="20"/>
+
+  <groupbox>
+   <description id="urlLabel">Location</description>
+   <spacer height="10"/>
+   <hbox>
+    <button id="mgImportButton"
+            oncommand="document.getElementById('progressBox').hidden = false;importSet()"
+            label="&mappings.btnImport;"/>
+    <spacer flex="1"/>
+   </hbox>
+  </groupbox>
+
+  <hbox>
+   <spacer flex="1"/>
+   <button id="mgPermissionButton"
+           image="chrome://mozgest/skin/attention.png"
+           oncommand="openDialog('chrome://mozgest/content/pref/permissions.xul','','', URI.host);"
+           label="&mEditor.lblPermissions;"/>
+  </hbox>
+
+  <spacer height="20"/>
+
+  <vbox id="progressBox" flex="1" hidden="true">
+   <progressmeter id="prMeter"/>
+   <spacer height="10"/>
+   <deck id="msgDeck" selectedIndex="0">
+    <description id="msgDeck0"/>
+    <description id="msgDeck1">Succes</description>
+    <description id="msgDeck2">Restored</description>
+    <description id="msgDeck3">Error</description>
+   </deck>
+  </vbox>
+
+  <spacer height="10"/>
+
+ </vbox>
+
+ <script type="application/x-javascript">
+  <![CDATA[
+   var downloadError;
+
+   try {
+    var systemBundle = Components.classes["@mozilla.org/intl/stringbundle;1"].getService()
+                       .QueryInterface(Components.interfaces.nsIStringBundleService)
+                       .createBundle("chrome://global/locale/filepicker.properties");
+
+    downloadError = systemBundle.GetStringFromName("errorOpenFileDoesntExistTitle");
+   }
+   catch (e) {
+    downloadError = "Error opening %S"
+   }
+
+   var msgDeck = document.getElementById("msgDeck");
+
+   var cc = Components.classes;
+   var ci = Components.interfaces;
+   var aURL;
+
+   if (("arguments" in window))
+    aURL = window.arguments[0];
+   else {
+    var fp = cc["@mozilla.org/filepicker;1"].createInstance(ci.nsIFilePicker);
+    fp.init(window, mgGetString("impTitle"), ci.nsIFilePicker.modeOpen);
+
+    var retVal = fp.show();
+
+    if (retVal == ci.nsIFilePicker.returnOK)
+     aURL = fp.fileURL.spec;
+    else
+     window.close();
+   }
+
+   document.getElementById("warningLabel").firstChild.nodeValue = mgGetString("impWarning");
+   var importButton = document.getElementById("mgImportButton");
+   var succesLabel = document.getElementById("successLabel");
+   var acceptButton = document.documentElement._buttons.accept;
+   var cancelButton = document.documentElement._buttons.cancel;
+
+   acceptButton.hidden = true;
+
+   if (aURL) {
+    var imported = false;
+    downloadError = downloadError.replace(/%S/, decodeURI(aURL));
+
+    document.getElementById("msgDeck1").firstChild.nodeValue = mgGetString("impSuccess");
+    document.getElementById("msgDeck2").firstChild.nodeValue = mgGetString("impCorrupt");
+    document.getElementById("msgDeck3").firstChild.nodeValue = downloadError;
+    document.getElementById("urlLabel").firstChild.nodeValue = decodeURI(aURL);
+
+    var ioService = Components.classes["@mozilla.org/network/io-service;1"]
+                    .getService(Components.interfaces.nsIIOService);
+
+    var URI = ioService.newURI(aURL, null, null);
+
+    var persist = cc["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"]
+                  .createInstance(ci.nsIWebBrowserPersist);
+
+    persist.persistFlags = ci.nsIWebBrowserPersist.PERSIST_FLAGS_BYPASS_CACHE;
+    persist.persistFlags |= ci.nsIWebBrowserPersist.PERSIST_FLAGS_REPLACE_EXISTING_FILES;
+    persist.persistFlags |= ci.nsIWebBrowserPersist.PERSIST_FLAGS_IGNORE_REDIRECTED_DATA;
+    persist.persistFlags |= ci.nsIWebBrowserPersist.PERSIST_FLAGS_FAIL_ON_BROKEN_LINKS;
+
+    var mgPermissionObserver = {
+     observe: function(subject, topic, data) {
+      if (topic.indexOf("nsPref") == 0) {
+       if (data == "importFrom")
+        checkPermissions();
+      }
+     }
+    }
+
+    mgPrefs.prefs.QueryInterface(Components.interfaces.nsIPrefBranchInternal)
+           .addObserver("", mgPermissionObserver, false);
+
+    checkPermissions();
+   }
+
+   function importSet() {
+    var profile = cc['@mozilla.org/file/directory_service;1'].getService(ci.nsIProperties);
+    var filePath = profile.get('ProfD', ci.nsILocalFile);
+    var oldFile = profile.get('ProfD', ci.nsILocalFile);
+    oldFile.appendRelativePath("mousegestures.js");
+
+    var filePathDir = profile.get('ProfD', ci.nsILocalFile);
+    filePathDir.append("mozgest2")
+
+    try {
+     filePathDir.create(1, 0755);
+    }
+    catch (e) {}
+
+    var now = new Date();
+    var year = now.getFullYear();
+    var month = now.getMonth() +1;
+    month = (month < 10) ? "0"+month : month;
+    var day = now.getDate();
+    day = (day < 10) ? "0"+day : day;
+
+    var impText = "mousegestures_import_" + year + month + day + ".js";
+    filePathDir.append(impText);
+
+    persist.progressListener = {
+     onProgressChange: function (aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress) {
+      var percentComplete = (aCurTotalProgress/aMaxTotalProgress)*100;
+      document.getElementById("prMeter").value = parseInt(percentComplete);
+
+      if (parseInt(percentComplete) > 90 || URI.scheme == "file")
+       imported = true;
+
+      if (aRequest.name != aURL)
+       imported = false;
+     },
+
+     onStatusChange : function (a, b, c, d) {},
+
+     onStateChange: function (aWebProgress, aRequest, aStatus, aMessage) {
+      if (imported && (aStatus & persist.progressListener.STATE_STOP)) {
+       try {
+        oldFile.remove(false);
+        filePathDir.copyTo(filePath, "mousegestures.js");
+        _mgMS.getActiveMappings();
+        mgCommon.notifyObservers("mappingsUpdated");
+        msgDeck.selectedIndex = 1;
+       }
+       catch (e) {
+        try {
+         oldFile.remove(false);
+        }
+        catch (e) {}
+
+        _mgMS.removedDefaultMappings = new Array();
+        _mgMS.cleanUp();
+        _mgMS.getActiveMappings();
+        mgCommon.notifyObservers("mappingsUpdated");
+        msgDeck.selectedIndex = 2;
+       }
+      }
+
+      if (!imported && (aStatus & persist.progressListener.STATE_STOP))
+       msgDeck.selectedIndex = 3;
+
+      acceptButton.hidden = false;
+      cancelButton.hidden = true;
+      importButton.disabled = true;
+     }
+    }
+
+    persist.saveURI(URI, null, null, null, null, filePathDir);
+   }
+
+   function checkPermissions() {
+    var permButton = document.getElementById("mgPermissionButton");
+    permButton.setAttribute("tooltiptext", mgGetString("permButtonLabel1"));
+    permButton.removeAttribute("mgAllowImport");
+    importButton.disabled = true;
+
+    var allowedHosts = mgPrefs.prefs.getCharPref("importFrom").split("|");
+    var allow = (URI.scheme == "file") ? true : false;
+
+    if (!allow) {
+     for (var x = 0; x < allowedHosts.length; x++) {
+      if (allowedHosts[x] == URI.host) {
+       allow = true;
+       break;
+      }
+     }
+    }
+
+    if (allow) {
+     importButton.disabled = false;
+     permButton.setAttribute("tooltiptext", mgGetString("permButtonLabel0"));
+     permButton.setAttribute("mgAllowImport", true);
+    }
+  }
+
+  function removeObserver() {
+   try {
+    mgPrefs.prefs.QueryInterface(Components.interfaces.nsIPrefBranchInternal)
+    .removeObserver("", mgPermissionObserver);
+   }
+   catch (e) {}
+  }
+
+  ]]>
+ </script>
+</dialog>
\ No newline at end of file

=== modified file 'chrome/content/pref/mappings.js'
--- chrome/content/pref/mappings.js	2008-02-27 03:41:55 +0000
+++ chrome/content/pref/mappings.js	2009-07-25 21:50:38 +0000
@@ -35,8 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-var mgTabBox, mappingsTree, defaultTree;
-var tChildren, mChildren, dChildren;
+var mgTabBox, mapTree, defTree, mgCatLen;
 var sortByGesture = new Array();
 var sortByName = new Array();
 var sortBy = "byName";
@@ -45,11 +44,10 @@
 var exportButton;
 
 function initMappingsWindow(restart) {
-  mgTabBox     = document.getElementById("mgTabBox");
-  mappingsTree = document.getElementById("mappingstree");
-  defaultTree  = document.getElementById("defaultmappingstree");
-  mChildren    = document.getElementById("mappingstreechildren");
-  dChildren    = document.getElementById("defaultstreechildren");
+  mgTabBox = document.getElementById("mgTabBox");
+  mapTree = document.getElementById("mapTree");
+  defTree = document.getElementById("defTree");
+  mgCatLen = document.getElementById("mapTreeChildren").childNodes.length;
   exportButton = document.getElementById("exportButton");
 
   //from compassOverlay.xul
@@ -94,7 +92,9 @@
       if (window.arguments[0]) {
         var args = window.arguments[0];
         mgTabBox.selectedTab = document.getElementsByAttribute("mgWinType", args[1])[0];
-        setTimeout(handleArguments, 0, args[0], args[2]);
+
+        if (args[0] == "directEdit" || args[0] == "Import")
+          setTimeout(handleArguments, 0, args[0], args[2]);
       }
     }
     else {
@@ -127,19 +127,38 @@
     else
       mName = mgGetString(acm[mapping].func);
 
-    mgCommon.addTreeRow(mChildren, new Array(mgMappingLocalizer.localize(mapping), decodeURIComponent(mName), mapping));
+    var tc = document.getElementById("trcat" + acm[mapping].cat)
+    mgCommon.addTreeRow(tc, new Array(mgMappingLocalizer.localize(mapping), decodeURIComponent(mName)), "act" + mapping);
+
   }
 
+  setCount("trItemcatLabel", "trcat");
   showRemovedDefaults(component);
 }
 
+function setCount(label, item) {
+  for (var x = 0; x < mgCatLen; x++) {
+    var lbl = document.getElementById(label + x);
+    var tCat = document.getElementById(item + x);
+    var count = tCat.childNodes.length;
+
+    tCat.parentNode.setAttribute("hidden", (count > 0) ? false : true);
+    lbl.setAttribute("label", "(" + count + ")");
+  }
+}
+
 function clearTrees() {
-  while (mChildren.hasChildNodes())
-    mChildren.removeChild(mChildren.firstChild);
-
-  while (dChildren.hasChildNodes())
-    dChildren.removeChild(dChildren.firstChild);
-
+  for (var x=0; x < mgCatLen; x++) {
+    var tc = document.getElementById("trcat" + x);
+
+    while (tc.hasChildNodes())
+      tc.removeChild(tc.firstChild);
+
+    var tc1 = document.getElementById("deftrcat" + x);
+
+    while (tc1.hasChildNodes())
+      tc1.removeChild(tc1.firstChild);
+  }
 }
 
 function sortTree(sortOrder, dir) {
@@ -157,13 +176,17 @@
         else
           mName = mgGetString(_mgMS.actTemp[component][mapping].func);
 
-        sortByName[component][sortByName[component].length] = [mName, mapping];
+        sortByName[component][sortByName[component].length] = [mName, mapping, _mgMS.actTemp[component][mapping].cat];
       }
 
+
+
       if (dir == "ascending")
         sortByName[component].sort(function(a, b) {return ((a[0].toLowerCase())>(b[0].toLowerCase()) ? 1 : -1)} );
       if (dir == "descending")
         sortByName[component].sort(function(a, b) {return ((a[0].toLowerCase())<(b[0].toLowerCase()) ? 1 : -1)} );
+
+      sortByName[component].sort(function(a, b) {return ((a[2])>(b[2]) ? 1 : -1)} );
     }
 
     for (component in _mgMS.actTemp) {
@@ -225,46 +248,53 @@
 }
 
 function showRemovedDefaults() {
-  while (dChildren.hasChildNodes())
-    dChildren.removeChild(dChildren.firstChild);
-
   var rdm = _mgMS.defTemp[wType];
 
-  for (var mapping in rdm)
-    mgCommon.addTreeRow(dChildren, new Array(mgMappingLocalizer.localize(mapping),
-                        mgGetString(rdm[mapping].func)));
+  for (var mapping in rdm) {
+    var tc = document.getElementById("deftrcat" + rdm[mapping].cat);
+
+    mgCommon.addTreeRow(tc, new Array(mgMappingLocalizer.localize(mapping),
+                        mgGetString(rdm[mapping].func)), "def" + mapping);
+  }
+
+  setCount("deftrItemcatLabel", "deftrcat");
 }
 
 function removeMapping() {
   exportButton.disabled = true;
   var delArray = new Array();
 
-  if (mappingsTree.view.selection.count > 1) {
-    for (var x = 0; x < mappingsTree.view.rowCount; x++)
-      if (mappingsTree.view.selection.isSelected(x))
-        delArray.push(x);
+  for (var x = 0; x < mapTree.view.rowCount; x++) {
+    if (mapTree.view.selection.isSelected(x)) {
+      var tc = mapTree.view.getItemAtIndex(x);
+
+      if (tc.id.indexOf("trItemcat") != 0)
+        delArray[delArray.length] = tc.id;
+    }
   }
-  else
-    delArray.push(mappingsTree.view.selection.currentIndex);
 
+  mapTree.view.selection.clearSelection();
   var tempArray = new Array();
 
-  while (delArray.length) {
-    var row = delArray[delArray.length-1];
-    var map = mappingsTree.view.getCellText(row, mappingsTree.columns["origCodeCol"]);
+  for (x = 0; x < delArray.length; x++) {
+    var map = delArray[x].substring(3);
+    var item = document.getElementById(delArray[x]);
     tempArray[map] = "true";
 
     if (map in _mgMS.defaultMappings[wType]) {
       if (!_mgMS.actTemp[wType][map].name &&
-          _mgMS.actTemp[wType][map].func ==  _mgMS.defaultMappings[wType][map].func)
+          _mgMS.actTemp[wType][map].func == _mgMS.defaultMappings[wType][map].func)
       {
-        var mName = mgGetString(_mgMS.actTemp[wType][map].func);
-        _mgMS.defTemp[wType][map] = _mgMS.actTemp[wType][map];
-        mgCommon.addTreeRow(dChildren, new Array(mgMappingLocalizer.localize(map), mName, map));
+          _mgMS.defTemp[wType][map] = _mgMS.actTemp[wType][map];
+
+          var deftrcat = document.getElementById("def" + item.parentNode.id);
+
+          mgCommon.addTreeRow(deftrcat, new Array(mgMappingLocalizer.localize(map),
+                              mgGetString(_mgMS.defaultMappings[wType][map].func)), "def" + map);
+
       }
     }
-    mChildren.removeChild(mChildren.childNodes[row]);
-    delArray.pop();
+    item.parentNode.removeChild(item);
   }
 
   // rebuild _mgMS.actTemp
@@ -277,25 +307,29 @@
 
     _mgMS.actTemp[wType][mapping1] = temp[mapping1];
   }
+
+  sortTree(sortBy, sortOrder);
+  showMappingsFor(wType);
 }
 
 function addDefault() {
-  var row = defaultTree.contentView.selection.currentIndex;
-  var locCode = defaultTree.view.getCellText(row, defaultTree.columns["dmCodeCol"]);
-  var locName = defaultTree.view.getCellText(row, defaultTree.columns["dmDescCol"]);
-  var mapping = mgMappingLocalizer.deLocalize(locCode);
+  var index = defTree.view.selection.currentIndex;
+  var defItem = defTree.view.getItemAtIndex(index);
+  var defItemParent = defItem.parentNode;
+
+  var mapping = defItem.id.substring(3);
+  var mapItemID = "act" + defItem.id.substring(3);
+  var mapItemParent = document.getElementById(defItemParent.id.substring(3));
 
   if (overWriteCheck(mapping)) {
-    // search for the mapping and remove it!
-    // setting the cellText will crash!
-    for (var x = 0; x < mChildren.childNodes.length; x++) {
-       if (mappingsTree.view.getCellText(x, mappingsTree.columns["origCodeCol"]) == mapping) {
-         mChildren.removeChild(mChildren.childNodes[x]);
-         break;
-       }
-    }
-
-    mgCommon.addTreeRow(mChildren, new Array(locCode, locName, mapping));
+    var mapItem = document.getElementById(mapItemID);
+
+    if (mapItem)
+      mapItem.parentNode.removeChild(mapItem);
+
+    mgCommon.addTreeRow(mapItemParent, new Array(mgMappingLocalizer.localize(mapping),
+                                       mgGetString(_mgMS.defaultMappings[wType][mapping].func)), "act" + mapping);
+
 
     // rebuild _mgMS.defTemp
     var temp = _mgMS.defTemp[wType];
@@ -314,7 +348,8 @@
       _mgMS.actTemp[wType][mapping].count = 0;
 
     temp = null;
-    dChildren.removeChild(dChildren.childNodes[row]);
+    defTree.view.selection.clearSelection();
+    defItemParent.removeChild(defItem);
     sortTree(sortBy, sortOrder);
     showMappingsFor(wType);
     exportButton.disabled = true;
@@ -343,16 +378,15 @@
 
 function handleArguments(editMode, eCode) {
   if (editMode == "directEdit") {
-    for (var x = 0; x < mChildren.childNodes.length; x++) {
-      var oCode = mappingsTree.view.getCellText(x, mappingsTree.columns["origCodeCol"]);
-
-      if (oCode == eCode) {
-        mappingsTree.view.selection.select(x);
-        mappingsTree.boxObject.ensureRowIsVisible(x)
-        break;
-      }
-    }
-    mappingsTree.focus();
+    var item = document.getElementById("act" + eCode);
+
+    var cat = _mgMS.actTemp[wType][eCode].cat;
+    document.getElementById("trItemcat" + cat).setAttribute("open", true);
+
+    mapTree.view.selection.select(mapTree.view.getIndexOfItem(item));
+    mapTree.boxObject.ensureRowIsVisible(mapTree.view.getIndexOfItem(item));
+
+    mapTree.focus();
     editMapping("Edit");
   }
   else if (editMode == "Import")
@@ -382,8 +416,9 @@
   var mapping = null;
 
   if (mode == "Edit") {
-    var row = mappingsTree.view.selection.currentIndex;
-    mapping = mappingsTree.view.getCellText(row, mappingsTree.columns["origCodeCol"]);
+    var index = mapTree.view.selection.currentIndex;
+    var tc = mapTree.view.getItemAtIndex(index);
+    mapping = tc.id.substring(3);
   }
   if (mode == "Import") {
     wType =_mgMS.importWinType;
@@ -399,39 +434,68 @@
 }
 
 function publishMapping() {
-  var row = mappingsTree.view.selection.currentIndex;
-  var mapping = mappingsTree.view.getCellText(row, mappingsTree.columns["origCodeCol"]);
+  var index = mapTree.view.selection.currentIndex;
+  var tc = mapTree.view.getItemAtIndex(index);
+  var mapping = tc.id.substring(3);
 
   window.openDialog("chrome://mozgest/content/pref/publishMapping.xul",
                     "mozgest:publishmapping", "chrome,centerscreen,modal",
                     wType, mapping);
 }
 
-
 function updateButtons(tree, buttons) {
-  buttons.setAttribute("disabled", tree.currentIndex != -1 ? false : true);
+  buttons.setAttribute("disabled", true);
+
+  var sel = tree.view.selection;
+
+  if (sel.count == 0)
+    return;
+
+  var index = sel.currentIndex;
+  var tc = tree.view.getItemAtIndex(index)
+
+  if (sel.isSelected(index) && tree.view.isContainer(index))
+    sel.clearRange(index, index);
 
   if (buttons.id == "editButtons") {
-    try {
-      var row = mappingsTree.view.selection.currentIndex;
-      var mapping = mappingsTree.view.getCellText(row, mappingsTree.columns["origCodeCol"]);
-      var isBookMark = false;
-
-      if ((mapping in _mgMS.actTemp[wType] &&
-           _mgMS.actTemp[wType][mapping].type &&
-           _mgMS.actTemp[wType][mapping].type.toString().indexOf("2") == 0) ||
-           mappingsTree.view.selection.count > 1)
-        isBookMark = true;
-
-      document.getElementById("publishButton").disabled = isBookMark ? true : false;
-    }
-    catch (e) {}
-
-    try {
-      document.getElementById("editButton").disabled = (mappingsTree.view.selection.count == 1) ? false : true;
-    }
-    catch (e) {}
+    var pub = document.getElementById("publishButton");
+    var ed = document.getElementById("editButton");
+
+    if (sel.count == 0)
+      buttons.setAttribute("disabled", true);
+    else if (sel.count == 1) {
+      buttons.setAttribute("disabled", false);
+
+      index = sel.currentIndex;
+      tc = tree.view.getItemAtIndex(index);
+
+      if (!sel.isSelected(index)) {
+        for (x = 0; x < tree.view.rowCount; x++) {
+          if (sel.isSelected(x)) {
+            tc = tree.view.getItemAtIndex(x);
+            break;
+          }
+        }
+      }
+
+      var mapping = tc.id.substring(3)
+
+      if (mapping in _mgMS.actTemp[wType]) {
+        if (!_mgMS.actTemp[wType][mapping].type || _mgMS.actTemp[wType][mapping].type != 1)
+          pub.setAttribute("disabled", true);
+      }
+    }
+    else if (sel.count > 1) {
+      buttons.setAttribute("disabled", false);
+      pub.setAttribute("disabled", true);
+      ed.setAttribute("disabled", true);
+    }
+
+    return;
   }
+
+  if (sel.count > 0)
+    buttons.setAttribute("disabled", false);
 }
 
 var mgMappingsObserver = {

=== modified file 'chrome/content/pref/mappings.xul'
--- chrome/content/pref/mappings.xul	2008-02-27 03:41:55 +0000
+++ chrome/content/pref/mappings.xul	2009-07-25 21:50:38 +0000
@@ -38,6 +38,7 @@
 
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://mozgest/skin/mozgest.css" type="text/css"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://mozgest/locale/mozgest.dtd">
 <?xul-overlay href="compassOverlay.xul"?>
@@ -50,11 +51,17 @@
         persist="screenX,screenY,width,height"
         buttons="accept,cancel"
         ondialogaccept="return onAcceptMappings();"
-        ondialogcancel="return onCancel()">
+        ondialogcancel="return onCancel()"
+        cat0="&cat0;"
+        cat1="&cat1;"
+        cat2="&cat2;"
+        cat3="&cat3;"
+        cat4="&cat4;"
+        cat5="&cat5;"
+        cat6="&cat6;">
 
  <script type="application/x-javascript" src="../defaults.js"/>
  <script type="application/x-javascript" src="../mozgestCommon.js"/>
- <script type="application/x-javascript" src="../componentLoader.js"/>
  <script type="application/x-javascript" src="mappings.js"/>
 
  <broadcasterset id="broadcasterset">
@@ -85,33 +92,92 @@
      <rows>
 
       <row>
-       <label value="&mappings.lblActive;" class="header"/>
+       <label id="lblActive" value="&mappings.lblActive;" mgLblValue="&mappings.lblActive;" class="header"/>
        <hbox/>
       </row>
 
-      <row flex="3">
-       <tree id="mappingstree" style="width:30em;" flags="dont-build-content" hidecolumnpicker="true"
+      <row flex="3" id="mapTreeRow" persist="height">
+       <tree id="mapTree" hidecolumnpicker="true" style="width:25em;" flex="1"
              onselect="updateButtons(this, document.getElementById('editButtons'))">
+
         <treecols>
-         <treecol id="codeCol"
+         <treecol id="mEditorColFunc"
                   label="&mappings.colGesture;"
+                  primary="true"
+                  persist="width"
+                  flex="2"
                   onclick="if (event.button == 0)
                              changeSortOrder('byGesture', this, this.nextSibling.nextSibling)"
-                  width="80"
-                  mgOldSortDirection="descending"
-                  persist="width"/>
+                  mgOldSortDirection="descending"/>
          <splitter class="tree-splitter"/>
-         <treecol id="funcCol"
+         <treecol id="mEditorColDesc"
                   label="&colDescription;"
+                  persist="width"
+                  flex="1"
                   sortDirection="ascending"
                   mgOldSortDirection="descending"
                   onclick="if (event.button == 0)
-                             changeSortOrder('byName', this, this.previousSibling.previousSibling)"
-                  flex="1"/>
-         <treecol id="origCodeCol"
-                  hidden="true"/>
+                             changeSortOrder('byName', this, this.previousSibling.previousSibling)"/>
         </treecols>
-        <treechildren id="mappingstreechildren"/>
+
+        <treechildren id="mapTreeChildren">
+         <treeitem container="true" id="trItemcat1" persist="open">
+          <treerow>
+           <treecell label="&cat1;"/>
+           <treecell id="trItemcatLabel1" properties="mozgestCount"/>
+          </treerow>
+          <treechildren id="trcat1"/>
+         </treeitem>
+
+         <treeitem container="true" id="trItemcat2" persist="open">
+          <treerow>
+           <treecell label="&cat2;"/>
+           <treecell id="trItemcatLabel2" properties="mozgestCount"/>
+          </treerow>
+          <treechildren id="trcat2"/>
+         </treeitem>
+
+         <treeitem container="true" id="trItemcat3" persist="open">
+          <treerow>
+           <treecell label="&cat3;"/>
+           <treecell id="trItemcatLabel3" properties="mozgestCount"/>
+          </treerow>
+          <treechildren id="trcat3"/>
+         </treeitem>
+
+         <treeitem container="true" id="trItemcat4" persist="open">
+          <treerow>
+           <treecell label="&cat4;"/>
+           <treecell id="trItemcatLabel4" properties="mozgestCount"/>
+          </treerow>
+          <treechildren id="trcat4"/>
+         </treeitem>
+
+         <treeitem container="true" id="trItemcat5" persist="open">
+          <treerow>
+           <treecell label="&cat5;"/>
+           <treecell id="trItemcatLabel5" properties="mozgestCount"/>
+          </treerow>
+          <treechildren id="trcat5"/>
+         </treeitem>
+
+         <treeitem container="true" id="trItemcat6" persist="open">
+          <treerow>
+           <treecell label="&cat6;"/>
+           <treecell id="trItemcatLabel6" properties="mozgestCount"/>
+          </treerow>
+          <treechildren id="trcat6"/>
+         </treeitem>
+
+         <treeitem container="true" id="trItemcat0" persist="open">
+          <treerow>
+           <treecell label="&cat0;"/>
+           <treecell id="trItemcatLabel0" properties="mozgestCount"/>
+          </treerow>
+          <treechildren id="trcat0"/>
+         </treeitem>
+
+        </treechildren>
        </tree>
 
        <vbox>
@@ -131,25 +197,91 @@
        </vbox>
       </row>
 
-      <row>
-       <separator/>
-      </row>
-
-      <row>
-       <label value="&mappings.lblInactive;" class="header"/>
-      </row>
-
-      <row flex="1">
-       <tree id="defaultmappingstree" hidecolumnpicker="true" seltype="single"
+
+      <splitter resizeafter="farthest" style="margin:5px"/>
+      <row>
+       <label id="lblInactive" value="&mappings.lblInactive;" mgLblValue="&mappings.lblInactive;" class="header"/>
+      </row>
+
+      <row flex="1" id="defTreeRow" persist="height">
+       <tree id="defTree" hidecolumnpicker="true" style="width:25em;" flex="1" seltype="single"
              onselect="updateButtons(this, document.getElementById('addButton'))">
         <treecols>
-         <treecol id="dmCodeCol" hideheader="true">
-          <observes element="codeCol" attribute="width"/>
-         </treecol>
-         <treecol id="dmDescCol" flex="1" hideheader="true"/>
-         <treecol id="dmResCol" hidden="true"/>
+         <treecol id="defCodeCol"
+                  primary="true"
+                  persist="width"
+                  flex="2"
+                  hideheader="true">
+          <observes element="mEditorColFunc" attribute="width"/>
+         </treecol>
+         <treecol id="defDescCol"
+                  persist="width"
+                  flex="1"
+                  sortDirection="ascending"
+                  hideheader="true">
+          <observes element="mEditorColDesc" attribute="width"/>
+         </treecol>
         </treecols>
-        <treechildren id="defaultstreechildren"/>
+
+        <treechildren>
+
+         <treeitem container="true" id="deftrItemcat1" persist="open">
+          <treerow>
+           <treecell label="&cat1;"/>
+           <treecell id="deftrItemcatLabel1" properties="mozgestCount"/>
+          </treerow>
+          <treechildren id="deftrcat1"/>
+         </treeitem>
+
+         <treeitem container="true" id="deftrItemcat2" persist="open">
+          <treerow>
+           <treecell label="&cat2;"/>
+           <treecell id="deftrItemcatLabel2" properties="mozgestCount"/>
+          </treerow>
+          <treechildren id="deftrcat2"/>
+         </treeitem>
+
+         <treeitem container="true" id="deftrItemcat3" persist="open">
+          <treerow>
+           <treecell label="&cat3;"/>
+           <treecell id="deftrItemcatLabel3" properties="mozgestCount"/>
+          </treerow>
+          <treechildren id="deftrcat3"/>
+         </treeitem>
+
+         <treeitem container="true" id="deftrItemcat4" persist="open">
+          <treerow>
+           <treecell label="&cat4;"/>
+           <treecell id="deftrItemcatLabel4" properties="mozgestCount"/>
+          </treerow>
+          <treechildren id="deftrcat4"/>
+         </treeitem>
+
+         <treeitem container="true" id="deftrItemcat5" persist="open">
+          <treerow>
+           <treecell label="&cat5;"/>
+           <treecell id="deftrItemcatLabel5" properties="mozgestCount"/>
+          </treerow>
+          <treechildren id="deftrcat5"/>
+         </treeitem>
+
+         <treeitem container="true" id="deftrItemcat6" persist="open">
+          <treerow>
+           <treecell label="&cat6;"/>
+           <treecell id="deftrItemcatLabel6" properties="mozgestCount"/>
+          </treerow>
+          <treechildren id="deftrcat6"/>
+         </treeitem>
+
+         <treeitem container="true" id="deftrItemcat0" persist="open">
+          <treerow>
+           <treecell label="&cat0;"/>
+           <treecell id="deftrItemcatLabel0" properties="mozgestCount"/>
+          </treerow>
+          <treechildren id="deftrcat0"/>
+         </treeitem>
+
+        </treechildren>
        </tree>
 
        <vbox>

=== modified file 'chrome/content/pref/pref-mozgest.js'
--- chrome/content/pref/pref-mozgest.js	2008-02-27 03:41:55 +0000
+++ chrome/content/pref/pref-mozgest.js	2009-07-25 21:50:38 +0000
@@ -138,7 +138,7 @@
       || document.getElementById("modifier.ctrl").checked
       || document.getElementById("modifier.alt").checked
       || document.getElementById("modifier.shift").checked,
-      new Array("lmbGestureLimit", "dragdropDelay"));
+      new Array("lmbGestureLimit"));
 }
 
 function onMouseButtonChange() {
@@ -173,7 +173,7 @@
 }
 
 function toggleStatusSettingsBox() {
-  toggleElements(!document.getElementById("status.enabled").checked,
+  toggleElements(!document.getElementById("status.isEnabled").checked,
                  new Array("status.timeout"));
 }
 
@@ -214,23 +214,6 @@
   mgCommon.openDialog("chrome://mozgest/content/pref/mappings.xul");
 }
 
-function openPrintWindow() {
-  if (mgCommon.checkWindowOpen('chrome://mozgest/content/sidebar/mozgestSidebar.xul'))
-    return;
-
-  try {
-    var appS = Components.classes["@mozilla.org/appshell/appShellService;1"]
-               .getService().QueryInterface(Components.interfaces.nsIAppShellService);
-
-    var ioService = Components.classes["@mozilla.org/network/io-service;1"]
-                    .getService(Components.interfaces.nsIIOService);
-    var pURI = ioService.newURI('chrome://mozgest/content/sidebar/mozgestSidebar.xul',
-                                null, null);
-    appS.createTopLevelWindow(null, pURI, true, false, 4094, null, null);
-  }
-  catch (e) {}
-}
-
 function mgExitPrefPanel() {
   mgPrefs.prefs.setIntPref("selectedTabIndex", mgTabBox.selectedIndex);
 }
\ No newline at end of file

=== modified file 'chrome/content/pref/pref-mozgest.xul'
--- chrome/content/pref/pref-mozgest.xul	2008-02-27 03:41:55 +0000
+++ chrome/content/pref/pref-mozgest.xul	2009-07-25 21:50:38 +0000
@@ -54,20 +54,19 @@
         onunload="mgExitPrefPanel();"
         ondialogaccept="savePrefs();">
 
- <script type="application/x-javascript" src="../defaults.js"/> 
+ <script type="application/x-javascript" src="../defaults.js"/>
  <script type="application/x-javascript" src="../mozgestCommon.js"/>
- <script type="application/x-javascript" src="../componentLoader.js"/>
  <script type="application/x-javascript" src="pref-mozgest.js"/>
 
  <script type="application/x-javascript">
   <![CDATA[
    var eltIDs = [
     "mousebutton", "modifier.meta", "modifier.ctrl", "modifier.alt",
-    "modifier.shift", "lefthanded", "dragdropDelay", "lmbGestureLimit",
+    "modifier.shift", "lefthanded", "lmbGestureLimit",
     "enableStrokes", "grid", "diagonalTolerance", "delay",
     "enableRockers", "staticRockers", "enableWheelRockers", "staticWheelRockers",
     "trails.enabled", "trails.width", "trails.interval", "trails.color",
-    "status.enabled", "status.timeout"
+    "status.isEnabled", "status.timeout"
     ];
   ]]>
  </script>
@@ -135,14 +134,6 @@
                mgHelpDesc="&lmbGestureLimitDesc;"
                onclick="mgCommon.openHint(this.parentNode.firstChild.value, this);"/>
        </hbox>
-       <hbox align="center">
-        <label value="&lmbDragdropDelay;"/>
-        <textbox id="dragdropDelay" size="3"/>
-        <label value="&units.milliseconds;"/>
-        <image class="mgHelpButton"
-               mgHelpDesc="&lmbDragdropDelayDesc;"
-               onclick="mgCommon.openHint(this.parentNode.firstChild.value, this);"/>
-       </hbox>
       </groupbox>
      </vbox>
 
@@ -166,8 +157,7 @@
     <spacer flex="1"/>
 
     <hbox orient="horizontal">
-     <button label="&btnMappings;" oncommand="openMappingsWindow();" />
-     <button label="&btnPrint;" oncommand="openPrintWindow();" />
+     <button label="&btnMappings;" oncommand="openMappingsWindow();"/>
      <spacer flex="1" minwidth="30"/>
      <button label="&btnReset;" oncommand="resetToDefault();"/>
     </hbox>
@@ -300,7 +290,7 @@
 
     <groupbox>
      <caption>
-      <checkbox id="status.enabled"
+      <checkbox id="status.isEnabled"
                 label="&status.enabled;"
                 oncommand="toggleStatusSettingsBox();"/>
      </caption>
@@ -341,23 +331,23 @@
       <spacer height="30"/>
       <vbox>
        <hbox>
-        <label value="&visit.home;" style="text-decoration:underline;cursor:pointer"
+        <label value="&visit.faq;" class="mgHelpLink"
+               onclick="mgCommon.showWebPage('http://www.mousegestures.org/help/')"/>
+        <spacer flex="1"/>
+       </hbox>
+       <hbox>
+        <label value="&visit.home;" class="mgHelpLink"
                onclick="mgCommon.showWebPage('http://www.mousegestures.org/')"/>
         <spacer flex="1"/>
        </hbox>
        <hbox>
-        <label value="&visit.exchange;" style="text-decoration:underline;cursor:pointer"
+        <label value="&visit.exchange;" class="mgHelpLink"
                onclick="mgCommon.showWebPage('http://www.mousegestures.org/exchange/')"/>
         <spacer flex="1"/>
        </hbox>
-       <hbox>
-        <label value="&visit.faq;" style="text-decoration:underline;cursor:pointer"
-               onclick="mgCommon.showWebPage('http://www.mousegestures.org/help/')"/>
-        <spacer flex="1"/>
-       </hbox>
        <spacer height="25"/>
        <hbox>
-        <label value="Missing your language?" style="text-decoration:underline;cursor:pointer"
+        <label value="Missing your language?" class="mgHelpLink"
                onclick="mgCommon.showWebPage('http://www.mousegestures.org/languages/')"/>
         <spacer flex="1"/>
        </hbox>

=== modified file 'chrome/content/pref/publishMapping.xul'
--- chrome/content/pref/publishMapping.xul	2008-02-27 03:41:55 +0000
+++ chrome/content/pref/publishMapping.xul	2009-07-25 21:50:38 +0000
@@ -48,7 +48,6 @@
 
  <script type="application/x-javascript" src="../defaults.js"/>
  <script type="application/x-javascript" src="../mozgestCommon.js"/>
- <script type="application/x-javascript" src="../componentLoader.js"/>
 
  <script type="application/x-javascript">
  <![CDATA[
@@ -62,6 +61,7 @@
   var custom = false;
   var component;
   var mapping;
+  var cat
 
   function generateLink() {
     type = window.arguments[0];
@@ -85,6 +85,8 @@
     link = link + type + "/" + code;
     link += "/";
     link += !func ? "custom/" + (name + "/" + custom) : func;
+    link += "/cat";
+    link += mapping.cat;
     link += "/";
 
     // put it into textbox

=== modified file 'chrome/content/sidebar/drawgesture.js'
--- chrome/content/sidebar/drawgesture.js	2008-02-27 03:41:55 +0000
+++ chrome/content/sidebar/drawgesture.js	2009-07-25 21:50:38 +0000
@@ -102,6 +102,8 @@
 }
 
 function draw(aCanvas, aGesture) {
+  dummy(aCanvas);
+
   if (aGesture.charAt(0) == ":")
     drawRockerGesture(aCanvas, aGesture);
   else
@@ -180,7 +182,6 @@
                      positions[i + 1].x + xOffset,
                      positions[i + 1].y + yOffset);
   }
-  aCanvas.paint();
 }
 
 function getPos(point, history) {
@@ -245,7 +246,6 @@
   aCanvas.fillRect(x + 8, y + 8 + (6 * f), 1, 1);
   aCanvas.fillRect(x + 7, y + 8 + (5 * f), 3, 1);
   aCanvas.fillRect(x + 6, y + 8 + (4 * f), 5, 1);
-  aCanvas.paint();
 }
 
 function drawMouse(aCanvas, x, y, button) {
@@ -258,9 +258,7 @@
   aCanvas.drawLine(x + 11, y + 14, x + 9, y + 16);
 
   aCanvas.fillRect(x + 3, y + 16, 6, 1);
-
   aCanvas.fillRect(x + 1, y + 5, 10, 1);
-
   aCanvas.fillRect(x + 4, y + 1, 1, 4);
   aCanvas.fillRect(x + 7, y + 1, 1, 4);
 
@@ -276,57 +274,40 @@
     aCanvas.fillRect(x + 8, y + 1, 3, 4);
   else
     aCanvas.fillRect(x + 10, y + 1, 1, 1);
-
-  aCanvas.paint();
-}
-
-var graphics =
-{
-  createCanvasElement: function(id, width, height) {
-    var el = document.createElement("canvas");
-    el.setAttribute("id", id);
-    el.setAttribute("width", width);
-    el.setAttribute("height", height);
-    return el;
-  },
-
-  getContext: function(canvasID) {
-    return new nativeContextWrapper(canvasID);
-  }
-}
-
-function nativeContextWrapper(canvasID) {
-  this.ctx = document.getElementById(canvasID).getContext("2d");
-
-  this.drawLine = function(x1, y1, x2, y2) {
-    this.ctx.moveTo(x1 + 0.5, y1 + 0.5);
-    this.ctx.lineTo(x2 + 0.5, y2 + 0.5);
-    this.ctx.stroke();
-  };
-
-  this.fillCircle = function(x, y, diameter) {
-    this.ctx.arc(x + 0.5, y + 0.5, (diameter / 2), 0.1, 3, false);
-    this.ctx.arc(x + 0.5, y + 0.5, (diameter / 2), 3, 0.1, false);
-    this.ctx.fill();
-  };
-
-  this.fillRect = function(x, y, w, h) {
-    this.ctx.lineJoin = "miter";
-    this.ctx.fillRect(x, y, w, h);
-  };
-
-  this.paint = function() {};
-
-  this.setStroke = function(width) {
-    this.ctx.lineWidth = width;
-  };
-
-  this.setColor = function(color) {
-    this.ctx.strokeStyle = color;
-    this.ctx.fillStyle = color;
-  };
-
-  this.beginPath = function() {
-    this.ctx.beginPath();
-  };
+}
+
+function dummy(aCanvas) {
+  aCanvas.ctx = aCanvas.getContext("2d");
+
+  aCanvas.drawLine = function(x1, y1, x2, y2) {
+    aCanvas.ctx.moveTo(x1 + 0.5, y1 + 0.5);
+    aCanvas.ctx.lineTo(x2 + 0.5, y2 + 0.5);
+    aCanvas.ctx.stroke();
+  };
+
+  aCanvas.fillCircle = function(x, y, diameter) {
+    aCanvas.ctx.arc(x + 0.5, y + 0.5, (diameter / 2), 0.1, 3, false);
+    aCanvas.ctx.arc(x + 0.5, y + 0.5, (diameter / 2), 3, 0.1, false);
+    aCanvas.ctx.fill();
+  };
+
+  aCanvas.fillRect = function(x, y, w, h) {
+    aCanvas.ctx.lineJoin = "miter";
+    aCanvas.ctx.fillRect(x, y, w, h);
+  };
+
+  aCanvas.setStroke = function(width) {
+    aCanvas.ctx.lineWidth = width;
+  };
+
+  aCanvas.setColor = function(color) {
+    aCanvas.ctx.strokeStyle = color;
+    aCanvas.ctx.fillStyle = color;
+  };
+
+  aCanvas.beginPath = function() {
+    aCanvas.ctx.beginPath();
+  };
+
+  return aCanvas.ctx;
 }
\ No newline at end of file

=== modified file 'chrome/content/sidebar/mozgestSidebar.js'
--- chrome/content/sidebar/mozgestSidebar.js	2008-02-27 03:41:55 +0000
+++ chrome/content/sidebar/mozgestSidebar.js	2009-07-25 21:50:38 +0000
@@ -1,29 +1,24 @@
-var sbDoc, sbBody, counts, sortOrder, isSideBar;
+var sbMappings, sortOrder, mapArray;
 var activeElt = null;
-var toolTipEnabled = false;
-var scrollPos = 0;
-
-var sbFrame = document.getElementById("theFrame");
-document.getElementById(mgPrefs.prefs.getCharPref("sideBarSort")).setAttribute('checked', true);
-isSideBar = parent.mgWindowType ? true : false;
-
-if (window.arguments && window.arguments[0] == "standalone") {
-  isSideBar = true;
-}
-
-if (isSideBar) {
+var canvasEnabled = true;
+var tooltipEnabled = true;
+var scrollX = {};
+scrollX.value = 0;
+var scrollY = {};
+scrollY.value = 0;
+
+function initSidebar() {
+  mgComponentLoader.initMouseService(false);
+  sbMappings = document.getElementById("sbMappings");
+  document.getElementById(mgPrefs.prefs.getCharPref("sideBar.sort")).setAttribute("checked", true);
+  tooltipEnabled = mgPrefs.prefs.getBoolPref("sideBar.toolTip");
+
   try {
-    scrollPos = mgPrefs.prefs.getIntPref("sideBarPos");
+    scrollY.value = sbMappings.getAttribute("mgScrollTop");
+    setScrollPos();
   }
   catch (e) {}
   addEventListener("scroll", getScrollPos, true);
-  toolTipEnabled = mgPrefs.prefs.getBoolPref("sideBarToolTip");
-}
-
-if (!isSideBar) {
-  sbFrame.removeAttribute("context");
-  sbFrame.removeAttribute("oncontextmenu");
-  document.getElementById("printToolbox").removeAttribute("hidden");
 }
 
 function addObserver() {
@@ -33,9 +28,6 @@
 
   mgPrefs.prefs.QueryInterface(Components.interfaces.nsIPrefBranchInternal)
          .addObserver("", mgSidebarObserver, false);
-
-  if (!isSideBar)
-    document.title = document.documentElement.getAttribute("mgPrint");
 }
 
 function removeObserver() {
@@ -51,86 +43,61 @@
   observe: function(subject, topic, data) {
     if (topic == "mozgestControl") {
       if (data == "mappingsUpdated")
-        setTimeout("sbFrame.webNavigation.reload(0)", 0);
+        document.location.reload();
     }
 
     if (topic.indexOf("nsPref") == 0) {
       if (data == "enableStrokes" ||
           data == "enableRockers" ||
-          data == "enableWheelRockers")
-        setTimeout("sbFrame.webNavigation.reload(0)", 0);
+          data == "enableWheelRockers" ||
+          data == "sideBar.canvas")
+        setTimeout("document.location.reload()", 0);
 
-      if (data == "sideBarToolTip") {
-        if (isSidebar)
-          toolTipEnabled = mgPrefs.prefs.getBoolPref("sideBarToolTip");
-      }
+      if (data == "sideBar.toolTip")
+        tooltipEnabled = mgPrefs.prefs.getBoolPref("sideBar.toolTip");
     }
   }
 }
 
-function reloadFrame(aID) {
-  mgPrefs.prefs.setCharPref("sideBarSort", aID)
-  sbFrame.webNavigation.reload(0)
-}
-
-function updateGestureHistory(target) {
-  while (target.childNodes.length > 1)
-    target.removeChild(target.firstChild);
-
-  var h = parent.mgState.history;
-
-  for (var x = 0; x < h.length; x++) {
-    var item = document.createElement("menuitem");
-    item.setAttribute("label", h[x][0] + "  ");
-    item.setAttribute("acceltext", h[x][1]);
-    item.setAttribute("disabled", true);
-    item.setAttribute("mgMenuItem", true);
-    target.insertBefore(item, target.lastChild);
-  }
+function reloadDoc(aID) {
+  mgPrefs.prefs.setCharPref("sideBar.sort", aID)
+  document.location.reload(0)
 }
 
 function fillIn() {
-  sbDoc = sbFrame.contentDocument;
-  sbBody = sbDoc.body;
-  sbBody.setAttribute("isSideBar", isSideBar);
-
-  // Allow localizers to define font size
-  var fontSize;
+  var canvas = document.createElementNS("http://www.w3.org/1999/xhtml", "canvas");
   try {
-    fontSize = mgGetString("fontSize." + (isSideBar ? "sidebar" : "print"));
+    canvas.getContext("2d");
+    canvasEnabled = mgPrefs.prefs.getBoolPref("sideBar.canvas");
   }
   catch (e) {
-    fontSize = null;
+    canvasEnabled = false;
   }
-  if (fontSize)
-    sbBody.setAttribute("style", "font-size: " + fontSize);
-
-  prepareInject("window", false);
+
+  prepareInject("window");
+
   for (component in _mgMS.supportedWindows)
-    prepareInject(component, false);
+    prepareInject(component);
 
-  //print default mappings
-  if (!isSideBar) {
-    sbBody.appendChild(sbDoc.createElement("hr"));
-    prepareInject("window", true);
-    for (component in _mgMS.supportedWindows)
-      prepareInject(component, true);
-  }
+  setTimeout("initSidebar()", 0);
 }
 
-function prepareInject(component, readDef) {
-  var mappingsSet;
-
-  if (!readDef)
-    mappingsSet = _mgMS.activeMappings[component];
-  else
-    mappingsSet = _mgMS.defaultMappings[component];
-
-  counts = new Array();
+function prepareInject(component) {
+  var  mappingsSet = _mgMS.activeMappings[component];
+  mapArray = new Array();
+
+  for (var x = 1; x < 7; x++)
+    mapArray[x] = new Array();
+
+  mapArray[99] = new Array();
+
+  var mapCount = 0;
 
   for (mapping in mappingsSet) {
-    var mName       = null;
-    var mCount      = null;
+    mapCount += 1;
+    var mName = null;
+    var mCount = null;
+    var mCat = 0;
 
     if (mappingsSet[mapping].name)
       mName = decodeURIComponent(mappingsSet[mapping].name);
@@ -139,147 +106,216 @@
 
     if (mappingsSet[mapping].count)
       mCount = mappingsSet[mapping].count;
-
-    counts[counts.length] = { component : component,
-                              code : mapping,
-                              name : mName,
-                              count : mCount };
+    else
+      mCount = 0;
+
+    mCat = mappingsSet[mapping].cat;
+
+    if (mCat == 0)
+      mCat = 99;
+
+    mapArray[mCat][mapArray[mCat].length] = { component : component,
+                                              code : mapping,
+                                              name : mName,
+                                              count : mCount,
+                                              cat : ((mCat == 99) ? 0 : mCat) };
   }
 
-  if (counts.length == 0)
+  if (mapCount < 1)
     return;
 
-  if (mgPrefs.prefs.getCharPref("sideBarSort") == "sortByName") {
-    counts.sort(function(a, b) {return ((a.name.toLowerCase())>(b.name.toLowerCase()) ? 1 : -1)} );
-    sortOrder = "sortByName";
-  }
-  else {
-    counts.sort(function(a, b) {return ((a.count)>(b.count) ? 1 : -1)} );
-    sortOrder = "sortByUsage";
+  for (cat in mapArray) {
+    if (mgPrefs.prefs.getCharPref("sideBar.sort") == "sortByName") {
+      mapArray[cat].sort(function(a, b) {return ((a.name.toLowerCase())>(b.name.toLowerCase()) ? 1 : -1)});
+      sortOrder = "sortByName";
+    }
+    else {
+      mapArray[cat].sort(function(a, b) {return ((a.count)>(b.count) ? 1 : -1)});
+      sortOrder = "sortByUsage";
+    }
   }
 
-  inject(document.documentElement.getAttribute(component), readDef);
+  inject(document.documentElement.getAttribute(component), component);
 }
 
-function inject(wType, readDef) {
-  // calculate length
-  if (!readDef) {
-    var gLength = 0;
-    for (var xx=0; xx < counts.length; xx++) {
-      if (counts[xx].code.indexOf(":") == 0) {
-        var isWheel = isNaN(counts[xx].code.substring(1));
+function inject(wType, component) {
+  var counts = new Array();
+  var gLength = 0;
+
+  for (cat in mapArray) {
+    counts = mapArray[cat];
+
+    if (counts.length > 0) {
+      for (var n = 0; n < counts.length; n++) {
+        if (counts[n].code.indexOf(":") == 0) {
+          var isWheel = isNaN(counts[n].code.substring(1));
+
+          if ((isWheel && !mgPrefs.prefs.getBoolPref("enableWheelRockers")) ||
+              (!isWheel && !mgPrefs.prefs.getBoolPref("enableRockers")))
+            continue;
+        }
+        else if (!mgPrefs.prefs.getBoolPref("enableStrokes"))
+          continue;
+
+        gLength++;
+      }
+    }
+  }
+
+  if (gLength == 0)
+    return;
+
+  var rowEven = false;
+  var mC = document.getElementById("sbMappings")
+
+  //the header and container of the window type
+  var cBox = document.createElement("vbox");
+  cBox.style.paddingBottom = "15px";
+  cBox.mgWindowType = component;
+  var tb = document.createElement("tabbox");
+  var tabs = document.createElement("tabs");
+  var tab = document.createElement("tab");
+  tab.setAttribute("label", wType);
+  tab.setAttribute("flex", "1");
+  tab.setAttribute("crop", "end");
+  tabs.appendChild(tab);
+  tb.appendChild(tabs);
+  var tps = document.createElement("tabpanels");
+  var tp = document.createElement("tabpanel");
+  tp.setAttribute("orient", "vertical");
+  tps.appendChild(tp);
+  tb.appendChild(tps);
+  cBox.appendChild(tb)
+  mC.appendChild(cBox);
+
+  //rL is the window box
+  var rL = document.createElement("richlistbox");
+  rL.mgWindowType = component;
+  tp.appendChild(rL);
+
+  for (cat in mapArray) {
+    counts = mapArray[cat];
+
+    for (var x=0; x < counts.length; x++) {
+      if (counts[x].code.indexOf(":") == 0) {
+        var isWheel = isNaN(counts[x].code.substring(1));
 
         if ((isWheel && !mgPrefs.prefs.getBoolPref("enableWheelRockers")) ||
             (!isWheel && !mgPrefs.prefs.getBoolPref("enableRockers")))
           continue;
       }
-
       else if (!mgPrefs.prefs.getBoolPref("enableStrokes"))
-        continue
-
-      gLength++;
-    }
-
-    if (gLength < 1)
-      return;
-  }
-
-  var head = sbDoc.createElement("span");
-  head.className = "component";
-
-  if (!isSideBar) {
-    if (!readDef)
-      head.appendChild(sbDoc.createTextNode(document
-                       .documentElement.getAttribute("mgActive") + wType));
-    else
-      head.appendChild(sbDoc.createTextNode(document
-                       .documentElement.getAttribute("mgDefault") + wType));
-  }
-  else
-    head.appendChild(sbDoc.createTextNode(wType));
-
-  sbBody.appendChild(head);
-
-  var rowEven = false;
-  var table = sbDoc.createElement("table");
-  table.className = "mTable";
-  table.setAttribute("width", "100%");
-  table.setAttribute("cellspacing", 0);
-  sbBody.appendChild(table);
-
-  for (var x=0; x < counts.length; x++) {
-    if (counts[x].code.indexOf(":") == 0 && !readDef) {
-      var isWheel = isNaN(counts[x].code.substring(1));
-
-      if ((isWheel && !mgPrefs.prefs.getBoolPref("enableWheelRockers")) ||
-          (!isWheel && !mgPrefs.prefs.getBoolPref("enableRockers")))
-        continue;
-    }
-
-    if (counts[x].code.indexOf(":") != 0 && !readDef) {
-      if (!mgPrefs.prefs.getBoolPref("enableStrokes"))
-        continue;
-    }
-
-    rowEven = !rowEven;
-    var tRow = sbDoc.createElement("tr");
-    tRow.setAttribute("class", (rowEven ? 'even' : 'odd'));
-    tRow.mgWindowType = counts[x].component;
-    tRow.mgCode = counts[x].code;
-
-    var left = sbDoc.createElement("td");
-    left.appendChild(sbDoc.createTextNode(counts[x].name));
-    var right = sbDoc.createElement("td");
-    right.setAttribute("align", "right");
-    right.className = "gesture";
-    right.mgTooltip = true;
-    right.mgTCode = counts[x].code;
-    right.mgTWindowType = counts[x].component;
-    tRow.appendChild(left);
-    tRow.appendChild(right);
-    table.appendChild(tRow);
-
-    var aGest = counts[x].code;
-
-    if (!isSideBar && parseInt(mgAppInfo.version) < 3)
-      right.appendChild(sbDoc.createTextNode(mgMappingLocalizer.localize(aGest)));
-    else
-      sbDoc.defaultView.createGestureBox(aGest, right);
+        continue;
+
+      rowEven = !rowEven;
+
+      //rI is the row within rL
+      var rI = document.createElement("richlistitem");
+
+      rI.mgWindowType = counts[x].component;
+      rI.mgCode = counts[x].code;
+      rI.mgTooltip = true;
+      rI.mgCat = counts[x].cat;
+
+      var catID = "mgCat_" + counts[x].component + "_" + counts[x].cat;
+
+      if (!document.getElementById(catID)) {
+        var newCat = document.createElement("checkbox");
+        newCat.mgWindowType = counts[x].component;
+        newCat.mgCat = rI.mgCat;
+        newCat.id = catID;