From 7af30466468e02b44151cbbd4dc0e6e25b3f2596 Mon Sep 17 00:00:00 2001 From: cuu Date: Sat, 14 Jul 2018 11:30:23 +0800 Subject: [PATCH 1/4] add ExecPackage --- sys.py/UI/main_screen.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/sys.py/UI/main_screen.py b/sys.py/UI/main_screen.py index a94b980..4ed60f6 100644 --- a/sys.py/UI/main_screen.py +++ b/sys.py/UI/main_screen.py @@ -363,6 +363,15 @@ class MainScreen(object): else: return name + def IsExecPackage(self,dirname): + files = os.listdir(dirname) + bname = os.path.basename(dirname) + bname = self.ExtraName(bname) + for i in sorted(files): + if i == bname+".sh": + return True + return False + def IsEmulatorPackage(self,dirname): files = os.listdir(dirname) for i in sorted(files): @@ -396,6 +405,8 @@ class MainScreen(object): iconitem = IconItem() iconitem._CmdPath = "" iconitem.AddLabel(i2,self._IconFont) + if FileExists( _dir+"/"+i+"/"+i2+".png"): ### 20_Prog/Prog.png , cut 20_ + iconitem._ImageName = _dir+"/"+i+"/"+i2+".png" if FileExists( SkinMap(_dir+"/"+i2+".png") ): iconitem._ImageName = SkinMap(_dir+"/"+i2+".png") else: @@ -455,7 +466,12 @@ class MainScreen(object): iconitem._CmdPath = em iconitem._MyType = ICON_TYPES["Emulator"] cur_page._Icons.append(iconitem) - + + elif self.IsExecPackage(_dir+"/"+i): + iconitem._MyType = ICON_TYPES["EXE"] + iconitem._CmdPath = _dir+"/"+i+"/"+i2+".sh" + MakeExecutable(iconitem._CmdPath) + cur_page._Icons.append(iconitem) else: iconitem._MyType = ICON_TYPES["DIR"] iconitem._LinkPage = Page() From 98a8aa59fa1d63212decf1c8bf4ff2a4ae9d914e Mon Sep 17 00:00:00 2001 From: cuu Date: Sat, 14 Jul 2018 15:50:04 +0800 Subject: [PATCH 2/4] exec package search icon --- sys.py/UI/main_screen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys.py/UI/main_screen.py b/sys.py/UI/main_screen.py index 4ed60f6..f0d6430 100644 --- a/sys.py/UI/main_screen.py +++ b/sys.py/UI/main_screen.py @@ -407,7 +407,7 @@ class MainScreen(object): iconitem.AddLabel(i2,self._IconFont) if FileExists( _dir+"/"+i+"/"+i2+".png"): ### 20_Prog/Prog.png , cut 20_ iconitem._ImageName = _dir+"/"+i+"/"+i2+".png" - if FileExists( SkinMap(_dir+"/"+i2+".png") ): + elif FileExists( SkinMap(_dir+"/"+i2+".png") ): iconitem._ImageName = SkinMap(_dir+"/"+i2+".png") else: untitled = UntitledIcon() From 048e8aedcb6781acc0023ebaa5b7d76397c30387 Mon Sep 17 00:00:00 2001 From: cuu Date: Sat, 14 Jul 2018 16:06:34 +0800 Subject: [PATCH 3/4] add _Closed in main_screen --- sys.py/UI/main_screen.py | 6 ++++++ sys.py/config.py | 2 +- sys.py/run.py | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sys.py/UI/main_screen.py b/sys.py/UI/main_screen.py index f0d6430..928d1af 100644 --- a/sys.py/UI/main_screen.py +++ b/sys.py/UI/main_screen.py @@ -137,6 +137,7 @@ class MainScreen(object): _IconFont = fonts["varela15"] _SkinManager = None + _Closed = False _CounterScreen = None def __init__(self): @@ -349,6 +350,8 @@ class MainScreen(object): self._CanvasHWND.fill((255,255,255)) def SwapAndShow(self): + if self._Closed == True: + return if self._HWND != None: self._HWND.blit(self._CanvasHWND,(self._PosX,self._PosY,self._Width,self._Height)) pygame.display.update() @@ -557,6 +560,9 @@ class MainScreen(object): self._MsgBox.Draw() def Draw(self): + if self._Closed == True: + return + self._CurrentPage.Draw() #if self._HWND != None: # self._HWND.blit(self._CanvasHWND,(self._PosX,self._PosY,self._Width,self._Height)) diff --git a/sys.py/config.py b/sys.py/config.py index 09f1e9e..e2c271f 100644 --- a/sys.py/config.py +++ b/sys.py/config.py @@ -12,7 +12,7 @@ MPD_socket = "/tmp/mpd.socket" UPDATE_URL="https://raw.githubusercontent.com/clockworkpi/CPI/master/launcher_ver.json" -VERSION="stable 1.0" +VERSION="stable 1.1" SKIN="default" diff --git a/sys.py/run.py b/sys.py/run.py index e252cdf..57b6668 100644 --- a/sys.py/run.py +++ b/sys.py/run.py @@ -119,6 +119,7 @@ def RestoreLastBackLightBrightness(main_screen): passout_time_stage = 0 main_screen._TitleBar._InLowBackLight = -1 + main_screen._Closed = True if gobject_flash_led1 != -1: gobject.source_remove(gobject_flash_led1) @@ -220,7 +221,7 @@ def InspectionTeam(main_screen): main_screen._TitleBar._InLowBackLight = 0 - + main_screen._Closed = True if time_3 != 0: passout_time_stage = 2 # next From 45131fa3c211521a70131d3576d18f51a1b04829 Mon Sep 17 00:00:00 2001 From: cuu Date: Sat, 14 Jul 2018 16:10:43 +0800 Subject: [PATCH 4/4] ... --- sys.py/run.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys.py/run.py b/sys.py/run.py index 57b6668..3843db0 100644 --- a/sys.py/run.py +++ b/sys.py/run.py @@ -119,7 +119,7 @@ def RestoreLastBackLightBrightness(main_screen): passout_time_stage = 0 main_screen._TitleBar._InLowBackLight = -1 - main_screen._Closed = True + main_screen._Closed = False if gobject_flash_led1 != -1: gobject.source_remove(gobject_flash_led1)