From 2f01938415a17cb15335c68984ebaed484756ec4 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:17:23 +0800 Subject: [PATCH 01/26] add loop scroll --- sys.py/UI/Emulator/rom_list_page.py | 36 ++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/sys.py/UI/Emulator/rom_list_page.py b/sys.py/UI/Emulator/rom_list_page.py index 412ae93..31d596d 100644 --- a/sys.py/UI/Emulator/rom_list_page.py +++ b/sys.py/UI/Emulator/rom_list_page.py @@ -301,28 +301,48 @@ class RomListPage(Page): self._PsIndex -= self._ScrollStep if self._PsIndex < 0: - self._PsIndex = 0 - dy = tmp - self._PsIndex + # self._PsIndex = 0 + self._PsIndex = len(self._MyList) -1 # to end + + # dy = tmp - self._PsIndex + dy = abs(tmp - self._PsIndex) cur_li = self._MyList[self._PsIndex] if cur_li._PosY < 0: for i in range(0, len(self._MyList)): - self._MyList[i]._PosY += self._MyList[i]._Height*dy - self._Scrolled +=dy + self._MyList[i]._PosY += self._MyList[i]._Height * dy + self._Scrolled += dy + + # loop scroll, to end + # dy - 5: 6 items on screen, 6 - 1 = 5 + if self._PsIndex == len(self._MyList) - 1: + for i in range(0, len(self._MyList)): + self._MyList[i]._PosY -= self._MyList[i]._Height * (dy - 5) + self._Scrolled -= dy def ScrollDown(self): if len(self._MyList) == 0: return tmp = self._PsIndex self._PsIndex +=self._ScrollStep + if self._PsIndex >= len(self._MyList): - self._PsIndex = len(self._MyList) -1 + # self._PsIndex = len(self._MyList) -1 + self._PsIndex = 0 # to first - dy = self._PsIndex - tmp + # dy = self._PsIndex - tmp + dy = abs(self._PsIndex - tmp) cur_li = self._MyList[self._PsIndex] - if cur_li._PosY +cur_li._Height > self._Height: + if cur_li._PosY + cur_li._Height > self._Height: for i in range(0,len(self._MyList)): - self._MyList[i]._PosY -= self._MyList[i]._Height*dy + self._MyList[i]._PosY -= self._MyList[i]._Height * dy self._Scrolled -= dy + + # loop scroll, to first + # dy - 5: 6 items on screen, 6 - 1 = 5 + if self._PsIndex == 0: + for i in range(0, len(self._MyList)): + self._MyList[i]._PosY += self._MyList[i]._Height * (dy - 5) + self._Scrolled += dy def SyncScroll(self): ## From fe601a06961139407305aa511c66636c9d60d2a6 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:23:35 +0800 Subject: [PATCH 02/26] add loop scroll --- sys.py/UI/Emulator/fav_list_page.py | 36 ++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/sys.py/UI/Emulator/fav_list_page.py b/sys.py/UI/Emulator/fav_list_page.py index 8588050..70d230f 100644 --- a/sys.py/UI/Emulator/fav_list_page.py +++ b/sys.py/UI/Emulator/fav_list_page.py @@ -267,28 +267,48 @@ class FavListPage(Page): self._PsIndex -= self._ScrollStep if self._PsIndex < 0: - self._PsIndex = 0 - dy = tmp - self._PsIndex + # self._PsIndex = 0 + self._PsIndex = len(self._MyList) -1 # to end + + # dy = tmp - self._PsIndex + dy = abs(tmp - self._PsIndex) cur_li = self._MyList[self._PsIndex] if cur_li._PosY < 0: for i in range(0, len(self._MyList)): - self._MyList[i]._PosY += self._MyList[i]._Height*dy - self._Scrolled +=dy + self._MyList[i]._PosY += self._MyList[i]._Height * dy + self._Scrolled += dy + + # loop scroll, to end + # dy - 5: 6 items on screen, 6 - 1 = 5 + if self._PsIndex == len(self._MyList) - 1: + for i in range(0, len(self._MyList)): + self._MyList[i]._PosY -= self._MyList[i]._Height * (dy - 5) + self._Scrolled -= dy def ScrollDown(self): if len(self._MyList) == 0: return tmp = self._PsIndex self._PsIndex +=self._ScrollStep + if self._PsIndex >= len(self._MyList): - self._PsIndex = len(self._MyList) -1 + # self._PsIndex = len(self._MyList) -1 + self._PsIndex = 0 # to first - dy = self._PsIndex - tmp + # dy = self._PsIndex - tmp + dy = abs(self._PsIndex - tmp) cur_li = self._MyList[self._PsIndex] - if cur_li._PosY +cur_li._Height > self._Height: + if cur_li._PosY + cur_li._Height > self._Height: for i in range(0,len(self._MyList)): - self._MyList[i]._PosY -= self._MyList[i]._Height*dy + self._MyList[i]._PosY -= self._MyList[i]._Height * dy self._Scrolled -= dy + + # loop scroll, to first + # dy - 5: 6 items on screen, 6 - 1 = 5 + if self._PsIndex == 0: + for i in range(0, len(self._MyList)): + self._MyList[i]._PosY += self._MyList[i]._Height * (dy - 5) + self._Scrolled += dy def SyncScroll(self): ## From bfc849dbc4ae57690f9c44bd6a37d838a6447fa0 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Wed, 29 Jul 2020 21:48:11 +0800 Subject: [PATCH 03/26] add loop scroll --- sys.py/UI/Emulator/rom_list_page.py | 34 +++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/sys.py/UI/Emulator/rom_list_page.py b/sys.py/UI/Emulator/rom_list_page.py index 31d596d..5d9b75f 100644 --- a/sys.py/UI/Emulator/rom_list_page.py +++ b/sys.py/UI/Emulator/rom_list_page.py @@ -115,6 +115,8 @@ class RomListPage(Page): _RomSoConfirmDownloadPage = None _Backspace = False + + _ItemsPerPage = 6 def __init__(self): Page.__init__(self) @@ -294,7 +296,8 @@ class RomListPage(Page): self._RomSoConfirmDownloadPage = rom_so_confirm_page def ScrollUp(self): - if len(self._MyList) == 0: + # if len(self._MyList) == 0: + if len(self._MyList) <= 1: return tmp = self._PsIndex @@ -302,7 +305,7 @@ class RomListPage(Page): if self._PsIndex < 0: # self._PsIndex = 0 - self._PsIndex = len(self._MyList) -1 # to end + self._PsIndex = len(self._MyList) - 1 # to end # dy = tmp - self._PsIndex dy = abs(tmp - self._PsIndex) @@ -313,15 +316,21 @@ class RomListPage(Page): self._Scrolled += dy # loop scroll, to end - # dy - 5: 6 items on screen, 6 - 1 = 5 if self._PsIndex == len(self._MyList) - 1: + # check items per page + if len(self._MyList) < self._ItemsPerPage: + self._ItemsPerPage = len(self._MyList) + self._ItemsPerPage -= 1 # not include current item for i in range(0, len(self._MyList)): - self._MyList[i]._PosY -= self._MyList[i]._Height * (dy - 5) + self._MyList[i]._PosY -= self._MyList[i]._Height * (dy - self._ItemsPerPage) self._Scrolled -= dy + self._ItemsPerPage = 6 # reset to 6 def ScrollDown(self): - if len(self._MyList) == 0: + # if len(self._MyList) == 0: + if len(self._MyList) <= 1: return + tmp = self._PsIndex self._PsIndex +=self._ScrollStep @@ -338,12 +347,16 @@ class RomListPage(Page): self._Scrolled -= dy # loop scroll, to first - # dy - 5: 6 items on screen, 6 - 1 = 5 if self._PsIndex == 0: + # check items per page + if len(self._MyList) < self._ItemsPerPage: + self._ItemsPerPage = len(self._MyList) + self._ItemsPerPage -= 1 # not include current item for i in range(0, len(self._MyList)): - self._MyList[i]._PosY += self._MyList[i]._Height * (dy - 5) + self._MyList[i]._PosY += self._MyList[i]._Height * (dy - self._ItemsPerPage) self._Scrolled += dy - + self._ItemsPerPage = 6 # reset to 6 + def SyncScroll(self): ## if self._Scrolled == 0: @@ -452,7 +465,10 @@ class RomListPage(Page): cur_time = time.time() if cur_time - self._Screen._LastKeyDown > 0.3: - self._ScrollStep = 1 + self._ScrollStep = 1 + + if len(self._MyList) < self._ItemsPerPage: + self._ScrollStep = 1 def KeyDown(self,event): From b3e403a98838548b5135760a32d218c50598413e Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Wed, 29 Jul 2020 21:49:35 +0800 Subject: [PATCH 04/26] add loop scroll --- sys.py/UI/Emulator/fav_list_page.py | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/sys.py/UI/Emulator/fav_list_page.py b/sys.py/UI/Emulator/fav_list_page.py index 70d230f..929fb51 100644 --- a/sys.py/UI/Emulator/fav_list_page.py +++ b/sys.py/UI/Emulator/fav_list_page.py @@ -105,7 +105,8 @@ class FavListPage(Page): _Backspace = False - + _ItemsPerPage = 6 + def __init__(self): Page.__init__(self) self._Icons = {} @@ -279,11 +280,15 @@ class FavListPage(Page): self._Scrolled += dy # loop scroll, to end - # dy - 5: 6 items on screen, 6 - 1 = 5 if self._PsIndex == len(self._MyList) - 1: + # check items per page + if len(self._MyList) < self._ItemsPerPage: + self._ItemsPerPage = len(self._MyList) + self._ItemsPerPage -= 1 # not include current item for i in range(0, len(self._MyList)): - self._MyList[i]._PosY -= self._MyList[i]._Height * (dy - 5) + self._MyList[i]._PosY -= self._MyList[i]._Height * (dy - self._ItemsPerPage) self._Scrolled -= dy + self._ItemsPerPage = 6 # reset to 6 def ScrollDown(self): if len(self._MyList) == 0: @@ -304,11 +309,15 @@ class FavListPage(Page): self._Scrolled -= dy # loop scroll, to first - # dy - 5: 6 items on screen, 6 - 1 = 5 if self._PsIndex == 0: + # check items per page + if len(self._MyList) < self._ItemsPerPage: + self._ItemsPerPage = len(self._MyList) + self._ItemsPerPage -= 1 # not include current item for i in range(0, len(self._MyList)): - self._MyList[i]._PosY += self._MyList[i]._Height * (dy - 5) + self._MyList[i]._PosY += self._MyList[i]._Height * (dy - self._ItemsPerPage) self._Scrolled += dy + self._ItemsPerPage = 6 # reset to 6 def SyncScroll(self): ## @@ -416,7 +425,10 @@ class FavListPage(Page): cur_time = time.time() if cur_time - self._Screen._LastKeyDown > 0.3: - self._ScrollStep = 1 + self._ScrollStep = 1 + + if len(self._MyList) < self._ItemsPerPage: + self._ScrollStep = 1 def KeyDown(self,event): From 4986c2b30966f8824af8da3b74f4c3fa5b068ca9 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Wed, 29 Jul 2020 23:30:39 +0800 Subject: [PATCH 05/26] add loop scroll --- sys.py/UI/Emulator/fav_list_page.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/sys.py/UI/Emulator/fav_list_page.py b/sys.py/UI/Emulator/fav_list_page.py index 929fb51..aa991d2 100644 --- a/sys.py/UI/Emulator/fav_list_page.py +++ b/sys.py/UI/Emulator/fav_list_page.py @@ -282,13 +282,12 @@ class FavListPage(Page): # loop scroll, to end if self._PsIndex == len(self._MyList) - 1: # check items per page - if len(self._MyList) < self._ItemsPerPage: - self._ItemsPerPage = len(self._MyList) - self._ItemsPerPage -= 1 # not include current item - for i in range(0, len(self._MyList)): - self._MyList[i]._PosY -= self._MyList[i]._Height * (dy - self._ItemsPerPage) + if len(self._MyList) > self._ItemsPerPage: + self._ItemsPerPage -= 1 # not include current item + for i in range(0, len(self._MyList)): + self._MyList[i]._PosY -= self._MyList[i]._Height * (dy - self._ItemsPerPage) self._Scrolled -= dy - self._ItemsPerPage = 6 # reset to 6 + self._ItemsPerPage = 6 # reset to 6 def ScrollDown(self): if len(self._MyList) == 0: @@ -311,13 +310,12 @@ class FavListPage(Page): # loop scroll, to first if self._PsIndex == 0: # check items per page - if len(self._MyList) < self._ItemsPerPage: - self._ItemsPerPage = len(self._MyList) - self._ItemsPerPage -= 1 # not include current item - for i in range(0, len(self._MyList)): - self._MyList[i]._PosY += self._MyList[i]._Height * (dy - self._ItemsPerPage) + if len(self._MyList) > self._ItemsPerPage: + self._ItemsPerPage -= 1 # not include current item + for i in range(0, len(self._MyList)): + self._MyList[i]._PosY += self._MyList[i]._Height * (dy - self._ItemsPerPage) self._Scrolled += dy - self._ItemsPerPage = 6 # reset to 6 + self._ItemsPerPage = 6 # reset to 6 def SyncScroll(self): ## From e8623f6189d71ad03a0ea9ba8f3d904df69cf6d0 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Wed, 29 Jul 2020 23:32:08 +0800 Subject: [PATCH 06/26] add loop scroll --- sys.py/UI/Emulator/rom_list_page.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/sys.py/UI/Emulator/rom_list_page.py b/sys.py/UI/Emulator/rom_list_page.py index 5d9b75f..bd2c5ac 100644 --- a/sys.py/UI/Emulator/rom_list_page.py +++ b/sys.py/UI/Emulator/rom_list_page.py @@ -318,13 +318,12 @@ class RomListPage(Page): # loop scroll, to end if self._PsIndex == len(self._MyList) - 1: # check items per page - if len(self._MyList) < self._ItemsPerPage: - self._ItemsPerPage = len(self._MyList) - self._ItemsPerPage -= 1 # not include current item - for i in range(0, len(self._MyList)): - self._MyList[i]._PosY -= self._MyList[i]._Height * (dy - self._ItemsPerPage) + if len(self._MyList) > self._ItemsPerPage: + self._ItemsPerPage -= 1 # not include current item + for i in range(0, len(self._MyList)): + self._MyList[i]._PosY -= self._MyList[i]._Height * (dy - self._ItemsPerPage) self._Scrolled -= dy - self._ItemsPerPage = 6 # reset to 6 + self._ItemsPerPage = 6 # reset to 6 def ScrollDown(self): # if len(self._MyList) == 0: @@ -349,13 +348,12 @@ class RomListPage(Page): # loop scroll, to first if self._PsIndex == 0: # check items per page - if len(self._MyList) < self._ItemsPerPage: - self._ItemsPerPage = len(self._MyList) - self._ItemsPerPage -= 1 # not include current item - for i in range(0, len(self._MyList)): - self._MyList[i]._PosY += self._MyList[i]._Height * (dy - self._ItemsPerPage) + if len(self._MyList) > self._ItemsPerPage: + self._ItemsPerPage -= 1 # not include current item + for i in range(0, len(self._MyList)): + self._MyList[i]._PosY += self._MyList[i]._Height * (dy - self._ItemsPerPage) self._Scrolled += dy - self._ItemsPerPage = 6 # reset to 6 + self._ItemsPerPage = 6 # reset to 6 def SyncScroll(self): ## From 16d4bf0ecdfcd362759236f2dc54a09f497a2ffd Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Wed, 29 Jul 2020 23:46:17 +0800 Subject: [PATCH 07/26] add loop scroll --- sys.py/UI/page.py | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/sys.py/UI/page.py b/sys.py/UI/page.py index f1e6542..0d2d792 100644 --- a/sys.py/UI/page.py +++ b/sys.py/UI/page.py @@ -111,6 +111,7 @@ class Page(Widget): _Padding = pygame.Rect(0, 0, 0, 0) # x,y,w,h _Margin = pygame.Rect(0, 0, 0, 0) _ScrollStep = 1 + _ItemsPerPage = 6 def __init__(self): self._Icons = [] @@ -582,11 +583,18 @@ class Page(Widget): # make sure the Class has the _MyList def ScrollDown(self): - if len(self._MyList) == 0: + # if len(self._MyList) == 0: + if len(self._MyList) <= 1: return self._PsIndex +=1 if self._PsIndex >= len(self._MyList): - self._PsIndex = len(self._MyList) -1 + # self._PsIndex = len(self._MyList) -1 + + # loop scroll, to first + if len(self._MyList) > self._ItemsPerPage: + self.FScrollUp(len(self._MyList) - self._ItemsPerPage) + self._PsIndex = 0 + return cur_li = self._MyList[self._PsIndex] if cur_li._PosY +cur_li._Height > self._Height: @@ -594,18 +602,27 @@ class Page(Widget): self._MyList[i]._PosY -= self._MyList[i]._Height def ScrollUp(self): - if len(self._MyList) == 0: + # if len(self._MyList) == 0: + if len(self._MyList) <= 1: return self._PsIndex -= 1 if self._PsIndex < 0: - self._PsIndex = 0 + # self._PsIndex = 0 + + # loop scroll, to end + if len(self._MyList) > self._ItemsPerPage: + self.FScrollDown(len(self._MyList) - self._ItemsPerPage) + self._PsIndex = len(self._MyList) - 1 + return + cur_li = self._MyList[self._PsIndex] if cur_li._PosY < 0: for i in range(0, len(self._MyList)): self._MyList[i]._PosY += self._MyList[i]._Height def FScrollUp(self,Step=1): - if len(self._MyList) == 0: + # if len(self._MyList) == 0: + if len(self._MyList) <= 1: return tmp = self._PsIndex self._PsIndex -= Step @@ -625,7 +642,8 @@ class Page(Widget): self._PsIndex = len(self._MyList) -1 def FScrollDown(self,Step=1): - if len(self._MyList) == 0: + # if len(self._MyList) == 0: + if len(self._MyList) <= 1: return tmp = self._PsIndex self._PsIndex +=Step From 41acbb630559c057ae0e61fed057b5d7072b7d5f Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Thu, 30 Jul 2020 02:57:05 +0800 Subject: [PATCH 08/26] add loop scroll --- .../95_Music Player/play_list_page.py | 80 ++++++++++++++++--- 1 file changed, 68 insertions(+), 12 deletions(-) diff --git a/Menu/GameShell/95_Music Player/play_list_page.py b/Menu/GameShell/95_Music Player/play_list_page.py index c36f996..f485354 100644 --- a/Menu/GameShell/95_Music Player/play_list_page.py +++ b/Menu/GameShell/95_Music Player/play_list_page.py @@ -77,6 +77,8 @@ class PlayListPage(Page): _Backspace = False + _ItemsPerPage = 6 + def __init__(self): self._Icons = {} Page.__init__(self) @@ -196,30 +198,84 @@ class PlayListPage(Page): self._Scroller.Init() + # def ScrollUp(self): + # if len(self._MyList) == 0: + # return + # self._PsIndex -= 1 + # if self._PsIndex < 0: + # self._PsIndex = 0 + # cur_li = self._MyList[self._PsIndex] + # if cur_li._PosY < 0: + # for i in range(0, len(self._MyList)): + # self._MyList[i]._PosY += self._MyList[i]._Height + # self._Scrolled +=1 + + # def ScrollDown(self): + # if len(self._MyList) == 0: + # return + # self._PsIndex +=1 + # if self._PsIndex >= len(self._MyList): + # self._PsIndex = len(self._MyList) -1 + + # cur_li = self._MyList[self._PsIndex] + # if cur_li._PosY +cur_li._Height > self._Height: + # for i in range(0,len(self._MyList)): + # self._MyList[i]._PosY -= self._MyList[i]._Height + # self._Scrolled -=1 + def ScrollUp(self): - if len(self._MyList) == 0: + if len(self._MyList) <= 1: return - self._PsIndex -= 1 + + tmp = self._PsIndex + self._PsIndex -= self._ScrollStep + if self._PsIndex < 0: - self._PsIndex = 0 + self._PsIndex = len(self._MyList) - 1 # to end + + dy = abs(tmp - self._PsIndex) cur_li = self._MyList[self._PsIndex] if cur_li._PosY < 0: for i in range(0, len(self._MyList)): - self._MyList[i]._PosY += self._MyList[i]._Height - self._Scrolled +=1 + self._MyList[i]._PosY += self._MyList[i]._Height * dy + self._Scrolled += dy + + # loop scroll, to end + if self._PsIndex == len(self._MyList) - 1: + # check items per page + if len(self._MyList) > self._ItemsPerPage: + self._ItemsPerPage -= 1 # not include current item + for i in range(0, len(self._MyList)): + self._MyList[i]._PosY -= self._MyList[i]._Height * (dy - self._ItemsPerPage) + self._Scrolled -= dy + self._ItemsPerPage = 6 # reset to 6 def ScrollDown(self): - if len(self._MyList) == 0: + if len(self._MyList) <= 1: return - self._PsIndex +=1 - if self._PsIndex >= len(self._MyList): - self._PsIndex = len(self._MyList) -1 + tmp = self._PsIndex + self._PsIndex +=self._ScrollStep + + if self._PsIndex >= len(self._MyList): + self._PsIndex = 0 # to first + + dy = abs(self._PsIndex - tmp) cur_li = self._MyList[self._PsIndex] - if cur_li._PosY +cur_li._Height > self._Height: + if cur_li._PosY + cur_li._Height > self._Height: for i in range(0,len(self._MyList)): - self._MyList[i]._PosY -= self._MyList[i]._Height - self._Scrolled -=1 + self._MyList[i]._PosY -= self._MyList[i]._Height * dy + self._Scrolled -= dy + + # loop scroll, to first + if self._PsIndex == 0: + # check items per page + if len(self._MyList) > self._ItemsPerPage: + self._ItemsPerPage -= 1 # not include current item + for i in range(0, len(self._MyList)): + self._MyList[i]._PosY += self._MyList[i]._Height * (dy - self._ItemsPerPage) + self._Scrolled += dy + self._ItemsPerPage = 6 # reset to 6 def SyncScroll(self):# show where it left if self._Scrolled == 0: From a10023ae7fdd8f52ed62d07ff3b93a67884bfa49 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Thu, 30 Jul 2020 02:58:18 +0800 Subject: [PATCH 09/26] add loop scroll --- .../95_Music Player/music_lib_list_page.py | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/Menu/GameShell/95_Music Player/music_lib_list_page.py b/Menu/GameShell/95_Music Player/music_lib_list_page.py index 2af0ca5..1f9ebe1 100644 --- a/Menu/GameShell/95_Music Player/music_lib_list_page.py +++ b/Menu/GameShell/95_Music Player/music_lib_list_page.py @@ -94,6 +94,8 @@ class MusicLibListPage(Page): _BGheight = 70 _Backspace = False + + _ItemsPerPage = 6 def __init__(self): Page.__init__(self) @@ -102,7 +104,57 @@ class MusicLibListPage(Page): self._MyList = [] self._SwapMyList = [] self._MyStack = MusicLibStack() + + def ScrollUp(self): + if len(self._MyList) <= 1: + return + tmp = self._PsIndex + self._PsIndex -= self._ScrollStep + + if self._PsIndex < 0: + self._PsIndex = len(self._MyList) - 1 # to end + + dy = abs(tmp - self._PsIndex) + cur_li = self._MyList[self._PsIndex] + if cur_li._PosY < 0: + for i in range(0, len(self._MyList)): + self._MyList[i]._PosY += self._MyList[i]._Height * dy + + # loop scroll, to end + if self._PsIndex == len(self._MyList) - 1: + # check items per page + if len(self._MyList) > self._ItemsPerPage: + self._ItemsPerPage -= 1 # not include current item + for i in range(0, len(self._MyList)): + self._MyList[i]._PosY -= self._MyList[i]._Height * (dy - self._ItemsPerPage) + self._ItemsPerPage = 6 # reset to 6 + + def ScrollDown(self): + if len(self._MyList) <= 1: + return + + tmp = self._PsIndex + self._PsIndex +=self._ScrollStep + + if self._PsIndex >= len(self._MyList): + self._PsIndex = 0 # to first + + dy = abs(self._PsIndex - tmp) + cur_li = self._MyList[self._PsIndex] + if cur_li._PosY + cur_li._Height > self._Height: + for i in range(0,len(self._MyList)): + self._MyList[i]._PosY -= self._MyList[i]._Height * dy + + # loop scroll, to first + if self._PsIndex == 0: + # check items per page + if len(self._MyList) > self._ItemsPerPage: + self._ItemsPerPage -= 1 # not include current item + for i in range(0, len(self._MyList)): + self._MyList[i]._PosY += self._MyList[i]._Height * (dy - self._ItemsPerPage) + self._ItemsPerPage = 6 # reset to 6 + def SyncList(self,path): if myvars.Poller == None: return From b0e15e3a5d66ecb3e3bd8890a98f5e8ba4d4c196 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Fri, 31 Jul 2020 18:30:35 +0800 Subject: [PATCH 10/26] set default lang to DEOT English --- sys.py/UI/lang_manager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys.py/UI/lang_manager.py b/sys.py/UI/lang_manager.py index 058345d..d5734ca 100644 --- a/sys.py/UI/lang_manager.py +++ b/sys.py/UI/lang_manager.py @@ -16,7 +16,8 @@ class LangManager(object): _Langs = {} _Config = None - _ConfigFileName = "00_English.ini" ## double % to escape + # _ConfigFileName = "00_English.ini" ## double % to escape + _ConfigFileName = "99_DEOT_English.ini" _CJKMode = False def __init__(self): @@ -113,6 +114,5 @@ def InitMyLangManager(): global MyLangManager if MyLangManager == None: MyLangManager = LangManager() - InitMyLangManager() From ca1e4cfe912bf2fb3d652dc4ffc202c76a45edb5 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Fri, 31 Jul 2020 18:32:14 +0800 Subject: [PATCH 11/26] update scroll func --- sys.py/UI/page.py | 174 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 129 insertions(+), 45 deletions(-) diff --git a/sys.py/UI/page.py b/sys.py/UI/page.py index 0d2d792..005d20f 100644 --- a/sys.py/UI/page.py +++ b/sys.py/UI/page.py @@ -8,7 +8,7 @@ import sys import math import fnmatch import random - +import time from libs import easing @@ -111,6 +111,7 @@ class Page(Widget): _Padding = pygame.Rect(0, 0, 0, 0) # x,y,w,h _Margin = pygame.Rect(0, 0, 0, 0) _ScrollStep = 1 + _Scrolled = 0 _ItemsPerPage = 6 def __init__(self): @@ -582,82 +583,165 @@ class Page(Widget): self._Icons[i].Draw() # make sure the Class has the _MyList - def ScrollDown(self): + # def ScrollDown(self): # if len(self._MyList) == 0: - if len(self._MyList) <= 1: - return - self._PsIndex +=1 - if self._PsIndex >= len(self._MyList): + # return + # self._PsIndex +=1 + # if self._PsIndex >= len(self._MyList): # self._PsIndex = len(self._MyList) -1 - # loop scroll, to first - if len(self._MyList) > self._ItemsPerPage: - self.FScrollUp(len(self._MyList) - self._ItemsPerPage) - self._PsIndex = 0 - return - - cur_li = self._MyList[self._PsIndex] - if cur_li._PosY +cur_li._Height > self._Height: - for i in range(0,len(self._MyList)): - self._MyList[i]._PosY -= self._MyList[i]._Height + # cur_li = self._MyList[self._PsIndex] + # if cur_li._PosY +cur_li._Height > self._Height: + # for i in range(0,len(self._MyList)): + # self._MyList[i]._PosY -= self._MyList[i]._Height - def ScrollUp(self): + # def ScrollUp(self): # if len(self._MyList) == 0: + # return + # self._PsIndex -= 1 + # if self._PsIndex < 0: + # self._PsIndex = 0 + # cur_li = self._MyList[self._PsIndex] + # if cur_li._PosY < 0: + # for i in range(0, len(self._MyList)): + # self._MyList[i]._PosY += self._MyList[i]._Height + + def ScrollUp(self, step = 1): if len(self._MyList) <= 1: return - self._PsIndex -= 1 - if self._PsIndex < 0: - # self._PsIndex = 0 + + # check step + if step > self._ItemsPerPage: + step = self._ItemsPerPage - 1 + if step > len(self._MyList) - 1: + step = 1 + + # first to end + if self._PsIndex - step < 0 and step == 1: + # index of the last item on current screen + self._PsIndex = 0 + self._ItemsPerPage - 1 # loop scroll, to end if len(self._MyList) > self._ItemsPerPage: - self.FScrollDown(len(self._MyList) - self._ItemsPerPage) + self.FScrollDown(len(self._MyList) - self._ItemsPerPage, True) self._PsIndex = len(self._MyList) - 1 + self._Scrolled = self._PsIndex + return + else: + self.FScrollUp(step) + + def ScrollDown(self, step = 1): + if len(self._MyList) <= 1: return - cur_li = self._MyList[self._PsIndex] - if cur_li._PosY < 0: - for i in range(0, len(self._MyList)): - self._MyList[i]._PosY += self._MyList[i]._Height + # check step + if step > self._ItemsPerPage: + step = self._ItemsPerPage - 1 + if step > len(self._MyList) - 1: + step = 1 - def FScrollUp(self,Step=1): + # end to first + if self._PsIndex + step >= len(self._MyList) and step == 1: + # index of the first item on current screen + self._PsIndex = (len(self._MyList) - 1) - (self._ItemsPerPage - 1) + + # loop scroll, to first + if len(self._MyList) > self._ItemsPerPage: + self.FScrollUp(len(self._MyList) - self._ItemsPerPage, True) + self._PsIndex = 0 + self._Scrolled = self._PsIndex + return + else: + self.FScrollDown(step) + + # do not directly call this function, please use "ScrollUp(step)" + def FScrollUp(self, step = 1, loop_scroll = False): # if len(self._MyList) == 0: if len(self._MyList) <= 1: return + + if step < self._ItemsPerPage and not loop_scroll: + if (self._PsIndex - step + 1) - 1 < step: + step = 1 + tmp = self._PsIndex - self._PsIndex -= Step + self._PsIndex -= step if self._PsIndex < 0: self._PsIndex = 0 - dy = tmp-self._PsIndex + + # dy = tmp-self._PsIndex + dy = abs(tmp - self._PsIndex) cur_li = self._MyList[self._PsIndex] if cur_li._PosY < 0: for i in range(0, len(self._MyList)): - self._MyList[i]._PosY += self._MyList[i]._Height*dy + self._MyList[i]._PosY += self._MyList[i]._Height * dy + self._Scrolled += dy + + # do not directly call this function, please use "ScrollDown(step)" + def FScrollDown(self, step = 1, loop_scroll = False): + # if len(self._MyList) == 0: + if len(self._MyList) <= 1: + return + if step < self._ItemsPerPage and not loop_scroll: + if len(self._MyList) - (self._PsIndex + step + 1) < step: + step = 1 + + tmp = self._PsIndex + self._PsIndex += step + + if self._PsIndex >= len(self._MyList): + self._PsIndex = len(self._MyList) - 1 + + # dy = self._PsIndex - tmp + dy = abs(self._PsIndex - tmp) + cur_li = self._MyList[self._PsIndex] + if cur_li._PosY + cur_li._Height > self._Height: + for i in range(0, len(self._MyList)): + self._MyList[i]._PosY -= self._MyList[i]._Height * dy + self._Scrolled -= dy + + def SyncScroll(self): + if self._Scrolled == 0: + return + + if self._PsIndex < len(self._MyList): + cur_li = self._MyList[self._PsIndex] + if self._Scrolled > 0: + if cur_li._PosY < 0: + for i in range(0, len(self._MyList)): + self._MyList[i]._PosY += self._Scrolled * self._MyList[i]._Height + elif self._Scrolled < 0: + if cur_li._PosY +cur_li._Height > self._Height: + for i in range(0,len(self._MyList)): + self._MyList[i]._PosY += self._Scrolled * self._MyList[i]._Height + + def SpeedScroll(self, thekey): + if self._Screen._LastKey == thekey: + self._ScrollStep += 1 + if self._ScrollStep >= self._ItemsPerPage: + self._ScrollStep = self._ItemsPerPage - 1 + else: + self._ScrollStep = 1 + + cur_time = time.time() + + if cur_time - self._Screen._LastKeyDown > 0.3: + self._ScrollStep = 1 + + if len(self._MyList) < self._ItemsPerPage: + self._ScrollStep = 1 + def RefreshPsIndex(self): if len(self._MyList) == 0: self._PsIndex = 0 if self._PsIndex > (len(self._MyList) -1): self._PsIndex = len(self._MyList) -1 - - def FScrollDown(self,Step=1): - # if len(self._MyList) == 0: - if len(self._MyList) <= 1: - return - tmp = self._PsIndex - self._PsIndex +=Step - if self._PsIndex >= len(self._MyList): - self._PsIndex = len(self._MyList) -1 - dy = self._PsIndex - tmp - cur_li = self._MyList[self._PsIndex] - if cur_li._PosY +cur_li._Height > self._Height: - for i in range(0,len(self._MyList)): - self._MyList[i]._PosY -= self._MyList[i]._Height*dy - # def KeyDown(self,event):##default keydown,every inherited page class should have it's own KeyDown + # def KeyDown(self,event):##default keydown, every inherited page class should have it's own KeyDown # fast: fast display mode - def KeyDown(self, event, fast = False):##default keydown,every inherited page class should have it's own KeyDown + def KeyDown(self, event, fast = False):##default keydown, every inherited page class should have it's own KeyDown if IsKeyMenuOrB(event.key): self.ReturnToUpLevelPage() From 50bbed5691ecf780ba631f5cb57226850c36276d Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Fri, 31 Jul 2020 18:34:26 +0800 Subject: [PATCH 12/26] disable scroll func --- sys.py/UI/Emulator/fav_list_page.py | 144 +++++++++++----------------- 1 file changed, 55 insertions(+), 89 deletions(-) diff --git a/sys.py/UI/Emulator/fav_list_page.py b/sys.py/UI/Emulator/fav_list_page.py index aa991d2..503e926 100644 --- a/sys.py/UI/Emulator/fav_list_page.py +++ b/sys.py/UI/Emulator/fav_list_page.py @@ -98,15 +98,14 @@ class FavListPage(Page): _Emulator = None _Parent = None _Scroller = None - _Scrolled = 0 + # _Scrolled = 0 _BGwidth = 75 _BGheight = 73 _RomSoConfirmDownloadPage = None _Backspace = False - _ItemsPerPage = 6 - + def __init__(self): Page.__init__(self) self._Icons = {} @@ -260,78 +259,52 @@ class FavListPage(Page): self._RomSoConfirmDownloadPage = rom_so_confirm_page - def ScrollUp(self): - if len(self._MyList) == 0: - return + # def ScrollUp(self): + # if len(self._MyList) == 0: + # return - tmp = self._PsIndex - self._PsIndex -= self._ScrollStep + # tmp = self._PsIndex + # self._PsIndex -= self._ScrollStep - if self._PsIndex < 0: + # if self._PsIndex < 0: # self._PsIndex = 0 - self._PsIndex = len(self._MyList) -1 # to end - # dy = tmp - self._PsIndex - dy = abs(tmp - self._PsIndex) - cur_li = self._MyList[self._PsIndex] - if cur_li._PosY < 0: - for i in range(0, len(self._MyList)): - self._MyList[i]._PosY += self._MyList[i]._Height * dy - self._Scrolled += dy + # cur_li = self._MyList[self._PsIndex] + # if cur_li._PosY < 0: + # for i in range(0, len(self._MyList)): + # self._MyList[i]._PosY += self._MyList[i]._Height*dy + # self._Scrolled +=dy - # loop scroll, to end - if self._PsIndex == len(self._MyList) - 1: - # check items per page - if len(self._MyList) > self._ItemsPerPage: - self._ItemsPerPage -= 1 # not include current item - for i in range(0, len(self._MyList)): - self._MyList[i]._PosY -= self._MyList[i]._Height * (dy - self._ItemsPerPage) - self._Scrolled -= dy - self._ItemsPerPage = 6 # reset to 6 - - def ScrollDown(self): - if len(self._MyList) == 0: - return - tmp = self._PsIndex - self._PsIndex +=self._ScrollStep - - if self._PsIndex >= len(self._MyList): + # def ScrollDown(self): + # if len(self._MyList) == 0: + # return + # tmp = self._PsIndex + # self._PsIndex +=self._ScrollStep + # if self._PsIndex >= len(self._MyList): # self._PsIndex = len(self._MyList) -1 - self._PsIndex = 0 # to first - # dy = self._PsIndex - tmp - dy = abs(self._PsIndex - tmp) - cur_li = self._MyList[self._PsIndex] - if cur_li._PosY + cur_li._Height > self._Height: - for i in range(0,len(self._MyList)): - self._MyList[i]._PosY -= self._MyList[i]._Height * dy - self._Scrolled -= dy - - # loop scroll, to first - if self._PsIndex == 0: - # check items per page - if len(self._MyList) > self._ItemsPerPage: - self._ItemsPerPage -= 1 # not include current item - for i in range(0, len(self._MyList)): - self._MyList[i]._PosY += self._MyList[i]._Height * (dy - self._ItemsPerPage) - self._Scrolled += dy - self._ItemsPerPage = 6 # reset to 6 + # dy = self._PsIndex - tmp + # cur_li = self._MyList[self._PsIndex] + # if cur_li._PosY +cur_li._Height > self._Height: + # for i in range(0,len(self._MyList)): + # self._MyList[i]._PosY -= self._MyList[i]._Height*dy + # self._Scrolled -= dy - def SyncScroll(self): - ## - if self._Scrolled == 0: - return + # def SyncScroll(self): + # + # if self._Scrolled == 0: + # return - if self._PsIndex < len(self._MyList): - cur_li = self._MyList[self._PsIndex] - if self._Scrolled > 0: - if cur_li._PosY < 0: - for i in range(0, len(self._MyList)): - self._MyList[i]._PosY += self._Scrolled * self._MyList[i]._Height - elif self._Scrolled < 0: - if cur_li._PosY +cur_li._Height > self._Height: - for i in range(0,len(self._MyList)): - self._MyList[i]._PosY += self._Scrolled * self._MyList[i]._Height + # if self._PsIndex < len(self._MyList): + # cur_li = self._MyList[self._PsIndex] + # if self._Scrolled > 0: + # if cur_li._PosY < 0: + # for i in range(0, len(self._MyList)): + # self._MyList[i]._PosY += self._Scrolled * self._MyList[i]._Height + # elif self._Scrolled < 0: + # if cur_li._PosY +cur_li._Height > self._Height: + # for i in range(0,len(self._MyList)): + # self._MyList[i]._PosY += self._Scrolled * self._MyList[i]._Height def Click(self): @@ -412,21 +385,18 @@ class FavListPage(Page): self._Screen.Draw() self._Screen.SwapAndShow() - def SpeedScroll(self, thekey): - if self._Screen._LastKey == thekey: - self._ScrollStep+=1 - if self._ScrollStep >=5: - self._ScrollStep = 5 - else: - self._ScrollStep = 1 + # def SpeedScroll(self, thekey): + # if self._Screen._LastKey == thekey: + # self._ScrollStep+=1 + # if self._ScrollStep >=5: + # self._ScrollStep = 5 + # else: + # self._ScrollStep = 1 - cur_time = time.time() + # cur_time = time.time() - if cur_time - self._Screen._LastKeyDown > 0.3: - self._ScrollStep = 1 - - if len(self._MyList) < self._ItemsPerPage: - self._ScrollStep = 1 + # if cur_time - self._Screen._LastKeyDown > 0.3: + # self._ScrollStep = 1 def KeyDown(self,event): @@ -442,10 +412,7 @@ class FavListPage(Page): if event.key == CurKeys["Right"]: if self._Backspace: - move = 6 - - for i in range(move): - self.ScrollDown() + self.ScrollDown(5) self._Screen.Draw() self._Screen.SwapAndShow() @@ -454,23 +421,22 @@ class FavListPage(Page): if not self._Backspace: self.ReturnToUpLevelPage() else: - move = 6 - - for i in range(move): - self.ScrollUp() + self.ScrollUp(5) self._Screen.Draw() self._Screen.SwapAndShow() if event.key == CurKeys["Up"]: self.SpeedScroll(event.key) - self.ScrollUp() + # self.ScrollUp() + self.ScrollUp(self._ScrollStep) self._Screen.Draw() self._Screen.SwapAndShow() if event.key == CurKeys["Down"]: self.SpeedScroll(event.key) - self.ScrollDown() + # self.ScrollDown() + self.ScrollDown(self._ScrollStep) self._Screen.Draw() self._Screen.SwapAndShow() From b0c2a0197abd5776de1b63b8a3c75eec01f1d780 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Fri, 31 Jul 2020 18:35:28 +0800 Subject: [PATCH 13/26] disable scroll func --- sys.py/UI/Emulator/rom_list_page.py | 144 ++++++++++------------------ 1 file changed, 53 insertions(+), 91 deletions(-) diff --git a/sys.py/UI/Emulator/rom_list_page.py b/sys.py/UI/Emulator/rom_list_page.py index bd2c5ac..8eb3521 100644 --- a/sys.py/UI/Emulator/rom_list_page.py +++ b/sys.py/UI/Emulator/rom_list_page.py @@ -107,7 +107,7 @@ class RomListPage(Page): _Scroller = None - _Scrolled = 0 + # _Scrolled = 0 _BGwidth = 56 _BGheight = 70 @@ -115,8 +115,6 @@ class RomListPage(Page): _RomSoConfirmDownloadPage = None _Backspace = False - - _ItemsPerPage = 6 def __init__(self): Page.__init__(self) @@ -295,81 +293,52 @@ class RomListPage(Page): self._RomSoConfirmDownloadPage = rom_so_confirm_page - def ScrollUp(self): + # def ScrollUp(self): # if len(self._MyList) == 0: - if len(self._MyList) <= 1: - return + # return - tmp = self._PsIndex - self._PsIndex -= self._ScrollStep + # tmp = self._PsIndex + # self._PsIndex -= self._ScrollStep - if self._PsIndex < 0: + # if self._PsIndex < 0: # self._PsIndex = 0 - self._PsIndex = len(self._MyList) - 1 # to end - # dy = tmp - self._PsIndex - dy = abs(tmp - self._PsIndex) - cur_li = self._MyList[self._PsIndex] - if cur_li._PosY < 0: - for i in range(0, len(self._MyList)): - self._MyList[i]._PosY += self._MyList[i]._Height * dy - self._Scrolled += dy + # cur_li = self._MyList[self._PsIndex] + # if cur_li._PosY < 0: + # for i in range(0, len(self._MyList)): + # self._MyList[i]._PosY += self._MyList[i]._Height*dy + # self._Scrolled +=dy - # loop scroll, to end - if self._PsIndex == len(self._MyList) - 1: - # check items per page - if len(self._MyList) > self._ItemsPerPage: - self._ItemsPerPage -= 1 # not include current item - for i in range(0, len(self._MyList)): - self._MyList[i]._PosY -= self._MyList[i]._Height * (dy - self._ItemsPerPage) - self._Scrolled -= dy - self._ItemsPerPage = 6 # reset to 6 - - def ScrollDown(self): + # def ScrollDown(self): # if len(self._MyList) == 0: - if len(self._MyList) <= 1: - return - - tmp = self._PsIndex - self._PsIndex +=self._ScrollStep - - if self._PsIndex >= len(self._MyList): + # return + # tmp = self._PsIndex + # self._PsIndex +=self._ScrollStep + # if self._PsIndex >= len(self._MyList): # self._PsIndex = len(self._MyList) -1 - self._PsIndex = 0 # to first - # dy = self._PsIndex - tmp - dy = abs(self._PsIndex - tmp) - cur_li = self._MyList[self._PsIndex] - if cur_li._PosY + cur_li._Height > self._Height: - for i in range(0,len(self._MyList)): - self._MyList[i]._PosY -= self._MyList[i]._Height * dy - self._Scrolled -= dy + # dy = self._PsIndex - tmp + # cur_li = self._MyList[self._PsIndex] + # if cur_li._PosY +cur_li._Height > self._Height: + # for i in range(0,len(self._MyList)): + # self._MyList[i]._PosY -= self._MyList[i]._Height*dy + # self._Scrolled -= dy + + # def SyncScroll(self): + # + # if self._Scrolled == 0: + # return - # loop scroll, to first - if self._PsIndex == 0: - # check items per page - if len(self._MyList) > self._ItemsPerPage: - self._ItemsPerPage -= 1 # not include current item - for i in range(0, len(self._MyList)): - self._MyList[i]._PosY += self._MyList[i]._Height * (dy - self._ItemsPerPage) - self._Scrolled += dy - self._ItemsPerPage = 6 # reset to 6 - - def SyncScroll(self): - ## - if self._Scrolled == 0: - return - - if self._PsIndex < len(self._MyList): - cur_li = self._MyList[self._PsIndex] - if self._Scrolled > 0: - if cur_li._PosY < 0: - for i in range(0, len(self._MyList)): - self._MyList[i]._PosY += self._Scrolled * self._MyList[i]._Height - elif self._Scrolled < 0: - if cur_li._PosY +cur_li._Height > self._Height: - for i in range(0,len(self._MyList)): - self._MyList[i]._PosY += self._Scrolled * self._MyList[i]._Height + # if self._PsIndex < len(self._MyList): + # cur_li = self._MyList[self._PsIndex] + # if self._Scrolled > 0: + # if cur_li._PosY < 0: + # for i in range(0, len(self._MyList)): + # self._MyList[i]._PosY += self._Scrolled * self._MyList[i]._Height + # elif self._Scrolled < 0: + # if cur_li._PosY +cur_li._Height > self._Height: + # for i in range(0,len(self._MyList)): + # self._MyList[i]._PosY += self._Scrolled * self._MyList[i]._Height def Click(self): if len(self._MyList) == 0: @@ -452,21 +421,18 @@ class RomListPage(Page): self._Screen.Draw() self._Screen.SwapAndShow() - def SpeedScroll(self, thekey): - if self._Screen._LastKey == thekey: - self._ScrollStep+=1 - if self._ScrollStep >=5: - self._ScrollStep = 5 - else: - self._ScrollStep = 1 + # def SpeedScroll(self, thekey): + # if self._Screen._LastKey == thekey: + # self._ScrollStep+=1 + # if self._ScrollStep >=5: + # self._ScrollStep = 5 + # else: + # self._ScrollStep = 1 - cur_time = time.time() + # cur_time = time.time() - if cur_time - self._Screen._LastKeyDown > 0.3: - self._ScrollStep = 1 - - if len(self._MyList) < self._ItemsPerPage: - self._ScrollStep = 1 + # if cur_time - self._Screen._LastKeyDown > 0.3: + # self._ScrollStep = 1 def KeyDown(self,event): @@ -482,33 +448,29 @@ class RomListPage(Page): self._Screen.PushCurPage() self._Screen.SetCurPage(self._Parent.FavListPage) else: - move = 6 - - for i in range(move): - self.ScrollDown() + self.ScrollDown(5) self._Screen.Draw() self._Screen.SwapAndShow() if event.key == CurKeys["Left"]: if self._Backspace: - move = 6 - - for i in range(move): - self.ScrollUp() + self.ScrollUp(5) self._Screen.Draw() self._Screen.SwapAndShow() if event.key == CurKeys["Up"]: self.SpeedScroll(event.key) - self.ScrollUp() + # self.ScrollUp() + self.ScrollUp(self._ScrollStep) self._Screen.Draw() self._Screen.SwapAndShow() if event.key == CurKeys["Down"]: self.SpeedScroll(event.key) - self.ScrollDown() + # self.ScrollDown() + self.ScrollDown(self._ScrollStep) self._Screen.Draw() self._Screen.SwapAndShow() From 0efb5925dd66ca72e7c3254c7b6ae14746e236ee Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Fri, 31 Jul 2020 18:37:16 +0800 Subject: [PATCH 14/26] update scroll func --- Menu/GameShell/10_Settings/list_page.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Menu/GameShell/10_Settings/list_page.py b/Menu/GameShell/10_Settings/list_page.py index 55588df..e1aaf49 100644 --- a/Menu/GameShell/10_Settings/list_page.py +++ b/Menu/GameShell/10_Settings/list_page.py @@ -134,20 +134,12 @@ class ListPage(Page): self.Click() if event.key == CurKeys["Left"]: # PageUp - move = 3 - - for i in range(move): - self.ScrollUp() - + self.ScrollUp(3) self._Screen.Draw() self._Screen.SwapAndShow() if event.key == CurKeys["Right"]: # PageDown - move = 3 - - for i in range(move): - self.ScrollDown() - + self.ScrollDown(3) self._Screen.Draw() self._Screen.SwapAndShow() From fd75bef05204b10e9ce65b43e583c01d100952d1 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Fri, 31 Jul 2020 18:38:16 +0800 Subject: [PATCH 15/26] update scroll func --- Menu/GameShell/10_Settings/Cores/__init__.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Menu/GameShell/10_Settings/Cores/__init__.py b/Menu/GameShell/10_Settings/Cores/__init__.py index 3c8cc84..34da01b 100644 --- a/Menu/GameShell/10_Settings/Cores/__init__.py +++ b/Menu/GameShell/10_Settings/Cores/__init__.py @@ -210,20 +210,12 @@ class CoresPage(Page): self._Screen.SwapAndShow() if event.key == CurKeys["Left"]: # PageUp - move = 3 - - for i in range(move): - self.ScrollUp() - + self.ScrollUp(3) self._Screen.Draw() self._Screen.SwapAndShow() if event.key == CurKeys["Right"]: # PageDown - move = 3 - - for i in range(move): - self.ScrollDown() - + self.ScrollDown(3) self._Screen.Draw() self._Screen.SwapAndShow() From 8fbeb22c6c2f5fc2af92874f1e821155f35f4f3f Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Fri, 31 Jul 2020 18:39:23 +0800 Subject: [PATCH 16/26] update scroll func --- .../10_Settings/Languages/__init__.py | 47 +++++++++---------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/Menu/GameShell/10_Settings/Languages/__init__.py b/Menu/GameShell/10_Settings/Languages/__init__.py index 49ab84e..214e23d 100644 --- a/Menu/GameShell/10_Settings/Languages/__init__.py +++ b/Menu/GameShell/10_Settings/Languages/__init__.py @@ -152,30 +152,28 @@ class LanguagesPage(Page): self._Scroller.Init() self._Scroller.SetCanvasHWND(self._HWND) - - def ScrollDown(self): - if len(self._MyList) == 0: - return - self._PsIndex +=1 - if self._PsIndex >= len(self._MyList): - self._PsIndex = len(self._MyList) -1 + # def ScrollDown(self): + # if len(self._MyList) == 0: + # return + # self._PsIndex +=1 + # if self._PsIndex >= len(self._MyList): + # self._PsIndex = len(self._MyList) -1 - cur_li = self._MyList[self._PsIndex] - if cur_li._PosY +cur_li._Height > self._Height: - for i in range(0,len(self._MyList)): - self._MyList[i]._PosY -= self._MyList[i]._Height - - def ScrollUp(self): - if len(self._MyList) == 0: - return - self._PsIndex -= 1 - if self._PsIndex < 0: - self._PsIndex = 0 - cur_li = self._MyList[self._PsIndex] - if cur_li._PosY < 0: - for i in range(0, len(self._MyList)): - self._MyList[i]._PosY += self._MyList[i]._Height + # cur_li = self._MyList[self._PsIndex] + # if cur_li._PosY +cur_li._Height > self._Height: + # for i in range(0,len(self._MyList)): + # self._MyList[i]._PosY -= self._MyList[i]._Height + # def ScrollUp(self): + # if len(self._MyList) == 0: + # return + # self._PsIndex -= 1 + # if self._PsIndex < 0: + # self._PsIndex = 0 + # cur_li = self._MyList[self._PsIndex] + # if cur_li._PosY < 0: + # for i in range(0, len(self._MyList)): + # self._MyList[i]._PosY += self._MyList[i]._Height def Click(self): if len(self._MyList) == 0: @@ -216,7 +214,8 @@ class LanguagesPage(Page): thelang = thelang.strip() if thelang == "": - thelang = "English" + # thelang = "English" + thelang = "DEOT" for i in self._MyList: if thelang in i._Value: @@ -305,5 +304,3 @@ def Init(main_screen): OBJ.Init(main_screen) def API(main_screen): OBJ.API(main_screen) - - From c9740204d70da64e9afd3a62e51522ae56edd756 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Fri, 31 Jul 2020 18:40:56 +0800 Subject: [PATCH 17/26] update scroll func --- Menu/GameShell/10_Settings/Time/timezone_lib_list_page.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Menu/GameShell/10_Settings/Time/timezone_lib_list_page.py b/Menu/GameShell/10_Settings/Time/timezone_lib_list_page.py index 4297ce9..08982eb 100644 --- a/Menu/GameShell/10_Settings/Time/timezone_lib_list_page.py +++ b/Menu/GameShell/10_Settings/Time/timezone_lib_list_page.py @@ -245,12 +245,14 @@ class TimezoneListPage(Page): self._Screen.SwapAndShow() if event.key == CurKeys["Right"]: - self.FScrollDown(Step=5) + # self.FScrollDown(Step=5) + self.ScrollDown(5) self._Screen.Draw() self._Screen.SwapAndShow() if event.key == CurKeys["Left"]: - self.FScrollUp(Step=5) + # self.FScrollUp(Step=5) + self.ScrollUp(5) self._Screen.Draw() self._Screen.SwapAndShow() @@ -301,4 +303,4 @@ class TimezoneListPage(Page): if i._PosY < 0: continue - i.Draw() + i.Draw() From 537bbdec039c8e01c2049612293ec7341c354917 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Fri, 31 Jul 2020 18:41:59 +0800 Subject: [PATCH 18/26] update scroll func --- Menu/GameShell/21_Warehouse/__init__.py | 65 +++++++++++++++---------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/Menu/GameShell/21_Warehouse/__init__.py b/Menu/GameShell/21_Warehouse/__init__.py index 0dc4d25..e0a8081 100644 --- a/Menu/GameShell/21_Warehouse/__init__.py +++ b/Menu/GameShell/21_Warehouse/__init__.py @@ -532,7 +532,7 @@ class GameStorePage(Page): _AList = {} - _Scrolled = 0 + # _Scrolled = 0 _BGwidth = 320 _BGheight = 240-24-20 @@ -1020,32 +1020,32 @@ class GameStorePage(Page): self._Screen.SwapAndShow() """ - def ScrollDown(self): - if len(self._MyList) == 0: - return - self._PsIndex += 1 - if self._PsIndex >= len(self._MyList): - self._PsIndex = len(self._MyList)-1 + # def ScrollDown(self): + # if len(self._MyList) == 0: + # return + # self._PsIndex += 1 + # if self._PsIndex >= len(self._MyList): + # self._PsIndex = len(self._MyList)-1 - cur_li = self._MyList[self._PsIndex] - if cur_li._PosY+cur_li._Height > self._Height: - for i in range(0, len(self._MyList)): - self._MyList[i]._PosY -= self._MyList[i]._Height + # cur_li = self._MyList[self._PsIndex] + # if cur_li._PosY+cur_li._Height > self._Height: + # for i in range(0, len(self._MyList)): + # self._MyList[i]._PosY -= self._MyList[i]._Height - self._Scrolled_cnt -= self._MyList[i]._Height + # self._Scrolled_cnt -= self._MyList[i]._Height - def ScrollUp(self): - if len(self._MyList) == 0: - return - self._PsIndex -= 1 - if self._PsIndex < 0: - self._PsIndex = 0 - cur_li = self._MyList[self._PsIndex] - if cur_li._PosY < 0: - for i in range(0, len(self._MyList)): - self._MyList[i]._PosY += self._MyList[i]._Height + # def ScrollUp(self): + # if len(self._MyList) == 0: + # return + # self._PsIndex -= 1 + # if self._PsIndex < 0: + # self._PsIndex = 0 + # cur_li = self._MyList[self._PsIndex] + # if cur_li._PosY < 0: + # for i in range(0, len(self._MyList)): + # self._MyList[i]._PosY += self._MyList[i]._Height - self._Scrolled_cnt += self._MyList[i]._Height + # self._Scrolled_cnt += self._MyList[i]._Height def KeyDown(self,event): if IsKeyMenuOrB(event.key): @@ -1116,12 +1116,26 @@ class GameStorePage(Page): self.PreviewGame() if event.key == CurKeys["Up"]: - self.ScrollUp() + # self.ScrollUp() + self.SpeedScroll(event.key) + self.ScrollUp(self._ScrollStep) self._Screen.Draw() self._Screen.SwapAndShow() if event.key == CurKeys["Down"]: - self.ScrollDown() + # self.ScrollDown() + self.SpeedScroll(event.key) + self.ScrollDown(self._ScrollStep) + self._Screen.Draw() + self._Screen.SwapAndShow() + + if event.key == CurKeys["Right"]: # PageDown + self.ScrollDown(5) + self._Screen.Draw() + self._Screen.SwapAndShow() + + if event.key == CurKeys["Left"]: # PageUp + self.ScrollUp(5) self._Screen.Draw() self._Screen.SwapAndShow() @@ -1185,4 +1199,3 @@ def Init(main_screen): OBJ.Init(main_screen) def API(main_screen): OBJ.API(main_screen) - From 2ee8b1baee8678c5afb5ca5bb7685596b3590ce2 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Fri, 31 Jul 2020 18:43:25 +0800 Subject: [PATCH 19/26] update scroll func --- .../95_Music Player/music_lib_list_page.py | 70 +++---------------- 1 file changed, 8 insertions(+), 62 deletions(-) diff --git a/Menu/GameShell/95_Music Player/music_lib_list_page.py b/Menu/GameShell/95_Music Player/music_lib_list_page.py index 1f9ebe1..5dc92a1 100644 --- a/Menu/GameShell/95_Music Player/music_lib_list_page.py +++ b/Menu/GameShell/95_Music Player/music_lib_list_page.py @@ -94,8 +94,6 @@ class MusicLibListPage(Page): _BGheight = 70 _Backspace = False - - _ItemsPerPage = 6 def __init__(self): Page.__init__(self) @@ -104,57 +102,7 @@ class MusicLibListPage(Page): self._MyList = [] self._SwapMyList = [] self._MyStack = MusicLibStack() - - def ScrollUp(self): - if len(self._MyList) <= 1: - return - tmp = self._PsIndex - self._PsIndex -= self._ScrollStep - - if self._PsIndex < 0: - self._PsIndex = len(self._MyList) - 1 # to end - - dy = abs(tmp - self._PsIndex) - cur_li = self._MyList[self._PsIndex] - if cur_li._PosY < 0: - for i in range(0, len(self._MyList)): - self._MyList[i]._PosY += self._MyList[i]._Height * dy - - # loop scroll, to end - if self._PsIndex == len(self._MyList) - 1: - # check items per page - if len(self._MyList) > self._ItemsPerPage: - self._ItemsPerPage -= 1 # not include current item - for i in range(0, len(self._MyList)): - self._MyList[i]._PosY -= self._MyList[i]._Height * (dy - self._ItemsPerPage) - self._ItemsPerPage = 6 # reset to 6 - - def ScrollDown(self): - if len(self._MyList) <= 1: - return - - tmp = self._PsIndex - self._PsIndex +=self._ScrollStep - - if self._PsIndex >= len(self._MyList): - self._PsIndex = 0 # to first - - dy = abs(self._PsIndex - tmp) - cur_li = self._MyList[self._PsIndex] - if cur_li._PosY + cur_li._Height > self._Height: - for i in range(0,len(self._MyList)): - self._MyList[i]._PosY -= self._MyList[i]._Height * dy - - # loop scroll, to first - if self._PsIndex == 0: - # check items per page - if len(self._MyList) > self._ItemsPerPage: - self._ItemsPerPage -= 1 # not include current item - for i in range(0, len(self._MyList)): - self._MyList[i]._PosY += self._MyList[i]._Height * (dy - self._ItemsPerPage) - self._ItemsPerPage = 6 # reset to 6 - def SyncList(self,path): if myvars.Poller == None: return @@ -292,10 +240,7 @@ class MusicLibListPage(Page): if event.key == CurKeys["Right"]: if self._Backspace: - move = 6 - - for i in range(move): - self.ScrollDown() + self.ScrollDown(5) self._Screen.Draw() self._Screen.SwapAndShow() @@ -304,21 +249,22 @@ class MusicLibListPage(Page): if not self._Backspace: self.ReturnToUpLevelPage() else: - move = 6 - - for i in range(move): - self.ScrollUp() + self.ScrollUp(5) self._Screen.Draw() self._Screen.SwapAndShow() if event.key == CurKeys["Up"]: - self.ScrollUp() + # self.ScrollUp() + self.SpeedScroll(event.key) + self.ScrollUp(self._ScrollStep) self._Screen.Draw() self._Screen.SwapAndShow() if event.key == CurKeys["Down"]: - self.ScrollDown() + # self.ScrollDown() + self.SpeedScroll(event.key) + self.ScrollDown(self._ScrollStep) self._Screen.Draw() self._Screen.SwapAndShow() From 0f2f4688f0676780dadc42d2bf8e33e9f89bed36 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Fri, 31 Jul 2020 18:44:16 +0800 Subject: [PATCH 20/26] update scroll func --- .../95_Music Player/play_list_page.py | 102 ++++-------------- 1 file changed, 22 insertions(+), 80 deletions(-) diff --git a/Menu/GameShell/95_Music Player/play_list_page.py b/Menu/GameShell/95_Music Player/play_list_page.py index f485354..15a0428 100644 --- a/Menu/GameShell/95_Music Player/play_list_page.py +++ b/Menu/GameShell/95_Music Player/play_list_page.py @@ -71,14 +71,12 @@ class PlayListPage(Page): _BGwidth = 75 _BGheight = 70 - _Scrolled = 0 + # _Scrolled = 0 _CurSongName = "" _Backspace = False - _ItemsPerPage = 6 - def __init__(self): self._Icons = {} Page.__init__(self) @@ -223,74 +221,20 @@ class PlayListPage(Page): # self._MyList[i]._PosY -= self._MyList[i]._Height # self._Scrolled -=1 - def ScrollUp(self): - if len(self._MyList) <= 1: - return - - tmp = self._PsIndex - self._PsIndex -= self._ScrollStep - - if self._PsIndex < 0: - self._PsIndex = len(self._MyList) - 1 # to end + # def SyncScroll(self):# show where it left + # if self._Scrolled == 0: + # return - dy = abs(tmp - self._PsIndex) - cur_li = self._MyList[self._PsIndex] - if cur_li._PosY < 0: - for i in range(0, len(self._MyList)): - self._MyList[i]._PosY += self._MyList[i]._Height * dy - self._Scrolled += dy - - # loop scroll, to end - if self._PsIndex == len(self._MyList) - 1: - # check items per page - if len(self._MyList) > self._ItemsPerPage: - self._ItemsPerPage -= 1 # not include current item - for i in range(0, len(self._MyList)): - self._MyList[i]._PosY -= self._MyList[i]._Height * (dy - self._ItemsPerPage) - self._Scrolled -= dy - self._ItemsPerPage = 6 # reset to 6 - - def ScrollDown(self): - if len(self._MyList) <= 1: - return - - tmp = self._PsIndex - self._PsIndex +=self._ScrollStep - - if self._PsIndex >= len(self._MyList): - self._PsIndex = 0 # to first - - dy = abs(self._PsIndex - tmp) - cur_li = self._MyList[self._PsIndex] - if cur_li._PosY + cur_li._Height > self._Height: - for i in range(0,len(self._MyList)): - self._MyList[i]._PosY -= self._MyList[i]._Height * dy - self._Scrolled -= dy - - # loop scroll, to first - if self._PsIndex == 0: - # check items per page - if len(self._MyList) > self._ItemsPerPage: - self._ItemsPerPage -= 1 # not include current item - for i in range(0, len(self._MyList)): - self._MyList[i]._PosY += self._MyList[i]._Height * (dy - self._ItemsPerPage) - self._Scrolled += dy - self._ItemsPerPage = 6 # reset to 6 - - def SyncScroll(self):# show where it left - if self._Scrolled == 0: - return - - if self._PsIndex < len(self._MyList): - cur_li = self._MyList[self._PsIndex] - if self._Scrolled > 0: - if cur_li._PosY < 0: - for i in range(0, len(self._MyList)): - self._MyList[i]._PosY += self._Scrolled * self._MyList[i]._Height - elif self._Scrolled < 0: - if cur_li._PosY +cur_li._Height > self._Height: - for i in range(0,len(self._MyList)): - self._MyList[i]._PosY += self._Scrolled * self._MyList[i]._Height + # if self._PsIndex < len(self._MyList): + # cur_li = self._MyList[self._PsIndex] + # if self._Scrolled > 0: + # if cur_li._PosY < 0: + # for i in range(0, len(self._MyList)): + # self._MyList[i]._PosY += self._Scrolled * self._MyList[i]._Height + # elif self._Scrolled < 0: + # if cur_li._PosY +cur_li._Height > self._Height: + # for i in range(0,len(self._MyList)): + # self._MyList[i]._PosY += self._Scrolled * self._MyList[i]._Height def Click(self): if len(self._MyList) == 0: @@ -320,12 +264,16 @@ class PlayListPage(Page): self._Screen.SwapAndShow() if event.key == CurKeys["Up"]: - self.ScrollUp() + # self.ScrollUp() + self.SpeedScroll(event.key) + self.ScrollUp(self._ScrollStep) self._Screen.Draw() self._Screen.SwapAndShow() if event.key == CurKeys["Down"]: - self.ScrollDown() + # self.ScrollDown() + self.SpeedScroll(event.key) + self.ScrollDown(self._ScrollStep) self._Screen.Draw() self._Screen.SwapAndShow() @@ -336,20 +284,14 @@ class PlayListPage(Page): self._Screen.PushCurPage() self._Screen.SetCurPage(myvars.MusicLibListPage) else: - move = 6 - - for i in range(move): - self.ScrollDown() + self.ScrollDown(5) self._Screen.Draw() self._Screen.SwapAndShow() if event.key == CurKeys["Left"]: if self._Backspace: - move = 6 - - for i in range(move): - self.ScrollUp() + self.ScrollUp(5) self._Screen.Draw() self._Screen.SwapAndShow() From be3800235fec8ed1aa9f463fe0f172b0c54fb28e Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Fri, 31 Jul 2020 18:45:44 +0800 Subject: [PATCH 21/26] update 0f2f468 --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 2091dc7..381def8 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "gitversion":"fd63173", + "gitversion":"0f2f468", "version":"200626" } From 28b0ed5e9ad7f8d51cc92084f7b46b7bf806ac37 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Fri, 31 Jul 2020 20:13:41 +0800 Subject: [PATCH 22/26] set default lang to DEOT English --- sys.py/.lang | 1 + 1 file changed, 1 insertion(+) create mode 100644 sys.py/.lang diff --git a/sys.py/.lang b/sys.py/.lang new file mode 100644 index 0000000..31d313a --- /dev/null +++ b/sys.py/.lang @@ -0,0 +1 @@ +99_DEOT_English.ini \ No newline at end of file From d0ee57cf7d5ce7b00844015e1ab4e75d200697f6 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Fri, 31 Jul 2020 20:14:34 +0800 Subject: [PATCH 23/26] update 28b0ed5 --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 381def8..ac37792 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "gitversion":"0f2f468", + "gitversion":"28b0ed5", "version":"200626" } From ca1c095e6f5f5149918de4facf5e1ef399be92d1 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Fri, 31 Jul 2020 20:35:49 +0800 Subject: [PATCH 24/26] Update compkginfo.json --- Menu/GameShell/50_PICO-8/compkginfo.json | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Menu/GameShell/50_PICO-8/compkginfo.json b/Menu/GameShell/50_PICO-8/compkginfo.json index 503ef14..08fd7be 100644 --- a/Menu/GameShell/50_PICO-8/compkginfo.json +++ b/Menu/GameShell/50_PICO-8/compkginfo.json @@ -3,13 +3,16 @@ "InstallDir":"pico-8", "NotFoundMsg":["Please purchase the PICO-8 \n|None|varela16", "and copy it to the \"~/games/PICO-8\"|None|varela16"], -"MD5":{"pico-8_0.2.0i_raspi.zip":"be0c708d707fa967c77455512bd456c7", - "pico-8_0.1.11g_raspi.zip":"a3f2995cf117499f880bd964d6a0e1f2", - "pico-8_0.1.11g_amd64.zip":"6726141c784afd4a41be6b7414c1b932", - "pico-8_0.1.12_raspi.zip":"08eda95570e63089a2b9f5531503431e", - "pico-8_0.1.12c_raspi.zip":"1a62b0d7d4e4be65f89f23ec9757cb66", - "pico-8_0.1.12c2_raspi.zip":"7a878795472fa39304e9a10128c1f712", - "pico-8_0.2.0e_raspi.zip":"085edfecd111c2b195b878b2197afe7a", - "pico-8.zip":"whatever it takes"}, +"MD5": + { + "pico-8_0.1.11g_raspi.zip":"a3f2995cf117499f880bd964d6a0e1f2", + "pico-8_0.1.12_raspi.zip":"08eda95570e63089a2b9f5531503431e", + "pico-8_0.1.12c_raspi.zip":"1a62b0d7d4e4be65f89f23ec9757cb66", + "pico-8_0.1.12c2_raspi.zip":"7a878795472fa39304e9a10128c1f712", + "pico-8_0.2.0e_raspi.zip":"085edfecd111c2b195b878b2197afe7a", + "pico-8_0.2.0i_raspi.zip":"be0c708d707fa967c77455512bd456c7", + "pico-8_0.2.1b_raspi.zip":"d72968c56b4de8bc3dda84a6d5b6270e", + "pico-8.zip":"whatever it takes" + }, "Post-Up":"bash Post-Up.sh" } From d89f523c5006552e6dc517e1866d5ae7a606dbfa Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Fri, 31 Jul 2020 20:45:34 +0800 Subject: [PATCH 25/26] Update __init__.py --- sys.py/UI/CommercialSoftwarePackage/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys.py/UI/CommercialSoftwarePackage/__init__.py b/sys.py/UI/CommercialSoftwarePackage/__init__.py index 7252984..6227a76 100644 --- a/sys.py/UI/CommercialSoftwarePackage/__init__.py +++ b/sys.py/UI/CommercialSoftwarePackage/__init__.py @@ -105,7 +105,8 @@ class NotFoundPage(Page): self._Board.SetAndBlitText(d) def KeyDown(self,event): - if event.key == CurKeys["A"] or event.key == CurKeys["Menu"]: + # if event.key == CurKeys["A"] or event.key == CurKeys["Menu"]: + if IsKeyMenuOrB(event.key): self.ReturnToUpLevelPage() self._Screen.Draw() self._Screen.SwapAndShow() From 9c83ef1c8cc90d5499cb91ecdd806f993646ab5b Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Fri, 31 Jul 2020 20:46:26 +0800 Subject: [PATCH 26/26] update d89f523 --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index ac37792..d320dd2 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "gitversion":"28b0ed5", + "gitversion":"d89f523", "version":"200626" }