Skip to content

Commit 881d4d1

Browse files
committed
- refactoring the "free" characters window
- adding more info to the conflict window
1 parent 72a97a4 commit 881d4d1

File tree

8 files changed

+75
-84
lines changed

8 files changed

+75
-84
lines changed

docs/index.html

+24-24
Original file line numberDiff line numberDiff line change
@@ -1490,33 +1490,33 @@ <h3 id="global-shortcuts">Global shortcuts</h3>
14901490
<col style="width: 21%" />
14911491
</colgroup>
14921492
<thead>
1493-
<tr>
1493+
<tr class="header">
14941494
<th>Shortcut</th>
14951495
<th>Function</th>
14961496
<th>Shortcut</th>
14971497
<th>Function</th>
14981498
</tr>
14991499
</thead>
15001500
<tbody>
1501-
<tr>
1501+
<tr class="odd">
15021502
<td><strong>+</strong> / <strong>-</strong> and <strong>,</strong> / <strong>.</strong></td>
15031503
<td>adjust volume</td>
15041504
<td><strong>W</strong></td>
15051505
<td>toggle title logging</td>
15061506
</tr>
1507-
<tr>
1507+
<tr class="even">
15081508
<td><strong>m</strong></td>
15091509
<td>mute player</td>
15101510
<td><strong>w</strong></td>
15111511
<td>like a station</td>
15121512
</tr>
1513-
<tr>
1513+
<tr class="odd">
15141514
<td><strong>v</strong></td>
15151515
<td>save volume</td>
15161516
<td><strong>^N</strong> / <strong>^P</strong> [1] [2]</td>
15171517
<td>play next / previous station</td>
15181518
</tr>
1519-
<tr>
1519+
<tr class="even">
15201520
<td><strong>T</strong></td>
15211521
<td>toggle transparency</td>
15221522
<td><strong>&lt;</strong> / <strong>&gt;</strong> [1]</td>
@@ -1600,17 +1600,17 @@ <h3 id="defining-and-using-groups">Defining and using Groups</h3>
16001600
<col style="width: 76%" />
16011601
</colgroup>
16021602
<thead>
1603-
<tr>
1603+
<tr class="header">
16041604
<th>Key</th>
16051605
<th>Description</th>
16061606
</tr>
16071607
</thead>
16081608
<tbody>
1609-
<tr>
1609+
<tr class="odd">
16101610
<td><strong>^E</strong> / <strong>^Y</strong></td>
16111611
<td>Go to next / previous <strong>Group</strong></td>
16121612
</tr>
1613-
<tr>
1613+
<tr class="even">
16141614
<td><strong>^G</strong></td>
16151615
<td>Display a list of existing <strong>Groups</strong> to select from</td>
16161616
</tr>
@@ -1818,21 +1818,21 @@ <h3 id="extra-player-parameters">Extra Player Parameters</h3>
18181818
<col style="width: 91%" />
18191819
</colgroup>
18201820
<thead>
1821-
<tr>
1821+
<tr class="header">
18221822
<th>Player</th>
18231823
<th>Parameters</th>
18241824
</tr>
18251825
</thead>
18261826
<tbody>
1827-
<tr>
1827+
<tr class="odd">
18281828
<td>mpv</td>
18291829
<td>–no-video, –quiet, –input-ipc-server, –input-unix-socket, –playlist, –profile</td>
18301830
</tr>
1831-
<tr>
1831+
<tr class="even">
18321832
<td>mplayer</td>
18331833
<td>-vo, -quiet, -playlist, -profile</td>
18341834
</tr>
1835-
<tr>
1835+
<tr class="odd">
18361836
<td>vlc</td>
18371837
<td>-Irc, -vv<br><strong>Windows only:</strong> –rc-host, –file-logging, –logmode, –log-verbose, –logfile</td>
18381838
</tr>
@@ -1908,34 +1908,34 @@ <h3 id="parameters-used">Parameters used</h3>
19081908
<col style="width: 30%" />
19091909
</colgroup>
19101910
<thead>
1911-
<tr>
1911+
<tr class="header">
19121912
<th>mpv<br>(X in seconds)</th>
19131913
<th>mplayer<br>(X in KBytes)</th>
19141914
<th>vlc<br>(X in seconds)</th>
19151915
</tr>
19161916
</thead>
19171917
<tbody>
1918-
<tr>
1918+
<tr class="odd">
19191919
<td>–demuxer-readahead-secs=X-1</td>
19201920
<td>-cache X</td>
19211921
<td>–network-caching X*1000</td>
19221922
</tr>
1923-
<tr>
1923+
<tr class="even">
19241924
<td>–demuxer-cache-wait=yes</td>
19251925
<td>-cache-min 80</td>
19261926
<td></td>
19271927
</tr>
1928-
<tr>
1928+
<tr class="odd">
19291929
<td>–cache=yes</td>
19301930
<td></td>
19311931
<td></td>
19321932
</tr>
1933-
<tr>
1933+
<tr class="even">
19341934
<td>–cache-secs=X</td>
19351935
<td></td>
19361936
<td></td>
19371937
</tr>
1938-
<tr>
1938+
<tr class="odd">
19391939
<td>–cache-on-disk=yes/no *</td>
19401940
<td></td>
19411941
<td></td>
@@ -2027,29 +2027,29 @@ <h2 id="mouse-support">Mouse support <span style="padding-left: 10px;"><sup styl
20272027
<col style="width: 73%" />
20282028
</colgroup>
20292029
<thead>
2030-
<tr>
2030+
<tr class="header">
20312031
<th>Action</th>
20322032
<th>Result</th>
20332033
</tr>
20342034
</thead>
20352035
<tbody>
2036-
<tr>
2036+
<tr class="odd">
20372037
<td><strong>Click</strong></td>
20382038
<td>Change selection</td>
20392039
</tr>
2040-
<tr>
2040+
<tr class="even">
20412041
<td><strong>Double click</strong></td>
20422042
<td>Start / stop the player</td>
20432043
</tr>
2044-
<tr>
2044+
<tr class="odd">
20452045
<td><strong>Middle click</strong></td>
20462046
<td>Toggle player muting<br>(does not work with all terminals)</td>
20472047
</tr>
2048-
<tr>
2048+
<tr class="even">
20492049
<td><strong>Wheel</strong></td>
20502050
<td>Scroll up / down</td>
20512051
</tr>
2052-
<tr>
2052+
<tr class="odd">
20532053
<td><strong>Shift-Wheel</strong></td>
20542054
<td>Adjust volume<br>(does not work with all terminals)</td>
20552055
</tr>

docs/radio-browser.html

+20-20
Original file line numberDiff line numberDiff line change
@@ -89,49 +89,49 @@ <h2 id="controls">Controls <span style="padding-left: 10px;"><sup style="font-si
8989
<p>These are the <strong>RadioBrowser</strong> specific keys one can use in addition to local playlist keys (if applicable).</p>
9090
<table>
9191
<thead>
92-
<tr>
92+
<tr class="header">
9393
<th>Key</th>
9494
<th>Action</th>
9595
</tr>
9696
</thead>
9797
<tbody>
98-
<tr>
98+
<tr class="odd">
9999
<td>O</td>
100100
<td>Open RadioBrowser</td>
101101
</tr>
102-
<tr>
102+
<tr class="even">
103103
<td>c</td>
104104
<td>Open config window</td>
105105
</tr>
106-
<tr>
106+
<tr class="odd">
107107
<td>C</td>
108108
<td>Select server to connect to</td>
109109
</tr>
110-
<tr>
110+
<tr class="even">
111111
<td>s</td>
112112
<td>Search for stations</td>
113113
</tr>
114-
<tr>
114+
<tr class="odd">
115115
<td>{ [ ]</td>
116116
<td>Display the first / next /previous page</td>
117117
</tr>
118-
<tr>
118+
<tr class="even">
119119
<td>F1 F2 F3</td>
120120
<td>Same functionally as above for Windows</td>
121121
</tr>
122-
<tr>
122+
<tr class="odd">
123123
<td>S</td>
124124
<td>Sort search results</td>
125125
</tr>
126-
<tr>
126+
<tr class="even">
127127
<td>I</td>
128128
<td>Station database info (current selection)</td>
129129
</tr>
130-
<tr>
130+
<tr class="odd">
131131
<td>V</td>
132132
<td>Vote for station</td>
133133
</tr>
134-
<tr>
134+
<tr class="even">
135135
<td>\\ q Escape</td>
136136
<td>Close RadioBrowser</td>
137137
</tr>
@@ -244,41 +244,41 @@ <h3 id="history-management">History Management</h3>
244244
<col style="width: 78%" />
245245
</colgroup>
246246
<thead>
247-
<tr>
247+
<tr class="header">
248248
<th>Key</th>
249249
<th>Action</th>
250250
</tr>
251251
</thead>
252252
<tbody>
253-
<tr>
253+
<tr class="odd">
254254
<td><strong>^N</strong> <strong>^P</strong></td>
255255
<td>Move to next / previous “<strong>search term</strong>” definition.</td>
256256
</tr>
257-
<tr>
257+
<tr class="even">
258258
<td><strong>HOME</strong> or <strong>0</strong></td>
259259
<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>
260260
</tr>
261-
<tr>
261+
<tr class="odd">
262262
<td><strong>END</strong> or <strong>g</strong> or <strong>$</strong></td>
263263
<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>
264264
</tr>
265-
<tr>
265+
<tr class="even">
266266
<td><strong>PgUp</strong> / <strong>PgDown</strong></td>
267267
<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>
268268
</tr>
269-
<tr>
269+
<tr class="odd">
270270
<td><strong>^Y</strong></td>
271271
<td>Add current item to history.</td>
272272
</tr>
273-
<tr>
273+
<tr class="even">
274274
<td><strong>^X</strong></td>
275275
<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>
276276
</tr>
277-
<tr>
277+
<tr class="odd">
278278
<td><strong>^B</strong></td>
279279
<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>
280280
</tr>
281-
<tr>
281+
<tr class="even">
282282
<td><strong>^E</strong></td>
283283
<td>Save the history.</td>
284284
</tr>

docs/rec-dir.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -49,24 +49,24 @@ <h1 style="color: SaddleBrown" id="pyradio-recordings-directory">PyRadio Recordi
4949
<col style="width: 71%" />
5050
</colgroup>
5151
<thead>
52-
<tr>
52+
<tr class="header">
5353
<th></th>
5454
<th>If the new directory</th>
5555
<th>PyRadio will</th>
5656
</tr>
5757
</thead>
5858
<tbody>
59-
<tr>
59+
<tr class="odd">
6060
<td>1.</td>
6161
<td>does not exist</td>
6262
<td>move the original directory to the new location and optionally rename it</td>
6363
</tr>
64-
<tr>
64+
<tr class="even">
6565
<td>2.</td>
6666
<td>already exists and it is <strong>empty</strong></td>
6767
<td>delete the new directory and move the original directory to the new location and optionally rename it</td>
6868
</tr>
69-
<tr>
69+
<tr class="odd">
7070
<td>3.</td>
7171
<td>already exists and it is <strong>not empty</strong></td>
7272
<td>move the original directory <strong>inside</strong> the new directory and optionally rename it</td>

docs/recording.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -141,17 +141,17 @@ <h2 id="recording-implementation">Recording implementation <span style="padding-
141141
<p>The following keys are used for this feature:</p>
142142
<table>
143143
<thead>
144-
<tr>
144+
<tr class="header">
145145
<th>Key</th>
146146
<th>Description</th>
147147
</tr>
148148
</thead>
149149
<tbody>
150-
<tr>
150+
<tr class="odd">
151151
<td>|<br>(pipe symbol)</td>
152152
<td>Toggle recording on and off</td>
153153
</tr>
154-
<tr>
154+
<tr class="even">
155155
<td>Space</td>
156156
<td>Pause and resume playback</td>
157157
</tr>

docs/themes.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ <h3 id="using-transparency">Using transparency</h3>
299299
<col style="width: 26%" />
300300
</colgroup>
301301
<thead>
302-
<tr>
302+
<tr class="header">
303303
<th>Force transparency</th>
304304
<th>Theme setting</th>
305305
<th>PyRadio honors</th>
@@ -308,28 +308,28 @@ <h3 id="using-transparency">Using transparency</h3>
308308
</tr>
309309
</thead>
310310
<tbody>
311-
<tr>
311+
<tr class="odd">
312312
<td>False<br>(the default)</td>
313313
<td>0 - Do not use transparency</td>
314314
<td>Theme setting</td>
315315
<td>Opaque window</td>
316316
<td>Opaque window</td>
317317
</tr>
318-
<tr>
318+
<tr class="even">
319319
<td></td>
320320
<td>1 - Theme is transparent</td>
321321
<td>Theme setting</td>
322322
<td>Transparent window</td>
323323
<td>Transparent window</td>
324324
</tr>
325-
<tr>
325+
<tr class="odd">
326326
<td></td>
327327
<td>2 - Don't care</td>
328328
<td>Config Transparency</td>
329329
<td>Transparent window</td>
330330
<td>Opaque window</td>
331331
</tr>
332-
<tr>
332+
<tr class="even">
333333
<td>True</td>
334334
<td>Any (0, 1 or 2)</td>
335335
<td>Config Transparency</td>

docs/windows.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -128,21 +128,21 @@ <h3 id="player-installation">Player installation <span style="padding-left: 10px
128128
<col style="width: 30%" />
129129
</colgroup>
130130
<thead>
131-
<tr>
131+
<tr class="header">
132132
<th></th>
133133
<th>MPV</th>
134134
<th>MPlayer</th>
135135
<th>VLC</th>
136136
</tr>
137137
</thead>
138138
<tbody>
139-
<tr>
139+
<tr class="odd">
140140
<td><strong>Pros</strong></td>
141141
<td>Fully functional</td>
142142
<td>Fully functional</td>
143143
<td>Plays almost all streams</td>
144144
</tr>
145-
<tr>
145+
<tr class="even">
146146
<td><strong>Cons</strong></td>
147147
<td>-</td>
148148
<td>May not play all streams (e.g. m3u8)</td>

0 commit comments

Comments
 (0)