Merge branch 'master' of github.com:Taffer/launcher into codestyle-cleanup

Menu/GameShell/21_Warehouse/__init__.py

@@ -59,7 +59,6 @@ class RPCStack:
 
 class LoadHousePage(Page):
     _FootMsg = ["Nav.","","","Back","Cancel"]
-    _DownloaderTimer = -1
     _Value = 0
     _URL = None
     _ListFontObj = MyLangManager.TrFont("varela18")
@@ -188,7 +187,6 @@ class LoadHousePage(Page):
 
 class ImageDownloadProcessPage(Page):
     _FootMsg = ["Nav.","","","Back",""]
-    _DownloaderTimer = -1
     _Value = 0
     _URL = None
     _ListFontObj = MyLangManager.TrFont("varela13")
@@ -344,7 +342,9 @@ class Aria2DownloadProcessPage(Page):
         self._SizeLabel.Init("0/0Kb",MyLangManager.TrFont("varela12"))
         self._SizeLabel.SetColor( self._URLColor )
  
+    @property
     def GObjectUpdateProcessInterval(self):
+        downloaded = 0
         if self._Screen.CurPage() == self and self._GID is not None:
                 self._Value =  config.RPC.tellStatus(self._GID)
             
@@ -352,9 +352,9 @@ class Aria2DownloadProcessPage(Page):
                 total = 0
 
         if self._Value["status"] == "waiting":
-                    self._FileNameLabel.SetText( "waiting to download..." )
+            self._FileNameLabel.SetText("waiting to download...")
         if self._Value["status"] == "paused":
-                    self._FileNameLabel.SetText( "download paused..." )
+            self._FileNameLabel.SetText("download paused...")
         if self._Value["status"] == "error":
             self._FileNameLabel.SetText("download errors,cancel it please")
 
@@ -362,17 +362,16 @@ class Aria2DownloadProcessPage(Page):
             downloaded = self._Value["completedLength"]
             total = self._Value["totalLength"]
 
-                    downloaded = downloaded/1000.0/1000.0
+            downloaded = downloaded / 1000.0 / 1000.0
-                    total      = total/1000.0/1000.0
+            total = total / 1000.0 / 1000.0
 
-                self._SizeLabel.SetText( "%.2f" % downloaded+"/"+ "%.2f" % total +"Mb")
+        self._SizeLabel.SetText("%.2f" % downloaded+"/"+"%.2f" % total+"Mb")
 
         print("Progress: %d%%" % (self._Value))
         self._Screen.Draw()
         self._Screen.SwapAndShow()
         return True
-        else:
+
-            return False
     
     def CheckDownload(self,aria2_gid):
         self._GID = aria2_gid 
@@ -546,6 +545,8 @@ class GameStorePage(Page):
     _warehouse_db = "warehouse.db"
     _GobjTimer = -1
 
+    _Scrolled_cnt = 0
+
     def __init__(self):
         Page.__init__(self)
         self._Icons = {}
@@ -672,10 +673,7 @@ class GameStorePage(Page):
             
             self._MyList.append(li)
             
-            if self._PsIndex > len(self._MyList) - 1:
+        self.RefreshPsIndex()
-                self._PsIndex = len(self._MyList) - 1
-            if self._PsIndex < 0:
-                self._PsIndex = 0   
             
         
     def Init(self):
@@ -725,7 +723,7 @@ class GameStorePage(Page):
 
         self._PreviewPage = ImageDownloadProcessPage()
         self._PreviewPage._Screen = self._Screen
-        self._PreviewPage._Name = "preview"
+        self._PreviewPage._Name = "Preview"
         self._PreviewPage.Init()
 
         self._LoadHousePage = LoadHousePage()
@@ -867,7 +865,6 @@ class GameStorePage(Page):
             print("show keyboard to add ware house")
             self._Screen.PushCurPage()
             self._Screen.SetCurPage( self._Keyboard )
- 
         else:
             #download the game probably
             remote_file_url = cur_li._Value["file"]
@@ -902,7 +899,6 @@ class GameStorePage(Page):
                     pygame.time.delay(800)
                     self._Screen._TitleBar.Redraw()
 
-               
             else:
                 print("file downloaded")# maybe check it if is installed,then execute it
                 if cur_li._Value["type"]=="launcher" and cur_li._ReadOnly == False:
@@ -1005,7 +1001,6 @@ class GameStorePage(Page):
         self.SyncList()
  
     def OnReturnBackCb(self):
-
         if self._MyStack.Length() == 1:
             self._FootMsg[2] = "Remove"
             self._FootMsg[1] = "Update"
@@ -1014,6 +1009,8 @@ class GameStorePage(Page):
             self._FootMsg[1] = "Preview"
 
         self.SyncList()
+        self.RestoreScrolled()
+
         self._Screen.Draw()
         self._Screen.SwapAndShow()
        
@@ -1022,6 +1019,34 @@ class GameStorePage(Page):
         self._Screen.Draw()
         self._Screen.SwapAndShow()
         """
+
+    def ScrollDown(self):
+        if len(self._MyList) == 0:
+            return
+        self._PsIndex += 1
+        if self._PsIndex >= len(self._MyList):
+            self._PsIndex = len(self._MyList)-1
+
+        cur_li = self._MyList[self._PsIndex]
+        if cur_li._PosY+cur_li._Height > self._Height:
+            for i in range(0, len(self._MyList)):
+                self._MyList[i]._PosY -= self._MyList[i]._Height
+
+            self._Scrolled_cnt -= self._MyList[i]._Height
+
+    def ScrollUp(self):
+        if len(self._MyList) == 0:
+            return
+        self._PsIndex -= 1
+        if self._PsIndex < 0:
+            self._PsIndex = 0
+        cur_li = self._MyList[self._PsIndex]
+        if cur_li._PosY < 0:
+            for i in range(0, len(self._MyList)):
+                self._MyList[i]._PosY += self._MyList[i]._Height
+
+            self._Scrolled_cnt += self._MyList[i]._Height
+
     def KeyDown(self,event):
         if IsKeyMenuOrB(event.key):
 
@@ -1094,11 +1119,15 @@ class GameStorePage(Page):
             self.ScrollUp()
             self._Screen.Draw()
             self._Screen.SwapAndShow()
+
         if event.key == CurKeys["Down"]:
             self.ScrollDown()
             self._Screen.Draw()
             self._Screen.SwapAndShow()
 
+    def RestoreScrolled(self):
+        for i in range(0, len(self._MyList)):
+            self._MyList[i]._PosY += self._Scrolled_cnt
 
     def Draw(self):