title_bar hide the dlstatus icon

This commit is contained in:
cuu 2019-12-19 04:58:13 +00:00
parent 46b67bc12f
commit 9b1c89af4c
2 changed files with 32 additions and 15 deletions

View File

@ -146,7 +146,11 @@ class LoadHousePage(Page):
ret = False ret = False
self.Leave() self.Leave()
else:
self._Screen._MsgBox.SetText("Fetch house failed")
self._Screen._MsgBox.Draw()
self._Screen.SwapAndShow()
ret = False
return ret return ret
else: else:
return False return False
@ -183,7 +187,7 @@ class LoadHousePage(Page):
class ImageDownloadProcessPage(Page): class ImageDownloadProcessPage(Page):
_FootMsg = ["Nav.","","","Back","Cancel"] _FootMsg = ["Nav.","","","Back",""]
_DownloaderTimer = -1 _DownloaderTimer = -1
_Value = 0 _Value = 0
_URL = None _URL = None
@ -522,7 +526,7 @@ class GameStoreListItem(InfoPageListItem):
class GameStorePage(Page): class GameStorePage(Page):
_FootMsg = ["Nav","UpdateWare","Up","Back","Select"] _FootMsg = ["Nav","Update","Up","Back","Select"]
_MyList = [] _MyList = []
_ListFont12 = MyLangManager.TrFont("notosanscjk12") _ListFont12 = MyLangManager.TrFont("notosanscjk12")
_ListFont15 = MyLangManager.TrFont("varela15") _ListFont15 = MyLangManager.TrFont("varela15")
@ -546,11 +550,12 @@ class GameStorePage(Page):
Page.__init__(self) Page.__init__(self)
self._Icons = {} self._Icons = {}
self._MyStack = RPCStack() self._MyStack = RPCStack()
#title path type #title file type
## Two level url , only github.com
repos = [ repos = [
{"title":"github.com/cuu/gamestore","file":"https://raw.githubusercontent.com/cuu/gamestore/master/index.json","type":"source"} {"title":"github.com/clockworkpi/warehouse","file":"https://raw.githubusercontent.com/clockworkpi/warehouse/master/index.json","type":"source"}
] ]
self._MyStack.Push(repos) self._MyStack.Push(repos)
def GObjectUpdateProcessInterval(self): def GObjectUpdateProcessInterval(self):
@ -666,7 +671,12 @@ class GameStorePage(Page):
li.SetSmallText("") li.SetSmallText("")
self._MyList.append(li) self._MyList.append(li)
if self._PsIndex > len(self._MyList) - 1:
self._PsIndex = len(self._MyList) - 1
if self._PsIndex < 0:
self._PsIndex = 0
def Init(self): def Init(self):
if self._Screen != None: if self._Screen != None:
@ -696,7 +706,7 @@ class GameStorePage(Page):
self._Scroller._PosX = self._Width - 10 self._Scroller._PosX = self._Width - 10
self._Scroller._PosY = 2 self._Scroller._PosY = 2
self._Scroller.Init() self._Scroller.Init()
self._Scroller.SetCanvasHWND(self._HWND) self._Scroller.SetCanvasHWND(self._CanvasHWND)
self._remove_page = YesCancelConfirmPage() self._remove_page = YesCancelConfirmPage()
self._remove_page._Screen = self._Screen self._remove_page._Screen = self._Screen
@ -705,9 +715,9 @@ class GameStorePage(Page):
self._remove_page._Name ="Are you sure?" self._remove_page._Name ="Are you sure?"
self._remove_page.Init() self._remove_page.Init()
self._Keyboard = Keyboard() self._Keyboard = Keyboard()
self._Keyboard._Name = "Enter warehouse addr" self._Keyboard._Name = "Enter warehouse addr"
self._Keyboard._FootMsg = ["Nav.","Add","ABC","Backspace","Enter"]
self._Keyboard._Screen = self._Screen self._Keyboard._Screen = self._Screen
self._Keyboard.Init() self._Keyboard.Init()
self._Keyboard.SetPassword("github.com/clockworkpi/warehouse") self._Keyboard.SetPassword("github.com/clockworkpi/warehouse")
@ -976,7 +986,7 @@ class GameStorePage(Page):
print("OnLoadCb") print("OnLoadCb")
if self._MyStack.Length() == 1: if self._MyStack.Length() == 1:
self._FootMsg[2] = "Remove" self._FootMsg[2] = "Remove"
self._FootMsg[1] = "UpdateWare" self._FootMsg[1] = "Update"
else: else:
self._FootMsg[2] = "Remove" self._FootMsg[2] = "Remove"
self._FootMsg[1] = "Preview" self._FootMsg[1] = "Preview"
@ -989,7 +999,7 @@ class GameStorePage(Page):
if self._MyStack.Length() == 1: if self._MyStack.Length() == 1:
self._FootMsg[2] = "Remove" self._FootMsg[2] = "Remove"
self._FootMsg[1] = "UpdateWare" self._FootMsg[1] = "Update"
else: else:
self._FootMsg[2] = "Remove" self._FootMsg[2] = "Remove"
self._FootMsg[1] = "Preview" self._FootMsg[1] = "Preview"
@ -1010,10 +1020,13 @@ class GameStorePage(Page):
self._MyStack.Pop() self._MyStack.Pop()
if self._MyStack.Length() == 1: if self._MyStack.Length() == 1:
self._FootMsg[2] = "Remove" self._FootMsg[2] = "Remove"
self._FootMsg[1] = "UpdateWare" self._FootMsg[1] = "Update"
else: else:
self._FootMsg[2] = "Remove" self._FootMsg[2] = "Remove"
self._FootMsg[1] = "Preview" self._FootMsg[1] = "Preview"
if self._MyStack.Length() == 2:
self._FootMsg[2] = ""
self._FootMsg[1] = ""
self.SyncList() self.SyncList()
self._Screen.Draw() self._Screen.Draw()
@ -1030,10 +1043,14 @@ class GameStorePage(Page):
if self._MyStack.Length() == 1: if self._MyStack.Length() == 1:
self._FootMsg[2] = "Remove" self._FootMsg[2] = "Remove"
self._FootMsg[1] = "UpdateWare" self._FootMsg[1] = "Update"
else: else:
self._FootMsg[2] = "Remove" self._FootMsg[2] = "Remove"
self._FootMsg[1] = "Preview" self._FootMsg[1] = "Preview"
if self._MyStack.Length() == 2:
self._FootMsg[2] = ""
self._FootMsg[1] = ""
self._Screen.Draw() self._Screen.Draw()
self._Screen.SwapAndShow() self._Screen.SwapAndShow()

View File

@ -374,7 +374,7 @@ class TitleBar(Widget):
self._Icons["bluetooth"].Draw() self._Icons["bluetooth"].Draw()
self._Icons["dlstatus"].Draw() #self._Icons["dlstatus"].Draw()
pygame.draw.line(self._CanvasHWND,self._SkinManager.GiveColor("Line"),(0,self._BarHeight),(self._Width,self._BarHeight),self._BorderWidth) pygame.draw.line(self._CanvasHWND,self._SkinManager.GiveColor("Line"),(0,self._BarHeight),(self._Width,self._BarHeight),self._BorderWidth)