changeset 5:3d8022e9dba7

Remove the last edit position functionality. It was incompatible with dark color schemes and I never used it anyway.
author Peter Geer <pageer@skepticats.com>
date Fri, 17 Jan 2014 23:31:14 -0500
parents ae5c778da391
children a72e80ed6414
files .komodotools/Build.komodotool .komodotools/Build_and_Install.komodotool .komodotools/Docs_-_Extensions.komodotool .komodotools/Reconfigure.komodotool TabSwitcher.komodoproject content/editPosition/editPosition.js content/pref/pref-editposition.js content/pref/pref-editposition.xul content/pref/prefOverlay.xul content/tabswitchOverlay.xul install.rdf skin/goto-last-edit.png skin/goto-next-edit.png tabswitcher-1.1.0-ko.xpi
diffstat 14 files changed, 20 insertions(+), 895 deletions(-) [+]
line wrap: on
line diff
--- a/.komodotools/Build.komodotool	Wed Feb 27 14:31:09 2013 -0500
+++ b/.komodotools/Build.komodotool	Fri Jan 17 23:31:14 2014 -0500
@@ -29,7 +29,7 @@
   ], 
   "trigger": "", 
   "rank": 100, 
-  "version": "1.0.7", 
+  "version": "1.0.12", 
   "async": 1, 
   "type": "macro", 
   "icon": "chrome://fugue/skin/icons/building--plus.png"
--- a/.komodotools/Build_and_Install.komodotool	Wed Feb 27 14:31:09 2013 -0500
+++ b/.komodotools/Build_and_Install.komodotool	Fri Jan 17 23:31:14 2014 -0500
@@ -47,7 +47,7 @@
   ], 
   "trigger": "", 
   "rank": 100, 
-  "version": "1.0.7", 
+  "version": "1.0.12", 
   "async": 1, 
   "type": "macro", 
   "icon": "chrome://fugue/skin/icons/building--arrow.png"
--- a/.komodotools/Docs_-_Extensions.komodotool	Wed Feb 27 14:31:09 2013 -0500
+++ b/.komodotools/Docs_-_Extensions.komodotool	Fri Jan 17 23:31:14 2014 -0500
@@ -8,7 +8,7 @@
   ], 
   "trigger": "", 
   "rank": 100, 
-  "version": "1.0.7", 
+  "version": "1.0.12", 
   "async": 1, 
   "type": "macro", 
   "icon": "chrome://fugue/skin/icons/information-white.png"
--- a/.komodotools/Reconfigure.komodotool	Wed Feb 27 14:31:09 2013 -0500
+++ b/.komodotools/Reconfigure.komodotool	Fri Jan 17 23:31:14 2014 -0500
@@ -57,7 +57,7 @@
   ], 
   "trigger": "", 
   "rank": 100, 
-  "version": "1.0.7", 
+  "version": "1.0.12", 
   "async": 1, 
   "type": "macro", 
   "icon": "chrome://fugue/skin/icons/wrench.png"
--- a/TabSwitcher.komodoproject	Wed Feb 27 14:31:09 2013 -0500
+++ b/TabSwitcher.komodoproject	Fri Jan 17 23:31:14 2014 -0500
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Komodo Project File - DO NOT EDIT -->
 <project id="de77f5bf-9ca6-4def-963f-db52b88af8b3" kpf_version="5" name="TabSwitcher.komodoproject">
-<preference-set idref="de77f5bf-9ca6-4def-963f-db52b88af8b3">
+<preference-set idref="de77f5bf-9ca6-4def-963f-db52b88af8b3" id="project" preftype="project">
   <boolean id="configured">1</boolean>
   <string id="koextgen.target">komodo</string>
 </preference-set>
--- a/content/editPosition/editPosition.js	Wed Feb 27 14:31:09 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,629 +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 Initial Developer of the Original Code is
-# Davide Ficano.
-# Portions created by the Initial Developer are Copyright (C) 2007
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Davide Ficano <davide.ficano@gmail.com>
-#
-# 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 *****
-*/
-
-function EditPosFixedSizeStack(maxItems) {
-    this.items = new Array();
-    this.maxItems = maxItems ? maxItems : 100;
-}
-
-//special stack, clearing markers on item deletion
-EditPosFixedSizeStack.prototype = {
-    push : function(item) {
-        if (this.items.length >= this.maxItems) {
-            scimoz = this.items[0].view.scimoz;
-            scimoz.markerDeleteHandle(this.items[0].marker);
-            this.items.splice(0, 1);
-        }
-        this.items.push(item);
-    },
-
-    pop : function() {
-        return this.items.pop();
-    },
-
-    peek : function() {
-        return this.items[this.items.length - 1];
-    },
-
-    get length() {
-        return this.items.length;
-    },
-
-    clear : function() {
-        for (var i = 0; i < this.items.length; i++) {
-            //remove markers first
-            scimoz = this.items[i].view.scimoz;
-            scimoz.markerDeleteHandle(this.items[i].marker);
-        }
-        this.items.splice(0, this.items.length);
-    },
-
-    resize : function(newSize) {
-        this.maxItems = newSize;
-        //TODO: discard items when newSize < maxItems
-    },
-
-    toString : function() {
-        var arr = new Array();
-        for (var i = 0; i < this.items.length; i++) {
-            arr.push(i + ":"
-                     + this.items[i].view.title
-                     +" l:"+(this.items[i].line+1)
-                     +" c:"+(this.items[i].col+1)+"\n");
-        }
-        return arr.join("\n");
-    }
-}
-
-const MARKNUM_EDITPOSLOC = 14;
-
-var gEditPosition = {
-    lastEditStack : new EditPosFixedSizeStack(10),
-    nextEditStack : new EditPosFixedSizeStack(10),
-    mode : null,
-    editClearNextStack: null,
-    fgColor : null,
-    bgColor : null,
-
-    onLoad : function() {
-        try {
-            var obs = DafizillaCommon.getObserverService();
-            obs.addObserver(this, "view_opened", false);
-            obs.addObserver(this, "view_closed", false);
-            obs.addObserver(this, "tabswitcher_pref_changed", false);
-
-            this.prefs = new TabSwitcherPrefs();
-            this.init();
-
-            if (this.prefs.editCompatibility) {
-                obs.addObserver(this, "current_view_check_status", false);
-            };
-
-            this.addListeners();
-
-            xtk.include("color");
-
-            this.fgColor = xtk.color.RGB(0x00, 0x00, 0x00); // black
-            this.bgColor = xtk.color.RGB(0x00, 0xFF, 0xFF); // cyan
-
-            //DafizillaCommon.log("onLoad done");
-        } catch (err) {
-            DafizillaCommon.exception(err);
-        }
-    },
-
-    init : function() {
-        try {
-            this.prefs.load();
-
-            //cache some prefs
-            var mode = this.prefs.editGranularity;
-
-            if (mode == "s") {
-                this.mode = mode;
-            } else {
-                this.mode = parseInt(mode) - 1;
-            }
-
-            this.editClearNextStack = this.prefs.editClearNextStack;
-
-            this.lastEditStack.resize(this.prefs.maxSizeEditPositionStack);
-            this.nextEditStack.resize(this.prefs.maxSizeEditPositionStack);
-        } catch (err) {
-            DafizillaCommon.exception(err);
-        }
-    },
-
-    onUnLoad : function() {
-        try {
-            var obs = DafizillaCommon.getObserverService();
-            if (this.prefs.editCompatibility) {
-                obs.removeObserver(this, "current_view_check_status");
-            };
-            obs.removeObserver(this, "view_opened");
-            obs.removeObserver(this, "view_closed");
-            obs.removeObserver(this, "tabswitcher_pref_changed");
-            this.removeListeners();
-        } catch (err) {
-            DafizillaCommon.exception(err);
-        }
-    },
-
-    observe : function(subject, topic, data) {
-        try {
-            switch (topic) {
-                case "current_view_check_status":
-                    //StatusBar_AddMessage("current_view_check_status", "debugger",5000,true);
-                    this.pushEdit();
-                    break;
-                case "view_closed":
-                    this.viewClosed(subject);
-                    break;
-                case "view_opened":
-                    this.viewOpened(subject);
-                    break;
-                case "tabswitcher_pref_changed":
-                    this.init();
-            }
-        } catch (err) {
-            DafizillaCommon.exception(err);
-        }
-    },
-
-    removeView : function(view, arr) {
-        try {
-            for (var i = arr.length - 1; i >= 0; i--) {
-                if (arr[i].view == view) {
-                    try {
-                        //remove markers first
-                        scimoz = arr[i].view.scimoz;
-                        scimoz.markerDeleteHandle(arr[i].marker);
-                    } catch (e) {}
-
-                    arr.splice(i, 1);
-                }
-            }
-        } catch (err) {
-            DafizillaCommon.exception(err);
-        }
-    },
-
-    pushEdit : function(view, position) {
-        //keep this function bloody FAST
-        try {
-            if (view) {
-                var currentView = view;
-            } else {
-                var currentView = ko.views.manager.currentView;
-            };
-            //DafizillaCommon.log("pushEdit");
-
-            if (!currentView.koDoc) {
-                return;
-            }
-
-            if (!currentView.koDoc.isDirty) {
-                return;
-            }
-
-            if (this.lastEditStack.length) {
-                var last = this.lastEditStack.peek();
-            } else {
-                var last = null;
-            }
-
-            var scimoz = currentView.scimoz;
-            if (position) {
-                var currentPos = position;
-            } else {
-                var currentPos = scimoz.currentPos;
-            }
-
-            if (last && last.view == currentView) {
-                // seems to happen that pushEdit is called multiple times
-                // with the same position
-                if (last.position != currentPos) {
-                    var currentLine = scimoz.lineFromPosition(currentPos);
-                    if (this.mode == "s") {
-                        //track ONLY the last line in a file
-                        this.movePosition(last, scimoz, currentPos, currentLine);
-                    } else {
-                        var cnt = this.mode;
-                        var diff = last.line - currentLine;
-                        var absdiff = diff < 0 ? -diff : diff;
-                        if (absdiff <= cnt) {
-                            //var msg = "modifypos: "+cnt+" "+absdiff+" "+last.position+" "+currentPos;
-                            //StatusBar_AddMessage(msg, "debugger",5000,true);
-
-                            this.movePosition(last, scimoz, currentPos, currentLine);
-                        } else {
-                            //var msg = "addpos: "+cnt+" "+absdiff+" "+currentPos;
-                            //StatusBar_AddMessage(msg, "debugger",5000,true);
-
-                            this.addPositionToStack(this.lastEditStack,
-                                                    currentView, currentPos);
-                        }
-                    }
-                }
-            } else {
-                this.addPositionToStack(this.lastEditStack,
-                                        currentView, currentPos);
-            }
-        } catch (err) {
-            DafizillaCommon.exception(err);
-        }
-    },
-
-    movePosition : function(item, scimoz, position, currentLine) {
-        //keep this function bloody FAST
-        try {
-            item.position = position;
-            item.col = scimoz.getColumn(position);
-
-            if (item.line != currentLine) {
-                item.line = currentLine;
-
-                //move marker too
-                scimoz.markerDeleteHandle(item.marker);
-                item.marker = scimoz.markerAdd(currentLine,
-                                              MARKNUM_EDITPOSLOC);
-            }
-
-            if (this.editClearNextStack) {
-                if (this.nextEditStack.length > 0) {
-                    this.nextEditStack.clear();
-                    this.updateCommands();
-                }
-            }
-        } catch (err) {
-            DafizillaCommon.exception(err);
-        }
-    },
-
-    addPositionToStack : function(toStack, view, position) {
-        //keep this function bloody FAST
-        try {
-            var cleared = false;
-            if (this.editClearNextStack) {
-                if (this.nextEditStack.length > 0) {
-                    this.nextEditStack.clear();
-                    cleared = true;
-                }
-            }
-
-            var scimoz = view.scimoz;
-            var line = scimoz.lineFromPosition(position);
-            var marker = scimoz.markerAdd(line, MARKNUM_EDITPOSLOC);
-
-            //var msg = "new marker: "+line;
-            //StatusBar_AddMessage(msg, "debugger",5000,true);
-
-            toStack.push({
-                view : view,
-                position : position,
-                line: line,
-                col: scimoz.getColumn(position),
-                marker: marker});
-
-            if (toStack.length == 1 || cleared) {
-                // status will change only when the length was 0 and got 1
-                this.updateCommands();
-            }
-        } catch (err) {
-            DafizillaCommon.exception(err);
-        }
-    },
-
-    updateCommands : function() {
-        this.enable("cmd_tabswitcher_goto_last_edit_position",
-                    this.lastEditStack.length > 0);
-        this.enable("cmd_tabswitcher_goto_next_edit_position",
-                    this.nextEditStack.length > 0);
-    },
-
-    enable : function(elementId, isEnabled) {
-        try {
-            var el = document.getElementById(elementId);
-
-            if (el) {
-                if (isEnabled) {
-                    el.removeAttribute("disabled");
-                } else {
-                    el.setAttribute("disabled", true);
-                }
-            }
-        } catch (err) {
-            DafizillaCommon.exception(err);
-        }
-    },
-
-    goToLastEdit : function(index) {
-        this._popEditPosition(this.lastEditStack, index, this.nextEditStack,
-                              this.prefs.editRememberCurrentPos);
-    },
-
-    goToNextEdit : function(index) {
-        this._popEditPosition(this.nextEditStack, index, this.lastEditStack,
-                              false);
-    },
-
-    _showStacks : function(msg) {
-        try {
-            var last = this.lastEditStack.toString();
-            var next = this.nextEditStack.toString();
-
-            alert(msg+'\nlast:'+last+'\nnext:'+next);
-        } catch (err) {
-            DafizillaCommon.exception(err);
-        }
-    },
-
-    _popEditPosition : function(fromStack, fromIndex, toStack, saveCurrent) {
-        try {
-
-            if (fromStack.length == 0) {
-                return false;
-            }
-
-            if (fromIndex == 0 && this.isEditOnCurrentView(fromStack.peek())) {
-                fromIndex = 1;
-            }
-
-            // elements are retrieved starting from end of array
-            // if fromIndex < 0 editPos is undefined
-            fromIndex = fromStack.items.length - 1 - fromIndex;
-
-            var editPos = fromStack.items[fromIndex];
-
-            if (!editPos) {
-                return false;
-            }
-
-            if (saveCurrent && toStack.length == 0){
-                //this._showStacks('before');
-                if (!this.isEditOnCurrentView(fromStack.peek())) {
-                    var currentView = ko.views.manager.currentView;
-                    this.addPositionToStack(toStack,
-                                            currentView, currentView.scimoz.currentPos);
-                    //this._showStacks('after');
-                }
-            }
-
-            var elementToMoveCount = fromStack.items.length;
-            for (var i = elementToMoveCount - 1; i >= fromIndex ; i--) {
-                toStack.push(fromStack.items[i]);
-            }
-
-            //no need to delete the marker here, because the whole
-            //item moves to the other stack
-            fromStack.items.splice(fromIndex, elementToMoveCount - fromIndex);
-            editPos.view.makeCurrent();
-            var scimoz = editPos.view.scimoz;
-
-            var line = scimoz.markerLineFromHandle(editPos.marker);
-            if (line == -1) {
-                //marker gone or whatever
-                scimoz.setSel(-1, editPos.position);
-            } else {
-                scimoz.gotoPos(scimoz.positionAtColumn(line, editPos.col));
-            }
-
-            this.updateCommands();
-
-        } catch (err) {
-            DafizillaCommon.exception(err);
-        }
-
-        return true;
-    },
-
-    removeAll : function() {
-        this.lastEditStack.clear();
-        this.nextEditStack.clear();
-        this.updateCommands();
-    },
-
-    initLastEditPopupMenu : function(menu) {
-        this.initPopupMenu(menu,
-                           this.lastEditStack,
-                           "gEditPosition.goToLastEdit(%1)");
-    },
-
-    initNextEditPopupMenu : function(menu) {
-        this.initPopupMenu(menu,
-                           this.nextEditStack,
-                           "gEditPosition.goToNextEdit(%1)");
-    },
-
-    initPopupMenu : function(menuPrefix, stack, command) {
-        try {
-            var menu = document.getElementById(menuPrefix + "-menubox");
-            DafizillaCommon.removeMenuItems(menu);
-
-            var items = stack.items;
-            var count = items.length - 1;
-            var index = 0;
-
-            // don't show current view
-            if (this.isEditOnCurrentView(items[count])) {
-                index = 1;
-            }
-            var itemsToAdd = this.prefs.maxVisibleMenuItems;
-            for (; index <= count && itemsToAdd > 0; index++, --itemsToAdd) {
-                var item = items[count - index];
-                var view = item.view;
-                var mi = document.createElement("menuitem");
-                // show line and column, but scimoz is 0 based
-                var text = view.title+" l:"+(item.line+1)+" c:"+(item.col+1);
-                mi.setAttribute("label", text);
-                mi.setAttribute("crop", "center");
-                mi.setAttribute("tooltiptext", view.koDoc.displayPath);
-                mi.setAttribute("oncommand", command.replace("%1", index));
-                menu.appendChild(mi);
-            }
-
-            if (menu.hasChildNodes()) {
-                document.getElementById(menuPrefix + "-menuseparator")
-                    .removeAttribute("collapsed");
-            } else {
-                document.getElementById(menuPrefix + "-menuseparator")
-                    .setAttribute("collapsed", "true");
-            }
-        } catch (err) {
-            DafizillaCommon.exception(err);
-        }
-    },
-
-    isEditOnCurrentView : function(editPos) {
-        //check if the passed position IS the current
-        try {
-            if (editPos) {
-                var currentView = ko.views.manager.currentView;
-
-                if (currentView.koDoc) {
-                    var currPos = currentView.scimoz.currentPos;
-                    var currLine = currentView.scimoz.lineFromPosition(currPos);
-
-                    //if (currentView == editPos.view && currPos == editPos.position) {
-                    if (currentView == editPos.view && currLine == editPos.line) {
-                        return true;
-                    }
-                }
-            }
-        } catch (err) {
-            DafizillaCommon.exception(err);
-        }
-        return false;
-    },
-
-    addListeners : function() {
-        try {
-            var self = this;
-
-            this.handle_current_view_check_status_setup = function(event) {
-                //StatusBar_AddMessage("handle_current_view_check_status_setup", "debugger",5000,true);
-
-                self.pushEdit();
-            };
-
-            this.handle_view_opened_setup = function(event) {
-                self.viewOpened(event.originalTarget);
-            };
-
-            this.handle_view_closed_setup = function(event) {
-                self.viewClosed(event.originalTarget);
-            };
-
-            if (this.prefs.editCompatibility) {
-                window.addEventListener('current_view_check_status',
-                                        this.handle_current_view_check_status_setup, false);
-            };
-
-            window.addEventListener('view_opened',
-                                    this.handle_view_opened_setup, false);
-            window.addEventListener('view_closed',
-                                    this.handle_view_closed_setup, false);
-
-            //DafizillaCommon.log("addEventListener done");
-        } catch (err) {
-            DafizillaCommon.exception(err);
-        }
-    },
-
-    removeListeners : function() {
-        try {
-            if (this.prefs.editCompatibility) {
-                window.removeEventListener('current_view_check_status',
-                                        this.handle_current_view_check_status_setup, false);
-            };
-            window.removeEventListener('view_opened',
-                                    this.handle_view_opened_setup, false);
-            window.removeEventListener('view_closed',
-                                    this.handle_view_closed_setup, false);
-        } catch (err) {
-            DafizillaCommon.exception(err);
-        }
-    },
-
-    viewClosed : function(view) {
-        try {
-            try {
-                view.removeModifiedHandler(this.viewModifiedHandler);
-            } catch (e) {
-                };
-            this.removeView(view, this.lastEditStack.items);
-            this.removeView(view, this.nextEditStack.items);
-            this.updateCommands();
-        } catch (err) {
-            DafizillaCommon.exception(err);
-        }
-    },
-
-    viewModifiedHandler : function(position, modificationType,
-                                   text, length, linesAdded, line,
-                                   foldLevelNow, foldLevelPrev) {
-        try {
-            try {
-                gEditPosition.pushEdit(this, position);
-            } catch (err) {
-                DafizillaCommon.exception(err);
-            };
-        } catch (err) {
-            DafizillaCommon.exception(err);
-        }
-    },
-
-    viewOpened : function(view) {
-        try {
-            if (view.koDoc) {
-                if (this.prefs.editShowMarkers) {
-                    var scimoz = view.scimoz;
-
-                    scimoz.markerDefine(MARKNUM_EDITPOSLOC, scimoz.SC_MARK_CIRCLEPLUS);
-                    scimoz.markerSetFore(MARKNUM_EDITPOSLOC, this.fgColor); // black
-                    scimoz.markerSetBack(MARKNUM_EDITPOSLOC, this.bgColor); // cyan
-
-                    //scimoz.setMarginMaskN(2, 0x0FFFF);
-                    scimoz.setMarginMaskN(2,
-                                          ko.markers.MARKERS_MASK_SYMBOLS |
-                                          (1 << MARKNUM_EDITPOSLOC));
-
-                    //ko.statusBar.AddMessage(
-                    //    "history marker patch done",
-                    //    "open_errs", 3000, true);
-                }
-
-                if (!this.prefs.editCompatibility) {
-                    var wantedflags = (
-                           Components.interfaces.ISciMoz.SC_MOD_INSERTTEXT |
-                           Components.interfaces.ISciMoz.SC_MOD_DELETETEXT);
-
-                    view.addModifiedHandler(this.viewModifiedHandler, view,
-                                            100, wantedflags);
-
-                    //DafizillaCommon.log("patch done");
-                };
-                //DafizillaCommon.log("viewOpened");
-            };
-        } catch (err) {
-            DafizillaCommon.exception(err);
-        }
-    }
-}
-
-window.addEventListener("load", function(event) {gEditPosition.onLoad(event)}, false);
-window.addEventListener("unload", function(event) {gEditPosition.onUnLoad(event)}, false);
\ No newline at end of file
--- a/content/pref/pref-editposition.js	Wed Feb 27 14:31:09 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +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 Initial Developer of the Original Code is
-# Davide Ficano.
-# Portions created by the Initial Developer are Copyright (C) 2007
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Davide Ficano <davide.ficano@gmail.com>
-#
-# 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 prefs = new TabSwitcherPrefs();
-var maxSizeEditPositionStackWidget;
-var maxVisibleMenuItemsWidget;
-var editGranularityWidget;
-var editClearNextStackWidget;
-var editRememberCurrentPosWidget;
-var editShowMarkersWidget;
-var editCompatibilityWidget;
- 
-function OnPreferencePageOK(prefset) {
-    prefs.maxSizeEditPositionStack = maxSizeEditPositionStackWidget.value;
-    prefs.maxVisibleMenuItems = maxVisibleMenuItemsWidget.value;
-    prefs.editGranularity = editGranularityWidget.value;
-    prefs.editClearNextStack = editClearNextStackWidget.checked;
-    prefs.editRememberCurrentPos = editRememberCurrentPosWidget.checked;
-    prefs.editShowMarkers = editShowMarkersWidget.checked;
-    prefs.editCompatibility = editCompatibilityWidget.checked;
-
-    prefs.save();
-    var obs = DafizillaCommon.getObserverService();
-    obs.notifyObservers(null, "tabswitcher_pref_changed", null);
-    return true;
-}
-
-function OnPreferencePageInitalize(prefset) {
-    maxSizeEditPositionStackWidget = document.getElementById("maxSizeEditPositionStack");
-    maxVisibleMenuItemsWidget = document.getElementById("maxVisibleMenuItems");
-    editGranularityWidget = document.getElementById("editGranularity");
-    editClearNextStackWidget = document.getElementById("editClearNextStack");
-    editRememberCurrentPosWidget = document.getElementById("editRememberCurrentPos");
-    editShowMarkersWidget = document.getElementById("editShowMarkers");
-    editCompatibilityWidget = document.getElementById("editCompatibility");
-}
-
-function OnPreferencePageLoading(prefset) {
-    prefs.load();
-    maxSizeEditPositionStackWidget.value = prefs.maxSizeEditPositionStack;
-    maxVisibleMenuItemsWidget.value = prefs.maxVisibleMenuItems;
-    editGranularityWidget.value = prefs.editGranularity;
-    editClearNextStackWidget.checked = prefs.editClearNextStack;
-    editRememberCurrentPosWidget.checked = prefs.editRememberCurrentPos;
-    editShowMarkersWidget.checked = prefs.editShowMarkers;
-    editCompatibilityWidget.checked = prefs.editCompatibility;
-}
-
-function editPositionOnLoad() {
-    parent.hPrefWindow.onpageload();
-}
--- a/content/pref/pref-editposition.xul	Wed Feb 27 14:31:09 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://tabswitcher/locale/pref.dtd" >
-
-<window xmlns:html="http://www.w3.org/1999/xhtml"
-    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    orient="vertical"
-    onload="editPositionOnLoad();">
-
-  <script type="application/x-javascript"
-          src="chrome://tabswitcher/content/common.js" />
-  <script type="application/x-javascript"
-          src="chrome://tabswitcher/content/commonPrefs.js" />
-  <script type="application/x-javascript"
-          src="chrome://tabswitcher/content/prefs.js" />
-  <script type="application/x-javascript"
-          src="chrome://tabswitcher/content/pref/pref-editposition.js" />
-
-  <groupbox orient="vertical">
-    <caption label="&edit.position.label;"/>
-
-    <grid flex="1">
-        <columns>
-            <column flex="1"/>
-            <column/>
-            <column/>
-        </columns>
-
-        <rows>
-            <row align="center">
-              <label value="&number.edit.position.store;" />
-              <textbox id="maxSizeEditPositionStack" size="4"/>
-            </row>
-            <row id="row-cmdargs" align="center">
-              <label value="&number.visible.menu.items;" />
-              <textbox id="maxVisibleMenuItems" size="4"/>
-            </row>
-            <row align="center">
-              <label value="&edit.position.granularity.label;" />
-              <menulist id="editGranularity">
-                <menupopup>
-                  <menuitem label="&edit.granularity.1;" value="1"/>
-                  <menuitem label="&edit.granularity.2;" value="2"/>
-                  <menuitem label="&edit.granularity.3;" value="3"/>
-                  <menuitem label="&edit.granularity.5;" value="5"/>
-                  <menuitem label="&edit.granularity.7;" value="7"/>
-                  <menuitem label="&edit.granularity.10;" value="10"/>
-                  <menuitem label="&edit.granularity.15;" value="15"/>
-                  <menuitem label="&edit.granularity.single;" value="s"/>
-                </menupopup>
-              </menulist>
-            </row>
-            <row align="center">
-              <checkbox id="editClearNextStack"
-                label="&edit.editClearNextStack.label;"
-                checked="false"/>
-            </row>
-            <row align="center">
-              <checkbox id="editRememberCurrentPos"
-                label="&edit.editRememberCurrentPos.label;"
-                checked="false"/>
-            </row>
-            <row align="center">
-              <checkbox id="editShowMarkers"
-                label="&edit.editShowMarkers.label;"
-                tooltip="&edit.editShowMarkers.tooltip;"
-                checked="false"/>
-            </row>
-            <row align="center">
-              <checkbox id="editCompatibility"
-                label="&edit.editCompatibility.label;"
-                tooltip="&edit.editCompatibility.tooltip;"
-                checked="false"/>
-            </row>
-            <label value="&edit.editCompatibility.text1;" />
-            <label value="&edit.editCompatibility.text2;" />
-
-        </rows>
-    </grid>
-
-  </groupbox>
-</window>
\ No newline at end of file
--- a/content/pref/prefOverlay.xul	Wed Feb 27 14:31:09 2013 -0500
+++ b/content/pref/prefOverlay.xul	Fri Jan 17 23:31:14 2014 -0500
@@ -14,33 +14,21 @@
                               url="chrome://tabswitcher/content/pref/pref-main.xul"
                               label="&tabswitcher.label;"/>
                 </treerow>
+            </treeitem>
+            <treeitem container="false" id="switchView">
+                <treerow>
+                    <treecell class="treecell-indent"
+                      url="chrome://tabswitcher/content/pref/pref-switchview.xul"
+                              label="&switch.view.label;"/>
+                </treerow>
+            </treeitem>
 
-                <treechildren id="uiTabSwitcherLastEditPosition">
-                    <treeitem container="false" id="editLastModificationStatusbar">
-                        <treerow>
-                            <treecell class="treecell-indent"
-                              url="chrome://tabswitcher/content/pref/pref-editposition.xul"
-                                      label="&edit.position.label;"/>
-                        </treerow>
-                    </treeitem>
-
-                    <treeitem container="false" id="switchView">
-                        <treerow>
-                            <treecell class="treecell-indent"
-                              url="chrome://tabswitcher/content/pref/pref-switchview.xul"
-                                      label="&switch.view.label;"/>
-                        </treerow>
-                    </treeitem>
-
-                    <treeitem container="false" id="ordertabs">
-                        <treerow>
-                            <treecell class="treecell-indent"
-                              url="chrome://tabswitcher/content/pref/pref-ordertabs.xul"
-                                      label="&tabs.order.label;"/>
-                        </treerow>
-                    </treeitem>
-                </treechildren>
-
+            <treeitem container="false" id="ordertabs">
+                <treerow>
+                    <treecell class="treecell-indent"
+                      url="chrome://tabswitcher/content/pref/pref-ordertabs.xul"
+                              label="&tabs.order.label;"/>
+                </treerow>
             </treeitem>
         </treechildren>
     </hbox>
--- a/content/tabswitchOverlay.xul	Wed Feb 27 14:31:09 2013 -0500
+++ b/content/tabswitchOverlay.xul	Fri Jan 17 23:31:14 2014 -0500
@@ -14,8 +14,6 @@
   <script type="application/x-javascript"
           src="chrome://tabswitcher/content/arrays.js" />
   <script type="application/x-javascript"
-          src="chrome://tabswitcher/content/editPosition/editPosition.js" />
-  <script type="application/x-javascript"
           src="chrome://tabswitcher/content/tabswitchOverlay.js" />
 
     <broadcasterset id="broadcasterset_global">
@@ -24,27 +22,6 @@
         key="key_cmd_tabswitcher_show"
         desc="&switchView.desc;"
         oncommand="gTabSwitcher.onShowTabSwitcher(event)"/>
-
-      <broadcaster
-        id="cmd_tabswitcher_goto_last_edit_position"
-        key="key_cmd_tabswitcher_goto_last_edit_position"
-        desc="&goto.last.edit.position.desc;"
-        disabled="true"
-        oncommand="gEditPosition.goToLastEdit(0);"/>
-
-      <broadcaster
-        id="cmd_tabswitcher_goto_next_edit_position"
-        key="key_cmd_tabswitcher_goto_next_edit_position"
-        desc="&goto.next.edit.position.desc;"
-        disabled="true"
-        oncommand="gEditPosition.goToNextEdit(0);"/>
-
-      <broadcaster
-        id="cmd_tabswitcher_edit_position_remove_all"
-        key="key_cmd_tabswitcher_edit_position_remove_all"
-        desc="&edit.position.remove.all.desc;"
-        oncommand="gEditPosition.removeAll();"/>
-
       <broadcaster
         id="cmd_tabswitcher_sort_by_name"
         key="key_cmd_tabswitcher_sort_by_name"
@@ -57,49 +34,5 @@
         desc="&sort.by.ext.desc;"
         oncommand="gTabSwitcher.sortTabsByExt();"/>
     </broadcasterset>
-
-    <toolboxrow id="main-toolboxrow">
-      <toolbar id="standardToolbar">
-          <toolbarbutton id="button-viewswitcher-gotolastedit"
-               persist="buttonstyle"
-               class="button-viewswitcher-goto-last-edit"
-               buttonstyle="pictures"
-               insertbefore="undoButton"
-               type="menu-button"
-               tooltiptext="&toolbar.goto.last.edit.position.tooltip;"
-               observes="cmd_tabswitcher_goto_last_edit_position">
-                <menupopup id="gotolastedit-toolbarMenuPopup"
-                           onpopupshowing="gEditPosition.initLastEditPopupMenu('gotolastedit');"
-                           oncommand="event.stopPropagation();">
-                    <vbox id="gotolastedit-menubox" />
-                    <menuseparator id="gotolastedit-menuseparator" />
-                    <menuitem id="gotolastedit-removeall-menuitem"
-                              label="&edit.position.remove.all.label;"
-                              tooltiptext="&edit.position.remove.all.label;"
-                              command="cmd_tabswitcher_edit_position_remove_all" />
-                </menupopup>
-          </toolbarbutton>
-          <toolbarbutton id="button-viewswitcher-nextedit"
-               persist="buttonstyle"
-               class="button-viewswitcher-goto-next-edit"
-               buttonstyle="pictures"
-               insertbefore="undoButton"
-               type="menu-button"
-               tooltiptext="&toolbar.goto.next.edit.position.tooltip;"
-               observes="cmd_tabswitcher_goto_next_edit_position">
-                <menupopup id="gotolastedit-toolbarMenuPopup"
-                           onpopupshowing="gEditPosition.initNextEditPopupMenu('gotonextedit');"
-                           oncommand="event.stopPropagation();">
-                    <vbox id="gotonextedit-menubox" />
-                    <menuseparator id="gotonextedit-menuseparator" />
-                    <menuitem id="gotonextedit-removeall-menuitem"
-                              label="&edit.position.remove.all.label;"
-                              tooltiptext="&edit.position.remove.all.label;"
-                              command="cmd_tabswitcher_edit_position_remove_all" />
-                </menupopup>
-          </toolbarbutton>
-      </toolbar>
-    </toolboxrow>
-
 </overlay>
 
--- a/install.rdf	Wed Feb 27 14:31:09 2013 -0500
+++ b/install.rdf	Fri Jan 17 23:31:14 2014 -0500
@@ -4,7 +4,7 @@
 	<Description about="urn:mozilla:install-manifest">
 		<em:id>tabswitcher@skepticats.com</em:id>
 		<em:name>TabSwitcher</em:name>
-		<em:version>1.0.1</em:version>
+		<em:version>1.1.0</em:version>
 		<em:description>Allows you to easily switch between tabs, list bookmarks, and navigate between edit positions.</em:description>
 		<em:creator>Davide Ficano</em:creator>
 		<em:contributor>Peter Geer ported to Komodo 7.</em:contributor>
Binary file skin/goto-last-edit.png has changed
Binary file skin/goto-next-edit.png has changed
Binary file tabswitcher-1.1.0-ko.xpi has changed