Melodactyl naming fixes 2.

--HG--
rename : melodactyl/content/xulmus.svg => melodactyl/content/melodactyl.svg

Makefile

@@ -1,4 +1,4 @@
-DIRS = teledactyl pentadactyl xulmus
+DIRS = teledactyl pentadactyl melodactyl
 TARGETS = clean distclean doc help info jar release xpi
 .SILENT:
 

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",

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", {

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]

melodactyl/TODO

@@ -7,7 +7,7 @@ BUGS:
   - :open songbird-internal-search searchString (broken because SB intercepts queries to this engine)
   - <C-^> 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

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

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">
   <defs
@@ -73,7 +73,7 @@
          sodipodi:role="line"
          id="tspan2231"
          x="6.2673268"
-         y="29.896835">xulmus_</tspan></text>
+         y="29.896835">melodactyl_</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:24px;font-style:normal;font-weight:normal;fill:#00ff00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Sans Mono"

melodactyl/content/melodactyl.xul

@@ -1,50 +1,50 @@
 <?xml version="1.0"?>
 
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://xulmus/skin/xulmus.css" type="text/css"?>
+<?xml-stylesheet href="chrome://melodactyl/skin/melodactyl.css" type="text/css"?>
 
-<overlay id="xulmus"
+<overlay id="melodactyl"
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     xmlns:nc="http://home.netscape.com/NC-rdf#"
     xmlns:html="http://www.w3.org/1999/xhtml"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <menupopup id="viewSidebarMenu">
-        <menuitem observes="xulmus-viewAddonsSidebar" label="Add-ons" accesskey="A"/>
+        <menuitem observes="melodactyl-viewAddonsSidebar" label="Add-ons" accesskey="A"/>
-        <menuitem observes="xulmus-viewConsoleSidebar" label="Console" accesskey="C"/>
+        <menuitem observes="melodactyl-viewConsoleSidebar" label="Console" accesskey="C"/>
-        <menuitem observes="xulmus-viewDownloadsSidebar" label="Downloads" accesskey="D"/>
+        <menuitem observes="melodactyl-viewDownloadsSidebar" label="Downloads" accesskey="D"/>
-        <menuitem observes="xulmus-viewPreferencesSidebar" label="Preferences" accesskey="P"/>
+        <menuitem observes="melodactyl-viewPreferencesSidebar" label="Preferences" accesskey="P"/>
     </menupopup>
 
     <broadcasterset id="mainBroadcasterSet">
-        <broadcaster id="xulmus-viewAddonsSidebar"
+        <broadcaster id="melodactyl-viewAddonsSidebar"
             autoCheck="false"
             type="checkbox"
             group="sidebar"
             sidebarurl="chrome://mozapps/content/extensions/extensions.xul"
             sidebartitle="Add-ons"
-            oncommand="toggleSidebar('xulmus-viewAddonsSidebar');"/>
+            oncommand="toggleSidebar('melodactyl-viewAddonsSidebar');"/>
-        <broadcaster id="xulmus-viewConsoleSidebar"
+        <broadcaster id="melodactyl-viewConsoleSidebar"
             autoCheck="false"
             type="checkbox"
             group="sidebar"
             sidebarurl="chrome://global/content/console.xul"
             sidebartitle="Console"
-            oncommand="toggleSidebar('xulmus-viewConsoleSidebar');"/>
+            oncommand="toggleSidebar('melodactyl-viewConsoleSidebar');"/>
-        <broadcaster id="xulmus-viewDownloadsSidebar"
+        <broadcaster id="melodactyl-viewDownloadsSidebar"
             autoCheck="false"
             type="checkbox"
             group="sidebar"
             sidebarurl="chrome://mozapps/content/downloads/downloads.xul"
             sidebartitle="Downloads"
-            oncommand="toggleSidebar('xulmus-viewDownloadsSidebar');"/>
+            oncommand="toggleSidebar('melodactyl-viewDownloadsSidebar');"/>
-        <broadcaster id="xulmus-viewPreferencesSidebar"
+        <broadcaster id="melodactyl-viewPreferencesSidebar"
             autoCheck="false"
             type="checkbox"
             group="sidebar"
             sidebarurl="about:config"
             sidebartitle="Preferences"
-            oncommand="toggleSidebar('xulmus-viewPreferencesSidebar');"/>
+            oncommand="toggleSidebar('melodactyl-viewPreferencesSidebar');"/>
     </broadcasterset>
 
 </overlay>

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

melodactyl/contrib/vim/mkvimball.txt

@@ -1,2 +1,2 @@
-syntax/xulmus.vim
+syntax/melodactyl.vim
-ftdetect/xulmus.vim
+ftdetect/melodactyl.vim

melodactyl/locale/en-US/autocommands.xml

@@ -25,9 +25,9 @@
     <dt>StreamPause</dt>   <dd>Triggered after a stream has paused</dd>
     <dt>StreamEnd</dt>     <dd>Triggered after a stream has ended</dd>
     <dt>StreamStop</dt>    <dd>Triggered after a stream has stopped</dd>
-    <dt>XulmusEnter</dt>   <dd>Triggered after Songbird starts</dd>
+    <dt>Enter</dt>         <dd>Triggered after Songbird starts</dd>
-    <dt>XulmusLeavePre</dt><dd>Triggered before exiting Songbird, just before destroying each module</dd>
+    <dt>LeavePre</dt>      <dd>Triggered before exiting Songbird, just before destroying each module</dd>
-    <dt>XulmusLeave</dt>   <dd>Triggered before exiting Songbird</dd>
+    <dt>Leave</dt>         <dd>Triggered before exiting Songbird</dd>
 </dl>
 
 <dl tag="autocommand-args" replace="autocommand-args">

melodactyl/locale/en-US/intro.xml

@@ -82,7 +82,7 @@ text editor.
 
 <h2 tag="features">Features</h2>
 
-<!-- TODO: make Xulmus specific -->
+<!-- TODO: make Melodactyl specific -->
 <ul>
     <li>Vim-like keybindings (<k>h</k>, <k>j</k>, <k>k</k>, <k>l</k>, <k>gg</k>, <k>G</k>, <k>0</k>, <k>$</k>, <k>ZZ</k>, <k name="C-f"/>, etc.)</li>
     <li>Ex commands (<ex>:quit</ex>, <ex>:open www.foo.com</ex>, ...)</li>
@@ -91,7 +91,7 @@ text editor.
     <li>Advanced completion of bookmark and history URLs (searching also in title, not only URL)</li>
     <li>Vim-like statusline with a Wget-like progress bar</li>
     <li>Minimal GUI (easily hide useless menubar and toolbar with <ex>:set guioptions=</ex>)</li>
-    <li>Ability to <ex>:source</ex> 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]</li>
+    <li>Ability to <ex>:source</ex> 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]</li>
     <li>Easy quick searches (<ex>:open foo</ex> will search for "foo" in google, <ex>:open ebay terminator</ex> will search for "terminator" on ebay) with support for &dactyl.host; keyword bookmarks and search engines</li>
     <li>Count supported for many commands (<em>3</em><k name="C-o"/> will go back 3 pages)</li>
     <li>Beep on errors</li>
@@ -119,7 +119,7 @@ text editor.
     <link topic="http://code.google.com/p/dactyl/wiki/FAQ">
         frequently asked questions (FAQ)</link>.
     Make sure, you have read the
-    <link topic="http://dactyl.googlecode.com/hg/xulmus/TODO">TODO</link>
+    <link topic="http://dactyl.googlecode.com/hg/melodactyl/TODO">TODO</link>
     file first, as we are aware of many things which can be improved
     when we find time for it or receive patches.
 </p>