From 860effc0128d6538409f340baa7636c6011e2a00 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Tue, 8 Sep 2020 16:44:34 +0800 Subject: [PATCH 01/20] Update update.sh --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index f393598..01da81c 100755 --- a/update.sh +++ b/update.sh @@ -1,6 +1,6 @@ #!/bin/bash -cd /home/cpi/launcher || exit +cd /home/cpi/launcher || exit feh --bg-center /home/cpi/launcher/sys.py/gameshell/wallpaper/updating.png git pull git reset --hard "$1" From c1328b519ae841cad92a6e67ac010acfc22e4d19 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Tue, 8 Sep 2020 16:46:18 +0800 Subject: [PATCH 02/20] Sync 200903 --- load.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/load.sh b/load.sh index ad0f003..fc70f5b 100755 --- a/load.sh +++ b/load.sh @@ -5,6 +5,6 @@ BASENAME=`dirname "$0"` cd $BASENAME/sys.py # boot sound -mplayer -volume 75 /home/cpi/music/startup.mp3 +mplayer -volume 50 /home/cpi/music/startup.mp3 python run.py From e8ed358cce62f03b83e1c9ffb662eb2c398904f0 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Tue, 8 Sep 2020 16:53:08 +0800 Subject: [PATCH 03/20] Update list_page.py --- Menu/GameShell/10_Settings/list_page.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Menu/GameShell/10_Settings/list_page.py b/Menu/GameShell/10_Settings/list_page.py index e1aaf49..54572b0 100644 --- a/Menu/GameShell/10_Settings/list_page.py +++ b/Menu/GameShell/10_Settings/list_page.py @@ -55,7 +55,7 @@ class ListPage(Page): ["","PowerOptions","Power Options"], ["","Wifi","Wi-Fi"], ["","Bluetooth","Bluetooth"], - ["","Sound","Sound Volume"], + ["","Sound","Sound Volume"], ["","Brightness","BackLight Brightness"], ["","Storage",""], ["","Time","Timezone"], From 9ec649dc37dc98f6decd339f9365560df8e2c76c Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Tue, 8 Sep 2020 16:57:59 +0800 Subject: [PATCH 04/20] Update 00_lowpower.sh From 03f835e139a7203ee06e6c3e3d80c0dc295be3d8 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Tue, 8 Sep 2020 17:00:23 +0800 Subject: [PATCH 05/20] Sync 200903 --- sys.py/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys.py/config.py b/sys.py/config.py index f274559..2bac6ee 100644 --- a/sys.py/config.py +++ b/sys.py/config.py @@ -17,7 +17,7 @@ MPD_socket = "/tmp/mpd.socket" #UPDATE_URL="https://raw.githubusercontent.com/clockworkpi/CPI_DEOT/master/version.json" UPDATE_URL="https://raw.githubusercontent.com/hi80482/launcher_deot/master/version.json" -VERSION="D.E.O.T. v2+ 200626" +VERSION="D.E.O.T. v2+ 200903" SKIN=None From ca9ff220c027035802250ea5e0f7c668b4d97d8e Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Tue, 8 Sep 2020 17:03:17 +0800 Subject: [PATCH 06/20] Update list_item.py --- sys.py/UI/Emulator/list_item.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys.py/UI/Emulator/list_item.py b/sys.py/UI/Emulator/list_item.py index e51464d..d5af9cf 100644 --- a/sys.py/UI/Emulator/list_item.py +++ b/sys.py/UI/Emulator/list_item.py @@ -113,5 +113,3 @@ class ListItem(object): self._Parent._Icons["sys"].Draw() pygame.draw.line(self._Parent._CanvasHWND,MySkinManager.GiveColor('Line'),(self._PosX,self._PosY+self._Height-1),(self._PosX+self._Width,self._PosY+self._Height-1),1) - - From 9b140a04319a1b62c82d1b2943dffcde06f4c3ef Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Tue, 8 Sep 2020 17:29:58 +0800 Subject: [PATCH 07/20] Update .gitignore From 5be742c4c26264d031f94da10f4efeb8fea38b32 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Tue, 8 Sep 2020 17:55:30 +0800 Subject: [PATCH 08/20] Sync 200903 --- Menu/GameShell/10_Settings/list_page.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Menu/GameShell/10_Settings/list_page.py b/Menu/GameShell/10_Settings/list_page.py index 54572b0..ea993de 100644 --- a/Menu/GameShell/10_Settings/list_page.py +++ b/Menu/GameShell/10_Settings/list_page.py @@ -27,7 +27,7 @@ class ListPage(Page): _FootMsg = ["Nav","","","Back","Enter"] _MyList = [] - _ListFontObj = MyLangManager.TrFont("varela15") + _ListFontObj = MyLangManager.TrFont("Eurostile15") _Scroller = None From 46b1b06396325b9d9dc5231e4edae0a5420c4079 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Tue, 8 Sep 2020 18:12:28 +0800 Subject: [PATCH 09/20] Sync 200903 --- sys.py/UI/Emulator/fav_list_page.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys.py/UI/Emulator/fav_list_page.py b/sys.py/UI/Emulator/fav_list_page.py index 503e926..58ffefc 100644 --- a/sys.py/UI/Emulator/fav_list_page.py +++ b/sys.py/UI/Emulator/fav_list_page.py @@ -239,7 +239,7 @@ class FavListPage(Page): bgpng._ImgSurf = MyIconPool.GiveIconSurface("star") bgpng._MyType = ICON_TYPES["STAT"] bgpng._Parent = self - bgpng.AddLabel(MyLangManager.Tr("MyFavGames"), MyLangManager.TrFont("varela18")) + bgpng.AddLabel(MyLangManager.Tr("MyFavGames"), MyLangManager.TrFont("Eurostile18")) bgpng.SetLableColor(MySkinManager.GiveColor('Disabled')) bgpng.Adjust(0,0,self._BGwidth,self._BGheight,0) From 235a64b7fac7705642d50bef87447fc6efae679e Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Tue, 8 Sep 2020 18:14:43 +0800 Subject: [PATCH 10/20] Sync 200903 --- sys.py/UI/Emulator/list_item.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys.py/UI/Emulator/list_item.py b/sys.py/UI/Emulator/list_item.py index d5af9cf..99637ff 100644 --- a/sys.py/UI/Emulator/list_item.py +++ b/sys.py/UI/Emulator/list_item.py @@ -62,7 +62,7 @@ class ListItem(object): def Init(self,text): - #self._Fonts["normal"] = fonts["veramono12"] + #self._Fonts["normal"] = fonts["Eurostile12"] l = Label() l._PosX = 20 From f895c162f8e6bf9f117fdfcf7e0cf0fd409b9e6e Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Tue, 8 Sep 2020 18:17:51 +0800 Subject: [PATCH 11/20] Sync 200903 --- sys.py/UI/Emulator/rom_list_page.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys.py/UI/Emulator/rom_list_page.py b/sys.py/UI/Emulator/rom_list_page.py index 8eb3521..418e795 100644 --- a/sys.py/UI/Emulator/rom_list_page.py +++ b/sys.py/UI/Emulator/rom_list_page.py @@ -273,7 +273,7 @@ class RomListPage(Page): bgpng._ImgSurf = MyIconPool.GiveIconSurface("empty") bgpng._MyType = ICON_TYPES["STAT"] bgpng._Parent = self - bgpng.AddLabel(MyLangManager.Tr("Please upload data over Wi-Fi"), MyLangManager.TrFont("varela22")) + bgpng.AddLabel(MyLangManager.Tr("Please upload data over Wi-Fi"), MyLangManager.TrFont("Eurostile22")) bgpng.SetLableColor(MySkinManager.GiveColor('Disabled')) bgpng.Adjust(0,0,self._BGwidth,self._BGheight,0) From cae19435b5c063de994d21f7b02cb3e8281c9dc0 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Tue, 8 Sep 2020 18:19:21 +0800 Subject: [PATCH 12/20] Sync 200903 --- sys.py/UI/Emulator/rom_so_confirm_page.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys.py/UI/Emulator/rom_so_confirm_page.py b/sys.py/UI/Emulator/rom_so_confirm_page.py index 34db516..2615438 100644 --- a/sys.py/UI/Emulator/rom_so_confirm_page.py +++ b/sys.py/UI/Emulator/rom_so_confirm_page.py @@ -21,7 +21,7 @@ from UI.lang_manager import MyLangManager import config class RomSoConfirmPage(ConfirmPage): - _ListFont = MyLangManager.TrFont("veramono18") + _ListFont = MyLangManager.TrFont("Eurostile15") _ConfirmText = MyLangManager.Tr("SetupGameEngineAutoQ") From b47479cbf3a812fdc4b9024635a8d2192ee880d6 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Tue, 8 Sep 2020 18:43:24 +0800 Subject: [PATCH 13/20] ignore mame2003_plus_libretro.so.zip --- .../Run.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sys.py/patches/{mame2003_plus_libretro.so.zip => .mame2003_plus_libretro.so.zip}/Run.sh (100%) diff --git a/sys.py/patches/mame2003_plus_libretro.so.zip/Run.sh b/sys.py/patches/.mame2003_plus_libretro.so.zip/Run.sh similarity index 100% rename from sys.py/patches/mame2003_plus_libretro.so.zip/Run.sh rename to sys.py/patches/.mame2003_plus_libretro.so.zip/Run.sh From 258a27acbca79d296bc6d528ceeb1aac411f4933 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Wed, 9 Sep 2020 00:09:25 +0800 Subject: [PATCH 14/20] Update pages.py --- Menu/GameShell/10_Settings/Sound/pages.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Menu/GameShell/10_Settings/Sound/pages.py b/Menu/GameShell/10_Settings/Sound/pages.py index 76122bd..16375e8 100644 --- a/Menu/GameShell/10_Settings/Sound/pages.py +++ b/Menu/GameShell/10_Settings/Sound/pages.py @@ -9,5 +9,5 @@ def InitSoundPage(main_screen): myvars.SoundPage = SoundPage() myvars.SoundPage._Screen = main_screen - myvars.SoundPage._Name = "Sound volume" + myvars.SoundPage._Name = "Sound Volume" myvars.SoundPage.Init() From 31e5835da6c1b97c338fc6196ed1e4a040ad177a Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Wed, 9 Sep 2020 00:10:46 +0800 Subject: [PATCH 15/20] =?UTF-8?q?Update=2004=5F=E6=AD=A3=E9=AB=94=E4=B8=AD?= =?UTF-8?q?=E6=96=87.ini?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sys.py/langs/04_正體中文.ini | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sys.py/langs/04_正體中文.ini b/sys.py/langs/04_正體中文.ini index 94b5a76..c55e010 100644 --- a/sys.py/langs/04_正體中文.ini +++ b/sys.py/langs/04_正體中文.ini @@ -19,7 +19,7 @@ Airplane Mode=飛航模式 Power Options=電源計畫 Wi-Fi=無線網路 Bluetooth=藍牙 -Sound Volume=音量 +Sound Volume=音量 BackLight Brightness=背光亮度 Storage=記憶卡 Timezone=時區 @@ -101,10 +101,6 @@ Forget=略過 Forgeting=略過此裝置... Device paired=裝置已配對 -#音量 -Sound Volume=音量 -Sound volume=音量 - #背光亮度 Brightness=背光亮度 From 13f3f787306acddc5c666ccc683a359f95d0733d Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Wed, 9 Sep 2020 00:16:47 +0800 Subject: [PATCH 16/20] update 31e5835 --- version.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.json b/version.json index d320dd2..8c3a75e 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "gitversion":"d89f523", - "version":"200626" + "gitversion":"31e5835", + "version":"200903" } From 1a2547e55d7cc0a8b1bde3ba19c613fe58cd5bfb Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Wed, 9 Sep 2020 04:56:54 +0800 Subject: [PATCH 17/20] Update __init__.py --- .../10_Settings/PowerOFF/__init__.py | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/Menu/GameShell/10_Settings/PowerOFF/__init__.py b/Menu/GameShell/10_Settings/PowerOFF/__init__.py index d55fdbd..2ef02e4 100644 --- a/Menu/GameShell/10_Settings/PowerOFF/__init__.py +++ b/Menu/GameShell/10_Settings/PowerOFF/__init__.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import pygame +import subprocess #UI lib from UI.constants import RUNSYS @@ -13,8 +14,18 @@ import config class PowerOffConfirmPage(ConfirmPage): - _ConfirmText = MyLangManager.Tr("Confirm Power OFF?") + _ConfirmText = MyLangManager.Tr("Awaiting Input") + #_FootMsg = ["Nav","Suspend","Reboot","Cancel","Shutdown"] + _FootMsg = ["Nav","","Reboot","Cancel","Shutdown"] + # uname -r + st = subprocess.check_output(["uname","-r"]) + st = st.strip("\n") + st = st.strip("\t") + + if "5.7" in st: + _FootMsg[1] = "Sleep" + def CheckBattery(self): try: f = open(config.Battery) @@ -43,7 +54,6 @@ class PowerOffConfirmPage(ConfirmPage): def KeyDown(self,event): if IsKeyMenuOrB(event.key): - self.ReturnToUpLevelPage() self._Screen.Draw() self._Screen.SwapAndShow() @@ -60,8 +70,19 @@ class PowerOffConfirmPage(ConfirmPage): cmdpath += "sudo halt -p" pygame.event.post( pygame.event.Event(RUNSYS, message=cmdpath)) + + if event.key == CurKeys["X"]: + cmdpath = "feh --bg-center %s;" % MySkinManager.GiveWallpaper("seeyou.png") + cmdpath += "sleep 3;" + cmdpath += "sudo reboot" + pygame.event.post( pygame.event.Event(RUNSYS, message=cmdpath)) - + if event.key == CurKeys["Y"]: + if self._FootMsg[1] != "": + cmdpath = "feh --bg-center %s;" % MySkinManager.GiveWallpaper("seeyou.png") + cmdpath += "sleep 3;" + cmdpath += "sudo pm-suspend" + pygame.event.post( pygame.event.Event(RUNSYS, message=cmdpath)) class APIOBJ(object): @@ -87,4 +108,3 @@ def Init(main_screen): OBJ.Init(main_screen) def API(main_screen): OBJ.API(main_screen) - From 42c63e7cb0a6c2bc5df67fb3e018bcbe33554b59 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Wed, 9 Sep 2020 04:57:35 +0800 Subject: [PATCH 18/20] update 1a2547e --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 8c3a75e..bc38f41 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "gitversion":"31e5835", + "gitversion":"1a2547e", "version":"200903" } From bb15dce4781511d58fff509b30c67503edaeb796 Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Wed, 9 Sep 2020 16:46:50 +0800 Subject: [PATCH 19/20] set system volume 50% --- load.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/load.sh b/load.sh index fc70f5b..aa97761 100755 --- a/load.sh +++ b/load.sh @@ -5,6 +5,9 @@ BASENAME=`dirname "$0"` cd $BASENAME/sys.py # boot sound -mplayer -volume 50 /home/cpi/music/startup.mp3 +mplayer -volume 75 /home/cpi/music/startup.mp3 + +# set system volume +amixer sset 'Master' 50% python run.py From 80a737f0297185777a3de33956fc47314bae02bd Mon Sep 17 00:00:00 2001 From: hi80482 <66435094+hi80482@users.noreply.github.com> Date: Wed, 9 Sep 2020 16:47:40 +0800 Subject: [PATCH 20/20] update bb15dce --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index bc38f41..832abf5 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "gitversion":"1a2547e", + "gitversion":"bb15dce", "version":"200903" }