- Pressing "t" in the config window will be ignored

- Updating Windows uninstall procedure and relevant docs

Author: s-n-g

README.html

@@ -369,6 +369,22 @@ <h2 id="update-notification">Update notification <span style="padding-left: 10px
 <p><strong>PyRadio</strong> will periodically (once every 10 days) check whether a new version has been released.</p>
 <p>If so, a notification message will be displayed, informing the user about it.</p>
 <h2 id="cleaning-up">Cleaning up <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></style></h2>
+<p>Since version 0.8.7.3 (0.8.8-beta2), it is not necessary to follow the previous procedure any more; <strong>PyRadio</strong> will search and remove any previously installed files when the “<strong>-u</strong>” (uninstall) parameter is used.</p>
+<p>This procedure will remove any <strong>Pyradio</strong> files installed in your system, but will leave instact <strong>PyRadio</strong> configuration files.</p>
+<p>Windows users notice: This procedure <strong>will not</strong> uninstall python, mplayer, or git from your system.</p>
+<p>Example:</p>
+<pre>$ devel/build_install_pyradio -u
+Uninstalling PyRadio
+** Removing executable ... done
+** Removing help files ... done
+Looking for python installed files
+** Removing &quot;pyradio-0.8.8-py3.8.egg&quot; ... done
+** Removing &quot;pyradio-0.8.6-py2.7.egg&quot; ... done
+** Removing &quot;pyradio-0.8.8-py3.8.egg&quot; ... done
+PyRadio successfully uninstalled</pre>
+<p>In this example, running <em>devel/build_install_pyradio -u</em> has removed <strong>PyRadio</strong> python 3.8 system wide installation files, <strong>PyRadio</strong> python 2.7 system wide installation files, and <strong>PyRadio</strong> python 3.8 user installation files, found in the system.</p>
+<p>I would recommend to execute <em>devel/build_install_pyradio -u</em> from time to time, and reinstall <strong>Pyradio</strong> right after its completion.</p>
+<h3 id="previous-cleaning-up-procedure">Previous cleaning up procedure</h3>
 <p>As <strong>PyRadio</strong> versions accumulate, when building from source, one may have to <em>clean up</em> old installation files.</p>
 <p>To do that, one has to observe the installation process in order to find out where the package is installed. The installation would complete printing the following messages (on <em>python 3.7</em>):</p>
 <pre>Installed /usr/lib/python3.7/site-packages/pyradio-0.7.8-py3.7.egg
@@ -384,18 +400,6 @@ <h2 id="cleaning-up">Cleaning up <span style="padding-left: 10px;"><sup style="f
 <p>As we see, previous versions still exist in this system: <strong>0.7.6.2</strong> and <strong>0.7.7</strong>. These files (actually directories) can safely be removed:</p>
 <pre>$ sudo rm -rf /usr/lib/python3.7/site-packages/pyradio-.7.6.2-py3.7.egg
 $ sudo rm -rf /usr/lib/python3.7/site-packages/pyradio-0.7.7-py3.7.egg</pre>
-<p style="margin: 1.5em 4em 0 4em; text-indent: -2.5em;"><strong>Note:</strong> Since version 0.8.7.3 (0.8.8-beta2), it is not necessary to follow the previous procedure any more; <strong>PyRadio</strong> will search and remove any previously installed files when the “<strong>-u</strong>” (uninstall) parameter is used.</p>
-<p>Example:</p>
-<pre>$ devel/build_install_pyradio -u
-Uninstalling PyRadio
-** Removing executable ... done
-** Removing help files ... done
-Looking for python installed files
-** Removing &quot;pyradio-0.8.8-py3.8.egg&quot; ... done
-** Removing &quot;pyradio-0.8.6-py2.7.egg&quot; ... done
-** Removing &quot;pyradio-0.8.8-py3.8.egg&quot; ... done
-PyRadio successfully uninstalled</pre>
-<p>In this example, running <em>devel/build_install_pyradio -u</em> has removed <strong>PyRadio</strong> python 3.8 system wide installation files, <strong>PyRadio</strong> python 2.7 system wide installation files, and <strong>PyRadio</strong> python 3.8 user installation files, found in the system.</p>
 <h2 id="debug-mode">Debug mode <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></style></h2>
 <p>Adding the “<strong>-d</strong>” option to the command line will instruct <strong>PyRadio</strong> to enter <em>Debug mode</em>, which means that it will print debug messages to a file. This file will always reside in the user’s home directory and will be named <em>pyradio.log</em>.</p>
 <p>In case of a bug or a glitch, please include this file to the issue you will <a target="_blank" href="https://github.com/coderholic/pyradio/issues">open at github</a>.</p>

README.md

@@ -534,6 +534,30 @@ If so, a notification message will be displayed, informing the user about it.
 
 ## Cleaning up
 
+Since version 0.8.7.3 (0.8.8-beta2), it is not necessary to follow the previous procedure any more; **PyRadio** will search and remove any previously installed files when the "**-u**" (uninstall) parameter is used.
+
+This procedure will remove any **Pyradio** files installed in your system, but will leave instact **PyRadio** configuration files. 
+
+Windows users notice: This procedure **will not** uninstall python, mplayer, or git from your system.
+
+Example:
+
+    $ devel/build_install_pyradio -u
+    Uninstalling PyRadio
+    ** Removing executable ... done
+    ** Removing help files ... done
+    Looking for python installed files
+    ** Removing "pyradio-0.8.8-py3.8.egg" ... done
+    ** Removing "pyradio-0.8.6-py2.7.egg" ... done
+    ** Removing "pyradio-0.8.8-py3.8.egg" ... done
+    PyRadio successfully uninstalled
+
+In this example, running *devel/build_install_pyradio -u* has removed **PyRadio** python 3.8 system wide installation files, **PyRadio** python 2.7 system wide installation files,  and **PyRadio** python 3.8 user installation files, found in the system.
+
+I would recommend to execute *devel/build_install_pyradio -u* from time to time, and reinstall **Pyradio** right after its completion.
+
+### Previous cleaning up procedure
+
 As **PyRadio** versions accumulate, when building from source, one may have to *clean up* old installation files.
 
 To do that, one has to observe the installation process in order to find out where the package is installed. The installation would complete printing the following messages (on *python 3.7*):
@@ -558,22 +582,6 @@ As we see, previous versions still exist in this system: **0.7.6.2** and **0.7.7
     $ sudo rm -rf /usr/lib/python3.7/site-packages/pyradio-.7.6.2-py3.7.egg
     $ sudo rm -rf /usr/lib/python3.7/site-packages/pyradio-0.7.7-py3.7.egg
 
-**Note:** Since version 0.8.7.3 (0.8.8-beta2), it is not necessary to follow the previous procedure any more; **PyRadio** will search and remove any previously installed files when the "**-u**" (uninstall) parameter is used.
-
-Example:
-
-    $ devel/build_install_pyradio -u
-    Uninstalling PyRadio
-    ** Removing executable ... done
-    ** Removing help files ... done
-    Looking for python installed files
-    ** Removing "pyradio-0.8.8-py3.8.egg" ... done
-    ** Removing "pyradio-0.8.6-py2.7.egg" ... done
-    ** Removing "pyradio-0.8.8-py3.8.egg" ... done
-    PyRadio successfully uninstalled
-
-In this example, running *devel/build_install_pyradio -u* has removed **PyRadio** python 3.8 system wide installation files, **PyRadio** python 2.7 system wide installation files,  and **PyRadio** python 3.8 user installation files, found in the system.
-
 ## Debug mode
 
 Adding the "**-d**" option to the command line will instruct **PyRadio** to enter *Debug mode*, which means that it will print debug messages to a file. This file will always reside in the user's home directory and will be named *pyradio.log*.

devel/build_install_pyradio.bat

@@ -144,11 +144,14 @@ goto :endofscript
 
 
 :uninstall
-echo === Gathering information...
+echo Uninstalling PyRadio
+echo ** Gathering information...
 DEL pyremove.bat 2>nul
-echo echo === Removing executable... >>pyremove.bat
+echo echo ** Removing executable... >>pyremove.bat
+echo echo ** Removing Desktop shortcut... >>pyremove.bat
+echo IF EXIST "%DESKTOP%\PyRadio.lnk" DEL "%DESKTOP%\PyRadio.lnk" 2>nul >>pyremove.bat
 python devel\site.py exe 2>nul >>pyremove.bat
-echo echo === Removing Python files... >>pyremove.bat
+REM echo echo ** Removing Python files... >>pyremove.bat
 python devel\site.py 2>nul >dirs
 python2 devel\site.py 2>nul >>dirs
 python3 devel\site.py 2>nul >>dirs
@@ -157,20 +160,17 @@ python2 -m site --user-site 2>nul >>dirs
 python3 -m site --user-site 2>nul >>dirs
 python devel\windirs.py
 echo DEL dirs >>pyremove.bat
-echo echo === Removing Desktop shortcut... >>pyremove.bat
-echo IF EXIST "%DESKTOP%\PyRadio.lnk" DEL "%DESKTOP%\PyRadio.lnk" 2>nul >>pyremove.bat
+echo echo Pyradio successfully uninstalled! >>pyremove.bat
 
 echo echo. >>pyremove.bat
-echo echo ********************************************************** >>pyremove.bat
-echo echo * >>pyremove.bat
-echo echo * Pyradio successfully uninstalled! >>pyremove.bat
-echo echo * >>pyremove.bat
-echo echo * PyRadio has not uninstalled MPlayer, Python and/or Git. >>pyremove.bat
-echo echo * You will have to manually uninstall them. >>pyremove.bat
-echo echo * >>pyremove.bat
-echo echo * PyRadio user files are left instact. You can find them >>pyremove.bat
-echo echo * at %APPDATA%\pyradio >>pyremove.bat
-echo echo * >>pyremove.bat
+echo echo ********************************************************* >>pyremove.bat
+echo echo. >>pyremove.bat
+echo echo PyRadio has not uninstalled MPlayer, Python and/or Git. >>pyremove.bat
+echo echo You will have to manually uninstall them. >>pyremove.bat
+echo echo. >>pyremove.bat
+echo echo PyRadio user files are left instact. You can find them at >>pyremove.bat
+echo echo %APPDATA%\pyradio >>pyremove.bat
+echo echo. >>pyremove.bat
 echo echo ********************************************************** >>pyremove.bat
 echo echo. >>pyremove.bat
 REM copy pyremove.bat con

devel/windirs.py

@@ -1,6 +1,6 @@
 import sys
 import glob
-from os.path import sep
+from os.path import sep, basename
 
 def show_python_dirs():
     import site
@@ -33,5 +33,7 @@ def show_python_dirs():
             pydirs = glob.glob(a_dir + sep + 'pyradio*egg')
             if pydirs:
                 with open("pyremove.bat", "a") as f:
+                    f.write('echo Looking for python installed files...\n')
                     for a_dir in pydirs:
+                        f.write('echo ** "{}"\n'.format(basename(a_dir)))
                         f.write('RD /S /Q "{}"\n'.format(a_dir))

pyradio.1

@@ -630,7 +630,33 @@ If for any reason \fBpyradio\fR always starts in \fIlocked mode\fR, one can \fBu
 If so, a notification message will be displayed, informing the user about it.
 
 .SH CLEANING UP
+
 .PP
+Since version 0.8.7.3 (0.8.8-beta2), it is not necessary to follow the previous procedure any more; \fBpyradio\fR will search and remove any previously installed files when the "\fB-u\fR" (uninstall) parameter is used.
+
+This procedure will remove any \fBpyradio\fR files installed in your system, but will leave instact \fBpyradio\fR configuration files. 
+
+Windows users notice: This procedure \fBwill not\fR uninstall python, mplayer, or git from your system.
+
+Example:
+
+    \fI$ \fBdevel/build_install_pyradio -u\fI
+    Uninstalling PyRadio
+    ** Removing executable ... done
+    ** Removing help files ... done
+    Looking for python installed files
+    ** Removing "pyradio-\fB0.8.8-py3.8\fI.egg" ... done
+    ** Removing "pyradio-\fB0.8.6-py2.7\fI.egg" ... done
+    ** Removing "pyradio-\fB0.8.8-py3.8\fI.egg" ... done
+    PyRadio successfully uninstalled\fR
+
+In this example, running \fIdevel/build_install_pyradio -u\fR has removed \fBpyradio\fR python 3.8 system wide installation files, \fBpyradio\fR python 2.7 system wide installation files,  and \fBpyradio\fR python 3.8 user installation files, found in the system.
+
+I would recommend to execute \fBdevel/build_install_pyradio -u\fR from time to time, and reinstall \fBpyradio\fR right after its completion.
+
+.PP
+\fBPREVIOUS CLEANING UP PROCEDURE\fR
+
 As \fBpyradio\fR versions accumulate, when building from source, one may have to \fIclean up\fR old installation files.
 
 To do that, one has to observe the installation process in order to find out where the package is installed. The installation would complete printing the following messages (on \fIpython 3.7\fR):
@@ -668,23 +694,6 @@ As we see, previous versions still exist in this system: \fB0.7.6.2\fR and \fB0.
 \fI$ \fBsudo rm -rf /usr/lib/python3.7/site-packages/pyradio-\fI0.7.7\fB-py3.7.egg
 
 
-.IP \fBNote:
-Since version 0.8.7.3 (0.8.8-beta2), it is not necessary to follow the previous procedure any more; \fBpyradio\fR will search and remove any previously installed files when the "\fB-u\fR" (uninstall) parameter is used.
-
-Example:
-
-    \fI$ \fBdevel/build_install_pyradio -u\fI
-    Uninstalling PyRadio
-    ** Removing executable ... done
-    ** Removing help files ... done
-    Looking for python installed files
-    ** Removing "pyradio-\fB0.8.8-py3.8\fI.egg" ... done
-    ** Removing "pyradio-\fB0.8.6-py2.7\fI.egg" ... done
-    ** Removing "pyradio-\fB0.8.8-py3.8\fI.egg" ... done
-    PyRadio successfully uninstalled\fR
-
-In this example, running \fIdevel/build_install_pyradio -u\fR has removed \fBpyradio\fR python 3.8 system wide installation files, \fBpyradio\fR python 2.7 system wide installation files,  and \fBpyradio\fR python 3.8 user installation files, found in the system.
-
 .SH DEBUG MODE
 .PP
 Adding the \fB-d\fR option to the command line will instruct \fBpyradio\fR to enter \fBDebug mode\fR, which means that it will print debug messages to a file. This file will always reside in the user's home directory and will be named \fIpyradio.log\fR.

pyradio/radio.py

@@ -3373,7 +3373,8 @@ def keypress(self, char):
                     self.ws.ADD_STATION_MODE, self.ws.THEME_MODE,
                     self.ws.RENAME_PLAYLIST_MODE, self.ws.NEW_PLAYLIST_MODE) and \
                 self.ws.operation_mode not in self.ws.PASSIVE_WINDOWS and \
-                not self.is_search_mode(self.ws.operation_mode):
+                not self.is_search_mode(self.ws.operation_mode) and \
+                self.ws.window_mode not in (self.ws.CONFIG_MODE, ):
             self._update_status_bar_right()
             self._config_win = None
             self.theme_forced_selection = None

windows.html

@@ -58,6 +58,7 @@ <h2 id="table-of-contents">Table of contents <span style="padding-left: 10px;"><
 <li><a href="#updating-with-git">5.1 Updating with Git</a></li>
 <li><a href="#updating-without-git">5.2 Updating without Git</a></li>
 </ul></li>
+<li><a href="#uninstalling-pyradio-or-cleaning-up">6. Uninstalling Pyradio (or Cleaning up)</a></li>
 </ul></li>
 <li><a href="build.html">Back</a></li>
 <li><a href="README.html">Back to README</a></li>
@@ -149,19 +150,20 @@ <h3 id="pyradio-installation">4. PyRadio installation <span style="padding-left:
 <p>You are ready to install <strong>PyRadio</strong>!</p>
 <p>So here’s how you do it:</p>
 <h4 id="using-git">4.1 Using Git</h4>
-<p>If you have Git installed, you open a console (press the <strong>Win</strong> key, type <strong>cmd</strong> and press <strong>ENTER</strong>) and type:</p>
+<p>If you have Git installed, you open a console (press the <strong>Win</strong> key, type <strong>cmd</strong> and press <strong>ENTER</strong> or if you are on Windows 10, use <strong>Run it as Administrator</strong> as you can see in the following image).</p>
+<p><a target="_blank" href="https://members.hellug.gr/sng/pyradio/run-as-admin.jpg">Run as Administrator</a></p>
+<p>Then type:</p>
 <pre>git clone https://github.com/coderholic/pyradio.git
 cd pyradio
 devel\build_install_pyradio</pre>
 <h4 id="not-using-git">4.2 Not using Git</h4>
 <p>Go to <a target="_blank" href="https://github.com/coderholic/pyradio/releases">PyRadio’s Releases page</a> and download the latest release (either a zip or a tar.gz file).</p>
 <p>Extract this file to your “<em>Home</em>” directory (“<strong>C:\Users\[Your User Name]</strong>” or “<strong>%USERPROFILE%</strong>) - you will get a directory whose name is similar to”<strong>pyradio-0.7.9</strong>".</p>
 <p>I will use this name for the following examples; you will have to use the actual name of directory you got from the extraction.</p>
-<p>Finally, open a console (press the <strong>Win</strong> key, type <strong>cmd</strong> and press <strong>ENTER</strong> or if you are on Windows 10, use <strong>Run it as Administrator</strong> as you can see in the following image)</p>
+<p>Finally, open a console (press the <strong>Win</strong> key, type <strong>cmd</strong> and press <strong>ENTER</strong> or if you are on Windows 10, use <strong>Run it as Administrator</strong> as you can see in the following image).</p>
 <p><a target="_blank" href="https://members.hellug.gr/sng/pyradio/run-as-admin.jpg">Run as Administrator</a></p>
 <p>Then type:</p>
 <pre>cd pyradio-0.7.9
-cd pyradio
 devel\build_install_pyradio</pre>
 <h4 id="final-steps">4.3 Final steps</h4>
 <p>If the installation is successful, you will get something similar to the following snippet:</p>
@@ -199,5 +201,35 @@ <h4 id="updating-with-git">5.1 Updating with Git</h4>
 devel\build_install_pyradio</pre>
 <h4 id="updating-without-git">5.2 Updating without Git</h4>
 <p>The procedure is the same as installing, so please follow the <a href="#not-using-git">relevant instructions</a>.</p>
+<h3 id="uninstalling-pyradio-or-cleaning-up">6. Uninstalling Pyradio (or Cleaning up) <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></style></h3>
+<p>To uninstall <strong>PyRadio</strong> you will have to use the “<strong>-u</strong>” (uninstall) parameter.</p>
+<p>This procedure will remove any <strong>Pyradio</strong> files installed in your system, but will leave instact <strong>PyRadio</strong> configuration files or uninstall python, mplayer, or git from your system.</p>
+<p>To uninstall <strong>PyRadio</strong> open a console (press the <strong>Win</strong> key, type <strong>cmd</strong> and press <strong>ENTER</strong> or if you are on Windows 10, use <strong>Run it as Administrator</strong> as you can see in the following image).</p>
+<p><a target="_blank" href="https://members.hellug.gr/sng/pyradio/run-as-admin.jpg">Run as Administrator</a></p>
+<p>Then navigate to the previously downloaded <strong>Pyradio</strong> setup folder, and execute <em>devel\build_install_pyradio -u</em>.</p>
+<p>Example:</p>
+<pre>C:\Users\spiros\pyradio&gt;devel\build_install_pyradio -u
+Uninstalling PyRadio
+** Gathering information...
+** Removing executable...
+** Removing Desktop shortcut...
+Looking for python installed files...
+** &quot;pyradio-0.8.8-py3.7.egg&quot;
+** &quot;pyradio-0.7.9-py3.7.egg&quot;
+** &quot;pyradio-0.6.3-py3.7.egg&quot;
+Pyradio successfully uninstalled!
+
+*********************************************************
+
+PyRadio has not uninstalled MPlayer, Python and/or Git.
+You will have to manually uninstall them.
+
+PyRadio user files are left instact. You can find them at
+C:\Users\spiros\AppData\Roaming\pyradio
+
+**********************************************************</pre>
+<p>In this example, running <em>devel\build_install_pyradio -u</em> has removed <strong>PyRadio</strong> python 3.7 installation files.</p>
+<p>The script has detected (and removed) version <em>8.8</em> (probably the current or previous version), along with verisons <em>7.9</em> and <em>6.3</em> (older versions previously installed).</p>
+<p>I would recommend to execute <em>devel\build_install_pyradio -u</em> from time to time, and reinstall <strong>PyRadio</strong> right after its completion.</p>
 </body>
 </html>