Rename :filter to :queue and :Filter to :filter.

xulmus/NEWS

@@ -8,6 +8,7 @@
     * add 'maxitems'
     * :dialog {subscribe|newsmartplaylist}
     * add :displaypane and :dpclose
+    * rename :filter to :queue and :Filter to :filter
 
 2009-03-28:
     * version 0.1

xulmus/TODO

@@ -16,9 +16,11 @@ FEATURES:
 9 '?' - Reusing '/'.
 8 Playlist/SmartPlaylist operations & meta-data operations.
 8 Sort-View commands.
+7 Queue view.
 7 j/k - for browsing through the visible view.
 7 extended hint mode for opening links in FF.
 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 Vimperator does? --djk
+5 tagging tracks for manipulation by commands

xulmus/content/player.js

@@ -100,12 +100,12 @@ function Player() // {{{
         function () { player.stop(); });
 
     mappings.add([modes.PLAYER],
-        ["f"], "Filter library",
-        function () { commandline.open(":", "filter ", modes.EX); });
+        ["Q"], "Queue tracks by artist/album/track",
+        function () { commandline.open(":", "queue ", modes.EX); });
 
     mappings.add([modes.PLAYER],
-        ["F"], "Loads current view filtered by the keywords",
-        function () { commandline.open(":", "Filter ", modes.EX); });
+        ["f"], "Loads current view filtered by the keywords",
+        function () { commandline.open(":", "filter ", modes.EX); });
 
     mappings.add([modes.PLAYER],
         ["i"], "Select current track",
@@ -172,9 +172,9 @@ function Player() // {{{
     ////////////////////// COMMANDS ////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    // TODO: rename :Filter to :filter and move this functionality into :tqueue etc? --djk
-    commands.add(["f[ilter]"],
-        "Filter and play tracks",
+    // FIXM: use :add -q like cmus? (not very vim-like are it's multi-option commands) --djk
+    commands.add(["qu[eue]"],
+        "Queue tracks by artist/album/track",
         function (args)
         {
             // Store the old view
@@ -207,7 +207,7 @@ function Player() // {{{
             completer: function (context, args) completion.song(context, args)
         });
 
-    commands.add(["F[ilter]"],
+    commands.add(["f[ilter]"],
             "Filter tracks based on keywords {genre/artist/album/track}",
             function (args)
             {

xulmus/locale/en-US/index.txt

@@ -14,8 +14,8 @@ section:Player{nbsp}mode[player-index]
 ||[m]t[m]|| Toggle shuffle mode +
 ||[m]r[m]|| Toggle repeat mode +
 ||[m]i[m]|| Select the currently playing track +
-||[m]f[m]|| Filter and play tracks +
-||[m]F[m]|| Filter and show the tracks as a view +
+||[m]f[m]|| Filter and show the tracks as a view +
+||[m]Q[m]|| Queue tracks by artist/album/track +
 ||[m]h[m]|| Seek -10s +
 ||[m]<Left>[m]|| Seek -10s +
 ||[m]l[m]|| Seek +10s +
@@ -176,17 +176,17 @@ section:Command-line{nbsp}editing[ex-edit-index]
 
 section:Ex{nbsp}commands[ex-cmd-index,:index]
 
+||[c]:filter[c]|| Filter and show the tracks as a view +
+||[c]:load[c]|| Load a playlist +
+||[c]:mediaview[c]|| Change the media view +
 ||[c]:playerplay[c]|| Play the current track +
 ||[c]:playerprev[c]|| Play the previous track +
 ||[c]:playernext[c]|| Play the next track +
 ||[c]:playerpause[c]|| Pause/unpause the current track +
 ||[c]:playerstop[c]|| Stop playing the current track +
-||[c]:filter[c]|| Filter and play tracks +
-||[c]:Filter[c]|| Filter and show the tracks as a view +
+||[c]:queue[c]|| Queue tracks by artist/album/track +
 ||[c]:seek[c]|| Seek to an absolute or relative position in a track +
 ||[c]:volume[c]|| Set the player volume +
-||[c]:load[c]|| Load a playlist +
-||[c]:mediaview[c]|| Change the media view +
 
 ||[c]:![c]|| Run a command +
 ||[c]:abbreviate[c]|| Abbreviate a key sequence +

xulmus/locale/en-US/player.txt

@@ -66,19 +66,21 @@ ________________________________________________________________________________
 Select the currently playing track.
 ________________________________________________________________________________
 
-section:Filtering{nbsp}the{nbsp}library[filter,filtering]
+section:Queueing{nbsp}tracks[queue,queueing]
 
 |p_f| |:f| |:filter|
 ||:f[ilter] {artist} [a][album][a] [a][track][a]|| +
 ||f||
 ________________________________________________________________________________
-Filter and play tracks. If only {artist} is specified then all tracks for that
-artist are played in album order. If [a][album][a] is also specified then all
-tracks for that album are played. A specific track can be specified with
-[a][track][a].
+Queue tracks by artist/album/track. If only {artist} is specified then all
+tracks for that artist are played in album order. If [a][album][a] is also
+specified then all tracks for that album are played. A specific track can be
+specified with [a][track][a].
 ________________________________________________________________________________
 
 
+section:Filtering{nbsp}the{nbsp}library[filter,filtering]
+
 |p_F| |:F| |:Filter|
 ||:F[ilter] {keywords}|| +
 ||F||