From d1313522914179a46c3e34b6ab9bdb77b391699b Mon Sep 17 00:00:00 2001 From: cuu Date: Mon, 28 May 2018 12:48:39 +0800 Subject: [PATCH] switching status wallpaper during updating,remove confirmation while deleting in game favourite list --- .../GameShell/10_Settings/Storage/__init__.py | 3 ++- Menu/GameShell/10_Settings/Update/__init__.py | 2 +- Menu/GameShell/10_Settings/Wifi/keyboard.py | 2 +- Menu/GameShell/10_Settings/list_page.py | 2 +- sys.py/UI/Emulator/fav_list_page.py | 25 +++++++++++++------ 5 files changed, 23 insertions(+), 11 deletions(-) diff --git a/Menu/GameShell/10_Settings/Storage/__init__.py b/Menu/GameShell/10_Settings/Storage/__init__.py index 8a9c545..76ba5ca 100644 --- a/Menu/GameShell/10_Settings/Storage/__init__.py +++ b/Menu/GameShell/10_Settings/Storage/__init__.py @@ -28,6 +28,7 @@ class StoragePage(Page): _DskUsg = None _HighColor = pygame.Color(51,166,255) + _FootMsg = ["Nav.","","","Back",""] def __init__(self): Page.__init__(self) @@ -97,7 +98,7 @@ class StoragePage(Page): rect_ = midRect(self._Width/2,self._Height-30,170,17, Width,Height) - aa_round_rect(self._CanvasHWND,rect_, (238,238,238),5,0,(238,238,238)) + aa_round_rect(self._CanvasHWND,rect_, (193,193,193),5,0,(193,193,193)) rect2 = midRect(self._Width/2,self._Height-30,int(170*(1.0-usage_percent)),17, Width,Height) diff --git a/Menu/GameShell/10_Settings/Update/__init__.py b/Menu/GameShell/10_Settings/Update/__init__.py index 1148769..9ad2825 100644 --- a/Menu/GameShell/10_Settings/Update/__init__.py +++ b/Menu/GameShell/10_Settings/Update/__init__.py @@ -111,7 +111,7 @@ class UpdateConfirmPage(ConfirmPage): if event.key == CurKeys["B"]: if self._GIT == True: - cmdpath = "cd /home/cpi/apps/launcher ;git pull; git reset --hard %s " % self._Version + cmdpath = "feh --bg-center /home/cpi/apps/launcher/sys.py/gameshell/wallpaper/updating.png; cd /home/cpi/apps/launcher ;git pull; git reset --hard %s ; feh --bg-center /home/cpi/apps/launcher/sys.py/gameshell/wallpaper/loading.png " % self._Version pygame.event.post( pygame.event.Event(RUNEVT, message=cmdpath)) self._GIT = False return diff --git a/Menu/GameShell/10_Settings/Wifi/keyboard.py b/Menu/GameShell/10_Settings/Wifi/keyboard.py index bc02564..a6bfca9 100644 --- a/Menu/GameShell/10_Settings/Wifi/keyboard.py +++ b/Menu/GameShell/10_Settings/Wifi/keyboard.py @@ -52,7 +52,7 @@ class KeyboardSelector(PageSelector): if rect.width <=0 or rect.height <= 0 : return - aa_round_rect(self._Parent._CanvasHWND,rect, (126,206,244),4,1,(255,255,255)) + aa_round_rect(self._Parent._CanvasHWND,rect, (126,206,244),3,0,(126,206,244)) # pygame.draw.rect(self._Parent._CanvasHWND,(0,0,0),rect,1) class Keyboard(Page): diff --git a/Menu/GameShell/10_Settings/list_page.py b/Menu/GameShell/10_Settings/list_page.py index 430ba51..add612e 100644 --- a/Menu/GameShell/10_Settings/list_page.py +++ b/Menu/GameShell/10_Settings/list_page.py @@ -82,7 +82,7 @@ class ListPage(Page): ["","Storage",""], ["","Update", ""], ["","About", "About"], - ["","PowerOFF","PowerOFF"]] + ["","PowerOFF","Power off"]] start_x = 0 start_y = 0 diff --git a/sys.py/UI/Emulator/fav_list_page.py b/sys.py/UI/Emulator/fav_list_page.py index 4692566..09890c6 100644 --- a/sys.py/UI/Emulator/fav_list_page.py +++ b/sys.py/UI/Emulator/fav_list_page.py @@ -383,15 +383,26 @@ class FavListPage(Page): cur_li = self._MyList[self._PsIndex] if cur_li.IsFile(): - - self._Parent.FavDeleteConfirmPage.SetFileName(cur_li._Path) - self._Parent.FavDeleteConfirmPage.SetTrashDir(self._Emulator["ROM"])## Fav delete,return to ROM dir,not .Trash - - self._Screen.PushCurPage() - self._Screen.SetCurPage(self._Parent.FavDeleteConfirmPage) + """ + #self._Parent.FavDeleteConfirmPage.SetFileName(cur_li._Path) + #self._Parent.FavDeleteConfirmPage.SetTrashDir(self._Emulator["ROM"])## Fav delete,return to ROM dir,not .Trash + #self._Screen.PushCurPage() + #self._Screen.SetCurPage(self._Parent.FavDeleteConfirmPage) + #self._Screen.Draw() + #self._Screen.SwapAndShow() + """ + + #delete directly without confirm dialog + stats = os.stat(cur_li._Path) + os.chown(self._FileName, stats.st_uid,stats.st_uid) ## normally uid and gid should be the same + self._Screen._MsgBox.SetText("Deleting...") + self._Screen._MsgBox.Draw() + self._Screen.SwapAndShow() + pygame.time.delay(600) + self.ReScan() self._Screen.Draw() self._Screen.SwapAndShow() - + def Draw(self): self.ClearCanvas()