From 01c3f87f59253f011b1f36f2d3768900a019896f Mon Sep 17 00:00:00 2001 From: Martin Stubenschrott Date: Mon, 24 Sep 2007 13:11:15 +0000 Subject: [PATCH] changed statusbar colors to match vim by default --- ChangeLog | 154 ++++++++++++++++++++++++++ NEWS | 3 + chrome/content/vimperator/default.css | 9 +- chrome/content/vimperator/events.js | 5 + chrome/content/vimperator/ui.js | 22 ++-- 5 files changed, 179 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5427cfd8..a4d58d8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,157 @@ +2007-09-24 14:41 stubenschrott + + * chrome/content/vimperator/: events.js, mappings.js, ui.js: - + g doesn't beep anymore - / searches for the + changed string + +2007-09-24 13:48 stubenschrott + + * NEWS, chrome/content/vimperator/commands.js, + chrome/content/vimperator/default.css, + chrome/content/vimperator/vimperator.js: :! command, fixed + statusbar height properly, system() now returns the stdout string + +2007-09-23 21:25 vkojouharov + + * chrome/content/vimperator/commands.js: mapleader support + +2007-09-23 18:56 stubenschrott + + * chrome/content/vimperator/vimperator.js: system() returns the + stdout string now, still not working on windows is createUnique + secure? I doubt it, biesi from #extdev thinks so + +2007-09-23 16:17 dougkearns + + * chrome/content/vimperator/find.js: prevent the failed find error + message from being cleared + +2007-09-23 16:14 dougkearns + + * NEWS, chrome/content/vimperator/ui.js: separate Ex command and + search commandline history + +2007-09-23 15:30 dougkearns + + * chrome/content/vimperator/events.js: allow all unknown key + mappings to be passed through to FF + +2007-09-23 15:15 dougkearns + + * chrome/content/vimperator/events.js: allow all unknown key + mappings to be passed through to FF + +2007-09-23 12:21 dougkearns + + * NEWS, chrome/content/vimperator/commands.js: merge new :time + command + +2007-09-23 10:52 dougkearns + + * chrome/content/vimperator/ui.js, NEWS: separate Ex command and + search commandline history + +2007-09-22 17:44 dougkearns + + * NEWS, chrome/content/vimperator/default.css, + chrome/content/vimperator/options.js, + chrome/content/vimperator/vimperator.js: add a new + 'visualbellstyle' option + +2007-09-22 16:51 dougkearns + + * chrome/content/vimperator/commands.js: don't close the sidebar if + it is already open with the requested type + +2007-09-22 16:50 dougkearns + + * NEWS, chrome/content/vimperator/commands.js, + chrome/content/vimperator/find.js: process link text only find + modifiers \[uU] before looking for capitalized letters when + 'smartcase' is set + +2007-09-22 16:29 dougkearns + + * NEWS, chrome/content/vimperator/default.css, + chrome/content/vimperator/options.js, + chrome/content/vimperator/ui.js, + chrome/content/vimperator/vimperator.xul: merge the existing + status bar with the standard FF status bar + +2007-09-22 16:07 dougkearns + + * NEWS, chrome/content/vimperator/default.css, + chrome/content/vimperator/options.js, + chrome/content/vimperator/ui.js, + chrome/content/vimperator/vimperator.xul: merge the existing + status bar with the standard FF status bar + +2007-09-21 13:17 dougkearns + + * chrome/content/vimperator/commands.js: don't close the sidebar if + it is already open with the requested type + +2007-09-21 06:58 stubenschrott + + * chrome/content/vimperator/vimperator.js: new + vimperator.{run/system}() methods, not sure if i'll keep both. + Only work on UNIX for now. + +2007-09-20 15:17 dougkearns + + * vimperator.vim: add 'hlsearchstyle' to Vim syntax file + +2007-09-20 15:08 dougkearns + + * chrome/content/vimperator/find.js: process link text only find + modifiers \[uU] before looking for capitalized letters when + 'smartcase' is set + +2007-09-19 14:25 dougkearns + + * chrome/content/vimperator/: events.js, vimperator.js: merge + refactored key event handlers + +2007-09-19 05:20 stubenschrott + + * NEWS, TODO, chrome/content/vimperator/buffers.js, + chrome/content/vimperator/commands.js, + chrome/content/vimperator/mappings.js: added full zoom, and + changed some zoom shortcuts + +2007-09-19 03:15 stubenschrott + + * NEWS, chrome/content/vimperator/commands.js, + chrome/content/vimperator/events.js: added intelligent :buffer + selection + +2007-09-19 02:32 stubenschrott + + * chrome/content/vimperator/editor.js: fixed textarea/location bar + keys properly (location bar still not working, when completion + popup is open) + +2007-09-19 01:57 stubenschrott + + * NEWS, chrome/content/vimperator/commands.js: added ! version to + :time + +2007-09-19 01:46 stubenschrott + + * chrome/content/vimperator/: commands.js, events.js, modes.js: + added :time command, please use when writing new functions and + you think they are slow + +2007-09-19 00:27 stubenschrott + + * AUTHORS, ChangeLog, chrome/content/vimperator/editor.js, + chrome/content/vimperator/events.js, + chrome/content/vimperator/vimperator.js: - fixed generating + artificial firefox commands with feedkeys()/:norm/:map - + home/end/etc. keys work again in the location bar - , + etc. work again to focus special form fields - small formatting + improvements + 2007-09-18 22:23 vkojouharov * chrome/content/vimperator/: commands.js, vimperator.js: basic diff --git a/NEWS b/NEWS index c4e747d1..e7b1f2c3 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,9 @@ 2007-xx-xx: * version 0.6 * THIS VERSION ONLY WORKS WITH FIREFOX 3.0 + * statusline is now white on black with bold font by default (like in (g)vim) + (change with userChrome.css if you don't like it until we have :colorscheme) + * :let leader="," and in :map support * :b2 now allowed, no space required before the 2 anymore * :! to run commands through system() (UNIX only) * separated search and Ex command history diff --git a/chrome/content/vimperator/default.css b/chrome/content/vimperator/default.css index fe7f85ec..c15e0dc3 100644 --- a/chrome/content/vimperator/default.css +++ b/chrome/content/vimperator/default.css @@ -149,6 +149,7 @@ fieldset.paypal { -moz-appearance: none !important; min-height: 18px !important; border: none !important; + font-weight: bold; } #vimperator-statusline { font-family: monospace; @@ -181,10 +182,12 @@ fieldset.paypal { background-color: black; } -/* -.status_insecure, .status_insecure * { +/* colors for the statusbar */ +/* #status-bar is included so it also get's the right color before the first setClass("insecure") */ +#status-bar, .status_insecure, .status_insecure * { + background-color: black; /* light green */ + color: white; } -*/ .status_secure, .status_secure * { background-color: #B0FF00; /* light green */ color: black; diff --git a/chrome/content/vimperator/events.js b/chrome/content/vimperator/events.js index 3aa1fac0..44c5042c 100644 --- a/chrome/content/vimperator/events.js +++ b/chrome/content/vimperator/events.js @@ -506,6 +506,11 @@ function Events() //{{{ vimperator.modes.reset(); break; + case vimperator.modes.COMMAND_LINE: + vimperator.commandline.close(); + vimperator.modes.reset(); + break; + default: // clear any selection made var selection = window.content.getSelection(); diff --git a/chrome/content/vimperator/ui.js b/chrome/content/vimperator/ui.js index 86de71f4..2f314915 100644 --- a/chrome/content/vimperator/ui.js +++ b/chrome/content/vimperator/ui.js @@ -268,6 +268,16 @@ function CommandLine() //{{{ command_widget.focus(); }; + /* normally used when pressing esc, does not execute a command */ + this.close = function() + { + var res = vimperator.triggerCallback("cancel", cur_extended_mode); + history.add(this.getCommand()); + //vimperator.modes.set(old_mode, old_extended_mode); + vimperator.statusline.updateProgress(""); // we may have a "match x of y" visible + this.clear(); + } + // FIXME: flags not yet really functional --mst this.echo = function(str, flags) { @@ -381,6 +391,7 @@ function CommandLine() //{{{ var key = vimperator.events.toString(event); // user pressed ENTER to carry out a command + // user pressing ESCAPE is handled in the global onEscape if (vimperator.events.isAcceptKey(key)) { var mode = cur_extended_mode; // save it here, as setMode() resets it @@ -391,17 +402,6 @@ function CommandLine() //{{{ return vimperator.triggerCallback("submit", mode, command); } - // user pressed ESCAPE to cancel this prompt - else if (vimperator.events.isCancelKey(key)) - { - var res = vimperator.triggerCallback("cancel", cur_extended_mode); - history.add(command); - vimperator.modes.set(old_mode, old_extended_mode); - completionlist.hide(); - vimperator.statusline.updateProgress(""); // we may have a "match x of y" visible - this.clear(); - return res; - } // user pressed UP or DOWN arrow to cycle history completion else if (key == "" || key == "")