Skip to content

Commit

Permalink
- refactoring the "free" characters window
Browse files Browse the repository at this point in the history
- adding more info to the conflict window
  • Loading branch information
s-n-g committed Dec 2, 2024
1 parent 72a97a4 commit 881d4d1
Show file tree
Hide file tree
Showing 8 changed files with 75 additions and 84 deletions.
48 changes: 24 additions & 24 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -1490,33 +1490,33 @@ <h3 id="global-shortcuts">Global shortcuts</h3>
<col style="width: 21%" />
</colgroup>
<thead>
<tr>
<tr class="header">
<th>Shortcut</th>
<th>Function</th>
<th>Shortcut</th>
<th>Function</th>
</tr>
</thead>
<tbody>
<tr>
<tr class="odd">
<td><strong>+</strong> / <strong>-</strong> and <strong>,</strong> / <strong>.</strong></td>
<td>adjust volume</td>
<td><strong>W</strong></td>
<td>toggle title logging</td>
</tr>
<tr>
<tr class="even">
<td><strong>m</strong></td>
<td>mute player</td>
<td><strong>w</strong></td>
<td>like a station</td>
</tr>
<tr>
<tr class="odd">
<td><strong>v</strong></td>
<td>save volume</td>
<td><strong>^N</strong> / <strong>^P</strong> [1] [2]</td>
<td>play next / previous station</td>
</tr>
<tr>
<tr class="even">
<td><strong>T</strong></td>
<td>toggle transparency</td>
<td><strong>&lt;</strong> / <strong>&gt;</strong> [1]</td>
Expand Down Expand Up @@ -1600,17 +1600,17 @@ <h3 id="defining-and-using-groups">Defining and using Groups</h3>
<col style="width: 76%" />
</colgroup>
<thead>
<tr>
<tr class="header">
<th>Key</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr>
<tr class="odd">
<td><strong>^E</strong> / <strong>^Y</strong></td>
<td>Go to next / previous <strong>Group</strong></td>
</tr>
<tr>
<tr class="even">
<td><strong>^G</strong></td>
<td>Display a list of existing <strong>Groups</strong> to select from</td>
</tr>
Expand Down Expand Up @@ -1818,21 +1818,21 @@ <h3 id="extra-player-parameters">Extra Player Parameters</h3>
<col style="width: 91%" />
</colgroup>
<thead>
<tr>
<tr class="header">
<th>Player</th>
<th>Parameters</th>
</tr>
</thead>
<tbody>
<tr>
<tr class="odd">
<td>mpv</td>
<td>–no-video, –quiet, –input-ipc-server, –input-unix-socket, –playlist, –profile</td>
</tr>
<tr>
<tr class="even">
<td>mplayer</td>
<td>-vo, -quiet, -playlist, -profile</td>
</tr>
<tr>
<tr class="odd">
<td>vlc</td>
<td>-Irc, -vv<br><strong>Windows only:</strong> –rc-host, –file-logging, –logmode, –log-verbose, –logfile</td>
</tr>
Expand Down Expand Up @@ -1908,34 +1908,34 @@ <h3 id="parameters-used">Parameters used</h3>
<col style="width: 30%" />
</colgroup>
<thead>
<tr>
<tr class="header">
<th>mpv<br>(X in seconds)</th>
<th>mplayer<br>(X in KBytes)</th>
<th>vlc<br>(X in seconds)</th>
</tr>
</thead>
<tbody>
<tr>
<tr class="odd">
<td>–demuxer-readahead-secs=X-1</td>
<td>-cache X</td>
<td>–network-caching X*1000</td>
</tr>
<tr>
<tr class="even">
<td>–demuxer-cache-wait=yes</td>
<td>-cache-min 80</td>
<td></td>
</tr>
<tr>
<tr class="odd">
<td>–cache=yes</td>
<td></td>
<td></td>
</tr>
<tr>
<tr class="even">
<td>–cache-secs=X</td>
<td></td>
<td></td>
</tr>
<tr>
<tr class="odd">
<td>–cache-on-disk=yes/no *</td>
<td></td>
<td></td>
Expand Down Expand Up @@ -2027,29 +2027,29 @@ <h2 id="mouse-support">Mouse support <span style="padding-left: 10px;"><sup styl
<col style="width: 73%" />
</colgroup>
<thead>
<tr>
<tr class="header">
<th>Action</th>
<th>Result</th>
</tr>
</thead>
<tbody>
<tr>
<tr class="odd">
<td><strong>Click</strong></td>
<td>Change selection</td>
</tr>
<tr>
<tr class="even">
<td><strong>Double click</strong></td>
<td>Start / stop the player</td>
</tr>
<tr>
<tr class="odd">
<td><strong>Middle click</strong></td>
<td>Toggle player muting<br>(does not work with all terminals)</td>
</tr>
<tr>
<tr class="even">
<td><strong>Wheel</strong></td>
<td>Scroll up / down</td>
</tr>
<tr>
<tr class="odd">
<td><strong>Shift-Wheel</strong></td>
<td>Adjust volume<br>(does not work with all terminals)</td>
</tr>
Expand Down
40 changes: 20 additions & 20 deletions docs/radio-browser.html
Original file line number Diff line number Diff line change
Expand Up @@ -89,49 +89,49 @@ <h2 id="controls">Controls <span style="padding-left: 10px;"><sup style="font-si
<p>These are the <strong>RadioBrowser</strong> specific keys one can use in addition to local playlist keys (if applicable).</p>
<table>
<thead>
<tr>
<tr class="header">
<th>Key</th>
<th>Action</th>
</tr>
</thead>
<tbody>
<tr>
<tr class="odd">
<td>O</td>
<td>Open RadioBrowser</td>
</tr>
<tr>
<tr class="even">
<td>c</td>
<td>Open config window</td>
</tr>
<tr>
<tr class="odd">
<td>C</td>
<td>Select server to connect to</td>
</tr>
<tr>
<tr class="even">
<td>s</td>
<td>Search for stations</td>
</tr>
<tr>
<tr class="odd">
<td>{ [ ]</td>
<td>Display the first / next /previous page</td>
</tr>
<tr>
<tr class="even">
<td>F1 F2 F3</td>
<td>Same functionally as above for Windows</td>
</tr>
<tr>
<tr class="odd">
<td>S</td>
<td>Sort search results</td>
</tr>
<tr>
<tr class="even">
<td>I</td>
<td>Station database info (current selection)</td>
</tr>
<tr>
<tr class="odd">
<td>V</td>
<td>Vote for station</td>
</tr>
<tr>
<tr class="even">
<td>\\ q Escape</td>
<td>Close RadioBrowser</td>
</tr>
Expand Down Expand Up @@ -244,41 +244,41 @@ <h3 id="history-management">History Management</h3>
<col style="width: 78%" />
</colgroup>
<thead>
<tr>
<tr class="header">
<th>Key</th>
<th>Action</th>
</tr>
</thead>
<tbody>
<tr>
<tr class="odd">
<td><strong>^N</strong> <strong>^P</strong></td>
<td>Move to next / previous “<strong>search term</strong>” definition.</td>
</tr>
<tr>
<tr class="even">
<td><strong>HOME</strong> or <strong>0</strong></td>
<td>Move to the “<strong>empty search term</strong>” (history item 0), the <em>template item</em>. This is a quick way to “reset” all settings and start new. Of course, one could just navigate to this history item using <strong>^N</strong> or <strong>^P</strong>, but it’s here just for convenience.<br><br>Pressing <strong>0</strong> works on all widgets; <strong>HOME</strong> does not work on <strong>Line editors</strong>.<br>To inster a <strong>0</strong> on a <strong>Line editor</strong> just type “<strong>\0</strong>”.</td>
</tr>
<tr>
<tr class="odd">
<td><strong>END</strong> or <strong>g</strong> or <strong>$</strong></td>
<td>Move to the last <strong>search term</strong>.<br><br>Pressing <strong>$</strong> works on all widgets; <strong>END</strong> and <strong>g</strong> do not work on <strong>Line editors</strong>.<br>To inster a <strong>$</strong> on a <strong>Line editor</strong> just type “<strong>\$</strong>”.</td>
</tr>
<tr>
<tr class="even">
<td><strong>PgUp</strong> / <strong>PgDown</strong></td>
<td>Jump up or down within the “<strong>search history</strong>” list.<br>These keys do not work when the “<em>Result limit</em>” counter field is focused.</td>
</tr>
<tr>
<tr class="odd">
<td><strong>^Y</strong></td>
<td>Add current item to history.</td>
</tr>
<tr>
<tr class="even">
<td><strong>^X</strong></td>
<td>Delete the current history item.<br>There is no confirmation and once an item is deleted there’s no undo function.<br>These rules apply:<br> 1. The first item (<strong>search term template</strong>) cannot be deleted.<br>2. When the history contains only two items (the <strong>search term template</strong> will always be the first one; the second one is a user defined <strong>search term</strong>), no item deletion is possible.<br>3. When the <strong>default search term</strong> is deleted, the first user defined <strong>search term</strong> becomes the default one.</td>
</tr>
<tr>
<tr class="odd">
<td><strong>^B</strong></td>
<td>Make the current history item the <strong>default</strong> one for <strong>RadioBrowser</strong> and save the history.<br>This means that, next time you open <strong>RadioBrowser</strong> this history item (“<strong>search term</strong>”) will be automatically loaded.</td>
</tr>
<tr>
<tr class="even">
<td><strong>^E</strong></td>
<td>Save the history.</td>
</tr>
Expand Down
8 changes: 4 additions & 4 deletions docs/rec-dir.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,24 +49,24 @@ <h1 style="color: SaddleBrown" id="pyradio-recordings-directory">PyRadio Recordi
<col style="width: 71%" />
</colgroup>
<thead>
<tr>
<tr class="header">
<th></th>
<th>If the new directory</th>
<th>PyRadio will</th>
</tr>
</thead>
<tbody>
<tr>
<tr class="odd">
<td>1.</td>
<td>does not exist</td>
<td>move the original directory to the new location and optionally rename it</td>
</tr>
<tr>
<tr class="even">
<td>2.</td>
<td>already exists and it is <strong>empty</strong></td>
<td>delete the new directory and move the original directory to the new location and optionally rename it</td>
</tr>
<tr>
<tr class="odd">
<td>3.</td>
<td>already exists and it is <strong>not empty</strong></td>
<td>move the original directory <strong>inside</strong> the new directory and optionally rename it</td>
Expand Down
6 changes: 3 additions & 3 deletions docs/recording.html
Original file line number Diff line number Diff line change
Expand Up @@ -141,17 +141,17 @@ <h2 id="recording-implementation">Recording implementation <span style="padding-
<p>The following keys are used for this feature:</p>
<table>
<thead>
<tr>
<tr class="header">
<th>Key</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr>
<tr class="odd">
<td>|<br>(pipe symbol)</td>
<td>Toggle recording on and off</td>
</tr>
<tr>
<tr class="even">
<td>Space</td>
<td>Pause and resume playback</td>
</tr>
Expand Down
10 changes: 5 additions & 5 deletions docs/themes.html
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ <h3 id="using-transparency">Using transparency</h3>
<col style="width: 26%" />
</colgroup>
<thead>
<tr>
<tr class="header">
<th>Force transparency</th>
<th>Theme setting</th>
<th>PyRadio honors</th>
Expand All @@ -308,28 +308,28 @@ <h3 id="using-transparency">Using transparency</h3>
</tr>
</thead>
<tbody>
<tr>
<tr class="odd">
<td>False<br>(the default)</td>
<td>0 - Do not use transparency</td>
<td>Theme setting</td>
<td>Opaque window</td>
<td>Opaque window</td>
</tr>
<tr>
<tr class="even">
<td></td>
<td>1 - Theme is transparent</td>
<td>Theme setting</td>
<td>Transparent window</td>
<td>Transparent window</td>
</tr>
<tr>
<tr class="odd">
<td></td>
<td>2 - Don't care</td>
<td>Config Transparency</td>
<td>Transparent window</td>
<td>Opaque window</td>
</tr>
<tr>
<tr class="even">
<td>True</td>
<td>Any (0, 1 or 2)</td>
<td>Config Transparency</td>
Expand Down
6 changes: 3 additions & 3 deletions docs/windows.html
Original file line number Diff line number Diff line change
Expand Up @@ -128,21 +128,21 @@ <h3 id="player-installation">Player installation <span style="padding-left: 10px
<col style="width: 30%" />
</colgroup>
<thead>
<tr>
<tr class="header">
<th></th>
<th>MPV</th>
<th>MPlayer</th>
<th>VLC</th>
</tr>
</thead>
<tbody>
<tr>
<tr class="odd">
<td><strong>Pros</strong></td>
<td>Fully functional</td>
<td>Fully functional</td>
<td>Plays almost all streams</td>
</tr>
<tr>
<tr class="even">
<td><strong>Cons</strong></td>
<td>-</td>
<td>May not play all streams (e.g. m3u8)</td>
Expand Down
Loading

0 comments on commit 881d4d1

Please sign in to comment.