diff --git a/Makefile b/Makefile index b27c4897..637f33c2 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -DIRS = teledactyl pentadactyl xulmus +DIRS = teledactyl pentadactyl melodactyl TARGETS = clean distclean doc help info jar release xpi .SILENT: diff --git a/common/content/tabs.js b/common/content/tabs.js index ac1b59bb..ee00c727 100644 --- a/common/content/tabs.js +++ b/common/content/tabs.js @@ -1055,7 +1055,7 @@ const Tabs = Module("tabs", { ] }); - // TODO: Is this really applicable to Xulmus? + // TODO: Is this really applicable to Melodactyl? options.add(["popups", "pps"], "Where to show requested popup windows", "stringlist", "tab", diff --git a/common/modules/sanitizer.jsm b/common/modules/sanitizer.jsm index 1dec97b9..d80ac6a8 100644 --- a/common/modules/sanitizer.jsm +++ b/common/modules/sanitizer.jsm @@ -12,7 +12,7 @@ // - integrate with the Clear Private Data dialog? // FIXME: -// - finish 1.9.0 support if we're going to support sanitizing in Xulmus +// - finish 1.9.0 support if we're going to support sanitizing in Melodactyl Components.utils.import("resource://dactyl/base.jsm"); defineModule("sanitizer", { diff --git a/melodactyl/NEWS b/melodactyl/NEWS index a50e9b8e..058d3f06 100755 --- a/melodactyl/NEWS +++ b/melodactyl/NEWS @@ -1,9 +1,9 @@ 2009-XX-XX: * version 0.2pre - * asciidoc is no longer required to build Xulmus + * asciidoc is no longer required to build Melodactyl * The help system is newly modularized * add [c]:silent[c] - * add [j]$MY_XULMUSRC[j] + * add [j]$MY_MELODACTYLRC[j] * add [m]'[m] and [m]"[m] local marks * add [m]w[m] and [m]W[m] Normal mode mappings for symmetry with [m]o[m]/[m]O[m] and [m]t[m]/[m]T[m] * add [c]:messclear[c] diff --git a/melodactyl/TODO b/melodactyl/TODO index e175284f..b48acc60 100644 --- a/melodactyl/TODO +++ b/melodactyl/TODO @@ -7,7 +7,7 @@ BUGS: - :open songbird-internal-search searchString (broken because SB intercepts queries to this engine) - only works between browser tabs not the media tab - numbered tabs - - command-line option handling is broken in Xulmus only - it used to work. + - command-line option handling is broken in Melodactyl only - it used to work. FEATURES: 9 '?' - Reusing '/'. @@ -20,5 +20,5 @@ FEATURES: 6 :tqueue, :lqueue etc. 5 make Player mode commands work in the Mini-Player. 5 Check for default extensions and add commands for them. Ex. Last.fm, Seeqpod e.t.c - Wouldn't these be provided as Xulmus plugins like Pentadactyl does? --djk + Wouldn't these be provided as Melodactyl plugins like Pentadactyl does? --djk 5 tagging tracks for manipulation by commands diff --git a/melodactyl/chrome.manifest b/melodactyl/chrome.manifest index 7978f433..3f8502ce 100644 --- a/melodactyl/chrome.manifest +++ b/melodactyl/chrome.manifest @@ -26,11 +26,11 @@ overlay chrome://songbird/content/xul/layoutBaseOverlay.xul chrome://dactyl/con #component {81495d80-89ee-4c36-a88d-ea7c4e5ac63f} components/protocols.js #contract @mozilla.org/network/protocol/about;1?what=melodactyl {81495d80-89ee-4c36-a88d-ea7c4e5ac63f} -#overlay chrome://songbird/content/xul/layoutWithBrowserOverlay.xul chrome://xulmus/content/xulmus.xul +#overlay chrome://songbird/content/xul/layoutWithBrowserOverlay.xul chrome://melodactyl/content/melodactyl.xul #overlay chrome://songbird/content/xul/layoutWithBrowserOverlay.xul chrome://dactyl/content/dactyl.xul -#overlay chrome://songbird/content/xul/layoutWithoutBrowserOverlay.xul chrome://xulmus/content/xulmus.xul +#overlay chrome://songbird/content/xul/layoutWithoutBrowserOverlay.xul chrome://melodactyl/content/melodactyl.xul #overlay chrome://songbird/content/xul/layoutWithoutBrowserOverlay.xul chrome://dactyl/content/dactyl.xul #overlay windowtype:Songbird:Main chrome://dactyl/content/dactyl.xul -#overlay windowtype:Songbird:Main chrome://xulmus/content/xulmus.xul +#overlay windowtype:Songbird:Main chrome://melodactyl/content/melodactyl.xul diff --git a/melodactyl/content/xulmus.svg b/melodactyl/content/melodactyl.svg similarity index 96% rename from melodactyl/content/xulmus.svg rename to melodactyl/content/melodactyl.svg index 55cf152b..d7909f33 100644 --- a/melodactyl/content/xulmus.svg +++ b/melodactyl/content/melodactyl.svg @@ -15,9 +15,9 @@ inkscape:version="0.46" version="1.0" sodipodi:docbase="/home/maxauthority/code/pentadactyl" - sodipodi:docname="xulmus.svg" + sodipodi:docname="melodactyl.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/maxauthority/code/pentadactyl/xulmus.png" + inkscape:export-filename="/home/maxauthority/code/pentadactyl/melodactyl.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> xulmus_ + y="29.896835">melodactyl_ - + - - - - - + + + + - - + - + - + + oncommand="toggleSidebar('melodactyl-viewPreferencesSidebar');"/> diff --git a/melodactyl/contrib/vim/Makefile b/melodactyl/contrib/vim/Makefile index cbbbe046..29972b5a 100644 --- a/melodactyl/contrib/vim/Makefile +++ b/melodactyl/contrib/vim/Makefile @@ -1,6 +1,6 @@ -VIMBALL = xulmus.vba +VIMBALL = melodactyl.vba -vimball: mkvimball.txt syntax/xulmus.vim ftdetect/xulmus.vim +vimball: mkvimball.txt syntax/melodactyl.vim ftdetect/melodactyl.vim -echo '%MkVimball! ${VIMBALL} .' | vim -u NORC -N -e -s mkvimball.txt all: vimball diff --git a/melodactyl/contrib/vim/mkvimball.txt b/melodactyl/contrib/vim/mkvimball.txt index 3b0b3ed3..ec820b41 100644 --- a/melodactyl/contrib/vim/mkvimball.txt +++ b/melodactyl/contrib/vim/mkvimball.txt @@ -1,2 +1,2 @@ -syntax/xulmus.vim -ftdetect/xulmus.vim +syntax/melodactyl.vim +ftdetect/melodactyl.vim diff --git a/melodactyl/locale/en-US/autocommands.xml b/melodactyl/locale/en-US/autocommands.xml index d7f4366e..83df5128 100644 --- a/melodactyl/locale/en-US/autocommands.xml +++ b/melodactyl/locale/en-US/autocommands.xml @@ -25,9 +25,9 @@
StreamPause
Triggered after a stream has paused
StreamEnd
Triggered after a stream has ended
StreamStop
Triggered after a stream has stopped
-
XulmusEnter
Triggered after Songbird starts
-
XulmusLeavePre
Triggered before exiting Songbird, just before destroying each module
-
XulmusLeave
Triggered before exiting Songbird
+
Enter
Triggered after Songbird starts
+
LeavePre
Triggered before exiting Songbird, just before destroying each module
+
Leave
Triggered before exiting Songbird
diff --git a/melodactyl/locale/en-US/intro.xml b/melodactyl/locale/en-US/intro.xml index b4f51187..ac5b7ce0 100644 --- a/melodactyl/locale/en-US/intro.xml +++ b/melodactyl/locale/en-US/intro.xml @@ -82,7 +82,7 @@ text editor.

Features

- +
  • Vim-like keybindings (h, j, k, l, gg, G, 0, $, ZZ, , etc.)
  • Ex commands (:quit, :open www.foo.com, ...)
    • @@ -91,7 +91,7 @@ text editor.
  • 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 :set guioptions=)
    • -
  • Ability to :source JavaScript files, and to use a [a]~/.xulmusrc[a] file with syntax highlighting if you install http://code.google.com/p/pentadactyl-labs/issues/detail?id=50[xulmus.vim]
    • +
  • Ability to :source JavaScript files, and to use a [a]~/.melodactylrc[a] file with syntax highlighting if you install http://code.google.com/p/pentadactyl-labs/issues/detail?id=50[melodactyl.vim]
  • Easy quick searches (:open foo will search for "foo" in google, :open ebay terminator will search for "terminator" on ebay) with support for &dactyl.host; keyword bookmarks and search engines
  • Count supported for many commands (3 will go back 3 pages)
  • Beep on errors
    • @@ -119,7 +119,7 @@ text editor. frequently asked questions (FAQ). Make sure, you have read the - TODO + TODO file first, as we are aware of many things which can be improved when we find time for it or receive patches.