From 38f8e79bd110b18c62010d431845fad5a8069300 Mon Sep 17 00:00:00 2001 From: Martin Stubenschrott Date: Sat, 1 Mar 2008 20:44:56 +0000 Subject: [PATCH 01/28] first commit, hurray! :) --- AUTHORS | 7 +++ Donators | 8 +++ Makefile | 6 ++ Makefile.common | 155 ++++++++++++++++++++++++++++++++++++++++++++++++ NEWS | 6 ++ TODO | 54 +++++++++++++++++ chrome.manifest | 5 ++ install.rdf | 29 +++++++++ 8 files changed, 270 insertions(+) create mode 100644 AUTHORS create mode 100644 Donators create mode 100644 Makefile create mode 100644 Makefile.common create mode 100644 NEWS create mode 100644 TODO create mode 100644 chrome.manifest create mode 100644 install.rdf diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 00000000..33981349 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,7 @@ +
+Main developer/Project founder:
+  * Martin Stubenschrott (stubenschrott@gmx.net)
+
+A lot of people contributed to Vimperator, which is the basis of Muttator, so please refer
+to that AUTHOR file for more contributors.
+
diff --git a/Donators b/Donators new file mode 100644 index 00000000..a4ca7399 --- /dev/null +++ b/Donators @@ -0,0 +1,8 @@ +
+Note: If you don't wish to appear on this list when making a donation, please tell me.
+
+2008:
+* YOU
+
+I want to say a big THANK YOU to all people which supported this project in this way.
+
diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..664597b7 --- /dev/null +++ b/Makefile @@ -0,0 +1,6 @@ +#### configuration + +VERSION = 0.1pre +NAME = muttator + +include Makefile.common diff --git a/Makefile.common b/Makefile.common new file mode 100644 index 00000000..717e7a7e --- /dev/null +++ b/Makefile.common @@ -0,0 +1,155 @@ +#### configuration + +TOP = $(shell pwd) +OS = $(shell uname -s) +BUILD_DATE = $(shell date "+%Y/%m/%d %H:%M:%S") + +DOC_SRC_FILES = $(wildcard locale/*/*.txt) +DOC_FILES = ${DOC_SRC_FILES:%.txt=%.html} + +# TODO: specify source files manually? +JAR_TXT_FILES = ${shell find content skin locale \ + -type f \ + -a ! -path '*CVS*' \ + -a \( \ + -path '*.js' \ + -o -path '*.css' \ + -o -path '*.xul' \ + -o -path '*.html' \ + \) \ + } +JAR_DIRS = $(foreach f,${JAR_FILES},$(dir $f)) +JAR_BIN_FILES = ${shell find content skin \ + -type f \ + -a ! -path '*CVS*' \ + -a -path '*.png' \ + } +JAR_FILES = ${JAR_BIN_FILES} ${JAR_TXT_FILES} ${DOC_FILES} +JAR = chrome/${NAME}.jar + +XPI_TXT_FILES = install.rdf chrome.manifest TODO AUTHORS Donators NEWS +XPI_DIRS = $(foreach f,${XPI_FILES},$(dir $f)) +XPI_BIN_FILES = ${JAR} Makefile.common Makefile +XPI_FILES = ${XPI_BIN_FILES} ${XPI_TXT_FILES} +XPI_NAME = ${NAME}_${VERSION}.xpi +XPI = ../downloads/${XPI_NAME} + +RDF = ../downloads/update.rdf +RDF_IN = ${RDF}.in + +BUILD_DIR = build.${VERSION}.${OS} +BUILD_JAR_DIR = ${BUILD_DIR}/jar +BUILD_XPI_DIR = ${BUILD_DIR}/xpi + +BUILD_JAR_SUBDIRS = $(sort ${JAR_DIRS:%=${BUILD_JAR_DIR}/%}) +BUILD_XPI_SUBDIRS = $(sort ${XPI_DIRS:%=${BUILD_XPI_DIR}/%}) + +ASCIIDOC = asciidoc +ZIP = zip +SED = sed + +# specify V=1 on make line to see more verbose output +Q=$(if ${V},,@) +CP_V=$(if ${V},-v) + +#### rules + +.PHONY: all help info doc jar xpi install clean distclean +all: help + +help: + @echo "${NAME} ${VERSION} build" + @echo + @echo " make help - display this help" + @echo " make info - show some info about the system" + @echo " make doc - build doc files" + @echo " make jar - build a JAR (${JAR})" + @echo " make xpi - build an XPI (${XPI_NAME})" + @echo " make release - updates update.rdf (this is not for you)" + @echo " make clean - clean up" + @echo " make distclean - clean up more" + @echo + @echo "running some commands with V=1 will show more build details" + +info: + @echo "version ${VERSION}" + @echo "release file ${XPI}" + @echo "doc files ${DOC_SRC_FILES}" + @echo -e "jar files $(shell echo ${JAR_FILES} | sed 's/ /\\n /g' )" + +doc: ${DOC_FILES} +xpi: ${XPI} +jar: ${JAR} + +release: ${XPI} ${RDF} + +${RDF}: ${RDF_IN} Makefile + @echo "Preparing release..." + ${Q}${SED} -e "s,###VERSION###,${VERSION},g" \ + -e "s,###DATE###,${BUILD_DATE},g" \ + < $< > $@ + @echo "SUCCESS: $@" + +clean: + @echo "Cleanup..." + ${Q}rm -f ${JAR} ${XPI} + ${Q}find . -name '*~' -exec rm -f {} \; + +distclean: clean + @echo "More cleanup..." + ${Q}rm -f ${DOC_FILES} + ${Q}rm -rf ${BUILD_DIR} + +#### xpi + +${BUILD_XPI_SUBDIRS}: + ${Q}mkdir -p $@ + +${XPI}: ${BUILD_XPI_SUBDIRS} ${XPI_FILES} + @echo "Building XPI..." + ${Q}mkdir -p $(dir ${XPI}) + ${Q}for f in ${XPI_BIN_FILES} ; do \ + cp $$f ${BUILD_XPI_DIR}/$$f ; \ + done + ${Q}for f in ${XPI_TXT_FILES} ; do \ + ${SED} -e "s,###VERSION###,${VERSION},g" \ + -e "s,###DATE###,${BUILD_DATE},g" \ + < $$f > ${BUILD_XPI_DIR}/$$f ; \ + ( diff -q $$f ${BUILD_XPI_DIR}/$$f 1>/dev/null ) || \ + ( echo "modified: $$f" ; \ + diff -u $$f ${BUILD_XPI_DIR}/$$f | grep '^[-+][^-+]' ) ; \ + done + # FIXME: VERSION and DATE tokens not replaced + ${Q}${SED} -e 's,\(skin\|content\|locale/.*\)/$$,jar:chrome/${NAME}.jar!/\1/,' \ + < chrome.manifest > ${BUILD_XPI_DIR}/chrome.manifest + ${Q}( cd ${BUILD_XPI_DIR} && ${ZIP} -r ${TOP}/${XPI} ${XPI_FILES} ) + @echo "SUCCESS: $@" + +#### jar + +${BUILD_JAR_SUBDIRS}: + ${Q}mkdir -p $@ + +${JAR}: ${BUILD_JAR_SUBDIRS} ${JAR_FILES} + @echo "Building JAR..." + ${Q}mkdir -p $(dir ${JAR}) + ${Q}for f in ${JAR_BIN_FILES} ; do \ + cp $$f ${BUILD_JAR_DIR}/$$f ; \ + done + ${Q}for f in ${JAR_TXT_FILES} ; do \ + ${SED} -e "s,###VERSION###,${VERSION},g" \ + -e "s,###DATE###,${BUILD_DATE},g" \ + < $$f > ${BUILD_JAR_DIR}/$$f ; \ + ( diff -q $$f ${BUILD_JAR_DIR}/$$f 1>/dev/null ) || \ + ( echo "modified: $$f" ; \ + diff -u $$f ${BUILD_JAR_DIR}/$$f | grep '^[-+][^-+]' ) ; \ + done + ${Q}( cd ${BUILD_JAR_DIR} && ${ZIP} -r ${TOP}/${JAR} ${JAR_FILES} ) + @echo "SUCCESS: $@" + +#### doc + +${DOC_FILES}: %.html: %.txt Makefile.common locale/en-US/asciidoc.conf + @echo "DOC $@" + ${Q}${ASCIIDOC} --unsafe -a linkcss -o $@ $< + diff --git a/NEWS b/NEWS new file mode 100644 index 00000000..ee575ef7 --- /dev/null +++ b/NEWS @@ -0,0 +1,6 @@ +
+2008-xx-xx:
+    * version 0.1
+    * first public release, straight port from vimperator
+
+ diff --git a/TODO b/TODO new file mode 100644 index 00000000..309dcc36 --- /dev/null +++ b/TODO @@ -0,0 +1,54 @@ +
+Priority list:
+1-9 as in vim (9=required for next release, 5=would be nice, 1=probably not)
+
+BUGS:
+- add window resize support to hints
+- can't reverse tab through the vimperator toolbar
+- gu and gU doesn't work on Windows.
+- pvh option not working
+- searching backwards incrementally does not work i.e. with 'incsearch' set
+- http://msdn2.microsoft.com/en-us/library/ms535258.aspx does not scroll with j/k/etc.
+  same for http://forum.mootools.net/topic.php?id=3458
+- insert abbreviations broken on 
+
+FEATURES:
+8 middleclick in content == p, and if command line is open, paste there the clipboard buffer
+8 add more autocommands (BrowserStart, BrowserQuit, TabClose, TabOpen, TabChanged, LocationChanged, any more?)
+8 ;? will show information about  like id, class, image filename, etc.
+8 there should be a listbox/combobox mode
+8 y and Y should be changed to: yy and yl=yank location, ys=yank selection,
+  yd=yank domain name, yt=yank title, yw=yank current word,
+  yS=yank selection, if no selection then yank current word (other things to yank?)
+8 all search commands should start searching from the top of the visible viewport 
+7 use ctrl-n/p in insert mode for word completion
+7 implement LocationList window, and get rid off/change PreviewWindow to be a real preview window being able to display html pages
+7 [ctrl-o/i] to Go back to a Previous Position (done partly, however currenty does not use a per tab jumplist)
+7 whereever possible: get rid of dialogs and ask console-like dialog questions or write error prompts directly on the webpage or with :echo()
+7 [d could go to the last domain in the history stack. so if i browse from
+  google to another page and click 10 links there, [d would take me back to the google page
+  opera's fast forward does something like this
+6 :sidebar improvements (:sidebar! Downloads while downloads is open should refocus the sidebar)
+6 jump to the next heading with ]h, next image ]i, previous textbox [t and so on
+6 :grep support (needs location list)
+6 use '' to jump between marks like vim
+6 pipe selected text/link/website to an external command
+6 :set wildoptions=auto mode, which would list completions on each keystroke (maybe performance problems)
+6 Use ctrl-w+j/k/w to switch between sidebar, content, preview window
+5 Favicons in completion windows and some other places?
+5 make a command to search within google search results
+  (http://gadelkareem.com/2007/01/28/using-google-ajax-api-as-an-array/)
+  maybe impossible, needs a per-site key from google
+4 Add -nargs, -complete, etc. to :command
+4 } { should jump to the next paragraph of the page (maybe impossible)
+3 Splitting Windows with [:sp :vsp ctrl-w,s ctrl-w,v] and closing with [ctrl-w,q], moving with [ctrl-w,w or tab]
+  have a look into the split browser extension
+- many other ideas are listed in the wiki
+
+RANDOM IDEAS:
+* numbered tabs
+* Would it be possible to add a setting "maxcompletionsshown" and 
+  "maxpreviewwindowheight" or something like this?
+* hide scrollbars: (window.content.document.body.style.overflow = "hidden" has problems with the mouse wheel)
+
+
diff --git a/chrome.manifest b/chrome.manifest new file mode 100644 index 00000000..8027292e --- /dev/null +++ b/chrome.manifest @@ -0,0 +1,5 @@ +# Thunderbird +content muttator content/ +locale muttator en-US locale/en-US/ +skin muttator classic/1.0 skin/ +overlay chrome://messenger/content/messenger.xul chrome://muttator/content/muttator.xul diff --git a/install.rdf b/install.rdf new file mode 100644 index 00000000..7eb84b35 --- /dev/null +++ b/install.rdf @@ -0,0 +1,29 @@ + + + + + + muttator@mozdev.org + Muttator + ###VERSION### + Make Thunderbird behave like Vim + Martin Stubenschrott + http://muttator.mozdev.org + chrome://muttator/skin/icon.png + + + + content/muttator/ + + + + + + {3550f703-e582-4d05-9a08-453d09bdfdc6} + 2.0 + 3.0.0.* + + + + + From 15ab2c5f88bc59844b1708e2756187c009df81db Mon Sep 17 00:00:00 2001 From: Martin Stubenschrott Date: Sat, 1 Mar 2008 20:51:17 +0000 Subject: [PATCH 02/28] updated explaination how to build muttator --- Makefile.common | 155 ------------------------------------------------ README | 11 ++++ 2 files changed, 11 insertions(+), 155 deletions(-) delete mode 100644 Makefile.common create mode 100644 README diff --git a/Makefile.common b/Makefile.common deleted file mode 100644 index 717e7a7e..00000000 --- a/Makefile.common +++ /dev/null @@ -1,155 +0,0 @@ -#### configuration - -TOP = $(shell pwd) -OS = $(shell uname -s) -BUILD_DATE = $(shell date "+%Y/%m/%d %H:%M:%S") - -DOC_SRC_FILES = $(wildcard locale/*/*.txt) -DOC_FILES = ${DOC_SRC_FILES:%.txt=%.html} - -# TODO: specify source files manually? -JAR_TXT_FILES = ${shell find content skin locale \ - -type f \ - -a ! -path '*CVS*' \ - -a \( \ - -path '*.js' \ - -o -path '*.css' \ - -o -path '*.xul' \ - -o -path '*.html' \ - \) \ - } -JAR_DIRS = $(foreach f,${JAR_FILES},$(dir $f)) -JAR_BIN_FILES = ${shell find content skin \ - -type f \ - -a ! -path '*CVS*' \ - -a -path '*.png' \ - } -JAR_FILES = ${JAR_BIN_FILES} ${JAR_TXT_FILES} ${DOC_FILES} -JAR = chrome/${NAME}.jar - -XPI_TXT_FILES = install.rdf chrome.manifest TODO AUTHORS Donators NEWS -XPI_DIRS = $(foreach f,${XPI_FILES},$(dir $f)) -XPI_BIN_FILES = ${JAR} Makefile.common Makefile -XPI_FILES = ${XPI_BIN_FILES} ${XPI_TXT_FILES} -XPI_NAME = ${NAME}_${VERSION}.xpi -XPI = ../downloads/${XPI_NAME} - -RDF = ../downloads/update.rdf -RDF_IN = ${RDF}.in - -BUILD_DIR = build.${VERSION}.${OS} -BUILD_JAR_DIR = ${BUILD_DIR}/jar -BUILD_XPI_DIR = ${BUILD_DIR}/xpi - -BUILD_JAR_SUBDIRS = $(sort ${JAR_DIRS:%=${BUILD_JAR_DIR}/%}) -BUILD_XPI_SUBDIRS = $(sort ${XPI_DIRS:%=${BUILD_XPI_DIR}/%}) - -ASCIIDOC = asciidoc -ZIP = zip -SED = sed - -# specify V=1 on make line to see more verbose output -Q=$(if ${V},,@) -CP_V=$(if ${V},-v) - -#### rules - -.PHONY: all help info doc jar xpi install clean distclean -all: help - -help: - @echo "${NAME} ${VERSION} build" - @echo - @echo " make help - display this help" - @echo " make info - show some info about the system" - @echo " make doc - build doc files" - @echo " make jar - build a JAR (${JAR})" - @echo " make xpi - build an XPI (${XPI_NAME})" - @echo " make release - updates update.rdf (this is not for you)" - @echo " make clean - clean up" - @echo " make distclean - clean up more" - @echo - @echo "running some commands with V=1 will show more build details" - -info: - @echo "version ${VERSION}" - @echo "release file ${XPI}" - @echo "doc files ${DOC_SRC_FILES}" - @echo -e "jar files $(shell echo ${JAR_FILES} | sed 's/ /\\n /g' )" - -doc: ${DOC_FILES} -xpi: ${XPI} -jar: ${JAR} - -release: ${XPI} ${RDF} - -${RDF}: ${RDF_IN} Makefile - @echo "Preparing release..." - ${Q}${SED} -e "s,###VERSION###,${VERSION},g" \ - -e "s,###DATE###,${BUILD_DATE},g" \ - < $< > $@ - @echo "SUCCESS: $@" - -clean: - @echo "Cleanup..." - ${Q}rm -f ${JAR} ${XPI} - ${Q}find . -name '*~' -exec rm -f {} \; - -distclean: clean - @echo "More cleanup..." - ${Q}rm -f ${DOC_FILES} - ${Q}rm -rf ${BUILD_DIR} - -#### xpi - -${BUILD_XPI_SUBDIRS}: - ${Q}mkdir -p $@ - -${XPI}: ${BUILD_XPI_SUBDIRS} ${XPI_FILES} - @echo "Building XPI..." - ${Q}mkdir -p $(dir ${XPI}) - ${Q}for f in ${XPI_BIN_FILES} ; do \ - cp $$f ${BUILD_XPI_DIR}/$$f ; \ - done - ${Q}for f in ${XPI_TXT_FILES} ; do \ - ${SED} -e "s,###VERSION###,${VERSION},g" \ - -e "s,###DATE###,${BUILD_DATE},g" \ - < $$f > ${BUILD_XPI_DIR}/$$f ; \ - ( diff -q $$f ${BUILD_XPI_DIR}/$$f 1>/dev/null ) || \ - ( echo "modified: $$f" ; \ - diff -u $$f ${BUILD_XPI_DIR}/$$f | grep '^[-+][^-+]' ) ; \ - done - # FIXME: VERSION and DATE tokens not replaced - ${Q}${SED} -e 's,\(skin\|content\|locale/.*\)/$$,jar:chrome/${NAME}.jar!/\1/,' \ - < chrome.manifest > ${BUILD_XPI_DIR}/chrome.manifest - ${Q}( cd ${BUILD_XPI_DIR} && ${ZIP} -r ${TOP}/${XPI} ${XPI_FILES} ) - @echo "SUCCESS: $@" - -#### jar - -${BUILD_JAR_SUBDIRS}: - ${Q}mkdir -p $@ - -${JAR}: ${BUILD_JAR_SUBDIRS} ${JAR_FILES} - @echo "Building JAR..." - ${Q}mkdir -p $(dir ${JAR}) - ${Q}for f in ${JAR_BIN_FILES} ; do \ - cp $$f ${BUILD_JAR_DIR}/$$f ; \ - done - ${Q}for f in ${JAR_TXT_FILES} ; do \ - ${SED} -e "s,###VERSION###,${VERSION},g" \ - -e "s,###DATE###,${BUILD_DATE},g" \ - < $$f > ${BUILD_JAR_DIR}/$$f ; \ - ( diff -q $$f ${BUILD_JAR_DIR}/$$f 1>/dev/null ) || \ - ( echo "modified: $$f" ; \ - diff -u $$f ${BUILD_JAR_DIR}/$$f | grep '^[-+][^-+]' ) ; \ - done - ${Q}( cd ${BUILD_JAR_DIR} && ${ZIP} -r ${TOP}/${JAR} ${JAR_FILES} ) - @echo "SUCCESS: $@" - -#### doc - -${DOC_FILES}: %.html: %.txt Makefile.common locale/en-US/asciidoc.conf - @echo "DOC $@" - ${Q}${ASCIIDOC} --unsafe -a linkcss -o $@ $< - diff --git a/README b/README new file mode 100644 index 00000000..c1705b48 --- /dev/null +++ b/README @@ -0,0 +1,11 @@ +In order to build muttator, you also need to checkout vimperator from: +http://vimperator.mozdev.org. + +And symlink the following files: + +cd muttator/src +ln -s ../../vimperator/src/Makefile.common . +ln -s ../../vimperator/src/content . + +If you want to check-in changes, don't forget to also commit the vimperator part +inside the local vimperator/ directory. From 05dc9f074f7fff33a9a9796448e9c7b03c79486a Mon Sep 17 00:00:00 2001 From: Martin Stubenschrott Date: Sat, 1 Mar 2008 21:06:48 +0000 Subject: [PATCH 03/28] hopefully added all remaining files --- locale/en-US/asciidoc.conf | 83 +++++++++ locale/en-US/intro.txt | 99 +++++++++++ locale/en-US/xhtml11.css | 333 +++++++++++++++++++++++++++++++++++++ skin/icon.png | Bin 0 -> 524 bytes skin/vimperator.css | 187 +++++++++++++++++++++ 5 files changed, 702 insertions(+) create mode 100644 locale/en-US/asciidoc.conf create mode 100644 locale/en-US/intro.txt create mode 100644 locale/en-US/xhtml11.css create mode 100644 skin/icon.png create mode 100644 skin/vimperator.css diff --git a/locale/en-US/asciidoc.conf b/locale/en-US/asciidoc.conf new file mode 100644 index 00000000..d60e7dc1 --- /dev/null +++ b/locale/en-US/asciidoc.conf @@ -0,0 +1,83 @@ +[miscellaneous] + +[glossary] +author=Martin Stubenschrott +email=stubenschrott@gmx.net + +# [header] +# +# +# +# +# +# +# {doctitle} +# +# +#
+#

{doctitle}

+# + +[replacements] +LOGO=
image:chrome://vimperator/content/logo_white.png[Vimperator]
+HEADER=
image:chrome://vimperator/content/logo_white.png[Vimperator] +\[count\]=[count] +\[arg\]=[arg] +\[arg1\]=[arg1] +\[arg2\]=[arg2] +\[url\]=[url] +\[file\]=[file] +\[value\]=[value] +\[filter\]=[filter] +\[!\]=[!] + +# [macros] +# section:Introduction[tag1,tag2] +(?su)(?.+?)\|(?!\+)=section +# help:helptext[href] +(?su)(?.+?)\|(?!\+)=help + +# maximum 3 tags for now +[section-inlinemacro] + + +

{target}

 +{3? {3}} +{2? {2}} +{1? {1}} +
+ +[help-inlinemacro] +{target} + +[quotes] +|=tag +||=key +[o]=option +'=option2 +[c]=command +[m]=mapping +[a]=argument +{|}=argument2 +[[|]]=argument3 +# disable monospaced text as all our text is monospaced and it causes problems for some things ++= +^= + +[tags] +tag=| +key=
|
+option=| +option2='|' +command=| +mapping=| +argument=| +argument2={|} +argument3=[|] + +[specialwords] +warningwords=Warning: NOTE: Note: + +[warningwords] +{words} diff --git a/locale/en-US/intro.txt b/locale/en-US/intro.txt new file mode 100644 index 00000000..ad668198 --- /dev/null +++ b/locale/en-US/intro.txt @@ -0,0 +1,99 @@ +LOGO + ++++
+++ +*First there was a Navigator, then there was an Explorer. +Later it was time for a Konqueror. Now it's time for an Imperator, the +VIMperator :)* ++++
+++ + +section:Introduction[intro] + +http://vimperator.mozdev.org[Vimperator] is a free browser add-on for Firefox, +which makes it look and behave like the http://www.vim.org[Vim] +text editor. It has similar key bindings, and you could call it a modal +web browser, as key bindings differ according to which mode you are in. + +|warning| + +Warning: +To provide the most authentic Vim experience, the Firefox menubar and toolbar were hidden. + +If you really need them, type: [c]:set guioptions+=mT[c] to get them back. + +If you don't like Vimperator at all, you can uninstall it by typing +[c]:addons[c] and remove/disable it. + +If you like it, but can't remember the shortcuts, press [m]F1[m] or +[c]:help[c] to get this help window back. + +|author| |donation| + +Vimperator was written by mailto:stubenschrott@gmx.net[Martin Stubenschrott]. +If you appreciate my work on Vimperator and want to encourage me working on it +more, you can either send me greetings, patches or make a donation: + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +
+
+ + + + +
+
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +Of course as a believer in free open source software, only make a donation +if you really like Vimperator and the money doesn't hurt - otherwise just use +it, recommend it and like it :) + +section:Help{nbsp}topics[overview] + +- help:Initialization[starting.html]: How vimperator starts up, where it reads the config file... +- help:Browsing[browsing.html]: Basic mappings and commands needed for + a browsing session (how to open a web page or go back in history). +- help:Motion{nbsp}commands[motion.html]: How to efficiently scroll in + Vimperator. +- help:Options[options.html]: A description of all options. +- help:Tabs[tabs.html]: Manage your tabbed browsing session. +- help:Marks[marks.html]: Usage of bookmarks, QuickMarks, and history. +- help:Repeating{nbsp}commands[repeat.html]: Usage of macros to repeat + recurring workflows. +- help:Autocommands[autocommands.html]: Automatically execute code on ceratain + events. +- help:Developer{nbsp}Information[developer.html]: How to write docs or + plugins. +- help:Various[various.html]: Other help which didn't fit into any other category. + +You can also jump directly to the help of a specific command with [c]:help +o[c] or [c]:help :set[c]. + +section:Features[features] + +* Vim-like keybindings ([m]h[m], [m]j[m], [m]k[m], [m]l[m], + [m]gg[m], [m]G[m], [m]0[m], [m]$[m], [m]ZZ[m], [m][m], etc.) +* Ex-commands ([c]:quit[c], [c]:open www.foo.com[c], ...) +* Tab completion available for all commands with support for 'longest' matching when set in 'wildmode' +* Hit-a-hint like navigation of links (start with [m]f[m] to follow a link) +* Advanced completion of bookmark and history URLs (searching also in title, not only URL) +* Vim-like statusline with a wget-like progress bar +* Minimal GUI (easily hide useless menubar and toolbar with [c]:set guioptions=[c]) +* Ability to [c]:source[c] javascript files, and to use a [a]~/.vimperatorrc[a] file + with syntax highlighting if you install scripts/vimperator.vim +* Easy quick searches ([c]:open foo[c] will search foo in google, + [c]:open ebay terminator[c] will search for terminator on ebay) + with support for Firefox keyword bookmarks and search engines +* Count supported for many commands ([m]3[m] will go back 3 pages) +* Beep on errors +* Marks support ([m]ma[m] to set mark a on a webpage, [m]'a[m] to go there) +* QuickMarks support (quickly go to previously marked web pages with [m]go[m][a]\\{a-zA-Z0-9\\}[a]) +* [c]:map[c] support (and feedkeys() for script writers) +* [c]:time[c] support for profiling +* Move the text cursor and select text with vim keys and a visual mode +* A comprehensive help file, explaining all commands, mappings and options. + +section:Contact[contact] + +Please send comments/bug reports/patches to the mailing list, where I will +properly answer any questions. You can also join the #vimperator IRC channel +on irc.freenode.net or check the Wiki for frequently asked questions. Make +sure, you have read the TODO file first, as I am aware of many things which +can be improved when I find time for it or get patches. + +// vim: set syntax=asciidoc: diff --git a/locale/en-US/xhtml11.css b/locale/en-US/xhtml11.css new file mode 100644 index 00000000..7a959da4 --- /dev/null +++ b/locale/en-US/xhtml11.css @@ -0,0 +1,333 @@ +/* + CSS stylesheet for XHTML produced by DocBook XSL stylesheets. + Tested with XSL stylesheets 1.61.2, 1.67.2 +*/ + +span.strong { + font-weight: bold; +} + +a { + color: #4A708B; + text-decoration: none; +} + +body blockquote { + margin-top: .75em; + line-height: 1.5; + margin-bottom: .75em; +} + +html body { + /*margin: 1em 5% 1em 5%;*/ + margin: auto; + padding-left: 25px; + padding-right: 25px; + line-height: 1.2; + font-family: -moz-fixed; + max-width: 800px; +} + +body div { + margin: 0; +} + +h1, h2, h3, h4, h5, h6, +div.toc p b, +div.list-of-figures p b, +div.list-of-tables p b, +div.abstract p.title +{ + color: #527bbd; +} + +div.toc p:first-child, +div.list-of-figures p:first-child, +div.list-of-tables p:first-child, +div.example p.title +{ + margin-bottom: 0.1em; +} + +body h1 { + margin: .0em 0 0 -4%; + line-height: 1.3; + border-bottom: 1px solid silver; +} + +body h2 { + /* necessary, because we put h2 into tables */ + margin-top: 20px !important; + margin-bottom: 0px !important; + line-height: 1.3; + /*border-bottom: 1px solid silver;*/ +} + +body h3 { + margin: .8em 0 0 -3%; + line-height: 1.3; +} + +body h4 { + margin: .8em 0 0 -3%; + line-height: 1.3; +} + +body h5 { + margin: .8em 0 0 -2%; + line-height: 1.3; +} + +body h6 { + margin: .8em 0 0 -1%; + line-height: 1.3; +} + +body hr { + border: none; /* Broken on IE6 */ +} +div.footnotes hr { + border: 1px solid silver; +} + +div.navheader th, div.navheader td, div.navfooter td { + font-size: 0.9em; + font-weight: bold; + color: #527bbd; +} +div.navheader img, div.navfooter img { + border-style: none; +} +div.navheader a, div.navfooter a { + font-weight: normal; +} +div.navfooter hr { + border: 1px solid silver; +} + +body td { + line-height: 1.2 +} + +body th { + line-height: 1.2; +} + +ol { + line-height: 1.2; +} + +ul, body dir, body menu { + line-height: 1.2; +} + +html { + margin: 0; + padding: 0; +} + +body h1, body h2, body h3, body h4, body h5, body h6 { + margin-left: 0 +} + +body pre { + margin: 0.5em 10% 0.5em 1em; + line-height: 1.2; + color: navy; +} + +tt.literal, code.literal { + color: navy; +} + + +.programlisting, .screen, .listingblock { + border: 1px solid silver; + background: #f4f4f4; + margin: 0.5em 10% 0.5em 0; + padding: 0.5em 1em; +} + +div.sidebar { + background: #ffffee; + margin: 1.0em 10% 0.5em 0; + padding: 0.5em 1em; + border: 1px solid silver; +} +div.sidebar * { padding: 0; } +div.sidebar div { margin: 0; } +div.sidebar p.title { + margin-top: 0.5em; + margin-bottom: 0.2em; +} + +div.bibliomixed { + margin: 0.5em 5% 0.5em 1em; +} + +#footer { + margin: 15px; + text-align: center; + color: gray; +} + +div.glossary dt { + font-weight: bold; +} +div.glossary dd p { + margin-top: 0.2em; +} + +dl { + margin: .8em 0; + line-height: 1.2; +} + +dt { + margin-top: 0.5em; +} + +dt span.term { + font-style: italic; +} + +div.variablelist dd p { + margin-top: 0; +} + +div.itemizedlist li, div.orderedlist li { + margin-left: -0.8em; + margin-top: 0.5em; +} + +ul, ol { + list-style-position: outside; +} + +div.sidebar ul, div.sidebar ol { + margin-left: 2.8em; +} + +div.itemizedlist p.title, +div.orderedlist p.title, +div.variablelist p.title +{ + margin-bottom: -0.8em; +} + +div.revhistory table { + border-collapse: collapse; + border: none; +} +div.revhistory th { + border: none; + color: #527bbd; +} +div.revhistory td { + border: 1px solid silver; +} + +/* Keep TOC and index lines close together. */ +div.toc dl, div.toc dt, +div.list-of-figures dl, div.list-of-figures dt, +div.list-of-tables dl, div.list-of-tables dt, +div.indexdiv dl, div.indexdiv dt +{ + line-height: normal; + margin-top: 0; + margin-bottom: 0; +} + +/* + Table styling does not work because of overriding attributes in + generated HTML. +*/ +div.table table, +div.informaltable table +{ + margin-left: 0; + margin-right: 5%; + margin-bottom: 0.8em; +} +div.informaltable table +{ + margin-top: 0.4em +} +div.table thead, +div.table tfoot, +div.table tbody, +div.informaltable thead, +div.informaltable tfoot, +div.informaltable tbody +{ + /* No effect in IE6. */ + border-top: 2px solid #527bbd; + border-bottom: 2px solid #527bbd; +} +div.table thead, div.table tfoot, +div.informaltable thead, div.informaltable tfoot +{ + font-weight: bold; +} + +div.mediaobject img { + border: 1px solid silver; + margin-bottom: 0.8em; +} +div.figure p.title, +div.table p.title +{ + margin-top: 1em; + margin-bottom: 0.4em; +} + +@media print { + div.navheader, div.navfooter { display: none; } +} + +/* my additions */ +span.tag, span.hiddentag { + font-weight: bold; + color: rgb(255, 0, 255); /* magenta */ + padding-left: 15px; + float: right; +} +/* inside a table cell means this tag is part of a section */ +td span.tag { + padding-top: 25px !important; +} + +div.key { + color: rgb(255, 0, 255); /* magenta */ + min-width: 120px; /* with 20px padding actually 140px */ + /*padding-bottom: 5px;*/ + padding-right: 20px; + float: left; +} +span.warning { + font-weight: bold; + color: red; +} +fieldset.paypal { + border: none; +} + +.argument { + color: #6A97D4; +} +.command { + font-weight: bold; + color: #632610; +} +.mapping { + font-weight: bold; + color: #102663; +} +.option { + font-weight: bold; + color: #106326; +} +.quoteblock { + margin-left: 140px; + padding-bottom: 10px; +} diff --git a/skin/icon.png b/skin/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..07a3331409ae67f60af99ec34331baba082ccea5 GIT binary patch literal 524 zcmV+n0`vWeP)yXC&(-^TfVh2As5bizXe&;*)p06N@OX3D#Fc=76I-M4> z65|}#br}wanR!3Prvd`h@AoB%eQ`|ADe*72N=}6&f*=r}a=EPWc$})xbzK2!x7)c^ zzf&OYX&8oVHk%a5^?D6}X_~nUuxmlBR!bcA9i>ufmy;`EDdIK&n$2cAsU61=pjNAu zyZnhu`2W*dE|>XNnt{YC=yWgKfjpQ+ofmxZ3f>348!&PyMHJKs6`; O0000 + +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 *****/ + +#vimperator-container { + font-family: monospace; +} + +#vimperator-bufferwindow, #vimperator-completion, #vimperator-previewwindow { + -moz-user-focus: ignore; + overflow: -moz-scrollbars-none !important; /* does not seem to work fully */ + border-width: 0px !important; + -moz-appearance: none !important; /* prevent an ugly 3D border */ +} + +/* the selected item in listboxes is hardly readable without this */ +#vimperator-completion > listitem[selected="true"] > listcell, +#vimperator-bufferwindow > listitem[selected="true"] > listcell, +#vimperator-previewwindow > listitem[selected="true"] > listcell { + background-color: Highlight !important; + color: HighlightText !important; +} + +/* fixes the min-height: 22px from firefox */ +#status-bar, statusbarpanel { + -moz-appearance: none !important; + min-height: 18px !important; + border: none !important; + font-weight: bold; + font-family: monospace; +} +#vimperator-statusline { + font-family: monospace; + margin: 0px; +} +#vimperator-statusline > label { + padding: 0px 0px 0px 8px; +} +#vimperator-statusline > label:first-child { + padding: 0px; +} +#vimperator-statusline-field-url { + background-color: inherit; + color: inherit; +} + +/* no longer at the window's bottom right corner */ +.statusbar-resizerpanel { + display: none; +} +#statusbar-display, #statusbar-progresspanel { + display: none; +} + +#vimperator-commandline { + padding: 1px; + /* + background-color: white; + color: black; + */ +} +#vimperator-commandline-prompt, #vimperator-commandline-command { + background-color: inherit; + color: inherit; +} + +#vimperator-visualbell { + border: none; + background-color: black; +} + +#sidebar { + max-width: 90% !important; + min-width: 10% !important; +} + +/* highlight groups */ + +.hl-Normal { + background-color: white; + color: black; +} +.hl-ErrorMsg { + background-color: red; + color: white; + font-weight: bold; +} +.hl-ModeMsg { + background-color: white; + color: black; +} +.hl-MoreMsg { + background-color: white; + color: green; +} +.hl-Question { + background-color: white; + color: green; +} +.hl-Title { + background-color: white; + color: magenta; + font-weight: bold; +} +.hl-Warning { + background-color: white; + color: red; +} +.hl-StatusLine { + background: none !important; + background-color: black !important; + color: white !important; +} +.hl-StatusLineSecure { + background: none !important; + background-color: #B0FF00 !important; /* light green */ + color: black !important; +} +.hl-StatusLineBroken { + background: none !important; + background-color: #FF6060 !important; /* light red */ + color: black !important; +} +.hl-URL { + background-color: white; + color: green; + text-decoration: none; +} +/* NOTE: .aClass:hover not supported in quirks mode: http://developer.mozilla.org/en/docs/Mozilla_Quirks_Mode_Behavior */ +a.hl-URL:hover { + text-decoration: underline; + cursor: pointer; +} + +/* MOW */ + +#vimperator-multiline-output { + overflow: hidden; + background-color: white; + color: black; +} + +#vimperator-multiline-output-content { + white-space: pre; /* -moz-pre-wrap FIXME: Should lines wrap like Vim? */ + font-family: -moz-fixed; + margin: 0px; +} + +#vimperator-multiline-output-content * { + font: inherit; +} + +#vimperator-multiline-output-content table { + white-space: inherit; + border-spacing: 0px; +} + +#vimperator-multiline-output-content td, +#vimperator-multiline-output-content th { + padding: 0px 2px; +} + +/* vim: set fdm=marker sw=4 ts=4 et: */ From 227727e1007f30b2f17d897faee7fa4c6392fe8e Mon Sep 17 00:00:00 2001 From: Martin Stubenschrott Date: Tue, 18 Mar 2008 15:18:18 +0000 Subject: [PATCH 04/28] updated vimperator.css --- skin/vimperator.css | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/skin/vimperator.css b/skin/vimperator.css index 7f7ed0f3..7468d2f7 100644 --- a/skin/vimperator.css +++ b/skin/vimperator.css @@ -26,11 +26,11 @@ 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 *****/ -#vimperator-container { +#liberator-container { font-family: monospace; } -#vimperator-bufferwindow, #vimperator-completion, #vimperator-previewwindow { +#liberator-bufferwindow, #liberator-completion, #liberator-previewwindow { -moz-user-focus: ignore; overflow: -moz-scrollbars-none !important; /* does not seem to work fully */ border-width: 0px !important; @@ -38,9 +38,9 @@ the terms of any one of the MPL, the GPL or the LGPL. } /* the selected item in listboxes is hardly readable without this */ -#vimperator-completion > listitem[selected="true"] > listcell, -#vimperator-bufferwindow > listitem[selected="true"] > listcell, -#vimperator-previewwindow > listitem[selected="true"] > listcell { +#liberator-completion > listitem[selected="true"] > listcell, +#liberator-bufferwindow > listitem[selected="true"] > listcell, +#liberator-previewwindow > listitem[selected="true"] > listcell { background-color: Highlight !important; color: HighlightText !important; } @@ -53,17 +53,17 @@ the terms of any one of the MPL, the GPL or the LGPL. font-weight: bold; font-family: monospace; } -#vimperator-statusline { +#liberator-statusline { font-family: monospace; margin: 0px; } -#vimperator-statusline > label { +#liberator-statusline > label { padding: 0px 0px 0px 8px; } -#vimperator-statusline > label:first-child { +#liberator-statusline > label:first-child { padding: 0px; } -#vimperator-statusline-field-url { +#liberator-statusline-field-url { background-color: inherit; color: inherit; } @@ -76,19 +76,19 @@ the terms of any one of the MPL, the GPL or the LGPL. display: none; } -#vimperator-commandline { +#liberator-commandline { padding: 1px; /* background-color: white; color: black; */ } -#vimperator-commandline-prompt, #vimperator-commandline-command { +#liberator-commandline-prompt, #liberator-commandline-command { background-color: inherit; color: inherit; } -#vimperator-visualbell { +#liberator-visualbell { border: none; background-color: black; } @@ -158,29 +158,29 @@ a.hl-URL:hover { /* MOW */ -#vimperator-multiline-output { +#liberator-multiline-output { overflow: hidden; background-color: white; color: black; } -#vimperator-multiline-output-content { +#liberator-multiline-output-content { white-space: pre; /* -moz-pre-wrap FIXME: Should lines wrap like Vim? */ font-family: -moz-fixed; margin: 0px; } -#vimperator-multiline-output-content * { +#liberator-multiline-output-content * { font: inherit; } -#vimperator-multiline-output-content table { +#liberator-multiline-output-content table { white-space: inherit; border-spacing: 0px; } -#vimperator-multiline-output-content td, -#vimperator-multiline-output-content th { +#liberator-multiline-output-content td, +#liberator-multiline-output-content th { padding: 0px 2px; } From 98ec9d5eab4f800d79a2e4cc4b63b7fd539d8b6e Mon Sep 17 00:00:00 2001 From: Martin Stubenschrott Date: Tue, 29 Apr 2008 20:28:26 +0000 Subject: [PATCH 05/28] muttator 0.1 released --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 664597b7..468264c9 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ #### configuration -VERSION = 0.1pre +VERSION = 0.1 NAME = muttator include Makefile.common From 20ad0e66bb9d70b18c2392b593785b56e4b33974 Mon Sep 17 00:00:00 2001 From: Martin Stubenschrott Date: Tue, 29 Apr 2008 20:29:40 +0000 Subject: [PATCH 06/28] updated NEWS --- NEWS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index ee575ef7..13ae1a2b 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ 
-2008-xx-xx:
+2008-04-29:
     * version 0.1
-    * first public release, straight port from vimperator
+    * first public release, straight port from vimperator with many basic mappings
From 54cf40e69f8eaef1ff8b4f67c83ed7d9a12673fd Mon Sep 17 00:00:00 2001 From: Martin Stubenschrott Date: Wed, 30 Apr 2008 13:01:05 +0000 Subject: [PATCH 07/28] updated homepage --- NEWS | 5 +++ TODO | 47 +-------------------- locale/en-US/asciidoc.conf | 4 +- locale/en-US/intro.txt | 84 +++++++++++++++++++------------------- 4 files changed, 50 insertions(+), 90 deletions(-) diff --git a/NEWS b/NEWS index 13ae1a2b..edbf3a19 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,9 @@ 
+2008-
+    * version 0.2
+    * ctrl-s mappings to move messages to an "Archive" folder (inspired by gmail)
+    * new :moveto and :copyto commands
+
 2008-04-29:
     * version 0.1
     * first public release, straight port from vimperator with many basic mappings
diff --git a/TODO b/TODO
index 309dcc36..68aec48f 100644
--- a/TODO
+++ b/TODO
@@ -3,52 +3,9 @@ Priority list:
 1-9 as in vim (9=required for next release, 5=would be nice, 1=probably not)
 
 BUGS:
-- add window resize support to hints
-- can't reverse tab through the vimperator toolbar
-- gu and gU doesn't work on Windows.
-- pvh option not working
-- searching backwards incrementally does not work i.e. with 'incsearch' set
-- http://msdn2.microsoft.com/en-us/library/ms535258.aspx does not scroll with j/k/etc.
-  same for http://forum.mootools.net/topic.php?id=3458
-- insert abbreviations broken on 
 
 FEATURES:
-8 middleclick in content == p, and if command line is open, paste there the clipboard buffer
-8 add more autocommands (BrowserStart, BrowserQuit, TabClose, TabOpen, TabChanged, LocationChanged, any more?)
-8 ;? will show information about  like id, class, image filename, etc.
-8 there should be a listbox/combobox mode
-8 y and Y should be changed to: yy and yl=yank location, ys=yank selection,
-  yd=yank domain name, yt=yank title, yw=yank current word,
-  yS=yank selection, if no selection then yank current word (other things to yank?)
-8 all search commands should start searching from the top of the visible viewport 
-7 use ctrl-n/p in insert mode for word completion
-7 implement LocationList window, and get rid off/change PreviewWindow to be a real preview window being able to display html pages
-7 [ctrl-o/i] to Go back to a Previous Position (done partly, however currenty does not use a per tab jumplist)
-7 whereever possible: get rid of dialogs and ask console-like dialog questions or write error prompts directly on the webpage or with :echo()
-7 [d could go to the last domain in the history stack. so if i browse from
-  google to another page and click 10 links there, [d would take me back to the google page
-  opera's fast forward does something like this
-6 :sidebar improvements (:sidebar! Downloads while downloads is open should refocus the sidebar)
-6 jump to the next heading with ]h, next image ]i, previous textbox [t and so on
-6 :grep support (needs location list)
-6 use '' to jump between marks like vim
-6 pipe selected text/link/website to an external command
-6 :set wildoptions=auto mode, which would list completions on each keystroke (maybe performance problems)
-6 Use ctrl-w+j/k/w to switch between sidebar, content, preview window
-5 Favicons in completion windows and some other places?
-5 make a command to search within google search results
-  (http://gadelkareem.com/2007/01/28/using-google-ajax-api-as-an-array/)
-  maybe impossible, needs a per-site key from google
-4 Add -nargs, -complete, etc. to :command
-4 } { should jump to the next paragraph of the page (maybe impossible)
-3 Splitting Windows with [:sp :vsp ctrl-w,s ctrl-w,v] and closing with [ctrl-w,q], moving with [ctrl-w,w or tab]
-  have a look into the split browser extension
-- many other ideas are listed in the wiki
-
-RANDOM IDEAS:
-* numbered tabs
-* Would it be possible to add a setting "maxcompletionsshown" and 
-  "maxpreviewwindowheight" or something like this?
-* hide scrollbars: (window.content.document.body.style.overflow = "hidden" has problems with the mouse wheel)
+9 edit messages with vim
+8 */# support
diff --git a/locale/en-US/asciidoc.conf b/locale/en-US/asciidoc.conf index d60e7dc1..83cda711 100644 --- a/locale/en-US/asciidoc.conf +++ b/locale/en-US/asciidoc.conf @@ -20,7 +20,7 @@ email=stubenschrott@gmx.net # [replacements] -LOGO=
image:chrome://vimperator/content/logo_white.png[Vimperator]
+LOGO=
image:chrome://muttator/content/muttator.png[Muttator]
HEADER=
image:chrome://vimperator/content/logo_white.png[Vimperator] \[count\]=[count] \[arg\]=[arg] @@ -49,7 +49,7 @@ HEADER=
{target} +{target} [quotes] |=tag diff --git a/locale/en-US/intro.txt b/locale/en-US/intro.txt index ad668198..ef708657 100644 --- a/locale/en-US/intro.txt +++ b/locale/en-US/intro.txt @@ -1,65 +1,70 @@ LOGO +++
+++ -*First there was a Navigator, then there was an Explorer. -Later it was time for a Konqueror. Now it's time for an Imperator, the -VIMperator :)* +*All mail clients suck. Mutt just sucks less. This one just sucks less than +mutt.* +++
+++ section:Introduction[intro] -http://vimperator.mozdev.org[Vimperator] is a free browser add-on for Firefox, +http://muttator.mozdev.org[Muttator] is a free browser add-on for Thunderbird, which makes it look and behave like the http://www.vim.org[Vim] text editor. It has similar key bindings, and you could call it a modal -web browser, as key bindings differ according to which mode you are in. +mail client, as key bindings differ according to which mode you are in. |warning| + Warning: -To provide the most authentic Vim experience, the Firefox menubar and toolbar were hidden. + +To provide the most authentic Vim experience, the Thunderbird menubar and toolbar were hidden. + If you really need them, type: [c]:set guioptions+=mT[c] to get them back. + -If you don't like Vimperator at all, you can uninstall it by typing +If you don't like Muttator at all, you can uninstall it by typing [c]:addons[c] and remove/disable it. + If you like it, but can't remember the shortcuts, press [m]F1[m] or [c]:help[c] to get this help window back. |author| |donation| + -Vimperator was written by mailto:stubenschrott@gmx.net[Martin Stubenschrott]. -If you appreciate my work on Vimperator and want to encourage me working on it +Muttator was written by mailto:stubenschrott@gmx.net[Martin Stubenschrott]. +If you appreciate my work on Muttator and want to encourage me working on it more, you can either send me greetings, patches or make a donation: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- - - - + + + +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Of course as a believer in free open source software, only make a donation -if you really like Vimperator and the money doesn't hurt - otherwise just use +if you really like Muttator and the money doesn't hurt - otherwise just use it, recommend it and like it :) section:Help{nbsp}topics[overview] -- help:Initialization[starting.html]: How vimperator starts up, where it reads the config file... -- help:Browsing[browsing.html]: Basic mappings and commands needed for - a browsing session (how to open a web page or go back in history). -- help:Motion{nbsp}commands[motion.html]: How to efficiently scroll in - Vimperator. -- help:Options[options.html]: A description of all options. -- help:Tabs[tabs.html]: Manage your tabbed browsing session. -- help:Marks[marks.html]: Usage of bookmarks, QuickMarks, and history. -- help:Repeating{nbsp}commands[repeat.html]: Usage of macros to repeat - recurring workflows. -- help:Autocommands[autocommands.html]: Automatically execute code on ceratain - events. -- help:Developer{nbsp}Information[developer.html]: How to write docs or - plugins. -- help:Various[various.html]: Other help which didn't fit into any other category. +TO BE WRITTEN... + +For now use [c]:viusage[c] to find out about available mappings and +[c]:exusage[c] to find out about available commands. When in Message mode +(activated by [m]i[m]), most mappings from Vimperator are available. + +// - help:Initialization[starting.html]: How vimperator starts up, where it reads the config file... +// - help:Browsing[browsing.html]: Basic mappings and commands needed for +// a browsing session (how to open a web page or go back in history). +// - help:Motion{nbsp}commands[motion.html]: How to efficiently scroll in +// Vimperator. +// - help:Options[options.html]: A description of all options. +// - help:Tabs[tabs.html]: Manage your tabbed browsing session. +// - help:Marks[marks.html]: Usage of bookmarks, QuickMarks, and history. +// - help:Repeating{nbsp}commands[repeat.html]: Usage of macros to repeat +// recurring workflows. +// - help:Autocommands[autocommands.html]: Automatically execute code on ceratain +// events. +// - help:Developer{nbsp}Information[developer.html]: How to write docs or +// plugins. +// - help:Various[various.html]: Other help which didn't fit into any other category. You can also jump directly to the help of a specific command with [c]:help o[c] or [c]:help :set[c]. @@ -68,25 +73,18 @@ section:Features[features] * Vim-like keybindings ([m]h[m], [m]j[m], [m]k[m], [m]l[m], [m]gg[m], [m]G[m], [m]0[m], [m]$[m], [m]ZZ[m], [m][m], etc.) -* Ex-commands ([c]:quit[c], [c]:open www.foo.com[c], ...) +* Ex-commands ([c]:quit[c], [c]:goto Inbox[c], ...) * Tab completion available for all commands with support for 'longest' matching when set in 'wildmode' * Hit-a-hint like navigation of links (start with [m]f[m] to follow a link) -* Advanced completion of bookmark and history URLs (searching also in title, not only URL) -* Vim-like statusline with a wget-like progress bar -* Minimal GUI (easily hide useless menubar and toolbar with [c]:set guioptions=[c]) -* Ability to [c]:source[c] javascript files, and to use a [a]~/.vimperatorrc[a] file - with syntax highlighting if you install scripts/vimperator.vim -* Easy quick searches ([c]:open foo[c] will search foo in google, - [c]:open ebay terminator[c] will search for terminator on ebay) - with support for Firefox keyword bookmarks and search engines -* Count supported for many commands ([m]3[m] will go back 3 pages) +* Minimal GUI (easily hide useless menubar and toolbar with [c]:set guioptions=f[c]) +* Ability to [c]:source[c] javascript files, and to use a [a]~/.muttatorrc[a] file +* Count supported for many commands ([m]3[m] will go back 3 messages) * Beep on errors -* Marks support ([m]ma[m] to set mark a on a webpage, [m]'a[m] to go there) -* QuickMarks support (quickly go to previously marked web pages with [m]go[m][a]\\{a-zA-Z0-9\\}[a]) * [c]:map[c] support (and feedkeys() for script writers) * [c]:time[c] support for profiling -* Move the text cursor and select text with vim keys and a visual mode -* A comprehensive help file, explaining all commands, mappings and options. +* Many other vimperator features are available when in -- MESSAGE -- mode + +// * A comprehensive help file, explaining all commands, mappings and options. section:Contact[contact] From decc773bebb3763a2225e25b69a4d4588bed474f Mon Sep 17 00:00:00 2001 From: Martin Stubenschrott Date: Wed, 30 Apr 2008 13:09:28 +0000 Subject: [PATCH 08/28] changed css --- locale/en-US/intro.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/locale/en-US/intro.txt b/locale/en-US/intro.txt index ef708657..47c72316 100644 --- a/locale/en-US/intro.txt +++ b/locale/en-US/intro.txt @@ -26,6 +26,10 @@ Muttator was written by mailto:stubenschrott@gmx.net[Martin Stubenschrott]. If you appreciate my work on Muttator and want to encourage me working on it more, you can either send me greetings, patches or make a donation: +NOTE: If this link does not work, go to http://muttator.mozdev.org and click +the donation button there, because Thunderbird seems to have a problem when +this link is inside an e-mail (which this help screen actually is). + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
From 1019c9ceec1b22e77884b73fc527ca876fd92ab9 Mon Sep 17 00:00:00 2001 From: Martin Stubenschrott Date: Wed, 30 Apr 2008 13:39:59 +0000 Subject: [PATCH 09/28] updated muttator logo --- skin/icon.png | Bin 524 -> 229 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/skin/icon.png b/skin/icon.png index 07a3331409ae67f60af99ec34331baba082ccea5..b65189b4440d2d3ac7d825921df473f477beb0e0 100644 GIT binary patch delta 181 zcmV;m080Oi1myvcIDY__Nkl8y{#Tx^0;#o$QpJs~5)gchUj{&x zc9lkN03sUm!OW&&0Kky|ZUwBMX#mj>DgXeMQp)oPEBdK`*2}>s*f+o~P$Gmr2`*PzXYeG5a}n-x9B`u9 jx)Co48Q!ufmy;`EDdIK&n$2cAsU61= zpjNAuyZnhu`2W*dE|>XNnt{YC=yWB|j$AHBYkvdhT?y}yHP!_!lG|F^i>@x=*z0B2AA Ur*l9xC;$Ke07*qoM6N<$g1uwp82|tP From 9c73f771cb3eaedd320eb2855ccec3e032bb455f Mon Sep 17 00:00:00 2001 From: Martin Stubenschrott Date: Wed, 30 Apr 2008 13:50:52 +0000 Subject: [PATCH 10/28] updated install information --- install.rdf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.rdf b/install.rdf index 7eb84b35..2cd39fa9 100644 --- a/install.rdf +++ b/install.rdf @@ -20,8 +20,8 @@ {3550f703-e582-4d05-9a08-453d09bdfdc6} - 2.0 - 3.0.0.* + 3.0a1pre + 3.0a1 From 299dd87dd721bb368fc02b382087c282a7d09205 Mon Sep 17 00:00:00 2001 From: Martin Stubenschrott Date: Wed, 30 Apr 2008 15:55:07 +0000 Subject: [PATCH 11/28] released muttator 0.2 --- Makefile | 2 +- NEWS | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 468264c9..664a5b83 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ #### configuration -VERSION = 0.1 +VERSION = 0.2 NAME = muttator include Makefile.common diff --git a/NEWS b/NEWS index edbf3a19..8c7d945c 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,11 @@ 
-2008-
+2008-04-30:
     * version 0.2
     * ctrl-s mappings to move messages to an "Archive" folder (inspired by gmail)
     * new :moveto and :copyto commands
+    * u and ctrl-r mappings to undo/redo
+    * new muttator specific :help screen
+    * small bug fixes
 
 2008-04-29:
     * version 0.1

From 796587034d5b8b2fc0d5b5b3a9bdb179c11dd3d0 Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott 
Date: Thu, 22 May 2008 15:53:08 +0000
Subject: [PATCH 12/28] updated install.rdf

---
 NEWS            | 14 ++++++++++++++
 TODO            |  2 +-
 chrome.manifest |  2 ++
 install.rdf     |  2 +-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 8c7d945c..79cf42b7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,18 @@
 
+2008-05-xx:
+    * version 0.3
+    * new -- COMPOSE -- mode with mutt-like keybindings (y to send message, e to edit message)
+    * external editor support for sending messages
+    * m to open a new message compose window
+    * :emptytrash command
+    * new * and # mappings to select next/prev message from same author (not perfect matching however)
+    * new "threads" option (non-functional for now)
+    * J, K, ]s, etc. search in closed threads now
+    * gj and gk to select messages in closed threads
+    * "x" to select current thread (change to t at some point)
+    * KMail-like mode-independent scrolling with left/right and up/down
+    * many small improvements
+
 2008-04-30:
     * version 0.2
     * ctrl-s mappings to move messages to an "Archive" folder (inspired by gmail)
diff --git a/TODO b/TODO
index 68aec48f..66b9bf35 100644
--- a/TODO
+++ b/TODO
@@ -6,6 +6,6 @@ BUGS:
 
 FEATURES:
 9 edit messages with vim
-8 */# support
+7 :set! mailnews.wraplength=140 or similar
 
 

diff --git a/chrome.manifest b/chrome.manifest
index 8027292e..313f09d6 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -3,3 +3,5 @@ content	muttator content/
 locale	muttator en-US locale/en-US/
 skin muttator classic/1.0 skin/
 overlay chrome://messenger/content/messenger.xul chrome://muttator/content/muttator.xul
+
+overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://muttator/content/muttatorcompose.xul
diff --git a/install.rdf b/install.rdf
index 2cd39fa9..5a6f8a90 100644
--- a/install.rdf
+++ b/install.rdf
@@ -21,7 +21,7 @@
 	    
 		{3550f703-e582-4d05-9a08-453d09bdfdc6}
 		3.0a1pre
-		3.0a1
+		3.0a2
 	    
 	
 

From 589f8984ab8e146646de59a1a294e618d93f5abd Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott 
Date: Mon, 26 May 2008 09:45:53 +0000
Subject: [PATCH 13/28] added another muttator author

---
 AUTHORS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 33981349..08aa9a66 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,6 +2,9 @@
 Main developer/Project founder:
   * Martin Stubenschrott (stubenschrott@gmx.net)
 
+Patches:
+  * Christian Dietrich (too many to list)
+
 A lot of people contributed to Vimperator, which is the basis of Muttator, so please refer
 to that AUTHOR file for more contributors.
From 4feb42118ff779990b0e69821b8ee6b18ba6cd9d Mon Sep 17 00:00:00 2001 From: Martin Stubenschrott Date: Thu, 29 May 2008 10:33:54 +0000 Subject: [PATCH 14/28] updated NEWS --- NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 79cf42b7..7809a7df 100644 --- a/NEWS +++ b/NEWS @@ -1,9 +1,12 @@ 
 2008-05-xx:
     * version 0.3
+    * new :message command
     * new -- COMPOSE -- mode with mutt-like keybindings (y to send message, e to edit message)
     * external editor support for sending messages
     * m to open a new message compose window
+    * new M command to send a new message to the sender of the currently selected message
+    * completions for :{go,copy,move}to commands
     * :emptytrash command
     * new * and # mappings to select next/prev message from same author (not perfect matching however)
     * new "threads" option (non-functional for now)

From ca7cd07bd2ef566c4418ee2a726f9ff73f575ad8 Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott 
Date: Mon, 2 Jun 2008 12:23:45 +0000
Subject: [PATCH 15/28] updated news

---
 NEWS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS b/NEWS
index 7809a7df..474c0ce5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 
 2008-05-xx:
     * version 0.3
+    * new :contacts and :??? commands for address book operations
     * new :message command
     * new -- COMPOSE -- mode with mutt-like keybindings (y to send message, e to edit message)
     * external editor support for sending messages

From 11e9543e497b55ab9e4f040e131b77f0962edca9 Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott 
Date: Mon, 2 Jun 2008 14:19:28 +0000
Subject: [PATCH 16/28] updated NEWS

---
 NEWS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 474c0ce5..c7169950 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,8 @@
 
 2008-05-xx:
     * version 0.3
-    * new :contacts and :??? commands for address book operations
+    * new tab related mappings + commands
+    * new :contacts and :contact commands for address book operations
     * new :message command
     * new -- COMPOSE -- mode with mutt-like keybindings (y to send message, e to edit message)
     * external editor support for sending messages

From a9377ea81c8a2bcdd74ec14f0e0e46536e42c7b5 Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott 
Date: Thu, 5 Jun 2008 14:26:29 +0000
Subject: [PATCH 17/28] released muttator 0.3

---
 Makefile | 2 +-
 NEWS     | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 664a5b83..a65012f0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #### configuration
 
-VERSION       = 0.2
+VERSION       = 0.3
 NAME          = muttator
 
 include Makefile.common
diff --git a/NEWS b/NEWS
index c7169950..4974bb90 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
 
-2008-05-xx:
+2008-06-xx:
+    * version 0.4
+    * new "threads" option (non-functional for now)
+
+2008-06-04:
     * version 0.3
     * new tab related mappings + commands
     * new :contacts and :contact commands for address book operations
@@ -11,10 +15,9 @@
     * completions for :{go,copy,move}to commands
     * :emptytrash command
     * new * and # mappings to select next/prev message from same author (not perfect matching however)
-    * new "threads" option (non-functional for now)
     * J, K, ]s, etc. search in closed threads now
     * gj and gk to select messages in closed threads
-    * "x" to select current thread (change to t at some point)
+    * "t" to select current thread, use "lr" now to label a message as read
     * KMail-like mode-independent scrolling with left/right and up/down
     * many small improvements
 

From 1d8b11007258ac9fc8259d9c25fa3547613c4a26 Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott 
Date: Thu, 5 Jun 2008 14:57:14 +0000
Subject: [PATCH 18/28] finally really fix english language of donation button

---
 locale/en-US/asciidoc.conf | 2 +-
 locale/en-US/intro.txt     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/locale/en-US/asciidoc.conf b/locale/en-US/asciidoc.conf
index 83cda711..3e4cbefd 100644
--- a/locale/en-US/asciidoc.conf
+++ b/locale/en-US/asciidoc.conf
@@ -21,7 +21,7 @@ email=stubenschrott@gmx.net
 
 [replacements]
 LOGO=
image:chrome://muttator/content/muttator.png[Muttator]

-HEADER=
     
image:chrome://vimperator/content/logo_white.png[Vimperator]
+HEADER=
    
image:chrome://vimperator/content/logo_white.png[Vimperator]
 \[count\]=[count]
 \[arg\]=[arg]
 \[arg1\]=[arg1]
diff --git a/locale/en-US/intro.txt b/locale/en-US/intro.txt
index 47c72316..119d123d 100644
--- a/locale/en-US/intro.txt
+++ b/locale/en-US/intro.txt
@@ -37,7 +37,8 @@ this link is inside an e-mail (which this help screen actually is).
 
 
 
-
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ From 0a7cd71ea185ca73956ce48fc67597fec974b868 Mon Sep 17 00:00:00 2001 From: Martin Stubenschrott Date: Tue, 29 Jul 2008 23:22:19 +0000 Subject: [PATCH 19/28] added License.txt --- License.txt | 25 +++++++++++++++++++++++++ Makefile | 2 +- NEWS | 9 +++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 License.txt diff --git a/License.txt b/License.txt new file mode 100644 index 00000000..cd24cb86 --- /dev/null +++ b/License.txt @@ -0,0 +1,25 @@ +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. + +(c) 2006-2008: Martin Stubenschrott + +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. diff --git a/Makefile b/Makefile index a65012f0..39bd3b03 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ #### configuration -VERSION = 0.3 +VERSION = 0.4pre NAME = muttator include Makefile.common diff --git a/NEWS b/NEWS index 4974bb90..9454d759 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,15 @@ 
 2008-06-xx:
     * version 0.4
+    * various "l" mappings for labeling messages
+    * "p" to open RSS message in browser
+    * "y" to yank sender or RSS URL
+    * "Y" to yank subject
+    * "R" to reply to all
+    * new compose mappings: s, t and i: Focus subject:, To: or message body
+    * q quits composer now, attention: does not save!
+    * new "x" mapping to toggle HTML display (is there a need for "simple HTML"?)
+    * new "h" mapping to toggle headers
     * new "threads" option (non-functional for now)
 
 2008-06-04:

From 47205a15616d77209026e4ddb7aa415aca3bd94a Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott 
Date: Sun, 3 Aug 2008 13:34:40 +0000
Subject: [PATCH 20/28] released version 0.4

---
 NEWS                | 12 +++++++++---
 skin/vimperator.css |  5 +++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 9454d759..0a5d9185 100644
--- a/NEWS
+++ b/NEWS
@@ -1,16 +1,22 @@
 
-2008-06-xx:
+2008-08-xx:
+    * version 0.5
+    * new "threads" option (non-functional for now)
+
+2008-08-03:
     * version 0.4
+    * new 'autoexternal' option to edit new messages/reply with the external editor by default
+      NOTE: You must set this option in your .muttatorrc, as options are not shared between the
+      main thunderbird window and the compose window!
     * various "l" mappings for labeling messages
     * "p" to open RSS message in browser
     * "y" to yank sender or RSS URL
     * "Y" to yank subject
     * "R" to reply to all
     * new compose mappings: s, t and i: Focus subject:, To: or message body
-    * q quits composer now, attention: does not save!
+    * q quits composer now
     * new "x" mapping to toggle HTML display (is there a need for "simple HTML"?)
     * new "h" mapping to toggle headers
-    * new "threads" option (non-functional for now)
 
 2008-06-04:
     * version 0.3
diff --git a/skin/vimperator.css b/skin/vimperator.css
index 7468d2f7..301c2d1a 100644
--- a/skin/vimperator.css
+++ b/skin/vimperator.css
@@ -184,4 +184,9 @@ a.hl-URL:hover {
     padding: 0px 2px;
 }
 
+/* for muttator's composer */
+#content-frame, #appcontent {
+    border: 0px;
+}
+
 /* vim: set fdm=marker sw=4 ts=4 et: */

From c69201ae56635da116cb414b96b8ed03f95de7d1 Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott 
Date: Sun, 3 Aug 2008 13:51:07 +0000
Subject: [PATCH 21/28] updated version to 0.5pre

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 39bd3b03..11862e34 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #### configuration
 
-VERSION       = 0.4pre
+VERSION       = 0.5pre
 NAME          = muttator
 
 include Makefile.common

From 75cafd678a889d68e2b349423158e2da86c576cb Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott 
Date: Fri, 15 Aug 2008 20:03:48 +0000
Subject: [PATCH 22/28] update muttator version to be compatible with TB
 3.0b1pre

---
 Makefile    | 2 +-
 install.rdf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 11862e34..a40cdb53 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #### configuration
 
-VERSION       = 0.5pre
+VERSION       = 0.4
 NAME          = muttator
 
 include Makefile.common
diff --git a/install.rdf b/install.rdf
index 5a6f8a90..f5f9b58b 100644
--- a/install.rdf
+++ b/install.rdf
@@ -21,7 +21,7 @@
 	    
 		{3550f703-e582-4d05-9a08-453d09bdfdc6}
 		3.0a1pre
-		3.0a2
+		3.0b1pre
 	    
 	
 

From 311249080f34b1cbf1871427e0d3078a603dd060 Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott 
Date: Thu, 11 Sep 2008 20:25:06 +0000
Subject: [PATCH 23/28] made muttator work with recent liberator

---
 chrome.manifest | 1 +
 1 file changed, 1 insertion(+)

diff --git a/chrome.manifest b/chrome.manifest
index 313f09d6..0eae6fd8 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,5 +1,6 @@
 # Thunderbird
 content	muttator content/
+resource muttator content/
 locale	muttator en-US locale/en-US/
 skin muttator classic/1.0 skin/
 overlay chrome://messenger/content/messenger.xul chrome://muttator/content/muttator.xul

From d5050a3d33425cbd4103f0fcd38875be70611a9b Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott 
Date: Tue, 16 Sep 2008 01:09:55 +0000
Subject: [PATCH 24/28] required changes to work with newer liberators

---
 Makefile            |  2 +-
 chrome.manifest     |  2 +-
 skin/vimperator.css | 37 ++++++++++++++++++++++++++-----------
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index a40cdb53..11862e34 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #### configuration
 
-VERSION       = 0.4
+VERSION       = 0.5pre
 NAME          = muttator
 
 include Makefile.common
diff --git a/chrome.manifest b/chrome.manifest
index 0eae6fd8..0241067a 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,6 +1,6 @@
 # Thunderbird
 content	muttator content/
-resource muttator content/
+resource muttator modules/
 locale	muttator en-US locale/en-US/
 skin muttator classic/1.0 skin/
 overlay chrome://messenger/content/messenger.xul chrome://muttator/content/muttator.xul
diff --git a/skin/vimperator.css b/skin/vimperator.css
index 301c2d1a..1dcaf2d9 100644
--- a/skin/vimperator.css
+++ b/skin/vimperator.css
@@ -30,11 +30,11 @@ the terms of any one of the MPL, the GPL or the LGPL.
     font-family: monospace;
 }
 
-#liberator-bufferwindow, #liberator-completion, #liberator-previewwindow {
+#liberator-completions {
     -moz-user-focus: ignore;
     overflow: -moz-scrollbars-none !important; /* does not seem to work fully */
     border-width: 0px !important;
-    -moz-appearance: none !important; /* prevent an ugly 3D border */
+    /*-moz-appearance: none !important; /* prevent an ugly 3D border */
 }
 
 /* the selected item in listboxes is hardly readable without this */
@@ -45,6 +45,10 @@ the terms of any one of the MPL, the GPL or the LGPL.
    color: HighlightText !important;
 }
 
+/*.liberator-compitem {
+    min-height: 16px;
+}*/
+
 /* fixes the min-height: 22px from firefox */
 #status-bar, statusbarpanel {
     -moz-appearance: none !important;
@@ -78,12 +82,18 @@ the terms of any one of the MPL, the GPL or the LGPL.
 
 #liberator-commandline {
     padding: 1px;
+    font-family: monospace;
     /*
     background-color: white;
     color: black;
     */
 }
-#liberator-commandline-prompt, #liberator-commandline-command {
+#liberator-commandline-prompt {
+    margin: 0px;
+    padding: 0px;
+    background-color: inherit;
+}
+#liberator-commandline-command {
     background-color: inherit;
     color: inherit;
 }
@@ -109,6 +119,10 @@ the terms of any one of the MPL, the GPL or the LGPL.
     color: white;
     font-weight: bold;
 }
+.hl-InfoMsg {
+    background-color: white;
+    color: magenta;
+}
 .hl-ModeMsg {
     background-color: white;
     color: black;
@@ -146,7 +160,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
     color: black !important;
 }
 .hl-URL {
-    background-color: white;
+    background-color: inherit;
     color: green;
     text-decoration: none;
 }
@@ -158,29 +172,29 @@ a.hl-URL:hover {
 
 /* MOW */
 
-#liberator-multiline-output {
+#liberator-completions, #liberator-multiline-output {
     overflow: hidden;
     background-color: white;
     color: black;
 }
 
-#liberator-multiline-output-content {
-    white-space: pre; /* -moz-pre-wrap FIXME: Should lines wrap like Vim? */
+#liberator-completions-content, #liberator-multiline-output-content {
+    white-space: pre;
     font-family: -moz-fixed;
     margin: 0px;
 }
 
-#liberator-multiline-output-content * {
+#liberator-completions-content *, #liberator-multiline-output-content * {
     font: inherit;
 }
 
-#liberator-multiline-output-content table {
+#liberator-completions-content table, #liberator-multiline-output-content table {
     white-space: inherit;
     border-spacing: 0px;
 }
 
-#liberator-multiline-output-content td,
-#liberator-multiline-output-content th {
+#liberator-completions-content td, #liberator-multiline-output-content td,
+#liberator-completions-content th, #liberator-multiline-output-content th {
     padding: 0px 2px;
 }
 
@@ -189,4 +203,5 @@ a.hl-URL:hover {
     border: 0px;
 }
 
+
 /* vim: set fdm=marker sw=4 ts=4 et: */

From 3aff44419d647ac70f764c0920d4608606230a9f Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott 
Date: Sat, 11 Oct 2008 16:44:50 +0000
Subject: [PATCH 25/28] fix muttator loading, composer still broken partly

---
 chrome.manifest | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/chrome.manifest b/chrome.manifest
index 0241067a..570fb5b9 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,8 +1,11 @@
 # Thunderbird
-content	muttator content/
-resource muttator modules/
-locale	muttator en-US locale/en-US/
-skin muttator classic/1.0 skin/
-overlay chrome://messenger/content/messenger.xul chrome://muttator/content/muttator.xul
-
-overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://muttator/content/muttatorcompose.xul
+content  liberator content/
+resource liberator modules/
+locale   liberator en-US locale/en-US/
+skin     liberator classic/1.0 skin/
+override chrome://liberator/content/liberator.dtd chrome://liberator/content/muttator.dtd
+overlay  chrome://messenger/content/messenger.xul chrome://liberator/content/liberator.xul
+overlay  chrome://messenger/content/messenger.xul chrome://liberator/content/muttator.xul
+overlay  chrome://messenger/content/messengercompose/messengercompose.xul chrome://liberator/content/liberator.xul
+#overlay  chrome://messenger/content/messengercompose/messengercompose.xul chrome://liberator/content/muttatorcompose.xul
+overlay  chrome://messenger/content/messengercompose/messengercompose.xul chrome://liberator/content/compose/compose.xul

From e0d9865f20d83c5bb58ae1f3ddd4938a4cd9c8f1 Mon Sep 17 00:00:00 2001
From: Daniel Bainton 
Date: Sat, 11 Oct 2008 18:11:05 +0000
Subject: [PATCH 26/28] Moving vimperator.css to liberator.css to make the
 style load on newer liberator

---
 skin/{vimperator.css => liberator.css} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename skin/{vimperator.css => liberator.css} (100%)

diff --git a/skin/vimperator.css b/skin/liberator.css
similarity index 100%
rename from skin/vimperator.css
rename to skin/liberator.css

From 13fb14235840189d08681ff91e88a25ab405cce4 Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott 
Date: Tue, 14 Oct 2008 00:14:24 +0000
Subject: [PATCH 27/28] made muttator's composer work

---
 chrome.manifest | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/chrome.manifest b/chrome.manifest
index 570fb5b9..0e6fa900 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -3,9 +3,14 @@ content  liberator content/
 resource liberator modules/
 locale   liberator en-US locale/en-US/
 skin     liberator classic/1.0 skin/
+
 override chrome://liberator/content/liberator.dtd chrome://liberator/content/muttator.dtd
+override chrome://liberator/content/config.js chrome://liberator/content/muttator.js
+
 overlay  chrome://messenger/content/messenger.xul chrome://liberator/content/liberator.xul
 overlay  chrome://messenger/content/messenger.xul chrome://liberator/content/muttator.xul
-overlay  chrome://messenger/content/messengercompose/messengercompose.xul chrome://liberator/content/liberator.xul
-#overlay  chrome://messenger/content/messengercompose/messengercompose.xul chrome://liberator/content/muttatorcompose.xul
+
+#1
+#override chrome://liberator/content/compose/liberator.xul chrome://liberator/content/liberator.xul
+overlay  chrome://messenger/content/messengercompose/messengercompose.xul chrome://liberator/content/compose/liberator.xul
 overlay  chrome://messenger/content/messengercompose/messengercompose.xul chrome://liberator/content/compose/compose.xul

From 4bdc2097e1e95f3fdc8d70f3687fcba40f6bc820 Mon Sep 17 00:00:00 2001
From: Daniel Bainton 
Date: Tue, 2 Dec 2008 21:18:30 +0200
Subject: [PATCH 28/28] [muttator] Move everything to muttator/

---
 AUTHORS => muttator/AUTHORS                     |   0
 Donators => muttator/Donators                   |   0
 License.txt => muttator/License.txt             |   0
 Makefile => muttator/Makefile                   |   0
 NEWS => muttator/NEWS                           |   0
 README => muttator/README                       |   0
 TODO => muttator/TODO                           |   0
 chrome.manifest => muttator/chrome.manifest     |   0
 install.rdf => muttator/install.rdf             |   0
 {locale => muttator/locale}/en-US/asciidoc.conf |   0
 {locale => muttator/locale}/en-US/intro.txt     |   0
 {locale => muttator/locale}/en-US/xhtml11.css   |   0
 {skin => muttator/skin}/icon.png                | Bin
 {skin => muttator/skin}/liberator.css           |   0
 14 files changed, 0 insertions(+), 0 deletions(-)
 rename AUTHORS => muttator/AUTHORS (100%)
 rename Donators => muttator/Donators (100%)
 rename License.txt => muttator/License.txt (100%)
 rename Makefile => muttator/Makefile (100%)
 rename NEWS => muttator/NEWS (100%)
 rename README => muttator/README (100%)
 rename TODO => muttator/TODO (100%)
 rename chrome.manifest => muttator/chrome.manifest (100%)
 rename install.rdf => muttator/install.rdf (100%)
 rename {locale => muttator/locale}/en-US/asciidoc.conf (100%)
 rename {locale => muttator/locale}/en-US/intro.txt (100%)
 rename {locale => muttator/locale}/en-US/xhtml11.css (100%)
 rename {skin => muttator/skin}/icon.png (100%)
 rename {skin => muttator/skin}/liberator.css (100%)

diff --git a/AUTHORS b/muttator/AUTHORS
similarity index 100%
rename from AUTHORS
rename to muttator/AUTHORS
diff --git a/Donators b/muttator/Donators
similarity index 100%
rename from Donators
rename to muttator/Donators
diff --git a/License.txt b/muttator/License.txt
similarity index 100%
rename from License.txt
rename to muttator/License.txt
diff --git a/Makefile b/muttator/Makefile
similarity index 100%
rename from Makefile
rename to muttator/Makefile
diff --git a/NEWS b/muttator/NEWS
similarity index 100%
rename from NEWS
rename to muttator/NEWS
diff --git a/README b/muttator/README
similarity index 100%
rename from README
rename to muttator/README
diff --git a/TODO b/muttator/TODO
similarity index 100%
rename from TODO
rename to muttator/TODO
diff --git a/chrome.manifest b/muttator/chrome.manifest
similarity index 100%
rename from chrome.manifest
rename to muttator/chrome.manifest
diff --git a/install.rdf b/muttator/install.rdf
similarity index 100%
rename from install.rdf
rename to muttator/install.rdf
diff --git a/locale/en-US/asciidoc.conf b/muttator/locale/en-US/asciidoc.conf
similarity index 100%
rename from locale/en-US/asciidoc.conf
rename to muttator/locale/en-US/asciidoc.conf
diff --git a/locale/en-US/intro.txt b/muttator/locale/en-US/intro.txt
similarity index 100%
rename from locale/en-US/intro.txt
rename to muttator/locale/en-US/intro.txt
diff --git a/locale/en-US/xhtml11.css b/muttator/locale/en-US/xhtml11.css
similarity index 100%
rename from locale/en-US/xhtml11.css
rename to muttator/locale/en-US/xhtml11.css
diff --git a/skin/icon.png b/muttator/skin/icon.png
similarity index 100%
rename from skin/icon.png
rename to muttator/skin/icon.png
diff --git a/skin/liberator.css b/muttator/skin/liberator.css
similarity index 100%
rename from skin/liberator.css
rename to muttator/skin/liberator.css