Skip to content

Commit d3f1c9b

Browse files
committed
- implemented theme window search
- using _search_modes for the search function - when opening the search window no string will be displayed - updated docs
1 parent 1e61b91 commit d3f1c9b

File tree

7 files changed

+172
-112
lines changed

7 files changed

+172
-112
lines changed

README.html

+5-2
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,13 @@ <h2 id="controls">Controls <span style="padding-left: 10px;"><sup style="font-si
115115
DEL,x Delete selected station - -
116116
t T Load theme / Toggle transparency [Valid] [Valid]
117117
c Open Configuration window. - -
118+
/ n N Search, go to next / previous result [Valid] [Valid]
118119
? Show keys help [Valid] [Valid]
119120
# Redraw window [Valid] [Valid]
120121
Esc/q Quit - -
121122
Esc/q/Left/h - Cancel / close window Cancel / close window</pre>
122123
<p>The same logic applies to all <strong>PyRadio</strong> windows.</p>
123-
<p style="margin: 1.5em 4em 0 4em; text-indent: -2.5em;"><strong>Note:</strong> All windows support changing the volume and muting / unmuting the player (provided that <strong>PyRadio</strong> is actually connected to a station).</p>
124+
<p style="margin: 1.5em 4em 0 4em; text-indent: -2.5em;"><strong>Note:</strong> All windows - except the <em>Search window</em> - support changing the volume and muting / unmuting the player (provided that <strong>PyRadio</strong> is actually connected to a station).</p>
124125
<h2 id="config-file">Config file <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></style></h2>
125126
<p><strong>PyRadio</strong> upon its execution tries to read its configuration file (i.e. <em>~/.config/pyradio/config</em>). If this file is not found, it will be created. If an error occurs while parsing it, an error message will be displayed and <strong><em>PyRadio</em></strong> will terminate.</p>
126127
<p>The file contains parameters such as the player to use, the playlist to load etc. It is heavily commented (as you can see <a href="pyradio/config">here</a>), so that manual editing is really easy. The best practice to manually edit this file is executing <strong><em>PyRadio</em></strong> with the <strong>-ocd</strong> command line option, which will open the configuration directory in your file manager, and then edit it using your preferable text editor.</p>
@@ -234,9 +235,11 @@ <h3 id="mplayer">MPlayer</h3>
234235
<h2 id="search-function">Search function <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></style></h2>
235236
<p>On any window presenting a list of items (stations, playlists, themes) a <strong>search function</strong> is available by pressing “<strong>/</strong>”.</p>
236237
<p>The <em>Search Window</em> supports normal and extend editing and in session history.</p>
238+
<p>One can always get help by pressing the “<strong>?</strong>” key.</p>
239+
<p>The search will be case insensitive under <strong>python 3</strong>; it will be case sensitive under <strong>python 2</strong>.</p>
237240
<p>After a search term has been successfully found, next occurrence can be obtained using the “<strong>n</strong>” key and previous occurrence can be obtained using the “<strong>N</strong>” key.</p>
238241
<p style="margin: 1.5em 4em 0 4em; text-indent: -2.5em;"><strong>Note:</strong> <strong>Python 2</strong> users are confined in typing ASCII characters only.</p>
239-
<p style="margin: 1.5em 4em 0 4em; text-indent: -2.5em;"><strong>Note:</strong> Currently, the <strong>search function</strong> is available on the stations’ and playlists’ window only.</p>
242+
<p style="margin: 1.5em 4em 0 4em; text-indent: -2.5em;"><strong>Note:</strong> Currently, the <strong>search function</strong> is available on the stations’ and playlists’ and themes’ window only.</p>
240243
<h2 id="pyradio-themes">PyRadio Themes <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></style></h2>
241244
<p><strong>PyRadio</strong> comes with 6 preconfigured (hard coded) themes:</p>
242245
<ol type="1">

README.md

+7-2
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ e Change station's encoding
100100
DEL,x Delete selected station - -
101101
t T Load theme / Toggle transparency [Valid] [Valid]
102102
c Open Configuration window. - -
103+
/ n N Search, go to next / previous result [Valid] [Valid]
103104
? Show keys help [Valid] [Valid]
104105
# Redraw window [Valid] [Valid]
105106
Esc/q Quit - -
@@ -108,7 +109,7 @@ Esc/q/Left/h - Cancel / close windo
108109

109110
The same logic applies to all **PyRadio** windows.
110111

111-
**Note:** All windows support changing the volume and muting / unmuting the player (provided that **PyRadio** is actually connected to a station).
112+
**Note:** All windows - except the *Search window* - support changing the volume and muting / unmuting the player (provided that **PyRadio** is actually connected to a station).
112113

113114

114115
## Config file
@@ -335,11 +336,15 @@ On any window presenting a list of items (stations, playlists, themes) a **searc
335336

336337
The *Search Window* supports normal and extend editing and in session history.
337338

339+
One can always get help by pressing the "**?**" key.
340+
341+
The search will be case insensitive under **python 3**; it will be case sensitive under **python 2**.
342+
338343
After a search term has been successfully found, next occurrence can be obtained using the "**n**" key and previous occurrence can be obtained using the "**N**" key.
339344

340345
**Note:** **Python 2** users are confined in typing ASCII characters only.
341346

342-
**Note:** Currently, the **search function** is available on the stations' and playlists' window only.
347+
**Note:** Currently, the **search function** is available on the stations' and playlists' and themes' window only.
343348

344349
## PyRadio Themes
345350

pyradio.1

+6-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Quit
8787
The same logic applies to all \fBpyradio\fR windows.
8888

8989
.IP \fBNote:
90-
All windows support changing the volume and muting / unmuting the player (provided that it is actually connected to a station).
90+
All windows - except the \fISearch window\fR - support changing the volume and muting / unmuting the player (provided that \fBpyradio\fR is actually connected to a station).
9191

9292
.SH CONFIG FILE
9393
\fBpyradio\fR upon its execution tries to read its configuration file (i.e. \fI~/.config/pyradio/config\fR). If this file is not found, it will be created. If an error occurs while parsing it, an error message will be displayed and \fBpyradio\fR will terminate.
@@ -348,13 +348,17 @@ On any window presenting a list of items (stations, playlists, themes) a \fBsear
348348

349349
The \fISearch Window\fR supports normal and extend editing and in session history.
350350

351+
One can always get help by pressing the "\fI?\fR" key.
352+
353+
The search will be case insensitive under \fBpython 3\fR; it will be case sensitive under \fBpython 2\fR.
354+
351355
After a search term has been successfully found, next occurrence can be obtained using the "\fIn\fR" key and previous occurrence can be obtained using the "\fIN\fR" key.
352356

353357
.IP \fBNote\fR
354358
\fBPython 2\fR users are confined in typing ASCII characters only.
355359

356360
.IP \fBNote\fR
357-
Currently, the \fBsearch function\fR is available on the stations' and playlists' window only.
361+
Currently, the \fBsearch function\fR is available on the stations', playlists' and themes' window only.
358362

359363
.SH PYRADIO THEMES
360364
.PP

0 commit comments

Comments
 (0)