luna/devedeng-extended
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure that all entries are shown in the menu

Browse source 
There were two errors in the menu generation:

- if there were no page jumps, the number of pages was always "one"
- in each page, one entry was missing (except for the first page,
where two entries were missing).

This patch fixes both
This commit is contained in:
Sergio Costas 2019-01-06 19:08:54 +01:00
parent 0c52e14115
commit 0162267bfa
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/devedeng/dvd_menu.py
View file

@ -382,8 +382,18 @@ class dvd_menu(devedeng.interface_manager.interface_manager):
entries_per_page -= 1 entries_per_page -= 1
n_entries = len(self.title_list) n_entries = len(self.title_list)
paint_arrows = False
if n_entries > entries_per_page:
paint_arrows = True
else:
for element in self.file_list:
if ((element.element_type == "separator") and element.page_jump):
paint_arrows = True
break
if paint_arrows:
entries_per_page -= 1
self.pages = 1 self.pages = 1
n_entries = 0 n_entries = 1
self.page_list = [0] self.page_list = [0]
entry = 0 entry = 0
for element in self.file_list: for element in self.file_list:
@ -392,15 +402,10 @@ class dvd_menu(devedeng.interface_manager.interface_manager):
n_entries = 1 n_entries = 1
self.page_list.append(entry) self.page_list.append(entry)
entry += 1 entry += 1
n_entries += 1
if (page_number > self.pages) and (page_number > 0): if (page_number > self.pages) and (page_number > 0):
page_number = self.pages - 1 page_number = self.pages - 1
if (self.pages > 1):
paint_arrows = True
entries_per_page -= 1
else:
paint_arrows = False
if self.wcurrent_page is not None: if self.wcurrent_page is not None:
self.wcurrent_page.set_text(_("Page {0} of {1}").format(page_number + 1, self.pages)) self.wcurrent_page.set_text(_("Page {0} of {1}").format(page_number + 1, self.pages))
xl = left_margin_p xl = left_margin_p