From ee88a3170bf3f8650f930b0d1bf4097e80c5eeb7 Mon Sep 17 00:00:00 2001 From: cuu Date: Sun, 5 May 2019 13:45:16 +0800 Subject: [PATCH] gcores theme update --- Menu/GameShell/10_Settings/About/__init__.py | 2 +- .../GameShell/10_Settings/GateWay/__init__.py | 5 +++-- .../10_Settings/Languages/__init__.py | 6 +++--- Menu/GameShell/10_Settings/Lima/__init__.py | 7 ++++--- .../GameShell/10_Settings/Storage/__init__.py | 2 +- .../Time/timezone_lib_list_page.py | 8 ++++---- Menu/GameShell/10_Settings/Wifi/wifi_list.py | 8 ++++---- Menu/GameShell/10_Settings/list_page.py | 2 +- .../97_Music Player/mpd_spectrum_page.py | 8 ++++---- .../97_Music Player/music_lib_list_page.py | 12 +++++------ .../97_Music Player/play_list_page.py | 10 ++++----- .../sys.py/gameshell/icons/blueselector.png | Bin 3392 -> 1302 bytes sys.py/UI/above_all_patch.py | 5 +++-- sys.py/UI/counter_screen.py | 2 +- sys.py/UI/icon_item.py | 4 ++-- sys.py/UI/info_page_selector.py | 7 ++++--- sys.py/UI/keyboard.py | 2 +- sys.py/UI/page.py | 2 +- sys.py/UI/scroller.py | 5 +++-- sys.py/UI/skin_manager.py | 19 +++++++----------- sys.py/config.py | 2 +- 21 files changed, 59 insertions(+), 59 deletions(-) diff --git a/Menu/GameShell/10_Settings/About/__init__.py b/Menu/GameShell/10_Settings/About/__init__.py index 30cafc1..e97da2a 100644 --- a/Menu/GameShell/10_Settings/About/__init__.py +++ b/Menu/GameShell/10_Settings/About/__init__.py @@ -329,7 +329,7 @@ class AboutPage(Page): self._DrawOnce = True if self._HWND != None: - self._HWND.fill((255,255,255)) + self._HWND.fill( MySkinManager.GiveColor("White") ) self._HWND.blit(self._CanvasHWND,(self._PosX,self._PosY,self._Width, self._Height ) ) diff --git a/Menu/GameShell/10_Settings/GateWay/__init__.py b/Menu/GameShell/10_Settings/GateWay/__init__.py index 0c83c80..185dcfb 100644 --- a/Menu/GameShell/10_Settings/GateWay/__init__.py +++ b/Menu/GameShell/10_Settings/GateWay/__init__.py @@ -38,8 +38,9 @@ class ListPageSelector(InfoPageSelector): 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(InfoPageListItem): diff --git a/Menu/GameShell/10_Settings/Languages/__init__.py b/Menu/GameShell/10_Settings/Languages/__init__.py index a6cc2b1..8ccf33f 100644 --- a/Menu/GameShell/10_Settings/Languages/__init__.py +++ b/Menu/GameShell/10_Settings/Languages/__init__.py @@ -37,9 +37,9 @@ class ListPageSelector(InfoPageSelector): 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(InfoPageListItem): _PosX = 0 diff --git a/Menu/GameShell/10_Settings/Lima/__init__.py b/Menu/GameShell/10_Settings/Lima/__init__.py index b0a15d2..8adc938 100644 --- a/Menu/GameShell/10_Settings/Lima/__init__.py +++ b/Menu/GameShell/10_Settings/Lima/__init__.py @@ -37,9 +37,10 @@ class ListPageSelector(InfoPageSelector): 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(InfoPageListItem): _PosX = 0 diff --git a/Menu/GameShell/10_Settings/Storage/__init__.py b/Menu/GameShell/10_Settings/Storage/__init__.py index b52bec6..edbfce8 100644 --- a/Menu/GameShell/10_Settings/Storage/__init__.py +++ b/Menu/GameShell/10_Settings/Storage/__init__.py @@ -67,7 +67,7 @@ class StoragePage(Page): self._FreeLabel = Label() self._FreeLabel.SetCanvasHWND(self._CanvasHWND) - self._FreeLabel.Init("FREE",MySkinManager.GiveFont("Eurostile12")) + self._FreeLabel.Init("FREE",MySkinManager.GiveFont("varela12")) self._FreeLabel.SetColor(self._PctLabel._Color) 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 f4f9a87..bf90beb 100644 --- a/Menu/GameShell/10_Settings/Time/timezone_lib_list_page.py +++ b/Menu/GameShell/10_Settings/Time/timezone_lib_list_page.py @@ -50,7 +50,7 @@ class TimeLibStack: return len(self.stack) class ListPageSelector(PageSelector): - _BackgroundColor = MySkinManager.GiveColor('Front') + _BackgroundColor = MySkinManager.GiveColor('Line') def __init__(self): self._PosX = 0 @@ -73,9 +73,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 TimezoneListPage(Page): diff --git a/Menu/GameShell/10_Settings/Wifi/wifi_list.py b/Menu/GameShell/10_Settings/Wifi/wifi_list.py index fa042ae..4342787 100644 --- a/Menu/GameShell/10_Settings/Wifi/wifi_list.py +++ b/Menu/GameShell/10_Settings/Wifi/wifi_list.py @@ -202,7 +202,7 @@ class WifiInfoPage(Page): class WifiListSelector(PageSelector): - _BackgroundColor = MySkinManager.GiveColor('Front') + _BackgroundColor = MySkinManager.GiveColor('Line') def __init__(self): pass @@ -222,9 +222,9 @@ class WifiListSelector(PageSelector): self._PosY = y self._Height = h - aa_round_rect(self._Parent._CanvasHWND, - (x,y,self._Width,h),self._BackgroundColor,4,0,self._BackgroundColor) - + #aa_round_rect(self._Parent._CanvasHWND, + # (x,y,self._Width,h),self._BackgroundColor,4,0,self._BackgroundColor) + pygame.draw.rect(self._Parent._CanvasHWND,self._BackgroundColor,(x,y,self._Width,h),0) class WifiListMessageBox(Label): _Parent = None diff --git a/Menu/GameShell/10_Settings/list_page.py b/Menu/GameShell/10_Settings/list_page.py index 5b222ca..c7882d5 100644 --- a/Menu/GameShell/10_Settings/list_page.py +++ b/Menu/GameShell/10_Settings/list_page.py @@ -65,7 +65,7 @@ class ListPage(Page): ["","About", "About"], ["","PowerOFF","Power off"], ["","ButtonsLayout","Buttons Layout"], - ["","LauncherGo","Switch to LauncherGo"], + #["","LauncherGo","Switch to LauncherGo"], ["","Lima","GPU driver switch"], ["","GateWay","Network gateway switch"]] diff --git a/Menu/GameShell/97_Music Player/mpd_spectrum_page.py b/Menu/GameShell/97_Music Player/mpd_spectrum_page.py index fbd5e9c..9ee255a 100644 --- a/Menu/GameShell/97_Music Player/mpd_spectrum_page.py +++ b/Menu/GameShell/97_Music Player/mpd_spectrum_page.py @@ -178,7 +178,7 @@ class MPDSpectrumPage(Page): self._time2 = Label() self._time2.SetCanvasHWND(self._CanvasHWND) self._time2.Init("00:00-00:00", self._ListFont, - MySkinManager.GiveColor('White')) + MySkinManager.GiveColor('Text')) self.Start() @@ -336,7 +336,7 @@ class MPDSpectrumPage(Page): if self._RollCanvas != None: # self._RollCanvas.fill((111,22,33)) - self._RollCanvas.fill(MySkinManager.GiveColor('Black')) + self._RollCanvas.fill(MySkinManager.GiveColor('Text')) if self._song_title._Width > self._RollW: if (self._song_title._PosX + self._song_title._Width) > self._RollW and self._frames % 30 == 0: self._song_title._PosX -= 1 @@ -410,9 +410,9 @@ class MPDSpectrumPage(Page): else: self._capYPositionArray[i] = value - pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('White'),(i*(bw+gap)+margin_left,self._Height-gap-self._capYPositionArray[i]-margin_bottom,bw,gap),0) + pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'),(i*(bw+gap)+margin_left,self._Height-gap-self._capYPositionArray[i]-margin_bottom,bw,gap),0) - pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('White'),(i*(bw+gap)+margin_left,self._Height-value-gap-margin_bottom,bw,value+gap),0) + pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'),(i*(bw+gap)+margin_left,self._Height-value-gap-margin_bottom,bw,value+gap),0) self._vis_values[i] -= 2 diff --git a/Menu/GameShell/97_Music Player/music_lib_list_page.py b/Menu/GameShell/97_Music Player/music_lib_list_page.py index 5bcc1b4..a5a3b49 100644 --- a/Menu/GameShell/97_Music Player/music_lib_list_page.py +++ b/Menu/GameShell/97_Music Player/music_lib_list_page.py @@ -49,7 +49,7 @@ class MusicLibStack: return len(self.stack) class ListPageSelector(PageSelector): - _BackgroundColor = MySkinManager.GiveColor('Front') + _BackgroundColor = MySkinManager.GiveColor('Line') def __init__(self): self._PosX = 0 @@ -72,9 +72,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 MusicLibListPage(Page): @@ -184,8 +184,8 @@ class MusicLibListPage(Page): self._BGpng._ImgSurf = MyIconPool._Icons["empty"] self._BGpng._MyType = ICON_TYPES["STAT"] self._BGpng._Parent = self - self._BGpng.AddLabel(MyLangManager.Tr("Please upload data over Wi-Fi"), MyLangManager.TrFont("varela22")) - self._BGpng.SetLableColor(MySkinManager.GiveColor('Disabled')) + self._BGpng.AddLabel(MyLangManager.Tr("Please upload data over Wi-Fi"), MyLangManager.TrFont("varela18")) + self._BGpng.SetLableColor(MySkinManager.GiveColor('Text')) self._BGpng.Adjust(0,0,self._BGwidth,self._BGheight,0) diff --git a/Menu/GameShell/97_Music Player/play_list_page.py b/Menu/GameShell/97_Music Player/play_list_page.py index 4cc6a4e..286f379 100644 --- a/Menu/GameShell/97_Music Player/play_list_page.py +++ b/Menu/GameShell/97_Music Player/play_list_page.py @@ -23,7 +23,7 @@ from list_item import ListItem import myvars class ListPageSelector(PageSelector): - _BackgroundColor = MySkinManager.GiveColor('Front') + _BackgroundColor = MySkinManager.GiveColor('Line') def __init__(self): self._PosX = 0 @@ -51,9 +51,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 PlayListPage(Page): @@ -184,7 +184,7 @@ class PlayListPage(Page): self._BGpng._MyType = ICON_TYPES["STAT"] self._BGpng._Parent = self self._BGpng.AddLabel(MyLangManager.Tr("my favorite music"), MyLangManager.TrFont("varela18")) - self._BGpng.SetLableColor(MySkinManager.GiveColor('Disabled')) + self._BGpng.SetLableColor(MySkinManager.GiveColor('Text')) self._BGpng.Adjust(0,0,self._BGwidth,self._BGheight,0) self._Scroller = ListScroller() diff --git a/skin/default/sys.py/gameshell/icons/blueselector.png b/skin/default/sys.py/gameshell/icons/blueselector.png index 82e285b18582e27775782e3eb0bba331e814106d..56994bf03e7ff78a8c197fab3ea9c5c1ae77e39e 100644 GIT binary patch delta 1283 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 icon_width or self._ImgSurf.get_height() > icon_height: - self._ImgSurf = pygame.transform.scale(self._ImgSurf,(icon_width,icon_height)) + #if self._ImgSurf.get_width() > icon_width or self._ImgSurf.get_height() > icon_height: + # self._ImgSurf = pygame.transform.scale(self._ImgSurf,(icon_width,icon_height)) def ChangeImgSurfColor(self,color): color_surface(self._ImgSurf,color) diff --git a/sys.py/UI/info_page_selector.py b/sys.py/UI/info_page_selector.py index 69869e6..1be54d1 100644 --- a/sys.py/UI/info_page_selector.py +++ b/sys.py/UI/info_page_selector.py @@ -8,7 +8,7 @@ from UI.page import Page,PageSelector from UI.skin_manager import MySkinManager class InfoPageSelector(PageSelector): - _BackgroundColor = MySkinManager.GiveColor('Front') + _BackgroundColor = MySkinManager.GiveColor('Line') def __init__(self): self._Width = Width @@ -25,5 +25,6 @@ class InfoPageSelector(PageSelector): self._PosY = y self._Height = h - aa_round_rect(self._Parent._CanvasHWND, - (self._PosX,self._PosY,self._Width-4,self._Height),self._BackgroundColor,4,0,self._BackgroundColor) + pygame.draw.rect(self._Parent._CanvasHWND,self._BackgroundColor,(self._PosX,self._PosY,self._Width-4,self._Height),0) + #aa_round_rect(self._Parent._CanvasHWND, + # (self._PosX,self._PosY,self._Width-4,self._Height),self._BackgroundColor,4,0,self._BackgroundColor) diff --git a/sys.py/UI/keyboard.py b/sys.py/UI/keyboard.py index bd71987..e38e2dd 100644 --- a/sys.py/UI/keyboard.py +++ b/sys.py/UI/keyboard.py @@ -48,7 +48,7 @@ class KeyboardSelector(PageSelector): if rect.width <=0 or rect.height <= 0 : return - aa_round_rect(self._Parent._CanvasHWND,rect, (126,206,244),3,0,(126,206,244)) + aa_round_rect(self._Parent._CanvasHWND,rect, MySkinManager.GiveColor("Line"),3,0,MySkinManager.GiveColor("Line")) # pygame.draw.rect(self._Parent._CanvasHWND,(0,0,0),rect,1) class Keyboard(Page): diff --git a/sys.py/UI/page.py b/sys.py/UI/page.py index f1a66bb..9ca3301 100644 --- a/sys.py/UI/page.py +++ b/sys.py/UI/page.py @@ -648,6 +648,6 @@ class Page(Widget): def Draw(self): self.ClearCanvas() self.DrawIcons() - #self.DrawPageSelector() + self.DrawPageSelector() diff --git a/sys.py/UI/scroller.py b/sys.py/UI/scroller.py index 9361ffd..f6d2490 100644 --- a/sys.py/UI/scroller.py +++ b/sys.py/UI/scroller.py @@ -14,7 +14,7 @@ class ListScroller(object): _Height = 0 _MinHeight = 6 ## tested _Parent = None - _Color = MySkinManager.GiveColor('Front') + _Color = MySkinManager.GiveColor('Line') _StartX = 0 _StartY = 0 @@ -60,4 +60,5 @@ class ListScroller(object): def Draw(self): start_rect = midRect(self._PosX+self._StartX,self._StartY+self._Value,self._Width,self._Height,self._Parent._Width,self._Parent._Height) - aa_round_rect(self._CanvasHWND,start_rect, self._Color,3,0, self._Color) + #aa_round_rect(self._CanvasHWND,start_rect, self._Color,3,0, self._Color) + pygame.draw.rect(self._CanvasHWND,self._Color,start_rect,0) diff --git a/sys.py/UI/skin_manager.py b/sys.py/UI/skin_manager.py index 03899d8..509ca58 100644 --- a/sys.py/UI/skin_manager.py +++ b/sys.py/UI/skin_manager.py @@ -54,21 +54,16 @@ class SkinManager(object): fonts_path["Eurostile"] = "%s/EurostileMN-Medium.pfb.ttf" %skinpath fonts_path["EurostileBold"] = "%s/EurostileMN-ExtendedBold.pfb.ttf" % skinpath - self._Fonts["Eurostile10"] = pygame.font.Font(fonts_path["Eurostile"],10) - self._Fonts["Eurostile11"] = pygame.font.Font(fonts_path["Eurostile"],11) - self._Fonts["Eurostile12"] = pygame.font.Font(fonts_path["Eurostile"],12) - self._Fonts["Eurostile13"] = pygame.font.Font(fonts_path["Eurostile"],13) - - self._Fonts["EurostileBold13"] = pygame.font.Font(fonts_path["EurostileBold"],13) + self._Fonts["EurostileBold13"] = pygame.font.Font(fonts_path["EurostileBold"],13) self._Fonts["EurostileBold30"] = pygame.font.Font(fonts_path["EurostileBold"],30) for i in range(10,29): - self._Fonts["varela%d"%i] = pygame.font.Font(fonts_path["varela"],i) + self._Fonts["varela%d"%i] = pygame.font.Font(fonts_path["Eurostile"],i) - self._Fonts["varela34"] = pygame.font.Font(fonts_path["varela"],34) - self._Fonts["varela40"] = pygame.font.Font(fonts_path["varela"],40) - self._Fonts["varela120"] = pygame.font.Font(fonts_path["varela"],120) + self._Fonts["varela34"] = pygame.font.Font(fonts_path["Eurostile"],34) + self._Fonts["varela40"] = pygame.font.Font(fonts_path["Eurostile"],40) + self._Fonts["varela120"] = pygame.font.Font(fonts_path["Eurostile"],120) for i in range(10,26): self._Fonts["veramono%d"%i] = pygame.font.Font(fonts_path["veramono"],i) @@ -86,9 +81,9 @@ class SkinManager(object): Colors["High"] = pygame.Color(51, 166, 255) Colors["Text"] = pygame.Color(42, 140, 121) Colors["ReadOnlyText"] = pygame.Color(130,130,130) - Colors["Front"] = pygame.Color(131, 199, 219) + Colors["Front"] = pygame.Color(42,140,121) Colors["URL"] = pygame.Color(51, 166, 255) - Colors["Line"] = pygame.Color(42, 140, 121) + Colors["Line"] = pygame.Color(21, 70, 60) Colors["TitleBg"] = pygame.Color(11, 16, 22) Colors["Active"] = pygame.Color(175, 90, 0) Colors["Inactive"] = pygame.Color(27,78,72) diff --git a/sys.py/config.py b/sys.py/config.py index c5320c5..7596276 100644 --- a/sys.py/config.py +++ b/sys.py/config.py @@ -10,7 +10,7 @@ Battery = "/sys/class/power_supply/axp20x-battery/uevent" MPD_socket = "/tmp/mpd.socket" -UPDATE_URL="https://raw.githubusercontent.com/clockworkpi/CPI/master/launcher_ver.json" +UPDATE_URL="https://raw.githubusercontent.com/clockworkpi/CPI/master/launcher_gcores_ver.json" VERSION="gcores stable 1.0"