Merge branch 'gcores' of https://github.com/cuu/launcher into gcores

.cpirc

@@ -1,9 +1,9 @@
 SCREEN=`cat /sys/class/graphics/fb0/modes`
 
-XORG_CONF="~/launcher/.xorg.conf"
-if [ -f ~/.lima ]
+XORG_CONF="/home/cpi/launcher/.xorg.conf"
+if [ -f /home/cpi/.lima ]
 then
-XORG_CONF="~/launcher/.xorg_lima.conf"
+XORG_CONF="/home/cpi/launcher/.xorg_lima.conf"
 fi
 
 if [ -f /tmp/autologin ]

LICENSE

@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

Menu/GameShell/10_Settings/About/__init__.py

@@ -329,7 +329,7 @@ class AboutPage(Page):
             self._DrawOnce = True
             
         if self._HWND != None:
-            self._HWND.fill((255,255,255))
+            self._HWND.fill( MySkinManager.GiveColor("White")  )
             
             self._HWND.blit(self._CanvasHWND,(self._PosX,self._PosY,self._Width, self._Height ) )
             

Menu/GameShell/10_Settings/Bluetooth/__init__.py

@@ -71,7 +71,7 @@ class BleForgetConfirmPage(ConfirmPage):
 
 
 class BleInfoPageSelector(PageSelector):
-    _BackgroundColor = MySkinManager.GiveColor('Front')
+    _BackgroundColor = MySkinManager.GiveColor('Line')
 
     def __init__(self):
         self._PosX = 0
@@ -92,8 +92,9 @@ class BleInfoPageSelector(PageSelector):
             self._PosY = y
             self._Height = h
 
-            aa_round_rect(self._Parent._CanvasHWND,  
-                          (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
+            #aa_round_rect(self._Parent._CanvasHWND,  
+            #              (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
+            pygame.draw.rect(self._Parent._CanvasHWND,self._BackgroundColor,(x,y,self._Width-4,h),0)
 
 class BleInfoPage(Page):
     _FootMsg =  ["Nav","Forget","Disconnect","Back",""]
@@ -315,7 +316,7 @@ class BleInfoPage(Page):
             
 
 class BleListSelector(PageSelector):
-    _BackgroundColor = MySkinManager.GiveColor('Front')
+    _BackgroundColor = MySkinManager.GiveColor('Line')
 
     def __init__(self):
         self._PosX = 0
@@ -336,8 +337,9 @@ class BleListSelector(PageSelector):
             self._PosY = y
             self._Height = h
 
-            aa_round_rect(self._Parent._CanvasHWND,  
-                          (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
+            #aa_round_rect(self._Parent._CanvasHWND,  
+            #              (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
+            pygame.draw.rect(self._Parent._CanvasHWND,self._BackgroundColor, (x,y,self._Width-4,h),0 )
 
 class BleListMessageBox(Label):
     _Parent = None
@@ -351,7 +353,7 @@ class BleListMessageBox(Label):
         padding = 10 
         pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('White'),(x-padding,y-padding, w+padding*2,h+padding*2))
 
-        pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Black'),(x-padding,y-padding, w+padding*2,h+padding*2),1)
+        pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'),(x-padding,y-padding, w+padding*2,h+padding*2),1)
 
         self._CanvasHWND.blit(my_text,(x,y,w,h))
 

Menu/GameShell/10_Settings/GateWay/__init__.py

@@ -38,8 +38,9 @@ class ListPageSelector(InfoPageSelector):
             self._PosY = y
             self._Height = h
             
-            aa_round_rect(self._Parent._CanvasHWND,  
-                          (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
+            #aa_round_rect(self._Parent._CanvasHWND,  
+            #              (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
+            pygame.draw.rect(self._Parent._CanvasHWND,self._BackgroundColor,(x,y,self._Width-4,h) ,0)
 
 
 class PageListItem(InfoPageListItem):

Menu/GameShell/10_Settings/Languages/__init__.py

@@ -37,9 +37,9 @@ class ListPageSelector(InfoPageSelector):
             self._PosY = y
             self._Height = h
             
-            aa_round_rect(self._Parent._CanvasHWND,  
-                          (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
-
+            #aa_round_rect(self._Parent._CanvasHWND,  
+            #              (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
+            pygame.draw.rect(self._Parent._CanvasHWND,self._BackgroundColor,(x,y,self._Width-4,h) ,0)
 
 class PageListItem(InfoPageListItem):
     _PosX = 0

Menu/GameShell/10_Settings/Lima/__init__.py

@@ -37,9 +37,10 @@ class ListPageSelector(InfoPageSelector):
             self._PosY = y
             self._Height = h
             
-            aa_round_rect(self._Parent._CanvasHWND,  
-                          (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
-
+            #aa_round_rect(self._Parent._CanvasHWND,  
+            #              (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
+            
+            pygame.draw.rect(self._Parent._CanvasHWND,self._BackgroundColor,(x,y,self._Width-4,h) ,0)
 
 class PageListItem(InfoPageListItem):
     _PosX = 0

Menu/GameShell/10_Settings/PowerOptions/__init__.py

@@ -24,7 +24,7 @@ from UI.lang_manager import MyLangManager
 import config
 
 class ListPageSelector(PageSelector):
-    _BackgroundColor = MySkinManager.GiveColor('Front')
+    _BackgroundColor = MySkinManager.GiveColor('Line')
 
     def __init__(self):
         self._PosX = 0
@@ -47,9 +47,9 @@ class ListPageSelector(PageSelector):
             self._PosY = y
             self._Height = h
             
-            aa_round_rect(self._Parent._CanvasHWND,  
-                          (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
-
+            #aa_round_rect(self._Parent._CanvasHWND,  
+            #              (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
+            pygame.draw.rect(self._Parent._CanvasHWND,self._BackgroundColor,(x,y,self._Width-4,h),0 )
 
 class PageListItem(object):
     _PosX = 0

Menu/GameShell/10_Settings/Storage/__init__.py

@@ -67,7 +67,7 @@ class StoragePage(Page):
         
         self._FreeLabel = Label()
         self._FreeLabel.SetCanvasHWND(self._CanvasHWND)
-        self._FreeLabel.Init("FREE",MySkinManager.GiveFont("Eurostile12"))
+        self._FreeLabel.Init("FREE",MySkinManager.GiveFont("varela12"))
         self._FreeLabel.SetColor(self._PctLabel._Color)
 
         

Menu/GameShell/10_Settings/Time/timezone_lib_list_page.py

@@ -50,7 +50,7 @@ class TimeLibStack:
         return len(self.stack)
 
 class ListPageSelector(PageSelector):
-    _BackgroundColor = MySkinManager.GiveColor('Front')
+    _BackgroundColor = MySkinManager.GiveColor('Line')
 
     def __init__(self):
         self._PosX = 0
@@ -73,9 +73,9 @@ class ListPageSelector(PageSelector):
             self._PosY = y
             self._Height = h
             
-            aa_round_rect(self._Parent._CanvasHWND,  
-                          (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
-
+            #aa_round_rect(self._Parent._CanvasHWND,  
+            #              (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
+            pygame.draw.rect(self._Parent._CanvasHWND,self._BackgroundColor,(x,y,self._Width-4,h),0)
 
 
 class TimezoneListPage(Page):

Menu/GameShell/10_Settings/Wifi/wifi_list.py

@@ -202,7 +202,7 @@ class WifiInfoPage(Page):
         
     
 class WifiListSelector(PageSelector):
-    _BackgroundColor = MySkinManager.GiveColor('Front')
+    _BackgroundColor = MySkinManager.GiveColor('Line')
 
     def __init__(self):
         pass
@@ -222,9 +222,9 @@ class WifiListSelector(PageSelector):
             self._PosY = y
             self._Height = h
 
-            aa_round_rect(self._Parent._CanvasHWND,  
-                          (x,y,self._Width,h),self._BackgroundColor,4,0,self._BackgroundColor)
-
+            #aa_round_rect(self._Parent._CanvasHWND,  
+            #              (x,y,self._Width,h),self._BackgroundColor,4,0,self._BackgroundColor)
+            pygame.draw.rect(self._Parent._CanvasHWND,self._BackgroundColor,(x,y,self._Width,h),0)
 
 class WifiListMessageBox(Label):
     _Parent = None
@@ -238,7 +238,7 @@ class WifiListMessageBox(Label):
         padding = 10 
         pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('White'),(x-padding,y-padding, w+padding*2,h+padding*2))        
 
-        pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Black'),(x-padding,y-padding, w+padding*2,h+padding*2),1)
+        pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'),(x-padding,y-padding, w+padding*2,h+padding*2),1)
 
         self._CanvasHWND.blit(my_text,(x,y,w,h))
 
@@ -621,8 +621,8 @@ class WifiList(Page):
                 for i in wicd_wirelss_encrypt_pwd:
                     if "preshared_key" in i:
                         if i["preshared_key"] != None:
-                            if len(i["preshared_key"]) > 0:
-                                thepass = i["preshared_key"]
+                            if len(str(i["preshared_key"])) > 0:
+                                thepass = str(i["preshared_key"])
                                 break
                 
                 myvars.PasswordPage.SetPassword(thepass)

Menu/GameShell/10_Settings/list_page.py

@@ -55,7 +55,7 @@ class ListPage(Page):
                          ["","PowerOptions","Power Options"],
                          ["","Wifi","Wi-Fi"],
                          ["","Bluetooth","Bluetooth"],
-                         ["","Sound","Sound Volume"],
+                         ["","Sound","Sound  Volume"],
                          ["","Brightness","BackLight Brightness"],
                          ["","Storage",""],
                          ["","Time","Timezone"],
@@ -63,11 +63,11 @@ class ListPage(Page):
                          ["","Notification","Notification"],
                          ["","Update", ""],
                          ["","About",  "About"],
-                         ["","PowerOFF","Power off"],
+                         ["","PowerOFF","Power OFF"],
                          ["","ButtonsLayout","Buttons Layout"],
-                         ["","LauncherGo","Switch to LauncherGo"],
-                         ["","Lima","GPU driver switch"],
-                         ["","GateWay","Network gateway switch"]]
+                         #["","LauncherGo","Switch to LauncherGo"],
+                         ["","Lima","GPU Driver Switch"],
+                         ["","GateWay","Network Gateway Switch"]]
 
         start_x  = 0
         start_y  = 0

Menu/GameShell/50_PICO-8/compkginfo.json

@@ -3,7 +3,6 @@
 "InstallDir":"pico-8",
 "NotFoundMsg":["Please purchase the PICO-8 \n|None|varela16",
 "and copy it to the \"~/games/PICO-8\"|None|varela16"],
-
-"MD5":{"pico-8_0.1.11g_raspi.zip":"a3f2995cf117499f880bd964d6a0e1f2","pico-8_0.1.11g_amd64.zip":"6726141c784afd4a41be6b7414c1b932","pico-8_0.1.12_raspi.zip":"08eda95570e63089a2b9f5531503431e"},
+"MD5":{"pico-8_0.1.11g_raspi.zip":"a3f2995cf117499f880bd964d6a0e1f2","pico-8_0.1.11g_amd64.zip":"6726141c784afd4a41be6b7414c1b932","pico-8_0.1.12_raspi.zip":"08eda95570e63089a2b9f5531503431e","pico-8_0.1.12c_raspi.zip":"1a62b0d7d4e4be65f89f23ec9757cb66","pico-8.zip":"whatever it takes"},
 "Post-Up":"bash Post-Up.sh" 
 }

Menu/GameShell/97_Music Player/mpd_spectrum_page.py

@@ -163,22 +163,22 @@ class MPDSpectrumPage(Page):
 
         self._song_title = Label()
         self._song_title.SetCanvasHWND(self._RollCanvas)
-        self._song_title.Init("Untitled",self._SongFont,MySkinManager.GiveColor('White'))
+        self._song_title.Init("Untitled",self._SongFont,MySkinManager.GiveColor('Text'))
 
 
         self._title = Label()
         self._title.SetCanvasHWND(self._CanvasHWND)
-        self._title.Init("Title:",self._ListFont,MySkinManager.GiveColor('White'))
+        self._title.Init("Title:",self._ListFont,MySkinManager.GiveColor('Text'))
 
         self._time = Label()
         self._time.SetCanvasHWND(self._CanvasHWND)
-        self._time.Init("Time:",self._ListFont,MySkinManager.GiveColor('White'))        
+        self._time.Init("Time:",self._ListFont,MySkinManager.GiveColor('Text'))        
 
 
         self._time2 = Label()
         self._time2.SetCanvasHWND(self._CanvasHWND)
         self._time2.Init("00:00-00:00", self._ListFont,
-                         MySkinManager.GiveColor('White'))
+                         MySkinManager.GiveColor('Text'))
 
         
         self.Start()
@@ -336,7 +336,7 @@ class MPDSpectrumPage(Page):
     
         if self._RollCanvas != None:
 #            self._RollCanvas.fill((111,22,33))
-            self._RollCanvas.fill(MySkinManager.GiveColor('Black'))
+            self._RollCanvas.fill(MySkinManager.GiveColor('White'))
             if self._song_title._Width > self._RollW:
                 if (self._song_title._PosX + self._song_title._Width) > self._RollW and self._frames % 30 == 0:
                     self._song_title._PosX -= 1
@@ -410,9 +410,9 @@ class MPDSpectrumPage(Page):
                 else:
                     self._capYPositionArray[i] = value
 
-                pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('White'),(i*(bw+gap)+margin_left,self._Height-gap-self._capYPositionArray[i]-margin_bottom,bw,gap),0)
+                pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'),(i*(bw+gap)+margin_left,self._Height-gap-self._capYPositionArray[i]-margin_bottom,bw,gap),0)
                 
-                pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('White'),(i*(bw+gap)+margin_left,self._Height-value-gap-margin_bottom,bw,value+gap),0)
+                pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'),(i*(bw+gap)+margin_left,self._Height-value-gap-margin_bottom,bw,value+gap),0)
                 
                 self._vis_values[i] -= 2       
 

Menu/GameShell/97_Music Player/music_lib_list_page.py

@@ -2,7 +2,7 @@
 import os
 import pygame
 
-from libs.roundrects import aa_round_rect
+#from libs.roundrects import aa_round_rect
 
 ## local UI import
 from UI.constants import Width,Height,ICON_TYPES
@@ -49,7 +49,7 @@ class MusicLibStack:
         return len(self.stack)
 
 class ListPageSelector(PageSelector):
-    _BackgroundColor = MySkinManager.GiveColor('Front')
+    _BackgroundColor = MySkinManager.GiveColor('Line')
 
     def __init__(self):
         self._PosX = 0
@@ -72,9 +72,9 @@ class ListPageSelector(PageSelector):
             self._PosY = y
             self._Height = h
             
-            aa_round_rect(self._Parent._CanvasHWND,  
-                          (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
-
+            #aa_round_rect(self._Parent._CanvasHWND,  
+            #              (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
+            pygame.draw.rect(self._Parent._CanvasHWND,self._BackgroundColor,(x,y,self._Width-4,h),0)
 
 
 class MusicLibListPage(Page):
@@ -184,8 +184,8 @@ class MusicLibListPage(Page):
         self._BGpng._ImgSurf = MyIconPool._Icons["empty"]
         self._BGpng._MyType = ICON_TYPES["STAT"]
         self._BGpng._Parent = self
-        self._BGpng.AddLabel(MyLangManager.Tr("Please upload data over Wi-Fi"), MyLangManager.TrFont("varela22"))
-        self._BGpng.SetLableColor(MySkinManager.GiveColor('Disabled'))
+        self._BGpng.AddLabel(MyLangManager.Tr("Please upload data over Wi-Fi"), MyLangManager.TrFont("varela18"))
+        self._BGpng.SetLableColor(MySkinManager.GiveColor('Text'))
         self._BGpng.Adjust(0,0,self._BGwidth,self._BGheight,0)
 
 

Menu/GameShell/97_Music Player/play_list_page.py

@@ -3,7 +3,7 @@ import os
 import pygame
 import gobject
 
-from libs.roundrects import aa_round_rect
+#from libs.roundrects import aa_round_rect
 
 ## local UI import
 from UI.constants import Width,Height,ICON_TYPES
@@ -23,7 +23,7 @@ from list_item  import ListItem
 import myvars
 
 class ListPageSelector(PageSelector):
-    _BackgroundColor = MySkinManager.GiveColor('Front')
+    _BackgroundColor = MySkinManager.GiveColor('Line')
 
     def __init__(self):
         self._PosX = 0
@@ -51,9 +51,9 @@ class ListPageSelector(PageSelector):
         self._PosY = y
         self._Height = h
 
-        aa_round_rect(self._Parent._CanvasHWND,  
-                      (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
-        
+        #aa_round_rect(self._Parent._CanvasHWND,  
+        #              (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
+        pygame.draw.rect(self._Parent._CanvasHWND,self._BackgroundColor,(x,y,self._Width-4,h),0)
 
 
 class PlayListPage(Page):
@@ -184,7 +184,7 @@ class PlayListPage(Page):
         self._BGpng._MyType = ICON_TYPES["STAT"]
         self._BGpng._Parent = self
         self._BGpng.AddLabel(MyLangManager.Tr("my favorite music"), MyLangManager.TrFont("varela18"))
-        self._BGpng.SetLableColor(MySkinManager.GiveColor('Disabled'))
+        self._BGpng.SetLableColor(MySkinManager.GiveColor('Text'))
         self._BGpng.Adjust(0,0,self._BGwidth,self._BGheight,0)
 
         self._Scroller = ListScroller()

Menu/GameShell/98_TinyCloud/__init__.py

@@ -18,8 +18,9 @@ class TinyCloudPage(Page):
     _FootMsg =  ["Nav","","","Back",""]
     _MyList = []
     
-    _ListFontObj = MyLangManager.TrFont("varela13")
-    
+    _ListFontObj = MyLangManager.TrFont("veramono13")
+    _ListLabelFontObj = MyLangManager.TrFont("varela13")
+
     _AList = {}
     _Labels = {}
 
@@ -117,17 +118,21 @@ class TinyCloudPage(Page):
             self._IP = "xxx.xxx.xxx.xxx"
         
         labels = \
-        [["forssh","For ssh and scp:",self._ListFontObj,self._TextColor],
+        [["forssh","For ssh and scp:",self._ListLabelFontObj,self._TextColor],
          ["ssh_addr","ssh cpi@%s" % self._IP, self._ListFontObj,self._URLColor],
-         ["forwin", "For Windows network:",    self._ListFontObj, self._TextColor],
+         
+         ["forwin", "For Windows network:",    self._ListLabelFontObj, self._TextColor],
          ["samba_games", "\\\\%s\games" % self._IP, self._ListFontObj,self._URLColor],
          ["samba_music", "\\\\%s\music" % self._IP, self._ListFontObj,self._URLColor],
-         ["forID",      "ID:",                     self._ListFontObj, self._TextColor],
-         ["forKey",     "Key:",                    self._ListFontObj, self._TextColor],
+         
+         ["forID",      "ID:",                     self._ListLabelFontObj, self._TextColor],
+         ["forKey",     "Key:",                    self._ListLabelFontObj, self._TextColor],
          ["key_and_pass", "cpi",                   self._ListFontObj, self._URLColor],
-         ["for_airplay", "Airplay:",               self._ListFontObj, self._TextColor],
+         
+         ["for_airplay", "Airplay:",               self._ListLabelFontObj, self._TextColor],
          ["airplay_name","clockworkpi",            self._ListFontObj, self._URLColor],
-         ["for-usb-eth","USB-Ethernet:",            self._ListFontObj, self._TextColor],
+         
+         ["for-usb-eth","USB-Ethernet:",            self._ListLabelFontObj, self._TextColor],
          ["usb-eth-addr","192.168.10.1",            self._ListFontObj, self._URLColor]]
 
         for i in labels:

sys.py/UI/Emulator/fav_list_page.py

@@ -4,7 +4,7 @@ import os
 import pygame
 import glob
 import time
-from libs.roundrects import aa_round_rect
+#from libs.roundrects import aa_round_rect
 
 ## local UI import
 from UI.constants import Width,Height,ICON_TYPES,RUNEVT
@@ -52,7 +52,7 @@ class FavStack:
         return len(self.stack)
 
 class ListPageSelector(PageSelector):
-    _BackgroundColor = MySkinManager.GiveColor('Front')
+    _BackgroundColor = MySkinManager.GiveColor('Line')
 
     def __init__(self):
         self._PosX = 0
@@ -82,9 +82,9 @@ class ListPageSelector(PageSelector):
         self._PosY = y
         self._Height = h
 
-        aa_round_rect(self._Parent._CanvasHWND,  
-                    (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
-
+        #aa_round_rect(self._Parent._CanvasHWND,  
+        #            (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
+        pygame.draw.rect(self._Parent._CanvasHWND,self._BackgroundColor,(x,y,self._Width-4,h),0)
 
 
 class FavListPage(Page):
@@ -129,8 +129,11 @@ class FavListPage(Page):
                     stats = os.stat(v)
                     if stats.st_gid != self._Parent._FavGID: ## only favs
                         continue
+                    try:
+                        dirmap["gamedir"] = v.decode("utf8","ignore")
+                    except:
+                        dirmap["gamedir"] = v.decode("ascii","ignore")
                     
-                    dirmap["gamedir"] = v.decode("utf8")
                     ret.append(dirmap)            
             if os.path.isfile(v) and self._Emulator["FILETYPE"] == "file":
                 stats = os.stat(v)
@@ -141,7 +144,11 @@ class FavListPage(Page):
                     pieces  = bname.split(".")
                     if len(pieces) > 1:
                         if pieces[ len(pieces)-1   ].lower() in self._Emulator["EXT"]:
-                            dirmap["file"] = v.decode("utf8")
+                            try:
+                                dirmap["file"] = v.decode("utf8","ignore")
+                            except:
+                                dirmap["file"] = v.decode("ascii","ignore")
+                            
                             ret.append(dirmap)
                 
 #            else:
@@ -231,7 +238,7 @@ class FavListPage(Page):
         bgpng._MyType = ICON_TYPES["STAT"]
         bgpng._Parent = self
         bgpng.AddLabel(MyLangManager.Tr("MyFavGames"), MyLangManager.TrFont("varela18"))
-        bgpng.SetLableColor(MySkinManager.GiveColor('Disabled'))
+        bgpng.SetLableColor(MySkinManager.GiveColor('Text'))
         bgpng.Adjust(0,0,self._BGwidth,self._BGheight,0)
 
         self._Icons["bg"] = bgpng

sys.py/UI/Emulator/rom_list_page.py

@@ -11,7 +11,7 @@ import validators
 #from pySmartDL import SmartDL
 import time
 
-from libs.roundrects import aa_round_rect
+#from libs.roundrects import aa_round_rect
 
 ## local UI import
 from UI.constants import Width,Height,ICON_TYPES,RUNEVT
@@ -59,7 +59,7 @@ class RomStack:
         return len(self.stack)
 
 class ListPageSelector(PageSelector):
-    _BackgroundColor = MySkinManager.GiveColor('Front')
+    _BackgroundColor = MySkinManager.GiveColor('Line')
 
     def __init__(self):
         self._PosX = 0
@@ -89,8 +89,9 @@ class ListPageSelector(PageSelector):
         self._PosY = y
         self._Height = h
 
-        aa_round_rect(self._Parent._CanvasHWND,  
-                    (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
+#        aa_round_rect(self._Parent._CanvasHWND,  
+#                    (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
+        pygame.draw.rect(self._Parent._CanvasHWND,self._BackgroundColor,(x,y,self._Width-4,h),0)
 
 
 
@@ -143,7 +144,11 @@ class RomListPage(Page):
                     continue
                 
                 if FileExists(v+"/"+gameshell_bat):
-                    dirmap["gamedir"] = v.decode("utf8")
+                    try:
+                        dirmap["gamedir"] = v.decode("utf8","ignore")
+                    except:
+                        dirmap["gamedir"] = v.decode("ascii","ignore")
+                    
                     ret.append(dirmap)
             if os.path.isfile(v) and self._Emulator["FILETYPE"] == "file":
                 stats = os.stat(v)
@@ -162,7 +167,11 @@ class RomListPage(Page):
                         pieces  = bname.split(".")
                         if len(pieces) > 1:
                             if pieces[ len(pieces)-1   ].lower() in self._Emulator["EXT"]:
-                                dirmap["file"] = v.decode("utf8")
+                                try:
+                                    dirmap["file"] = v.decode("utf8","ignore")
+                                except:
+                                    dirmap["file"] = v.decode("ascii","ignore")
+                                
                                 ret.append(dirmap)
 #            else:
 #                print("not file or dir")
@@ -264,8 +273,8 @@ class RomListPage(Page):
         bgpng._ImgSurf = MyIconPool._Icons["empty"]
         bgpng._MyType = ICON_TYPES["STAT"]
         bgpng._Parent = self
-        bgpng.AddLabel(MyLangManager.Tr("Please upload data over Wi-Fi"), MyLangManager.TrFont("varela22"))
-        bgpng.SetLableColor(MySkinManager.GiveColor('Disabled'))
+        bgpng.AddLabel(MyLangManager.Tr("Please upload data over Wi-Fi"), MyLangManager.TrFont("varela18"))
+        bgpng.SetLableColor(MySkinManager.GiveColor('Text'))
         bgpng.Adjust(0,0,self._BGwidth,self._BGheight,0)
 
         self._Icons["bg"] = bgpng

sys.py/UI/Emulator/rom_so_confirm_page.py

@@ -10,7 +10,7 @@ import gobject
 import validators
 #from pySmartDL import SmartDL
 
-from libs.roundrects import aa_round_rect
+#from libs.roundrects import aa_round_rect
 
 from UI.confirm_page import ConfirmPage
 from UI.download_process_page import DownloadProcessPage

sys.py/UI/above_all_patch.py

@@ -31,7 +31,7 @@ class AboveAllPatch(Widget):
     _FontObj=  MyLangManager.TrFont("veramono20")
     _Parent =None
     _Color = MySkinManager.GiveColor('Text')
-    _ValColor = MySkinManager.GiveColor('URL')
+    _ValColor = MySkinManager.GiveColor('Text')
     _CanvasHWND = None
     _TextSurf = None
     _Icons   = {}
@@ -130,5 +130,6 @@ class SoundPatch(AboveAllPatch):
             #w = 10,h = 40
             vol_rect = pygame.Rect(80+i*20, self._Height/2+20,10, 40)
             
-            aa_round_rect(self._CanvasHWND,vol_rect,MySkinManager.GiveColor("Front"),3,0,MySkinManager.GiveColor("Front"))
+            pygame.draw.rect(self._CanvasHWND,self._ValColor,vol_rect,0)
+            #aa_round_rect(self._CanvasHWND,vol_rect,self._ValColor,3,0,self._ValColor)
     

sys.py/UI/counter_screen.py

@@ -24,7 +24,7 @@ class CounterScreen(FullScreen):
     _NumberLabel = None
     
     _BGColor = MySkinManager.GiveColor('Black')
-    _FGColor = MySkinManager.GiveColor('White')
+    _FGColor = MySkinManager.GiveColor('Text')
     
     _Counting = False
     _Number = 10

sys.py/UI/download_process_page.py

@@ -75,11 +75,11 @@ class DownloadProcessPage(Page):
         
         self._FileNameLabel = Label()
         self._FileNameLabel.SetCanvasHWND(self._CanvasHWND)
-        self._FileNameLabel.Init("", fonts["varela12"])
+        self._FileNameLabel.Init("", MyLangManager.TrFont("varela12"))
 
         self._SizeLabel = Label()
         self._SizeLabel.SetCanvasHWND(self._CanvasHWND)
-        self._SizeLabel.Init("0/0Kb",fonts["varela12"])
+        self._SizeLabel.Init("0/0Kb",MyLangManager.TrFont("varela12"))
         self._SizeLabel.SetColor( self._URLColor )
 
         

sys.py/UI/icon_item.py

@@ -73,8 +73,8 @@ class IconItem(Widget):
         if self._ImgSurf == None and self._ImageName != "":
 #            print(self._ImageName)
             self._ImgSurf = pygame.image.load( self._ImageName ).convert_alpha() 
-            if self._ImgSurf.get_width() > icon_width or self._ImgSurf.get_height() > icon_height:
-                self._ImgSurf = pygame.transform.scale(self._ImgSurf,(icon_width,icon_height))
+            #if self._ImgSurf.get_width() > icon_width or self._ImgSurf.get_height() > icon_height:
+            #    self._ImgSurf = pygame.transform.scale(self._ImgSurf,(icon_width,icon_height))
    
     def ChangeImgSurfColor(self,color):
         color_surface(self._ImgSurf,color)

sys.py/UI/info_page_selector.py

@@ -8,7 +8,7 @@ from UI.page   import Page,PageSelector
 from UI.skin_manager import MySkinManager
 
 class InfoPageSelector(PageSelector):
-    _BackgroundColor = MySkinManager.GiveColor('Front')
+    _BackgroundColor = MySkinManager.GiveColor('Line')
 
     def __init__(self):
         self._Width  = Width
@@ -25,5 +25,6 @@ class InfoPageSelector(PageSelector):
             self._PosY = y
             self._Height = h
             
-            aa_round_rect(self._Parent._CanvasHWND,  
-                          (self._PosX,self._PosY,self._Width-4,self._Height),self._BackgroundColor,4,0,self._BackgroundColor)
+            pygame.draw.rect(self._Parent._CanvasHWND,self._BackgroundColor,(self._PosX,self._PosY,self._Width-4,self._Height),0)
+            #aa_round_rect(self._Parent._CanvasHWND,  
+            #              (self._PosX,self._PosY,self._Width-4,self._Height),self._BackgroundColor,4,0,self._BackgroundColor)

sys.py/UI/keyboard.py

@@ -48,7 +48,7 @@ class KeyboardSelector(PageSelector):
         if rect.width <=0 or rect.height <= 0 :
             return
 
-        aa_round_rect(self._Parent._CanvasHWND,rect, (126,206,244),3,0,(126,206,244))
+        aa_round_rect(self._Parent._CanvasHWND,rect, MySkinManager.GiveColor("Line"),3,0,MySkinManager.GiveColor("Line"))
 #        pygame.draw.rect(self._Parent._CanvasHWND,(0,0,0),rect,1)
 
 class Keyboard(Page):

sys.py/UI/lang_manager.py

@@ -100,9 +100,10 @@ class LangManager(object):
             return MySkinManager.GiveFont(orig_font_str)
         else:
             if font_size_number > 28:
-                raise Exception('cjk font string format error '+ str(font_size_number))
-            
-            return MySkinManager.GiveFont("notosanscjk%d" % font_size_number)
+            #    raise Exception('cjk font string format error '+ str(font_size_number))
+                return MySkinManager.GiveFont(orig_font_str)
+            else:
+                return MySkinManager.GiveFont("notosanscjk%d" % font_size_number)
 
 ##global MyLangManager Handler
 MyLangManager = None

sys.py/UI/main_screen.py

@@ -110,7 +110,7 @@ class MessageBox(Label):
             #self._HWND.blit(self._CanvasHWND,rect)
 
         if withborder == True:
-            pygame.draw.rect(self._HWND,MySkinManager.GiveColor('Black'),(x_-padding,y_-padding, self._Width+padding*2,self._Height+padding*2),1)
+            pygame.draw.rect(self._HWND,MySkinManager.GiveColor('Text'),(x_-padding,y_-padding, self._Width+padding*2,self._Height+padding*2),1)
         
     def Draw(self):        
         x = (self._Parent._Width)/2
@@ -138,7 +138,7 @@ class MainScreen(Widget):
     _TitleBar    = None
     _FootBar     = None
     _MsgBox      = None
-    _MsgBoxFont  = MyLangManager.TrFont("veramono20")
+    _MsgBoxFont  = MyLangManager.TrFont("varela20")
     _IconFont    = MyLangManager.TrFont("varela15")
     _SkinManager = None
 

sys.py/UI/page.py

@@ -648,6 +648,6 @@ class Page(Widget):
     def Draw(self):
         self.ClearCanvas()
         self.DrawIcons()
-        #self.DrawPageSelector()
+        self.DrawPageSelector()
 
 

sys.py/UI/scroller.py

@@ -14,7 +14,7 @@ class ListScroller(object):
     _Height = 0
     _MinHeight = 6 ## tested 
     _Parent    = None
-    _Color     = MySkinManager.GiveColor('Front')
+    _Color     = MySkinManager.GiveColor('Line')
     
     _StartX   = 0
     _StartY   = 0
@@ -60,4 +60,5 @@ class ListScroller(object):
     def Draw(self):
         
         start_rect = midRect(self._PosX+self._StartX,self._StartY+self._Value,self._Width,self._Height,self._Parent._Width,self._Parent._Height)
-        aa_round_rect(self._CanvasHWND,start_rect, self._Color,3,0, self._Color)
+        #aa_round_rect(self._CanvasHWND,start_rect, self._Color,3,0, self._Color)
+        pygame.draw.rect(self._CanvasHWND,self._Color,start_rect,0)

sys.py/UI/skin_manager.py

@@ -54,21 +54,16 @@ class SkinManager(object):
         fonts_path["Eurostile"] = "%s/EurostileMN-Medium.pfb.ttf" %skinpath
         fonts_path["EurostileBold"] = "%s/EurostileMN-ExtendedBold.pfb.ttf" % skinpath
         
-        self._Fonts["Eurostile10"]  = pygame.font.Font(fonts_path["Eurostile"],10)
-        self._Fonts["Eurostile11"]  = pygame.font.Font(fonts_path["Eurostile"],11)
-        self._Fonts["Eurostile12"]  = pygame.font.Font(fonts_path["Eurostile"],12)
-        self._Fonts["Eurostile13"]  = pygame.font.Font(fonts_path["Eurostile"],13)
-        
-        self._Fonts["EurostileBold13"]  = pygame.font.Font(fonts_path["EurostileBold"],13)
         
+        self._Fonts["EurostileBold13"]  = pygame.font.Font(fonts_path["EurostileBold"],13)        
         self._Fonts["EurostileBold30"]  = pygame.font.Font(fonts_path["EurostileBold"],30)
         
         for i in range(10,29):
-          self._Fonts["varela%d"%i] = pygame.font.Font(fonts_path["varela"],i)
+          self._Fonts["varela%d"%i] = pygame.font.Font(fonts_path["Eurostile"],i)
           
-        self._Fonts["varela34"] = pygame.font.Font(fonts_path["varela"],34)
-        self._Fonts["varela40"] = pygame.font.Font(fonts_path["varela"],40)
-        self._Fonts["varela120"] = pygame.font.Font(fonts_path["varela"],120)
+        self._Fonts["varela34"] = pygame.font.Font(fonts_path["Eurostile"],34)
+        self._Fonts["varela40"] = pygame.font.Font(fonts_path["Eurostile"],40)
+        self._Fonts["varela120"] = pygame.font.Font(fonts_path["Eurostile"],120)
         
         for i in range(10,26):
             self._Fonts["veramono%d"%i] = pygame.font.Font(fonts_path["veramono"],i)
@@ -86,9 +81,9 @@ class SkinManager(object):
         Colors["High"] = pygame.Color(51, 166, 255)
         Colors["Text"] = pygame.Color(42, 140, 121)
         Colors["ReadOnlyText"] = pygame.Color(130,130,130)
-        Colors["Front"] = pygame.Color(131, 199, 219)
+        Colors["Front"] = pygame.Color(42,140,121)
         Colors["URL"] = pygame.Color(51, 166, 255)
-        Colors["Line"] = pygame.Color(42, 140, 121)
+        Colors["Line"] = pygame.Color(21, 70, 60)
         Colors["TitleBg"] = pygame.Color(11, 16, 22)
         Colors["Active"] = pygame.Color(175, 90, 0)
         Colors["Inactive"] = pygame.Color(27,78,72)

sys.py/UI/textarea.py

@@ -76,7 +76,7 @@ class Textarea(Widget):
         cursor_row = 0
 
         for i, v in enumerate(self._MyWords):
-            t = self._FontObj.render(v, True, (8, 135, 174))
+            t = self._FontObj.render(v, True, MySkinManager.GiveColor("Text"))
             t_width = t.get_width()
             w += t_width
             del(t)
@@ -122,7 +122,7 @@ class Textarea(Widget):
         linenumber = 0
         self._TextFull = len(self._MyWords) > self._TextLimit
         for i, v in enumerate(self._BlitWords):
-            t = self._FontObj.render(v,True,(8,135,174))
+            t = self._FontObj.render(v,True,MySkinManager.GiveColor("Text"))
             w += t.get_width()
 
             if w >= self._Width-endmargin and linenumber == 0:
@@ -142,7 +142,7 @@ class Textarea(Widget):
         y = self._PosY
         linenumber = 0
         for i,v in enumerate(self._BlitWords[:self._BlitIndex]):
-            t = self._FontObj.render(v,True,(8,135,174))
+            t = self._FontObj.render(v,True,MySkinManager.GiveColor("Text"))
             w += t.get_width()
 
             if w >= self._Width-endmargin and linenumber == 0:
@@ -156,7 +156,7 @@ class Textarea(Widget):
                 break
             x += t.get_width()
             
-        self._CanvasHWND.blit(self._FontObj.render("_",True,(0,0,0)),(x+1,y-2))
+        self._CanvasHWND.blit(self._FontObj.render("_",True,MySkinManager.GiveColor("Text")),(x+1,y-2))
     
     def Draw(self):
         #aa_round_rect(self._CanvasHWND, (4,24.5+6,312,60),self._BackgroundColor,4,0,self._BackgroundColor)

sys.py/config.py

@@ -10,7 +10,7 @@ Battery   = "/sys/class/power_supply/axp20x-battery/uevent"
 
 MPD_socket = "/tmp/mpd.socket"
 
-UPDATE_URL="https://raw.githubusercontent.com/clockworkpi/CPI/master/launcher_ver.json"
+UPDATE_URL="https://raw.githubusercontent.com/clockworkpi/CPI/master/launcher_gcores_ver.json"
 
 VERSION="gcores stable 1.0"