From 160ff76d6e3d66c00d10ca20a8a97069d0ece737 Mon Sep 17 00:00:00 2001 From: cuu Date: Sun, 5 May 2019 14:37:26 +0800 Subject: [PATCH] colors fix --- .../10_Settings/Bluetooth/__init__.py | 16 +++++++++------- .../10_Settings/PowerOptions/__init__.py | 8 ++++---- Menu/GameShell/10_Settings/list_page.py | 8 ++++---- Menu/GameShell/50_PICO-8/compkginfo.json | 2 +- sys.py/gameshell/wallpaper/loading.png | Bin 1788 -> 7876 bytes 5 files changed, 18 insertions(+), 16 deletions(-) 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 83b4192..79b54df 100644 --- a/Menu/GameShell/50_PICO-8/compkginfo.json +++ b/Menu/GameShell/50_PICO-8/compkginfo.json @@ -4,6 +4,6 @@ "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"}, +"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.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 63a69e144cb2c8dceb5707e62989e3f68f65d372..304fe552bab8724b43611668194d97edfea0ca0c 100644 GIT binary patch literal 7876 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