From 8585d753e78bfda2e87c8a42f97a55da73adbd2d Mon Sep 17 00:00:00 2001 From: cuu Date: Fri, 1 May 2020 18:46:54 +0800 Subject: [PATCH] fixings --- CPI/version.json | 3 --- Menu/GameShell/10_Settings/About/__init__.py | 23 ++++++++++++++----- .../10_Settings/Airplane/__init__.py | 6 ++--- .../GameShell/10_Settings/Storage/__init__.py | 2 +- sys.py/config.py | 2 +- 5 files changed, 22 insertions(+), 14 deletions(-) delete mode 100644 CPI/version.json diff --git a/CPI/version.json b/CPI/version.json deleted file mode 100644 index 0d2fff6..0000000 --- a/CPI/version.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "gitversion":"383394b" -} diff --git a/Menu/GameShell/10_Settings/About/__init__.py b/Menu/GameShell/10_Settings/About/__init__.py index 4a5c0c3..78f3877 100644 --- a/Menu/GameShell/10_Settings/About/__init__.py +++ b/Menu/GameShell/10_Settings/About/__init__.py @@ -275,7 +275,8 @@ class AboutPage(Page): if self._Screen._CanvasHWND != None and self._CanvasHWND == None: self._HWND = self._Screen._CanvasHWND self._CanvasHWND = pygame.Surface( (self._Screen._Width,self._BGheight+50) ) - + self._CanvasHWND_Wallpaper = pygame.Surface( (self._Screen._Width,self._Screen._Height) ) + self._PosX = self._Index*self._Screen._Width self._Width = self._Screen._Width ## equal to screen width self._Height = self._Screen._Height @@ -345,14 +346,19 @@ class AboutPage(Page): def Draw(self): - + if self._DrawOnce == False: - self.ClearCanvas() + if self._Wallpaper: + self._CanvasHWND.fill((0,0,0,)) + self._CanvasHWND.set_colorkey((0,0,0)) + else: + self._CanvasHWND.fill(MySkinManager.GiveColor("White")) + #self._Ps.Draw() for i in self._MyList: i.Draw() - + self._DrawOnce = True self._Icons["bg"].DrawRect((230,0,82,184),(228,0,82,184)) @@ -364,8 +370,13 @@ class AboutPage(Page): if self._HWND != None: self._HWND.fill(MySkinManager.GiveColor("White")) - self._HWND.blit(self._CanvasHWND,(self._PosX,self._PosY,self._Width, self._Height ) ) - + if self._Wallpaper: + self._CanvasHWND_Wallpaper.blit(self._Wallpaper,(0,0)) + self._CanvasHWND_Wallpaper.blit(self._CanvasHWND,(self._PosX,self._PosY,self._Width, self._Height )) + self._HWND.blit(self._CanvasHWND_Wallpaper,(0,0,self._Width, self._Height ) ) + else: + self._HWND.blit(self._CanvasHWND,(self._PosX,self._PosY,self._Width, self._Height )) + self._Scroller.UpdateSize(self._BGheight,abs(self._Scrolled)*3) self._Scroller.Draw() diff --git a/Menu/GameShell/10_Settings/Airplane/__init__.py b/Menu/GameShell/10_Settings/Airplane/__init__.py index 3338d90..9e4d6bc 100644 --- a/Menu/GameShell/10_Settings/Airplane/__init__.py +++ b/Menu/GameShell/10_Settings/Airplane/__init__.py @@ -82,9 +82,9 @@ class AirplanePage(Page): DialogBoxs._ImgSurf = MyIconPool.GiveIconSurface("DialogBoxs") DialogBoxs._MyType = ICON_TYPES["STAT"] DialogBoxs._Parent = self - DialogBoxs._IconWidth = 134 - DialogBoxs._IconHeight = 93 - DialogBoxs.Adjust(0,0,134,372,0) + DialogBoxs._IconWidth = 180 + DialogBoxs._IconHeight = 80 + DialogBoxs.Adjust(0,0,180,320,0) self._Icons["DialogBoxs"] = DialogBoxs diff --git a/Menu/GameShell/10_Settings/Storage/__init__.py b/Menu/GameShell/10_Settings/Storage/__init__.py index 0af1f8a..bd86413 100644 --- a/Menu/GameShell/10_Settings/Storage/__init__.py +++ b/Menu/GameShell/10_Settings/Storage/__init__.py @@ -106,7 +106,7 @@ class StoragePage(Page): rect2.left = rect_.left rect2.top = rect_.top - aa_round_rect(self._CanvasHWND,rect2, MySkinManager.GiveColor('Front'),5,0,MySkinManager.GiveColor('Front')) + aa_round_rect(self._CanvasHWND,rect2, MySkinManager.GiveColor('High'),5,0,MySkinManager.GiveColor('High')) class APIOBJ(object): diff --git a/sys.py/config.py b/sys.py/config.py index 4275c3b..a543cdf 100644 --- a/sys.py/config.py +++ b/sys.py/config.py @@ -13,7 +13,7 @@ Battery = "/sys/class/power_supply/axp20x-battery/uevent" MPD_socket = "/tmp/mpd.socket" -UPDATE_URL="https://raw.githubusercontent.com/clockworkpi/launcher_deot/master/CPI/version.json" +UPDATE_URL="https://raw.githubusercontent.com/clockworkpi/CPI_DEOT/master/version.json" VERSION="stable 1.25"