Skip to content

Commit 731da1a

Browse files
committed
- Version 0.8.9.31 (0.9-beta28)
- Fixing icon installation and discover - Fixing config window not showing last entry
1 parent dfdaaa4 commit 731da1a

File tree

5 files changed

+35
-11
lines changed

5 files changed

+35
-11
lines changed

Changelog

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2022-11-25 s-n-g
2+
* version 0.8.9.31 (0.9-beta28)
3+
* fixing icon installation and discovery
4+
* fixing config window not showing last entry
5+
16
2022-11-25 s-n-g
27
* version 0.8.9.30 (0.9-beta27)
38
* Adding a Desktop File

README.html

+5
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,11 @@ <h2 id="requirements">Requirements <span style="padding-left: 10px;"><sup style=
190190
<h2 id="changelog">Changelog <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></span></h2>
191191
<pre style="height: 200px;">
192192

193+
2022-11-25 s-n-g
194+
* version 0.8.9.31 (0.9-beta28)
195+
* fixing icon installation and discovery
196+
* fixing config window not showing last entry
197+
193198
2022-11-25 s-n-g
194199
* version 0.8.9.30 (0.9-beta27)
195200
* Adding a Desktop File

pyradio/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
" pyradio -- Console radio player. "
22

3-
version_info = (0, 8, 9, 30)
3+
version_info = (0, 8, 9, 31)
44

55
# Set it to True if new stations have been
66
# added to the package's stations.csv

pyradio/config_window.py

+22-8
Original file line numberDiff line numberDiff line change
@@ -234,13 +234,27 @@ def _print_title(self):
234234
def refresh_selection(self):
235235
self._print_title()
236236
if not self.too_small:
237+
# logger.error('\n\n================\nself._start = {}'.format(self._start))
238+
# logger.error(self._config_options)
237239
it_list = list(self._config_options.values())
238-
for i in range(self._start, len(it_list)):
239-
it = it_list[i]
240-
logger.error('selecyion = {}'.format(self.selection))
240+
for i in range(len(it_list)-1, 0, -1):
241+
if it_list[i][0] == '':
242+
it_list.pop()
243+
logger.error(it_list)
244+
if self.__selection < self.maxY -2:
245+
self._start = 0
246+
else:
247+
self._start += 1
248+
# logger.error('self._start = {}'.format(self._start))
249+
# for i in range(self._start, len(it_list)):
250+
for i in range(self._start, self._start + self.maxY - 2):
251+
try:
252+
it = it_list[i]
253+
except IndexError:
254+
break
255+
# logger.error('selection = {0}, i = {1}, max = {2}'.format(self.selection, i, self.maxY))
241256
# if i < self.number_of_items:
242-
if i < self.maxY-2:
243-
logger.error('i = {}'.format(i))
257+
if i <= self.maxY-2:
244258
if i == self.__selection:
245259
col = hcol = curses.color_pair(6)
246260
self._print_options_help()
@@ -249,13 +263,13 @@ def refresh_selection(self):
249263
hcol = curses.color_pair(4)
250264
hline_width = self._second_column - 2
251265
try:
252-
self._win.hline(i+1, 1, ' ', hline_width, col)
266+
self._win.hline(i+1-self._start, 1, ' ', hline_width, col)
253267
except:
254268
logger.error('===== ERROR: {}'.format(i+1))
255269
if i in self._headers:
256-
self._win.addstr(i+1, 1, it[0], curses.color_pair(4))
270+
self._win.addstr(i+1-self._start, 1, it[0], curses.color_pair(4))
257271
else:
258-
self._win.addstr(i+1, 3, it[0], col)
272+
self._win.addstr(i+1-self._start, 1, ' ' + it[0], col)
259273
if isinstance(it[1], bool):
260274
self._win.addstr('{}'.format(it[1]), hcol)
261275
else:

pyradio/log.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,8 @@ def _get_icon_path(self):
266266
else:
267267
the_path = (
268268
join(self._cnf.stations_dir, 'pyradio.png'),
269-
'/usr/share/icon/pyradio.png',
270-
'/usr/local/share/icon/pyradio.png'
269+
'/usr/share/icons/pyradio.png',
270+
'/usr/local/share/icons/pyradio.png'
271271
)
272272
for n in the_path:
273273
if exists(n):

0 commit comments

Comments
 (0)