diff --git a/Menu/GameShell/10_Settings/Bluetooth/__init__.py b/Menu/GameShell/10_Settings/Bluetooth/__init__.py index 4a943ab..dd33b84 100644 --- a/Menu/GameShell/10_Settings/Bluetooth/__init__.py +++ b/Menu/GameShell/10_Settings/Bluetooth/__init__.py @@ -71,7 +71,7 @@ class BleForgetConfirmPage(ConfirmPage): class BleInfoPageSelector(PageSelector): - _BackgroundColor = MySkinManager.GiveColor('Front') + _BackgroundColor = MySkinManager.GiveColor('Line') def __init__(self): self._PosX = 0 @@ -92,8 +92,9 @@ class BleInfoPageSelector(PageSelector): self._PosY = y self._Height = h - aa_round_rect(self._Parent._CanvasHWND, - (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor) + #aa_round_rect(self._Parent._CanvasHWND, + # (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor) + pygame.draw.rect(self._Parent._CanvasHWND,self._BackgroundColor,(x,y,self._Width-4,h),0) class BleInfoPage(Page): _FootMsg = ["Nav","Forget","Disconnect","Back",""] @@ -315,7 +316,7 @@ class BleInfoPage(Page): class BleListSelector(PageSelector): - _BackgroundColor = MySkinManager.GiveColor('Front') + _BackgroundColor = MySkinManager.GiveColor('Line') def __init__(self): self._PosX = 0 @@ -336,8 +337,9 @@ class BleListSelector(PageSelector): self._PosY = y self._Height = h - aa_round_rect(self._Parent._CanvasHWND, - (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor) + #aa_round_rect(self._Parent._CanvasHWND, + # (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor) + pygame.draw.rect(self._Parent._CanvasHWND,self._BackgroundColor, (x,y,self._Width-4,h),0 ) class BleListMessageBox(Label): _Parent = None @@ -351,7 +353,7 @@ class BleListMessageBox(Label): padding = 10 pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('White'),(x-padding,y-padding, w+padding*2,h+padding*2)) - pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Black'),(x-padding,y-padding, w+padding*2,h+padding*2),1) + pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'),(x-padding,y-padding, w+padding*2,h+padding*2),1) self._CanvasHWND.blit(my_text,(x,y,w,h)) diff --git a/Menu/GameShell/10_Settings/PowerOptions/__init__.py b/Menu/GameShell/10_Settings/PowerOptions/__init__.py index b92cce9..396f257 100644 --- a/Menu/GameShell/10_Settings/PowerOptions/__init__.py +++ b/Menu/GameShell/10_Settings/PowerOptions/__init__.py @@ -24,7 +24,7 @@ from UI.lang_manager import MyLangManager import config class ListPageSelector(PageSelector): - _BackgroundColor = MySkinManager.GiveColor('Front') + _BackgroundColor = MySkinManager.GiveColor('Line') def __init__(self): self._PosX = 0 @@ -47,9 +47,9 @@ class ListPageSelector(PageSelector): self._PosY = y self._Height = h - aa_round_rect(self._Parent._CanvasHWND, - (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor) - + #aa_round_rect(self._Parent._CanvasHWND, + # (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor) + pygame.draw.rect(self._Parent._CanvasHWND,self._BackgroundColor,(x,y,self._Width-4,h),0 ) class PageListItem(object): _PosX = 0 diff --git a/Menu/GameShell/10_Settings/list_page.py b/Menu/GameShell/10_Settings/list_page.py index c7882d5..c997780 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"], @@ -63,11 +63,11 @@ class ListPage(Page): ["","Notification","Notification"], ["","Update", ""], ["","About", "About"], - ["","PowerOFF","Power off"], + ["","PowerOFF","Power OFF"], ["","ButtonsLayout","Buttons Layout"], #["","LauncherGo","Switch to LauncherGo"], - ["","Lima","GPU driver switch"], - ["","GateWay","Network gateway switch"]] + ["","Lima","GPU Driver Switch"], + ["","GateWay","Network Gateway Switch"]] start_x = 0 start_y = 0 diff --git a/Menu/GameShell/50_PICO-8/compkginfo.json b/Menu/GameShell/50_PICO-8/compkginfo.json index 19d7eda..05ce187 100644 --- a/Menu/GameShell/50_PICO-8/compkginfo.json +++ b/Menu/GameShell/50_PICO-8/compkginfo.json @@ -3,7 +3,6 @@ "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.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"}, +"MD5":{"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.zip":"whatever it takes"}, "Post-Up":"bash Post-Up.sh" } diff --git a/sys.py/gameshell/wallpaper/loading.png b/sys.py/gameshell/wallpaper/loading.png index 63a69e1..304fe55 100644 Binary files a/sys.py/gameshell/wallpaper/loading.png and b/sys.py/gameshell/wallpaper/loading.png differ