Merge compact mode volume slider changes.

[disorder] / disobedience / manual / playlists.html

diff --git a/disobedience/manual/playlists.html b/disobedience/manual/playlists.html
index 4a49102b3615b854937dc3f9dfd75c12e54f5f6d..bef0c18920c453c2ff96a6723dd2ce92deea9f99 100644 (file)
--- a/disobedience/manual/playlists.html
+++ b/disobedience/manual/playlists.html
@@ -62,8 +62,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    <h2><a name=creating>5.2 Creating Playlists</a></h2>
 
-   <!-- TODO rewrite with screenshots -->
-
    <p>To create a playlist, click the <b>Add</b> button in the
    playlist editor.  This will create a pop-up window where you can
    enter the name of the new playlist and decide whether it is
@@ -72,10 +70,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    <p>Only Roman letters (without any accents) and digits are allowed
    in playlist names.</p>
 
+   <p class=image><img src="playlist-create.png"></p>
+
    <h2><a name=editing>5.3 Editing Playlists</a></h2>
 
-   <!-- TODO rewrite with screenshots - might be worth waiting until
-   picker is a tree -->
+   <p>You can select the playlist to edit from the left side of the
+   window.  Shared playlists are listed first, then the public
+   playlists of each user (plus private playlists that you own).</p>
+
+   <p class=image><img src="playlist-window.png"></p>
 
    <p>When a playlist is selected, you can edit in the right hand half
    of the playlist window.  The editor is very similar in structure
@@ -83,23 +86,33 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    rearrange tracks within it by drag and drop and you can drag tracks
    from the <b>Choose</b> tab into it.</p>
 
+   <p>Right clicking will create a pop-up menu which you can use to
+   play indivudual tracks or the whole playlist, as well as the
+   usual options as found in the <b>Queue</b> tab.</p>
+
+   <p class=image><img src="playlist-popup-menu.png"></p>
+
    <h2><a name=playing>5.3 Playing Playlists</a></h2>
 
    <p>There are three ways to play a playlist:</p>
 
    <ol>
 
-     <li>Right clicking in the playlist editor will create a pop-up
-     menu.  In addition to the familiar options there is an option to
-     play this playlist.</li>
+     <li>You can use <b>Control > Activate Playlist</b> from the main
+     menu.</li>
+
+     <li>Right clicking in either half of the playlist editor will
+     create a pop-up menu.  There is an option to play this
+     playlist.</li>
 
      <li>You can select all the tracks and drag them to the desired
      point in the <b>Queue</b> tab.</li>
 
-     <li>You can use <b>Control > Activate Playlist</b> from the main
-     menu.</li>
-
    </ol>
 
+   <hr>
+
+   <a href="index.html">Back to contents</a>
+
  </body>
 </html>