From a7cca05c44d0c6d2f927c3062dc0272aeec3187c Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Sat, 11 Jul 2020 15:53:24 +0800 Subject: [PATCH 01/24] show launcher ver. & git ver. --- Menu/GameShell/10_Settings/Update/__init__.py | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/Menu/GameShell/10_Settings/Update/__init__.py b/Menu/GameShell/10_Settings/Update/__init__.py index d293dea..356f5d9 100644 --- a/Menu/GameShell/10_Settings/Update/__init__.py +++ b/Menu/GameShell/10_Settings/Update/__init__.py @@ -30,6 +30,14 @@ import config LauncherLoc = "/home/cpi/launcher" +# get git short hash +cur_dir = os.getcwd() +os.chdir(LauncherLoc) +current_git_version = get_git_revision_short_hash() +current_git_version = current_git_version.strip("\n") +current_git_version = current_git_version.strip("\t") +os.chdir(cur_dir) + class UpdateDownloadPage(DownloadProcessPage): _MD5 = "" @@ -206,6 +214,12 @@ class UpdatePage(Page): it["value"] = config.VERSION self._AList["version"] = it + git = {} + git["key"] = "githash" + git["label"] = "Git Hash" + git["value"] = current_git_version + self._AList["githash"] = git + self.GenList() def CheckUpdate(self): @@ -238,12 +252,12 @@ class UpdatePage(Page): self._Screen.SwapAndShow() elif "gitversion" in json_: ### just use git to run update - cur_dir = os.getcwd() - os.chdir(LauncherLoc) - current_git_version = get_git_revision_short_hash() - current_git_version = current_git_version.strip("\n") - current_git_version = current_git_version.strip("\t") - os.chdir(cur_dir) + # cur_dir = os.getcwd() + # os.chdir(LauncherLoc) + # current_git_version = get_git_revision_short_hash() + # current_git_version = current_git_version.strip("\n") + # current_git_version = current_git_version.strip("\t") + # os.chdir(cur_dir) if current_git_version != json_["gitversion"]: self._ConfirmPage._URL = None self._ConfirmPage._MD5 = None @@ -255,7 +269,7 @@ class UpdatePage(Page): self._Screen.Draw() if "version" in json_: - self._ConfirmPage.SnapMsg(MyLangManager.Tr("ConfirmUpdateToFQ") % json_["version"] ) + self._ConfirmPage.SnapMsg(MyLangManager.Tr("ConfirmUpdateToFQ") % (json_["version"] + "#" + json_["gitversion"]) ) else: self._ConfirmPage.SnapMsg(MyLangManager.Tr("UpdateToFQ") % json_["gitversion"] ) self._Screen.SwapAndShow() From 98bff12d0206a2f3e6272c89cba881ee5d49539b Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Sat, 11 Jul 2020 15:54:10 +0800 Subject: [PATCH 02/24] update a7cca05 --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 1429d50..88fcda2 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "gitversion":"6843aea", + "gitversion":"a7cca05", "version":"200626" } From 384065b014e088055ce47c58ff67138ef1ed140f Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Sat, 11 Jul 2020 16:00:40 +0800 Subject: [PATCH 03/24] Add PageUp & PageDown --- sys.py/UI/page.py | 106 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 79 insertions(+), 27 deletions(-) diff --git a/sys.py/UI/page.py b/sys.py/UI/page.py index 9a45b47..f1e6542 100644 --- a/sys.py/UI/page.py +++ b/sys.py/UI/page.py @@ -408,7 +408,8 @@ class Page(Widget): return all_last_posx - def IconSmoothUp(self,icon_ew): + # def IconSmoothUp(self,icon_ew): + def IconSmoothUp(self, icon_ew, fast = False): data = self.EasingData(self._PosX,icon_ew) data2 = self.IconStepMoveData(self._SelectedIconTopOffset,len(data)) @@ -421,10 +422,14 @@ class Page(Widget): if self._Icons[self._PrevIconIndex]._PosY < self._Height/2: self._Icons[self._PrevIconIndex]._PosY+=data2[i] - self.DrawIcons() - self._Screen.SwapAndShow() - - def IconsEasingLeft(self,icon_ew): + # self.DrawIcons() + # self._Screen.SwapAndShow() + if not fast: + self.DrawIcons() + self._Screen.SwapAndShow() + + # def IconsEasingLeft(self,icon_ew): + def IconsEasingLeft(self, icon_ew, fast = False): data = self.EasingData(self._PosX,icon_ew) data2 = self.IconStepMoveData(self._SelectedIconTopOffset,len(data)) @@ -438,10 +443,15 @@ class Page(Widget): if self._Icons[self._PrevIconIndex]._PosY < self._Height/2: self._Icons[self._PrevIconIndex]._PosY+=data2[i] - self.DrawIcons() - self._Screen.SwapAndShow() - - def IconsEasingRight(self,icon_ew): + + # self.DrawIcons() + # self._Screen.SwapAndShow() + if not fast: + self.DrawIcons() + self._Screen.SwapAndShow() + + # def IconsEasingRight(self,icon_ew): + def IconsEasingRight(self, icon_ew, fast = False): data = self.EasingData(self._PosX,icon_ew) data2 = self.IconStepMoveData(self._SelectedIconTopOffset,len(data)) @@ -452,13 +462,16 @@ class Page(Widget): self._Icons[self._IconIndex]._PosY-=data2[i] - + if self._Icons[self._PrevIconIndex]._PosY < self._Height/2: self._Icons[self._PrevIconIndex]._PosY+=data2[i] - - self.DrawIcons() - self._Screen.SwapAndShow() - + + # self.DrawIcons() + # self._Screen.SwapAndShow() + if not fast: + self.DrawIcons() + self._Screen.SwapAndShow() + def EasingLeft(self,ew): #ew int data = self.EasingData(self._PosX,ew) @@ -624,7 +637,10 @@ class Page(Widget): 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 + if IsKeyMenuOrB(event.key): self.ReturnToUpLevelPage() self._Screen.Draw() @@ -633,37 +649,73 @@ class Page(Widget): if event.key == CurKeys["Right"]: if self.MoveIconIndexNext() == True: if self._IconIndex == (self._IconNumbers -1) or self._PrevIconIndex == 0: - self.IconSmoothUp(icon_width + self._PageIconMargin) + # self.IconSmoothUp(icon_width + self._PageIconMargin) + self.IconSmoothUp(icon_width + self._PageIconMargin, fast) else: - self.IconsEasingLeft(icon_width + self._PageIconMargin) + # self.IconsEasingLeft(icon_width + self._PageIconMargin) + self.IconsEasingLeft(icon_width + self._PageIconMargin, fast) else: screen_icons = int(math.floor(self._Screen._Width / (icon_width + self._PageIconMargin))) if self._IconNumbers > screen_icons: - self.IconsEasingRight((icon_width + self._PageIconMargin) * (self._IconNumbers - screen_icons)) + # self.IconsEasingRight((icon_width + self._PageIconMargin) * (self._IconNumbers - screen_icons)) + self.IconsEasingRight((icon_width + self._PageIconMargin) * (self._IconNumbers - screen_icons), fast) elif self._IconNumbers > 0: - self.IconSmoothUp(icon_width+ self._PageIconMargin) + # self.IconSmoothUp(icon_width+ self._PageIconMargin) + self.IconSmoothUp(icon_width+ self._PageIconMargin, fast) self._PsIndex = self._IconIndex - self._Screen.Draw() - self._Screen.SwapAndShow() + # self._Screen.Draw() + # self._Screen.SwapAndShow() + if not fast: + self._Screen.Draw() + self._Screen.SwapAndShow() if event.key == CurKeys["Left"]: if self.MoveIconIndexPrev() == True: if self._IconIndex == 0 or self._PrevIconIndex == (self._IconNumbers -1): - self.IconSmoothUp(icon_width + self._PageIconMargin) + # self.IconSmoothUp(icon_width + self._PageIconMargin) + self.IconSmoothUp(icon_width + self._PageIconMargin, fast) else: - self.IconsEasingRight(icon_width + self._PageIconMargin) + # self.IconsEasingRight(icon_width + self._PageIconMargin) + self.IconsEasingRight(icon_width + self._PageIconMargin, fast) else: screen_icons = int(math.floor(self._Screen._Width / (icon_width + self._PageIconMargin))) if self._IconNumbers > screen_icons: - self.IconsEasingLeft((icon_width + self._PageIconMargin) * (self._IconNumbers - screen_icons)) + # self.IconsEasingLeft((icon_width + self._PageIconMargin) * (self._IconNumbers - screen_icons)) + self.IconsEasingLeft((icon_width + self._PageIconMargin) * (self._IconNumbers - screen_icons), fast) elif self._IconNumbers > 0: - self.IconSmoothUp(icon_width+ self._PageIconMargin) + # self.IconSmoothUp(icon_width+ self._PageIconMargin) + self.IconSmoothUp(icon_width+ self._PageIconMargin, fast) self._PsIndex = self._IconIndex - self._Screen.Draw() + # self._Screen.Draw() + # self._Screen.SwapAndShow() + if not fast: + self._Screen.Draw() + self._Screen.SwapAndShow() + + if event.key == CurKeys["Up"]: + move = 3 + pageup = pygame.event.Event(pygame.KEYDOWN, key = CurKeys["Left"]) + + for i in range(move): + self.KeyDown(pageup, True) + + self.DrawIcons() # redraw icons + self._Screen.Draw() # show selected icon self._Screen.SwapAndShow() - + + if event.key == CurKeys["Down"]: + move = 3 + pagedown = pygame.event.Event(pygame.KEYDOWN, key = CurKeys["Right"]) + + for i in range(move): + self.KeyDown(pagedown, True) + + self.DrawIcons() # redraw icons + self._Screen.Draw() # show selected icon + self._Screen.SwapAndShow() + if IsKeyStartOrA(event.key): self.IconClick() self._Screen.Draw() From 19654c38437ec75c4015dcdb5cdfb640dc78caf6 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Sat, 11 Jul 2020 16:01:24 +0800 Subject: [PATCH 04/24] update 384065b --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 88fcda2..e7a9381 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "gitversion":"a7cca05", + "gitversion":"384065b", "version":"200626" } From 72ddf59d395e0f651cb8cadcec10481aef803ebe Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Sun, 12 Jul 2020 14:06:08 +0800 Subject: [PATCH 05/24] Add key Backspace --- sys.py/UI/keys_def.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys.py/UI/keys_def.py b/sys.py/UI/keys_def.py index 176adc5..bcf2469 100644 --- a/sys.py/UI/keys_def.py +++ b/sys.py/UI/keys_def.py @@ -50,11 +50,13 @@ GameShell["Menu"] = pygame.K_ESCAPE SetXYABButtons(GetButtonsLayoutMode()) GameShell["Select"] = pygame.K_SPACE -GameShell["Start"] = pygame.K_RETURN +GameShell["Start"] = pygame.K_RETURN GameShell["LK1"] = pygame.K_h GameShell["LK5"] = pygame.K_l +GameShell["Backspace"] = pygame.K_BACKSPACE # Shift + Menu + PC = {} PC["Up"] = pygame.K_UP @@ -72,6 +74,8 @@ PC["Start"] = pygame.K_s PC["LK1"] = pygame.K_h PC["LK5"] = pygame.K_l +PC["Backspace"] = pygame.K_BACKSPACE # Shift + Menu + if CurKeySet == "PC": CurKeys = PC else: From 875b8feed9e55c9e73affdc8bca032eee99d3932 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Sun, 12 Jul 2020 14:11:06 +0800 Subject: [PATCH 06/24] Add PageUp/Down for rom list --- sys.py/UI/Emulator/rom_list_page.py | 55 ++++++++++++++++++++++++----- 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/sys.py/UI/Emulator/rom_list_page.py b/sys.py/UI/Emulator/rom_list_page.py index 6ba45ff..9d44bad 100644 --- a/sys.py/UI/Emulator/rom_list_page.py +++ b/sys.py/UI/Emulator/rom_list_page.py @@ -114,6 +114,7 @@ class RomListPage(Page): _RomSoConfirmDownloadPage = None + _Backspace = False def __init__(self): Page.__init__(self) @@ -433,7 +434,9 @@ class RomListPage(Page): if cur_time - self._Screen._LastKeyDown > 0.3: self._ScrollStep = 1 - def KeyDown(self,event): + # def KeyDown(self,event): + # fast: fast display mode + def KeyDown(self, event, fast = False): if IsKeyMenuOrB(event.key): self.ReturnToUpLevelPage() @@ -441,22 +444,49 @@ class RomListPage(Page): self._Screen.SwapAndShow() if event.key == CurKeys["Right"]: - self._Screen.PushCurPage() - self._Screen.SetCurPage(self._Parent.FavListPage) + # self._Screen.PushCurPage() + # self._Screen.SetCurPage(self._Parent.FavListPage) + if not self._Backspace: + self._Screen.PushCurPage() + self._Screen.SetCurPage(self._Parent.FavListPage) + else: + move = 6 + pagedown = pygame.event.Event(pygame.KEYDOWN, key = CurKeys["Down"]) + + for i in range(move): + self.KeyDown(pagedown, True) + self._Screen.Draw() self._Screen.SwapAndShow() - + + if event.key == CurKeys["Left"]: + if self._Backspace: + move = 6 + pageup = pygame.event.Event(pygame.KEYDOWN, key = CurKeys["Up"]) + + for i in range(move): + self.KeyDown(pageup, True) + + self._Screen.Draw() + self._Screen.SwapAndShow() + if event.key == CurKeys["Up"]: self.SpeedScroll(event.key) self.ScrollUp() - self._Screen.Draw() - self._Screen.SwapAndShow() + # self._Screen.Draw() + # self._Screen.SwapAndShow() + if not fast: + self._Screen.Draw() + self._Screen.SwapAndShow() if event.key == CurKeys["Down"]: self.SpeedScroll(event.key) self.ScrollDown() - self._Screen.Draw() - self._Screen.SwapAndShow() + # self._Screen.Draw() + # self._Screen.SwapAndShow() + if not fast: + self._Screen.Draw() + self._Screen.SwapAndShow() if IsKeyStartOrA(event.key): self.Click() @@ -502,6 +532,15 @@ class RomListPage(Page): self._Screen.SetCurPage(self._Parent.DeleteConfirmPage) self._Screen.Draw() self._Screen.SwapAndShow() + + if event.key == CurKeys["Backspace"]: # Shift + Menu + self._Backspace = not self._Backspace + if self._Backspace: + self._Screen._MsgBox.SetText("Page Up/Down: ON") + else: + self._Screen._MsgBox.SetText("Page Up/Down: OFF") + self._Screen._MsgBox.Draw() + self._Screen.SwapAndShow() def Draw(self): self.ClearCanvas() From b5f8e388455035b174c0a13cb2e004a78866533c Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Sun, 12 Jul 2020 14:14:21 +0800 Subject: [PATCH 07/24] Add PageUp/Down for fav list --- sys.py/UI/Emulator/fav_list_page.py | 66 ++++++++++++++++++++++++----- 1 file changed, 56 insertions(+), 10 deletions(-) diff --git a/sys.py/UI/Emulator/fav_list_page.py b/sys.py/UI/Emulator/fav_list_page.py index d49191e..23fc90e 100644 --- a/sys.py/UI/Emulator/fav_list_page.py +++ b/sys.py/UI/Emulator/fav_list_page.py @@ -103,6 +103,8 @@ class FavListPage(Page): _BGheight = 73 _RomSoConfirmDownloadPage = None + _Backspace = False + def __init__(self): Page.__init__(self) @@ -396,30 +398,65 @@ class FavListPage(Page): if cur_time - self._Screen._LastKeyDown > 0.3: self._ScrollStep = 1 - def KeyDown(self,event): - - if IsKeyMenuOrB(event.key) or event.key == CurKeys["Left"]: + # def KeyDown(self,event): + # fast: fast display mode + def KeyDown(self, event, fast = False): + + # if IsKeyMenuOrB(event.key) or event.key == CurKeys["Left"]: + # self.ReturnToUpLevelPage() + # self._Screen.Draw() + # self._Screen.SwapAndShow() + + if IsKeyMenuOrB(event.key): self.ReturnToUpLevelPage() self._Screen.Draw() self._Screen.SwapAndShow() + if event.key == CurKeys["Right"]: + if self._Backspace: + move = 6 + pagedown = pygame.event.Event(pygame.KEYDOWN, key = CurKeys["Down"]) + + for i in range(move): + self.KeyDown(pagedown, True) + + self._Screen.Draw() + self._Screen.SwapAndShow() + + if event.key == CurKeys["Left"]: + if not self._Backspace: + self.ReturnToUpLevelPage() + else: + move = 6 + pageup = pygame.event.Event(pygame.KEYDOWN, key = CurKeys["Up"]) + + for i in range(move): + self.KeyDown(pageup, True) + + self._Screen.Draw() + self._Screen.SwapAndShow() if event.key == CurKeys["Up"]: self.SpeedScroll(event.key) self.ScrollUp() - self._Screen.Draw() - self._Screen.SwapAndShow() + # self._Screen.Draw() + # self._Screen.SwapAndShow() + if not fast: + self._Screen.Draw() + self._Screen.SwapAndShow() + if event.key == CurKeys["Down"]: self.SpeedScroll(event.key) self.ScrollDown() - self._Screen.Draw() - self._Screen.SwapAndShow() - + # self._Screen.Draw() + # self._Screen.SwapAndShow() + if not fast: + self._Screen.Draw() + self._Screen.SwapAndShow() if IsKeyStartOrA(event.key): self.Click() - if event.key == CurKeys["X"]: #Scan current self.ReScan() self._Screen.Draw() @@ -450,7 +487,16 @@ class FavListPage(Page): self.ReScan() self._Screen.Draw() self._Screen.SwapAndShow() - + + if event.key == CurKeys["Backspace"]: # Shift + Menu + self._Backspace = not self._Backspace + if self._Backspace: + self._Screen._MsgBox.SetText("Page Up/Down: ON") + else: + self._Screen._MsgBox.SetText("Page Up/Down: OFF") + self._Screen._MsgBox.Draw() + self._Screen.SwapAndShow() + def Draw(self): self.ClearCanvas() From 8a36cfaf5c92e2ccf1a9cf106a12f4a92d111ac2 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Sun, 12 Jul 2020 14:59:12 +0800 Subject: [PATCH 08/24] Add PageUp/Down for music lib list --- .../95_Music Player/music_lib_list_page.py | 73 +++++++++++++++---- 1 file changed, 60 insertions(+), 13 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 1b6ed24..cfde2b3 100644 --- a/Menu/GameShell/95_Music Player/music_lib_list_page.py +++ b/Menu/GameShell/95_Music Player/music_lib_list_page.py @@ -92,6 +92,8 @@ class MusicLibListPage(Page): _BGpng = None _BGwidth = 56 _BGheight = 70 + + _Backspace = False def __init__(self): Page.__init__(self) @@ -224,23 +226,60 @@ class MusicLibListPage(Page): self.SyncList("/") self._PsIndex = 0 - def KeyDown(self,event): - - if IsKeyMenuOrB(event.key) or event.key == CurKeys["Left"]: - + # def KeyDown(self,event): + # fast: fast display mode + def KeyDown(self, event, fast = False): + + # if IsKeyMenuOrB(event.key) or event.key == CurKeys["Left"]: + # self.ReturnToUpLevelPage() + # self._Screen.Draw() + # self._Screen.SwapAndShow() + + if IsKeyMenuOrB(event.key): self.ReturnToUpLevelPage() self._Screen.Draw() self._Screen.SwapAndShow() - + + if event.key == CurKeys["Right"]: + if self._Backspace: + move = 6 + pagedown = pygame.event.Event(pygame.KEYDOWN, key = CurKeys["Down"]) + + for i in range(move): + self.KeyDown(pagedown, True) + + self._Screen.Draw() + self._Screen.SwapAndShow() + + if event.key == CurKeys["Left"]: + if not self._Backspace: + self.ReturnToUpLevelPage() + else: + move = 6 + pageup = pygame.event.Event(pygame.KEYDOWN, key = CurKeys["Up"]) + + for i in range(move): + self.KeyDown(pageup, True) + + self._Screen.Draw() + self._Screen.SwapAndShow() + if event.key == CurKeys["Up"]: self.ScrollUp() - self._Screen.Draw() - self._Screen.SwapAndShow() + # self._Screen.Draw() + # self._Screen.SwapAndShow() + if not fast: + self._Screen.Draw() + self._Screen.SwapAndShow() + if event.key == CurKeys["Down"]: self.ScrollDown() - self._Screen.Draw() - self._Screen.SwapAndShow() - + # self._Screen.Draw() + # self._Screen.SwapAndShow() + if not fast: + self._Screen.Draw() + self._Screen.SwapAndShow() + """ if event.key == CurKeys["Right"]: self.FScrollDown(Step=5) @@ -260,7 +299,16 @@ class MusicLibListPage(Page): if IsKeyStartOrA(event.key): self.Click() - + + if event.key == CurKeys["Backspace"]: # Shift + Menu + self._Backspace = not self._Backspace + if self._Backspace: + self._Screen._MsgBox.SetText("Page Up/Down: ON") + else: + self._Screen._MsgBox.SetText("Page Up/Down: OFF") + self._Screen._MsgBox.Draw() + self._Screen.SwapAndShow() + def Draw(self): self.ClearCanvas() @@ -277,7 +325,6 @@ class MusicLibListPage(Page): v._Active = True else: v._Active = False - if v._Active == False: v.NewCoord(start_x, start_y+counter* ListItem._Height) counter+=1 @@ -325,4 +372,4 @@ class MusicLibListPage(Page): if i._PosY < 0: continue - i.Draw() + i.Draw() From 6d6d50b4756e3bd5770e5304bf60d7a8c297f218 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Sun, 12 Jul 2020 15:02:44 +0800 Subject: [PATCH 09/24] Add PageUp/Down for music play list --- .../95_Music Player/play_list_page.py | 64 +++++++++++++++---- 1 file changed, 52 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 6cda511..802e687 100644 --- a/Menu/GameShell/95_Music Player/play_list_page.py +++ b/Menu/GameShell/95_Music Player/play_list_page.py @@ -74,7 +74,9 @@ class PlayListPage(Page): _Scrolled = 0 _CurSongName = "" - + + _Backspace = False + def __init__(self): self._Icons = {} Page.__init__(self) @@ -235,7 +237,6 @@ class PlayListPage(Page): self._MyList[i]._PosY += self._Scrolled * self._MyList[i]._Height def Click(self): - #self.RefreshPsIndex() if len(self._MyList) == 0: return @@ -251,7 +252,9 @@ class PlayListPage(Page): self.SyncList() self.SyncScroll() - def KeyDown(self,event): + # def KeyDown(self,event): + # fast: fast display mode + def KeyDown(self, event, fast = False): if IsKeyMenuOrB(event.key): if myvars.Poller != None: myvars.Poller.stop() @@ -264,19 +267,47 @@ class PlayListPage(Page): if event.key == CurKeys["Up"]: self.ScrollUp() - self._Screen.Draw() - self._Screen.SwapAndShow() + # self._Screen.Draw() + # self._Screen.SwapAndShow() + if not fast: + self._Screen.Draw() + self._Screen.SwapAndShow() + if event.key == CurKeys["Down"]: self.ScrollDown() - self._Screen.Draw() - self._Screen.SwapAndShow() - + # self._Screen.Draw() + # self._Screen.SwapAndShow() + if not fast: + self._Screen.Draw() + self._Screen.SwapAndShow() + if event.key == CurKeys["Right"]:#add - self._Screen.PushCurPage() - self._Screen.SetCurPage(myvars.MusicLibListPage) + # self._Screen.PushCurPage() + # self._Screen.SetCurPage(myvars.MusicLibListPage) + if not self._Backspace: + self._Screen.PushCurPage() + self._Screen.SetCurPage(myvars.MusicLibListPage) + else: + move = 6 + pagedown = pygame.event.Event(pygame.KEYDOWN, key = CurKeys["Down"]) + + for i in range(move): + self.KeyDown(pagedown, True) + self._Screen.Draw() self._Screen.SwapAndShow() - + + if event.key == CurKeys["Left"]: + if self._Backspace: + move = 6 + pageup = pygame.event.Event(pygame.KEYDOWN, key = CurKeys["Up"]) + + for i in range(move): + self.KeyDown(pageup, True) + + self._Screen.Draw() + self._Screen.SwapAndShow() + if event.key == CurKeys["Y"]:# del selected songs myvars.Poller.delete(self._PsIndex) self.SyncList() @@ -291,7 +322,16 @@ class PlayListPage(Page): self._Screen.PushPage(myvars.SpectrumPage) self._Screen.Draw() self._Screen.SwapAndShow() - + + if event.key == CurKeys["Backspace"]: # Shift + Menu + self._Backspace = not self._Backspace + if self._Backspace: + self._Screen._MsgBox.SetText("Page Up/Down: ON") + else: + self._Screen._MsgBox.SetText("Page Up/Down: OFF") + self._Screen._MsgBox.Draw() + self._Screen.SwapAndShow() + def Draw(self): self.ClearCanvas() From b68b430b190a4eedfd4971cf0a3e423b2e3af002 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Sun, 12 Jul 2020 15:06:29 +0800 Subject: [PATCH 10/24] add default buttons layout config --- sys.py/.buttonslayout | 1 + 1 file changed, 1 insertion(+) create mode 100644 sys.py/.buttonslayout diff --git a/sys.py/.buttonslayout b/sys.py/.buttonslayout new file mode 100644 index 0000000..080cb5d --- /dev/null +++ b/sys.py/.buttonslayout @@ -0,0 +1 @@ +snes \ No newline at end of file From 0b96d1af60f8b513dd574b6d8f7abb0d0f9da402 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Sun, 12 Jul 2020 15:40:04 +0800 Subject: [PATCH 11/24] code optimization --- .../95_Music Player/play_list_page.py | 24 ++++++------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/Menu/GameShell/95_Music Player/play_list_page.py b/Menu/GameShell/95_Music Player/play_list_page.py index 802e687..c36f996 100644 --- a/Menu/GameShell/95_Music Player/play_list_page.py +++ b/Menu/GameShell/95_Music Player/play_list_page.py @@ -252,9 +252,7 @@ class PlayListPage(Page): self.SyncList() self.SyncScroll() - # def KeyDown(self,event): - # fast: fast display mode - def KeyDown(self, event, fast = False): + def KeyDown(self,event): if IsKeyMenuOrB(event.key): if myvars.Poller != None: myvars.Poller.stop() @@ -267,19 +265,13 @@ class PlayListPage(Page): if event.key == CurKeys["Up"]: self.ScrollUp() - # self._Screen.Draw() - # self._Screen.SwapAndShow() - if not fast: - self._Screen.Draw() - self._Screen.SwapAndShow() + self._Screen.Draw() + self._Screen.SwapAndShow() if event.key == CurKeys["Down"]: self.ScrollDown() - # self._Screen.Draw() - # self._Screen.SwapAndShow() - if not fast: - self._Screen.Draw() - self._Screen.SwapAndShow() + self._Screen.Draw() + self._Screen.SwapAndShow() if event.key == CurKeys["Right"]:#add # self._Screen.PushCurPage() @@ -289,10 +281,9 @@ class PlayListPage(Page): self._Screen.SetCurPage(myvars.MusicLibListPage) else: move = 6 - pagedown = pygame.event.Event(pygame.KEYDOWN, key = CurKeys["Down"]) for i in range(move): - self.KeyDown(pagedown, True) + self.ScrollDown() self._Screen.Draw() self._Screen.SwapAndShow() @@ -300,10 +291,9 @@ class PlayListPage(Page): if event.key == CurKeys["Left"]: if self._Backspace: move = 6 - pageup = pygame.event.Event(pygame.KEYDOWN, key = CurKeys["Up"]) for i in range(move): - self.KeyDown(pageup, True) + self.ScrollUp() self._Screen.Draw() self._Screen.SwapAndShow() From debdf3592c7d670b87134c80997ac9019472d2e4 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Sun, 12 Jul 2020 15:41:50 +0800 Subject: [PATCH 12/24] code optimization --- .../95_Music Player/music_lib_list_page.py | 26 ++++++------------- 1 file changed, 8 insertions(+), 18 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 cfde2b3..2af0ca5 100644 --- a/Menu/GameShell/95_Music Player/music_lib_list_page.py +++ b/Menu/GameShell/95_Music Player/music_lib_list_page.py @@ -226,9 +226,7 @@ class MusicLibListPage(Page): self.SyncList("/") self._PsIndex = 0 - # def KeyDown(self,event): - # fast: fast display mode - def KeyDown(self, event, fast = False): + def KeyDown(self,event): # if IsKeyMenuOrB(event.key) or event.key == CurKeys["Left"]: # self.ReturnToUpLevelPage() @@ -243,10 +241,9 @@ class MusicLibListPage(Page): if event.key == CurKeys["Right"]: if self._Backspace: move = 6 - pagedown = pygame.event.Event(pygame.KEYDOWN, key = CurKeys["Down"]) for i in range(move): - self.KeyDown(pagedown, True) + self.ScrollDown() self._Screen.Draw() self._Screen.SwapAndShow() @@ -256,29 +253,22 @@ class MusicLibListPage(Page): self.ReturnToUpLevelPage() else: move = 6 - pageup = pygame.event.Event(pygame.KEYDOWN, key = CurKeys["Up"]) for i in range(move): - self.KeyDown(pageup, True) + self.ScrollUp() self._Screen.Draw() self._Screen.SwapAndShow() if event.key == CurKeys["Up"]: self.ScrollUp() - # self._Screen.Draw() - # self._Screen.SwapAndShow() - if not fast: - self._Screen.Draw() - self._Screen.SwapAndShow() + self._Screen.Draw() + self._Screen.SwapAndShow() if event.key == CurKeys["Down"]: self.ScrollDown() - # self._Screen.Draw() - # self._Screen.SwapAndShow() - if not fast: - self._Screen.Draw() - self._Screen.SwapAndShow() + self._Screen.Draw() + self._Screen.SwapAndShow() """ if event.key == CurKeys["Right"]: @@ -372,4 +362,4 @@ class MusicLibListPage(Page): if i._PosY < 0: continue - i.Draw() + i.Draw() From bf7d6270cde5fe4560c621f410c932a6d11bad82 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Sun, 12 Jul 2020 15:58:20 +0800 Subject: [PATCH 13/24] code optimization --- sys.py/UI/Emulator/fav_list_page.py | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/sys.py/UI/Emulator/fav_list_page.py b/sys.py/UI/Emulator/fav_list_page.py index 23fc90e..8588050 100644 --- a/sys.py/UI/Emulator/fav_list_page.py +++ b/sys.py/UI/Emulator/fav_list_page.py @@ -398,9 +398,7 @@ class FavListPage(Page): if cur_time - self._Screen._LastKeyDown > 0.3: self._ScrollStep = 1 - # def KeyDown(self,event): - # fast: fast display mode - def KeyDown(self, event, fast = False): + def KeyDown(self,event): # if IsKeyMenuOrB(event.key) or event.key == CurKeys["Left"]: # self.ReturnToUpLevelPage() @@ -415,10 +413,9 @@ class FavListPage(Page): if event.key == CurKeys["Right"]: if self._Backspace: move = 6 - pagedown = pygame.event.Event(pygame.KEYDOWN, key = CurKeys["Down"]) for i in range(move): - self.KeyDown(pagedown, True) + self.ScrollDown() self._Screen.Draw() self._Screen.SwapAndShow() @@ -428,10 +425,9 @@ class FavListPage(Page): self.ReturnToUpLevelPage() else: move = 6 - pageup = pygame.event.Event(pygame.KEYDOWN, key = CurKeys["Up"]) for i in range(move): - self.KeyDown(pageup, True) + self.ScrollUp() self._Screen.Draw() self._Screen.SwapAndShow() @@ -439,20 +435,14 @@ class FavListPage(Page): if event.key == CurKeys["Up"]: self.SpeedScroll(event.key) self.ScrollUp() - # self._Screen.Draw() - # self._Screen.SwapAndShow() - if not fast: - self._Screen.Draw() - self._Screen.SwapAndShow() + self._Screen.Draw() + self._Screen.SwapAndShow() if event.key == CurKeys["Down"]: self.SpeedScroll(event.key) self.ScrollDown() - # self._Screen.Draw() - # self._Screen.SwapAndShow() - if not fast: - self._Screen.Draw() - self._Screen.SwapAndShow() + self._Screen.Draw() + self._Screen.SwapAndShow() if IsKeyStartOrA(event.key): self.Click() From 225539c8e90300e8b4b6b76b737b24c06ce073b7 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Sun, 12 Jul 2020 15:59:38 +0800 Subject: [PATCH 14/24] code optimization --- sys.py/UI/Emulator/rom_list_page.py | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/sys.py/UI/Emulator/rom_list_page.py b/sys.py/UI/Emulator/rom_list_page.py index 9d44bad..412ae93 100644 --- a/sys.py/UI/Emulator/rom_list_page.py +++ b/sys.py/UI/Emulator/rom_list_page.py @@ -434,9 +434,7 @@ class RomListPage(Page): if cur_time - self._Screen._LastKeyDown > 0.3: self._ScrollStep = 1 - # def KeyDown(self,event): - # fast: fast display mode - def KeyDown(self, event, fast = False): + def KeyDown(self,event): if IsKeyMenuOrB(event.key): self.ReturnToUpLevelPage() @@ -451,10 +449,9 @@ class RomListPage(Page): self._Screen.SetCurPage(self._Parent.FavListPage) else: move = 6 - pagedown = pygame.event.Event(pygame.KEYDOWN, key = CurKeys["Down"]) for i in range(move): - self.KeyDown(pagedown, True) + self.ScrollDown() self._Screen.Draw() self._Screen.SwapAndShow() @@ -462,10 +459,9 @@ class RomListPage(Page): if event.key == CurKeys["Left"]: if self._Backspace: move = 6 - pageup = pygame.event.Event(pygame.KEYDOWN, key = CurKeys["Up"]) for i in range(move): - self.KeyDown(pageup, True) + self.ScrollUp() self._Screen.Draw() self._Screen.SwapAndShow() @@ -473,20 +469,14 @@ class RomListPage(Page): if event.key == CurKeys["Up"]: self.SpeedScroll(event.key) self.ScrollUp() - # self._Screen.Draw() - # self._Screen.SwapAndShow() - if not fast: - self._Screen.Draw() - self._Screen.SwapAndShow() + self._Screen.Draw() + self._Screen.SwapAndShow() if event.key == CurKeys["Down"]: self.SpeedScroll(event.key) self.ScrollDown() - # self._Screen.Draw() - # self._Screen.SwapAndShow() - if not fast: - self._Screen.Draw() - self._Screen.SwapAndShow() + self._Screen.Draw() + self._Screen.SwapAndShow() if IsKeyStartOrA(event.key): self.Click() From f68e2106ba778a86d7aeb318d009a6e2dc6891cb Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Sun, 12 Jul 2020 16:11:03 +0800 Subject: [PATCH 15/24] Add PageUp/Down for Settings page --- Menu/GameShell/10_Settings/list_page.py | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/Menu/GameShell/10_Settings/list_page.py b/Menu/GameShell/10_Settings/list_page.py index c386d48..55588df 100644 --- a/Menu/GameShell/10_Settings/list_page.py +++ b/Menu/GameShell/10_Settings/list_page.py @@ -124,15 +124,33 @@ class ListPage(Page): self.ScrollUp() self._Screen.Draw() self._Screen.SwapAndShow() + if event.key == CurKeys["Down"]: self.ScrollDown() self._Screen.Draw() self._Screen.SwapAndShow() - if IsKeyStartOrA(event.key): self.Click() + + if event.key == CurKeys["Left"]: # PageUp + move = 3 + for i in range(move): + self.ScrollUp() + + self._Screen.Draw() + self._Screen.SwapAndShow() + + if event.key == CurKeys["Right"]: # PageDown + move = 3 + + for i in range(move): + self.ScrollDown() + + self._Screen.Draw() + self._Screen.SwapAndShow() + def Draw(self): self.ClearCanvas() @@ -151,5 +169,3 @@ class ListPage(Page): self._Ps.Draw() for i in self._MyList: i.Draw() - - From 2150f57b4fe297ba83b2e7bc1008dbda694c5cdc Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Sun, 12 Jul 2020 16:21:32 +0800 Subject: [PATCH 16/24] Add PageUp/Down for cores --- Menu/GameShell/10_Settings/Cores/__init__.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/Menu/GameShell/10_Settings/Cores/__init__.py b/Menu/GameShell/10_Settings/Cores/__init__.py index 045317f..3c8cc84 100644 --- a/Menu/GameShell/10_Settings/Cores/__init__.py +++ b/Menu/GameShell/10_Settings/Cores/__init__.py @@ -209,7 +209,23 @@ class CoresPage(Page): self._Screen.Draw() self._Screen.SwapAndShow() - + if event.key == CurKeys["Left"]: # PageUp + move = 3 + + for i in range(move): + self.ScrollUp() + + self._Screen.Draw() + self._Screen.SwapAndShow() + + if event.key == CurKeys["Right"]: # PageDown + move = 3 + + for i in range(move): + self.ScrollDown() + + self._Screen.Draw() + self._Screen.SwapAndShow() def Draw(self): self.ClearCanvas() @@ -248,5 +264,3 @@ def Init(main_screen): OBJ.Init(main_screen) def API(main_screen): OBJ.API(main_screen) - - From aca93b56c37cc92d808aa628f7567bdeab82e954 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Sun, 12 Jul 2020 16:38:34 +0800 Subject: [PATCH 17/24] update update msgbox --- Menu/GameShell/10_Settings/Update/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Menu/GameShell/10_Settings/Update/__init__.py b/Menu/GameShell/10_Settings/Update/__init__.py index 356f5d9..326ef22 100644 --- a/Menu/GameShell/10_Settings/Update/__init__.py +++ b/Menu/GameShell/10_Settings/Update/__init__.py @@ -269,7 +269,7 @@ class UpdatePage(Page): self._Screen.Draw() if "version" in json_: - self._ConfirmPage.SnapMsg(MyLangManager.Tr("ConfirmUpdateToFQ") % (json_["version"] + "#" + json_["gitversion"]) ) + self._ConfirmPage.SnapMsg(MyLangManager.Tr("UpdateToFQ") % (json_["version"] + "-" + json_["gitversion"]) ) else: self._ConfirmPage.SnapMsg(MyLangManager.Tr("UpdateToFQ") % json_["gitversion"] ) self._Screen.SwapAndShow() From 3d82a97d51163424412b1650eaa1ad93eaf67c1e Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Sun, 12 Jul 2020 16:39:40 +0800 Subject: [PATCH 18/24] update aca93b5 --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index e7a9381..729b617 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "gitversion":"384065b", + "gitversion":"aca93b5", "version":"200626" } From d2d0e7a87b3b063f2cad9678e3d8f965b452e988 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Sun, 12 Jul 2020 17:31:19 +0800 Subject: [PATCH 19/24] Add PageUp and PageDown Keys --- README.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/README.md b/README.md index 6fe8d64..300056a 100644 --- a/README.md +++ b/README.md @@ -154,3 +154,24 @@ vim ~/.gameshell_skin ``` /home/cpi/launcher/skin/DEOT ``` + +# PageUp and PageDown Keys + +D-Pad Up/Down +``` +Main page +``` + +D-Pad Left/Right +``` +Settings +Timezone +RetroArch Cores Manager +``` +Shift + Menu & D-Pad Left/Right +``` +ROM list +Fav. list +Music lib. list +Music play list +``` From 02bf767fda8bd9f079f505c51a091b3958fa7905 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Sun, 12 Jul 2020 17:32:13 +0800 Subject: [PATCH 20/24] update d2d0e7a --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 729b617..24deb7b 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "gitversion":"aca93b5", + "gitversion":"d2d0e7a", "version":"200626" } From 64f9437fdd400f7940c0edd01357d4a86a97c970 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Mon, 13 Jul 2020 08:55:30 +0800 Subject: [PATCH 21/24] update icon --- .../Menu/GameShell/20_Retro Games/FBNeo.png | Bin 0 -> 2819 bytes .../GameShell/20_Retro Games/MednafenVB.png | Bin 4401 -> 4184 bytes .../Menu/GameShell/20_Retro Games/PCSX+.png | Bin 0 -> 4246 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 skin/DEOT/Menu/GameShell/20_Retro Games/FBNeo.png create mode 100644 skin/DEOT/Menu/GameShell/20_Retro Games/PCSX+.png diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/FBNeo.png b/skin/DEOT/Menu/GameShell/20_Retro Games/FBNeo.png new file mode 100644 index 0000000000000000000000000000000000000000..e6439be9eabec9baf3cbf5d1014ca6ac598d371e GIT binary patch literal 2819 zcmb7F2{@E%8~zM4Bf}sP(j;3kXl%_Gs{k+fje$RJ(r);gwgao7o000oO zFgLabt?l>8&kL@1x*<8B;qx`HG5~-I7Gl{Q3i`61=Jr+q5TOVFF>wI!WfioO06@h6 zz!V7p@D~7JW6(LbR#O0gEZOcOnyjv_0xtS0$>GE^k$*ox4tJ>igt@^rfKCp_G9!Ko zf-V^65^PxiIm`A;4gW$Y#@nyO9U-Zo_e5icTHah+0VrrQ$_{Gdo?5!O@%d<|L z4ZSR|~lhi-jd z`fN?gx*p4>%Bm89pxGAKAmw%osQc-E0mz>&WKLApn37 z`#yPqi&>Ij5KghMGJ#LPg^-(+$g^o_008}DVQfHjYMyx-?j-Il36LZDk5=sK5X0}w z>p%ur1|IZor9N}yW2q^cB+LU|yF?w3yrRM_yulsUJr32+H;M$QRTA{NkXlw9$gV~C z-^EK_`}_F9d|p4zVA7YG7oUarG!939?b4gWYVq(?H|uFz%^sa7(VsWo_I^^Kx`+oVzql2)4Du?7xGXox(eZ_29 z!DxWk5+^*`9Kc4hNM<@Hf|+1AQA#jMa0`8`{Tg1`Kb{h?Bt_dv6r~}XFVSN~@*MaB z#NK;IHeTgBKFc`drWBDU_i^HU>C^mM5I^>BgH+=!*2xh$?h2z3d2fe=gc><0(WheD z&qRDi8ScG;>JgKV_zbZ!c-k>7>^GZWpv2Ud^so2?qZ8f)RvI%*k=hHK!p4=@s4L|x ziz^S!;~w@&F3o?0$M4tZ^YeRTvwnIH0Dry=4de|b(8CsVn0&ZD@HmNO=+@)qR1x-D zqn42#oD6Iw4kI{zf>D(rDU%}KxeC>0u}6V##v~d>2|!5q$|##k#PbQJBw~$8aw#&c zu_|#;GiHnNyThnJjs}~zh;dETWRfs$x7i3yX7?vxYd5nBx4Y;Fdbj?>A*?A%5v8HbMsjcWpm^LzA>X|bPNkhX!0-4aj zI~P2CI2jkPh$oDGZ^DK1iCR+SM!O%tdPzneh=IZ0m9qUZIW`2;#8F*F7Wk z(~K{E|*zZ~+&b%h~ zA=x#+2if3VLrdsak#{c2A3o4<@axdmr4w#jukYm##;;T6=_yq(Ei*-@k86_H$;PgM zV>gaf3{15TQ&(NfwxEkcONn)ZFK-SwWVlh^NoVZ$^nf7@{SBNTLD_NH4{l#7>S|Z( z!&9uMoFUfPaVxy|u@RlU{OIjaWV}wz@y&D=`EiD2S^rMe{z)12fYqtZ_|1dW#Fc30 zYKeXVZ_RGuxGA*9dW)Oa1prrwaUbJU)jhHL#N*ySE8ovg>RjXRyRS1hI3-8x@r_tHyMp;oVl-XyqK(kJ&|#c ze9HpvamnOPDoiE z(6LRwRGA|sb3-J}e3MV%qHq51vD#rHF*C9#6-aH`R04@wDdP30_KgVYc6&@Bt4E5O zwlwjv^N4`wA6MVnsYfcZ*}}WyJ;Rpy9GBkikeuRVViR(=-LR3l=P3&}95LH+psKma z)-H;yi8ahRjF`NQRBJhY{=MvmZ^h+f3Jn$IA}5>9y9Ncq6*2E3g?mS{dXZ*^a4A`XhcE2&TZa(B6yV)VXx z*l7M(zKTd`OJSX-bO`iG>}AITLUh-<<6W}!gZ+dXbuJrJphGFEZp(c8%&;S4c literal 0 HcmV?d00001 diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/MednafenVB.png b/skin/DEOT/Menu/GameShell/20_Retro Games/MednafenVB.png index 8a87cefacfbe697a96462358b5b976f59fa9ab05..cf2484f37a1c05d9a1cd7cee75e18f6e5ae8a0e5 100644 GIT binary patch delta 4088 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 literal 0 HcmV?d00001 From ac520c779e3d4fff29ad4b2a964e833aa7f19a0c Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Mon, 13 Jul 2020 08:59:35 +0800 Subject: [PATCH 22/24] update 64f9437 --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 24deb7b..188d822 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "gitversion":"d2d0e7a", + "gitversion":"64f9437", "version":"200626" } From fd63173afde9584b040c30d83dc837ee0a14106a Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Mon, 13 Jul 2020 16:23:22 +0800 Subject: [PATCH 23/24] update CaveStory.sh --- Menu/GameShell/31_CaveStory.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Menu/GameShell/31_CaveStory.sh b/Menu/GameShell/31_CaveStory.sh index f972dbd..59f9f67 100755 --- a/Menu/GameShell/31_CaveStory.sh +++ b/Menu/GameShell/31_CaveStory.sh @@ -1,4 +1,7 @@ #!/bin/bash -#retroarch -L /home/cpi/.config/retroarch/cores/nxengine_libretro.so /home/cpi/games/nxengine/cavestory/data -retroarch -L /home/cpi/apps/emulators/nxengine_libretro.so /home/cpi/games/nxengine/cavestory/data +if [ -f "/home/cpi/.config/retroarch/cores/nxengine_libretro.so" ]; then + retroarch -L /home/cpi/.config/retroarch/cores/nxengine_libretro.so /home/cpi/games/nxengine/cavestory/data +else + retroarch -L /home/cpi/apps/emulators/nxengine_libretro.so /home/cpi/games/nxengine/cavestory/data +fi From cefd5bfe619603622886f2eb8e9eb10dc3a0a506 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Mon, 13 Jul 2020 16:24:09 +0800 Subject: [PATCH 24/24] update fd63173 --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 188d822..2091dc7 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "gitversion":"64f9437", + "gitversion":"fd63173", "version":"200626" }