From: Richard Kettlewell Date: Thu, 26 Nov 2009 17:57:23 +0000 (+0000) Subject: A new chapter with descriptions of the tabs X-Git-Tag: 5.0~38^2~9 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/d365231ae39a2802200aa040de120ee7bb7946a4 A new chapter with descriptions of the tabs --- diff --git a/disobedience/manual/choose-search.png b/disobedience/manual/choose-search.png new file mode 100644 index 0000000..bc28194 Binary files /dev/null and b/disobedience/manual/choose-search.png differ diff --git a/disobedience/manual/choose.png b/disobedience/manual/choose.png new file mode 100644 index 0000000..2f88ece Binary files /dev/null and b/disobedience/manual/choose.png differ diff --git a/disobedience/manual/disobedience.css b/disobedience/manual/disobedience.css index 605d81e..e28b881 100644 --- a/disobedience/manual/disobedience.css +++ b/disobedience/manual/disobedience.css @@ -32,6 +32,10 @@ a { text-decoration: none } +h2 a { + color: black +} + a:active { color: red } diff --git a/disobedience/manual/index.html b/disobedience/manual/index.html index 6810c4e..6c9bc7e 100644 --- a/disobedience/manual/index.html +++ b/disobedience/manual/index.html @@ -39,7 +39,15 @@ along with this program. If not, see .

2. Window Layout

+ +

3. Tabs

+ + diff --git a/disobedience/manual/intro.html b/disobedience/manual/intro.html index 1230ec5..0603538 100644 --- a/disobedience/manual/intro.html +++ b/disobedience/manual/intro.html @@ -34,7 +34,7 @@ along with this program. If not, see .
  • How to start Disobedience
  • -

    1.1 What is DisOrder?

    +

    1.1 What is DisOrder?

    DisOrder is a multi-user software jukebox. It allows MP3s, OGGs, etc to be @@ -75,7 +75,7 @@ along with this program. If not, see . on the same computer as the server provided it can run X11 applications.

    -

    1.2 Getting DisOrder

    +

    1.2 Getting DisOrder

    There are two ways to get DisOrder.

    @@ -114,7 +114,7 @@ along with this program. If not, see .

    There is no Windows support (although the web interface can be used from Windows computers).

    -

    1.3 Getting a DisOrder login

    +

    1.3 Getting a DisOrder login

    The easiest way to get a DisOrder login is to access the web interface and set one up using that. To do this, @@ -144,7 +144,7 @@ along with this program. If not, see . you want to take advantage of its more convenient design and extra features.

    -

    1.4 Starting Disobedience

    +

    1.4 Starting Disobedience

    On Debian systems it should be possible to find Disobedience in the menu system:

    @@ -162,7 +162,7 @@ along with this program. If not, see . should be reported.)

    -

    1.5 Initial Login

    +

    1.5 Initial Login

    The first time you run Disobedience it won't know what server to connect to, your username or your password, and will therefore diff --git a/disobedience/manual/queue-menu.png b/disobedience/manual/queue-menu.png new file mode 100644 index 0000000..af2dff9 Binary files /dev/null and b/disobedience/manual/queue-menu.png differ diff --git a/disobedience/manual/recent.png b/disobedience/manual/recent.png new file mode 100644 index 0000000..8ee5e68 Binary files /dev/null and b/disobedience/manual/recent.png differ diff --git a/disobedience/manual/tabs.html b/disobedience/manual/tabs.html new file mode 100644 index 0000000..7b7485c --- /dev/null +++ b/disobedience/manual/tabs.html @@ -0,0 +1,173 @@ + + + + + Disobedience: Tabs + + + +

    3. Tabs

    + +

    The chaper contains detailed descriptions of the Queue, Recent, + Choose and Added tabs.

    + +

    3.1 The Queue

    + +

    The Queue tab has already + been briefly described, but there + are some more things to say about. To start with, the meaning of + the columns:

    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    WhenThis is the server's estimate of when the track will start. + If play is disabled but the queue isn't empty, then it is based + on the assumption that play is about to be enabled.
    WhoThis is the person who selected the track. If the track + was picked at random by the server it is empty. You can + “adopt” a randomly picked track; see below.
    ArtistThe artist responsible for the track. Like the other track + name columns, this depends on the server's logic for parsing + filename, so can be a bit wrong. You can edit the track + properties to correct it.
    AlbumThe album that the track came from.
    TitleThe title of the track.
    LengthThe length the track will play for. For the playing track + this will include the amount of time it's been playing so + far.
    + +

    You can select tracks in the queue by clicking on them. You can + select multiple tracks by clicking in a second location with SHIFT + depressed (to select all tracks between the first and second click) + or with CTRL depressed (to add a single track to the selection).

    + +

    Having selected tracks you can drag them to a new location in + the queue. Of course, you can't drag the playing track, nor can + you drag other tracks before it.

    + +

    Right-clicking in the queue will create a pop-up menu:

    + +

    + +

    Track Properties will create a window with editable + properties of each selected track. Scratch playing track + only works if the playing track is the selected track and will stop + it playing. Remove track from queue will remove the + selected (non-playing) tracks from the queue.

    + +

    Adopt track will apply your name to one without an entry + in the Who column, i.e. one that was randomly picked by the + server. The reason you might do this is to signal to other users + that you did want this track to play. (For instance, it might be + an accepted convention that randomly picked tracks were fair game + for removal but that tracks picked by a human should normally be + left alone.)

    + +

    3.2 Recently Played Tracks

    + +

    + +

    The Recent tab is similar in structure to the queue but + it shows tracks that have played recently. The When column + indicates when the track played rather than when it will + played.

    + +

    Right clicking will create a pop-up menu with similar options to + those found in the queue's equivalent menu. The one additional + option is Play track, which allows a recently played track + to be added back to the queue.

    + +

    The other way of adding tracks from this tab back to the queue + is to drag them to the queue tab and then to the desired point into + the queue.

    + +

    3.3 Choosing Tracks

    + +

    The Choose tab contains all the tracks known to the + server, organized into a hierarchical structure based on the + underlying file and directory structure.

    + +

    + +

    The boxes in the Queued column are ticked if the track is + somewhere in the queue. You can click on an unticked box to add + the track to the queue, but clicking an already-ticked one will + have no effect.

    + +

    Directories can be expanded or collapsed by clicking on the + triangular signs left of their names. Tracks can be selected and + deselected by clicking on them. You can select multiple tracks by + clicking in a second location with SHIFT depressed (to select all + tracks between the first and second click) or with CTRL depressed + (to add a single track to the selection).

    + +

    Right clicking will create a pop-up menu with what are hopefuly + now familiar options. Play track will add the selected + track(s) to the queue and Track Properties will create a + window with editable properties of each selected track.

    + +

    Note that when tracks are added to the queue these ways they + will be added before any tracks picked at random by the server, so + that users don't have to wait for them to play out.

    + +

    Selected tracks can also be dragged to the queue, by dragging + first to the Queue tab itself and then to the desired + location in the queue.

    + +

    + +

    To do a word search over all tracks, you can just start typing. + Your search terms will appear in the input box at the bottom of the + window. Directories containing matching tracks are automatically + opened and the matches highlighted in yellow. You can jump to the + previous or next search result with the up and down arrows at the + bottom right of the screen (or jump to the next one by pressing + CTRL+G).

    + +

    To clear the search, press the Cancel button.

    + +

    3.4 Newly Added Tracks

    + +

    The Added tab shows tracks that have been newly detected + by the server, in order to allow those tracks to be conveniently + played. In behavior it is the same as the + recently played tracks list.

    + + + diff --git a/disobedience/manual/window.html b/disobedience/manual/window.html index 92a6d5d..0282f6a 100644 --- a/disobedience/manual/window.html +++ b/disobedience/manual/window.html @@ -26,12 +26,10 @@ along with this program. If not, see .

    2. Window Layout

    -

    This chapter covers the following topics:

    +

    This chapter contains a tour of the main Disobedience + window.

    -
      -
    - -

    2.1 The Disobedience Window

    +

    2.1 The Disobedience Window

    Disobedience should look something like this when you've started it up and logged in:

    @@ -61,7 +59,7 @@ along with this program. If not, see .

    The first track is 4 minutes and 10 seconds long and so far, the first 21 seconds of it has played.

    -

    2.2 Buttons

    +

    2.2 Buttons

    The meaning of the buttons is as follows:

    @@ -119,7 +117,7 @@ along with this program. If not, see . (silent) to 10 (loudest). The right hand slider is the balance control, which ranges form -1.0 (left) to +1.0 (right).

    -

    2.3 The Menu Bar

    +

    2.3 The Menu Bar