Skip to content

Commit 40ebece

Browse files
s-n-gs-n-g
committed
- implementing new shortcuts conflict detection (work in progress)
- adding keyboard dir and json files - several minor changes
1 parent c30ea7b commit 40ebece

25 files changed

+687
-158
lines changed

‎devel/get_shortcuts_and_classes.py

Lines changed: 435 additions & 0 deletions
Large diffs are not rendered by default.

‎docs/build.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
a{ color: SaddleBrown;}
3333
a:visited{color: SaddleBrown;}
3434
</style>
35-
<!--[if lt IE 9]>
36-
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
37-
<![endif]-->
3835
</head>
3936
<body>
4037
<header id="title-block-header">

‎docs/client.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
a{ color: SaddleBrown;}
3333
a:visited{color: SaddleBrown;}
3434
</style>
35-
<!--[if lt IE 9]>
36-
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
37-
<![endif]-->
3835
</head>
3936
<body>
4037
<header id="title-block-header">

‎docs/desktop-notification.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
a{ color: SaddleBrown;}
3333
a:visited{color: SaddleBrown;}
3434
</style>
35-
<!--[if lt IE 9]>
36-
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
37-
<![endif]-->
3835
</head>
3936
<body>
4037
<header id="title-block-header">

‎docs/headless.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
a{ color: SaddleBrown;}
3333
a:visited{color: SaddleBrown;}
3434
</style>
35-
<!--[if lt IE 9]>
36-
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
37-
<![endif]-->
3835
</head>
3936
<body>
4037
<header id="title-block-header">

‎docs/index.html

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
a{ color: SaddleBrown;}
3333
a:visited{color: SaddleBrown;}
3434
</style>
35-
<!--[if lt IE 9]>
36-
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
37-
<![endif]-->
3835
</head>
3936
<body>
4037
<header id="title-block-header">
@@ -1493,33 +1490,33 @@ <h3 id="global-shortcuts">Global shortcuts</h3>
14931490
<col style="width: 21%" />
14941491
</colgroup>
14951492
<thead>
1496-
<tr class="header">
1493+
<tr>
14971494
<th>Shortcut</th>
14981495
<th>Function</th>
14991496
<th>Shortcut</th>
15001497
<th>Function</th>
15011498
</tr>
15021499
</thead>
15031500
<tbody>
1504-
<tr class="odd">
1501+
<tr>
15051502
<td><strong>+</strong> / <strong>-</strong> and <strong>,</strong> / <strong>.</strong></td>
15061503
<td>adjust volume</td>
15071504
<td><strong>W</strong></td>
15081505
<td>toggle title logging</td>
15091506
</tr>
1510-
<tr class="even">
1507+
<tr>
15111508
<td><strong>m</strong></td>
15121509
<td>mute player</td>
15131510
<td><strong>w</strong></td>
15141511
<td>like a station</td>
15151512
</tr>
1516-
<tr class="odd">
1513+
<tr>
15171514
<td><strong>v</strong></td>
15181515
<td>save volume</td>
15191516
<td><strong>^N</strong> / <strong>^P</strong> [1] [2]</td>
15201517
<td>play next / previous station</td>
15211518
</tr>
1522-
<tr class="even">
1519+
<tr>
15231520
<td><strong>T</strong></td>
15241521
<td>toggle transparency</td>
15251522
<td><strong>&lt;</strong> / <strong>&gt;</strong> [1]</td>
@@ -1603,17 +1600,17 @@ <h3 id="defining-and-using-groups">Defining and using Groups</h3>
16031600
<col style="width: 76%" />
16041601
</colgroup>
16051602
<thead>
1606-
<tr class="header">
1603+
<tr>
16071604
<th>Key</th>
16081605
<th>Description</th>
16091606
</tr>
16101607
</thead>
16111608
<tbody>
1612-
<tr class="odd">
1609+
<tr>
16131610
<td><strong>^E</strong> / <strong>^Y</strong></td>
16141611
<td>Go to next / previous <strong>Group</strong></td>
16151612
</tr>
1616-
<tr class="even">
1613+
<tr>
16171614
<td><strong>^G</strong></td>
16181615
<td>Display a list of existing <strong>Groups</strong> to select from</td>
16191616
</tr>
@@ -1821,21 +1818,21 @@ <h3 id="extra-player-parameters">Extra Player Parameters</h3>
18211818
<col style="width: 91%" />
18221819
</colgroup>
18231820
<thead>
1824-
<tr class="header">
1821+
<tr>
18251822
<th>Player</th>
18261823
<th>Parameters</th>
18271824
</tr>
18281825
</thead>
18291826
<tbody>
1830-
<tr class="odd">
1827+
<tr>
18311828
<td>mpv</td>
18321829
<td>–no-video, –quiet, –input-ipc-server, –input-unix-socket, –playlist, –profile</td>
18331830
</tr>
1834-
<tr class="even">
1831+
<tr>
18351832
<td>mplayer</td>
18361833
<td>-vo, -quiet, -playlist, -profile</td>
18371834
</tr>
1838-
<tr class="odd">
1835+
<tr>
18391836
<td>vlc</td>
18401837
<td>-Irc, -vv<br><strong>Windows only:</strong> –rc-host, –file-logging, –logmode, –log-verbose, –logfile</td>
18411838
</tr>
@@ -1911,34 +1908,34 @@ <h3 id="parameters-used">Parameters used</h3>
19111908
<col style="width: 30%" />
19121909
</colgroup>
19131910
<thead>
1914-
<tr class="header">
1911+
<tr>
19151912
<th>mpv<br>(X in seconds)</th>
19161913
<th>mplayer<br>(X in KBytes)</th>
19171914
<th>vlc<br>(X in seconds)</th>
19181915
</tr>
19191916
</thead>
19201917
<tbody>
1921-
<tr class="odd">
1918+
<tr>
19221919
<td>–demuxer-readahead-secs=X-1</td>
19231920
<td>-cache X</td>
19241921
<td>–network-caching X*1000</td>
19251922
</tr>
1926-
<tr class="even">
1923+
<tr>
19271924
<td>–demuxer-cache-wait=yes</td>
19281925
<td>-cache-min 80</td>
19291926
<td></td>
19301927
</tr>
1931-
<tr class="odd">
1928+
<tr>
19321929
<td>–cache=yes</td>
19331930
<td></td>
19341931
<td></td>
19351932
</tr>
1936-
<tr class="even">
1933+
<tr>
19371934
<td>–cache-secs=X</td>
19381935
<td></td>
19391936
<td></td>
19401937
</tr>
1941-
<tr class="odd">
1938+
<tr>
19421939
<td>–cache-on-disk=yes/no *</td>
19431940
<td></td>
19441941
<td></td>
@@ -2030,29 +2027,29 @@ <h2 id="mouse-support">Mouse support <span style="padding-left: 10px;"><sup styl
20302027
<col style="width: 73%" />
20312028
</colgroup>
20322029
<thead>
2033-
<tr class="header">
2030+
<tr>
20342031
<th>Action</th>
20352032
<th>Result</th>
20362033
</tr>
20372034
</thead>
20382035
<tbody>
2039-
<tr class="odd">
2036+
<tr>
20402037
<td><strong>Click</strong></td>
20412038
<td>Change selection</td>
20422039
</tr>
2043-
<tr class="even">
2040+
<tr>
20442041
<td><strong>Double click</strong></td>
20452042
<td>Start / stop the player</td>
20462043
</tr>
2047-
<tr class="odd">
2044+
<tr>
20482045
<td><strong>Middle click</strong></td>
20492046
<td>Toggle player muting<br>(does not work with all terminals)</td>
20502047
</tr>
2051-
<tr class="even">
2048+
<tr>
20522049
<td><strong>Wheel</strong></td>
20532050
<td>Scroll up / down</td>
20542051
</tr>
2055-
<tr class="odd">
2052+
<tr>
20562053
<td><strong>Shift-Wheel</strong></td>
20572054
<td>Adjust volume<br>(does not work with all terminals)</td>
20582055
</tr>

‎docs/linux-pipx.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
a{ color: SaddleBrown;}
3333
a:visited{color: SaddleBrown;}
3434
</style>
35-
<!--[if lt IE 9]>
36-
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
37-
<![endif]-->
3835
</head>
3936
<body>
4037
<header id="title-block-header">

‎docs/linux.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
a{ color: SaddleBrown;}
3333
a:visited{color: SaddleBrown;}
3434
</style>
35-
<!--[if lt IE 9]>
36-
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
37-
<![endif]-->
3835
</head>
3936
<body>
4037
<header id="title-block-header">

‎docs/macos.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
a{ color: SaddleBrown;}
3333
a:visited{color: SaddleBrown;}
3434
</style>
35-
<!--[if lt IE 9]>
36-
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
37-
<![endif]-->
3835
</head>
3936
<body>
4037
<header id="title-block-header">

‎docs/packaging.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
a{ color: SaddleBrown;}
3333
a:visited{color: SaddleBrown;}
3434
</style>
35-
<!--[if lt IE 9]>
36-
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
37-
<![endif]-->
3835
</head>
3936
<body>
4037
<header id="title-block-header">

‎docs/pip-error.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
a{ color: SaddleBrown;}
3333
a:visited{color: SaddleBrown;}
3434
</style>
35-
<!--[if lt IE 9]>
36-
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
37-
<![endif]-->
3835
</head>
3936
<body>
4037
<header id="title-block-header">

‎docs/radio-browser.html

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
a{ color: SaddleBrown;}
3333
a:visited{color: SaddleBrown;}
3434
</style>
35-
<!--[if lt IE 9]>
36-
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
37-
<![endif]-->
3835
</head>
3936
<body>
4037
<header id="title-block-header">
@@ -92,49 +89,49 @@ <h2 id="controls">Controls <span style="padding-left: 10px;"><sup style="font-si
9289
<p>These are the <strong>RadioBrowser</strong> specific keys one can use in addition to local playlist keys (if applicable).</p>
9390
<table>
9491
<thead>
95-
<tr class="header">
92+
<tr>
9693
<th>Key</th>
9794
<th>Action</th>
9895
</tr>
9996
</thead>
10097
<tbody>
101-
<tr class="odd">
98+
<tr>
10299
<td>O</td>
103100
<td>Open RadioBrowser</td>
104101
</tr>
105-
<tr class="even">
102+
<tr>
106103
<td>c</td>
107104
<td>Open config window</td>
108105
</tr>
109-
<tr class="odd">
106+
<tr>
110107
<td>C</td>
111108
<td>Select server to connect to</td>
112109
</tr>
113-
<tr class="even">
110+
<tr>
114111
<td>s</td>
115112
<td>Search for stations</td>
116113
</tr>
117-
<tr class="odd">
114+
<tr>
118115
<td>{ [ ]</td>
119116
<td>Display the first / next /previous page</td>
120117
</tr>
121-
<tr class="even">
118+
<tr>
122119
<td>F1 F2 F3</td>
123120
<td>Same functionally as above for Windows</td>
124121
</tr>
125-
<tr class="odd">
122+
<tr>
126123
<td>S</td>
127124
<td>Sort search results</td>
128125
</tr>
129-
<tr class="even">
126+
<tr>
130127
<td>I</td>
131128
<td>Station database info (current selection)</td>
132129
</tr>
133-
<tr class="odd">
130+
<tr>
134131
<td>V</td>
135132
<td>Vote for station</td>
136133
</tr>
137-
<tr class="even">
134+
<tr>
138135
<td>\\ q Escape</td>
139136
<td>Close RadioBrowser</td>
140137
</tr>
@@ -247,41 +244,41 @@ <h3 id="history-management">History Management</h3>
247244
<col style="width: 78%" />
248245
</colgroup>
249246
<thead>
250-
<tr class="header">
247+
<tr>
251248
<th>Key</th>
252249
<th>Action</th>
253250
</tr>
254251
</thead>
255252
<tbody>
256-
<tr class="odd">
253+
<tr>
257254
<td><strong>^N</strong> <strong>^P</strong></td>
258255
<td>Move to next / previous “<strong>search term</strong>” definition.</td>
259256
</tr>
260-
<tr class="even">
257+
<tr>
261258
<td><strong>HOME</strong> or <strong>0</strong></td>
262259
<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>
263260
</tr>
264-
<tr class="odd">
261+
<tr>
265262
<td><strong>END</strong> or <strong>g</strong> or <strong>$</strong></td>
266263
<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>
267264
</tr>
268-
<tr class="even">
265+
<tr>
269266
<td><strong>PgUp</strong> / <strong>PgDown</strong></td>
270267
<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>
271268
</tr>
272-
<tr class="odd">
269+
<tr>
273270
<td><strong>^Y</strong></td>
274271
<td>Add current item to history.</td>
275272
</tr>
276-
<tr class="even">
273+
<tr>
277274
<td><strong>^X</strong></td>
278275
<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>
279276
</tr>
280-
<tr class="odd">
277+
<tr>
281278
<td><strong>^B</strong></td>
282279
<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>
283280
</tr>
284-
<tr class="even">
281+
<tr>
285282
<td><strong>^E</strong></td>
286283
<td>Save the history.</td>
287284
</tr>

0 commit comments

Comments
 (0)