diff --git a/.cpirc b/.cpirc
index 87099cb..41038d5 100644
--- a/.cpirc
+++ b/.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 ]
diff --git a/LICENSE b/LICENSE
index 94a9ed0..f288702 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007 Free Software Foundation, Inc.
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 .
+ along with this program. If not, see .
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
-.
+.
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
-.
+.
diff --git a/Menu/GameShell/10_Settings/About/__init__.py b/Menu/GameShell/10_Settings/About/__init__.py
index 30cafc1..e97da2a 100644
--- a/Menu/GameShell/10_Settings/About/__init__.py
+++ b/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 ) )
diff --git a/Menu/GameShell/10_Settings/Bluetooth/__init__.py b/Menu/GameShell/10_Settings/Bluetooth/__init__.py
index 4a943ab..dd33b84 100644
--- a/Menu/GameShell/10_Settings/Bluetooth/__init__.py
+++ b/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))
diff --git a/Menu/GameShell/10_Settings/GateWay/__init__.py b/Menu/GameShell/10_Settings/GateWay/__init__.py
index 0c83c80..185dcfb 100644
--- a/Menu/GameShell/10_Settings/GateWay/__init__.py
+++ b/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):
diff --git a/Menu/GameShell/10_Settings/Languages/__init__.py b/Menu/GameShell/10_Settings/Languages/__init__.py
index a6cc2b1..8ccf33f 100644
--- a/Menu/GameShell/10_Settings/Languages/__init__.py
+++ b/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
diff --git a/Menu/GameShell/10_Settings/Lima/__init__.py b/Menu/GameShell/10_Settings/Lima/__init__.py
index b0a15d2..8adc938 100644
--- a/Menu/GameShell/10_Settings/Lima/__init__.py
+++ b/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
diff --git a/Menu/GameShell/10_Settings/PowerOptions/__init__.py b/Menu/GameShell/10_Settings/PowerOptions/__init__.py
index b92cce9..396f257 100644
--- a/Menu/GameShell/10_Settings/PowerOptions/__init__.py
+++ b/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
diff --git a/Menu/GameShell/10_Settings/Storage/__init__.py b/Menu/GameShell/10_Settings/Storage/__init__.py
index b52bec6..edbfce8 100644
--- a/Menu/GameShell/10_Settings/Storage/__init__.py
+++ b/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)
diff --git a/Menu/GameShell/10_Settings/Time/timezone_lib_list_page.py b/Menu/GameShell/10_Settings/Time/timezone_lib_list_page.py
index f4f9a87..bf90beb 100644
--- a/Menu/GameShell/10_Settings/Time/timezone_lib_list_page.py
+++ b/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):
diff --git a/Menu/GameShell/10_Settings/Wifi/wifi_list.py b/Menu/GameShell/10_Settings/Wifi/wifi_list.py
index fa042ae..5b94e54 100644
--- a/Menu/GameShell/10_Settings/Wifi/wifi_list.py
+++ b/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)
diff --git a/Menu/GameShell/10_Settings/list_page.py b/Menu/GameShell/10_Settings/list_page.py
index 5b222ca..c997780 100644
--- a/Menu/GameShell/10_Settings/list_page.py
+++ b/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
diff --git a/Menu/GameShell/50_PICO-8/compkginfo.json b/Menu/GameShell/50_PICO-8/compkginfo.json
index 83b4192..05ce187 100644
--- a/Menu/GameShell/50_PICO-8/compkginfo.json
+++ b/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"
}
diff --git a/Menu/GameShell/97_Music Player/mpd_spectrum_page.py b/Menu/GameShell/97_Music Player/mpd_spectrum_page.py
index fbd5e9c..3e02847 100644
--- a/Menu/GameShell/97_Music Player/mpd_spectrum_page.py
+++ b/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
diff --git a/Menu/GameShell/97_Music Player/music_lib_list_page.py b/Menu/GameShell/97_Music Player/music_lib_list_page.py
index 5bcc1b4..d6919ff 100644
--- a/Menu/GameShell/97_Music Player/music_lib_list_page.py
+++ b/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)
diff --git a/Menu/GameShell/97_Music Player/play_list_page.py b/Menu/GameShell/97_Music Player/play_list_page.py
index 4cc6a4e..92b1e41 100644
--- a/Menu/GameShell/97_Music Player/play_list_page.py
+++ b/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()
diff --git a/Menu/GameShell/98_TinyCloud/__init__.py b/Menu/GameShell/98_TinyCloud/__init__.py
index 46c8d69..d6236ac 100644
--- a/Menu/GameShell/98_TinyCloud/__init__.py
+++ b/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:
diff --git a/skin/default/Menu/GameShell/20_Retro Games/MAME.png b/skin/default/Menu/GameShell/20_Retro Games/MAME.png
index 3f87af9..c7dd4ed 100644
Binary files a/skin/default/Menu/GameShell/20_Retro Games/MAME.png and b/skin/default/Menu/GameShell/20_Retro Games/MAME.png differ
diff --git a/skin/default/Menu/GameShell/20_Retro Games/MGBA.png b/skin/default/Menu/GameShell/20_Retro Games/MGBA.png
index 4eb6e25..116763e 100644
Binary files a/skin/default/Menu/GameShell/20_Retro Games/MGBA.png and b/skin/default/Menu/GameShell/20_Retro Games/MGBA.png differ
diff --git a/skin/default/Menu/GameShell/20_Retro Games/NESTOPIA.png b/skin/default/Menu/GameShell/20_Retro Games/NESTOPIA.png
index 5c84328..06956a8 100644
Binary files a/skin/default/Menu/GameShell/20_Retro Games/NESTOPIA.png and b/skin/default/Menu/GameShell/20_Retro Games/NESTOPIA.png differ
diff --git a/skin/default/Menu/GameShell/CaveStory.png b/skin/default/Menu/GameShell/CaveStory.png
index 1ea789c..4b11a04 100644
Binary files a/skin/default/Menu/GameShell/CaveStory.png and b/skin/default/Menu/GameShell/CaveStory.png differ
diff --git a/skin/default/Menu/GameShell/Music Player.png b/skin/default/Menu/GameShell/Music Player.png
index cbbdaf6..67df9ce 100644
Binary files a/skin/default/Menu/GameShell/Music Player.png and b/skin/default/Menu/GameShell/Music Player.png differ
diff --git a/skin/default/Menu/GameShell/PICO-8.png b/skin/default/Menu/GameShell/PICO-8.png
index c8f0664..64df2d0 100644
Binary files a/skin/default/Menu/GameShell/PICO-8.png and b/skin/default/Menu/GameShell/PICO-8.png differ
diff --git a/skin/default/Menu/GameShell/PowerOFF.png b/skin/default/Menu/GameShell/PowerOFF.png
index 25370da..187ce88 100644
Binary files a/skin/default/Menu/GameShell/PowerOFF.png and b/skin/default/Menu/GameShell/PowerOFF.png differ
diff --git a/skin/default/Menu/GameShell/Reload UI.png b/skin/default/Menu/GameShell/Reload UI.png
index 9dd1179..386842a 100644
Binary files a/skin/default/Menu/GameShell/Reload UI.png and b/skin/default/Menu/GameShell/Reload UI.png differ
diff --git a/skin/default/Menu/GameShell/Retro Games.png b/skin/default/Menu/GameShell/Retro Games.png
index 3debc72..bccb664 100644
Binary files a/skin/default/Menu/GameShell/Retro Games.png and b/skin/default/Menu/GameShell/Retro Games.png differ
diff --git a/skin/default/Menu/GameShell/RetroArch.png b/skin/default/Menu/GameShell/RetroArch.png
index f694f6e..ce13655 100644
Binary files a/skin/default/Menu/GameShell/RetroArch.png and b/skin/default/Menu/GameShell/RetroArch.png differ
diff --git a/skin/default/Menu/GameShell/Settings.png b/skin/default/Menu/GameShell/Settings.png
index 471a3aa..040dd51 100644
Binary files a/skin/default/Menu/GameShell/Settings.png and b/skin/default/Menu/GameShell/Settings.png differ
diff --git a/skin/default/Menu/GameShell/Sleep.png b/skin/default/Menu/GameShell/Sleep.png
index 16c27b0..3b654f5 100644
Binary files a/skin/default/Menu/GameShell/Sleep.png and b/skin/default/Menu/GameShell/Sleep.png differ
diff --git a/skin/default/Menu/GameShell/TinyCloud.png b/skin/default/Menu/GameShell/TinyCloud.png
index 70cdc35..fbd56a3 100644
Binary files a/skin/default/Menu/GameShell/TinyCloud.png and b/skin/default/Menu/GameShell/TinyCloud.png differ
diff --git a/skin/default/Menu/GameShell/freeDM.png b/skin/default/Menu/GameShell/freeDM.png
index dcc1208..d3fd5d7 100644
Binary files a/skin/default/Menu/GameShell/freeDM.png and b/skin/default/Menu/GameShell/freeDM.png differ
diff --git a/skin/default/sys.py/gameshell/blank.png b/skin/default/sys.py/gameshell/blank.png
index 999a1e8..fcabc8c 100644
Binary files a/skin/default/sys.py/gameshell/blank.png and b/skin/default/sys.py/gameshell/blank.png differ
diff --git a/skin/default/sys.py/gameshell/icons/DialogBoxs.png b/skin/default/sys.py/gameshell/icons/DialogBoxs.png
index e38d227..b7e6313 100644
Binary files a/skin/default/sys.py/gameshell/icons/DialogBoxs.png and b/skin/default/sys.py/gameshell/icons/DialogBoxs.png differ
diff --git a/skin/default/sys.py/gameshell/icons/GS.png b/skin/default/sys.py/gameshell/icons/GS.png
index 68b8aff..3a5877c 100644
Binary files a/skin/default/sys.py/gameshell/icons/GS.png and b/skin/default/sys.py/gameshell/icons/GS.png differ
diff --git a/skin/default/sys.py/gameshell/icons/_L.png b/skin/default/sys.py/gameshell/icons/_L.png
index 58a2e95..f872581 100644
Binary files a/skin/default/sys.py/gameshell/icons/_L.png and b/skin/default/sys.py/gameshell/icons/_L.png differ
diff --git a/skin/default/sys.py/gameshell/icons/_R.png b/skin/default/sys.py/gameshell/icons/_R.png
index d26a910..348e2cf 100644
Binary files a/skin/default/sys.py/gameshell/icons/_R.png and b/skin/default/sys.py/gameshell/icons/_R.png differ
diff --git a/skin/default/sys.py/gameshell/icons/about_bg.png b/skin/default/sys.py/gameshell/icons/about_bg.png
index 1fc0ee3..4c0e235 100644
Binary files a/skin/default/sys.py/gameshell/icons/about_bg.png and b/skin/default/sys.py/gameshell/icons/about_bg.png differ
diff --git a/skin/default/sys.py/gameshell/icons/airwire.png b/skin/default/sys.py/gameshell/icons/airwire.png
index 625d004..b443c96 100644
Binary files a/skin/default/sys.py/gameshell/icons/airwire.png and b/skin/default/sys.py/gameshell/icons/airwire.png differ
diff --git a/skin/default/sys.py/gameshell/icons/blueselector.png b/skin/default/sys.py/gameshell/icons/blueselector.png
index 82e285b..56994bf 100644
Binary files a/skin/default/sys.py/gameshell/icons/blueselector.png and b/skin/default/sys.py/gameshell/icons/blueselector.png differ
diff --git a/skin/default/sys.py/gameshell/icons/done.png b/skin/default/sys.py/gameshell/icons/done.png
index ceeadbf..6a7727f 100644
Binary files a/skin/default/sys.py/gameshell/icons/done.png and b/skin/default/sys.py/gameshell/icons/done.png differ
diff --git a/skin/default/sys.py/gameshell/icons/empty.png b/skin/default/sys.py/gameshell/icons/empty.png
index 7d8beb5..eafc21c 100644
Binary files a/skin/default/sys.py/gameshell/icons/empty.png and b/skin/default/sys.py/gameshell/icons/empty.png differ
diff --git a/skin/default/sys.py/gameshell/icons/heart.png b/skin/default/sys.py/gameshell/icons/heart.png
index f9c6673..e0b38f1 100644
Binary files a/skin/default/sys.py/gameshell/icons/heart.png and b/skin/default/sys.py/gameshell/icons/heart.png differ
diff --git a/skin/default/sys.py/gameshell/icons/icon_sd.png b/skin/default/sys.py/gameshell/icons/icon_sd.png
index 555d2d9..72e3163 100644
Binary files a/skin/default/sys.py/gameshell/icons/icon_sd.png and b/skin/default/sys.py/gameshell/icons/icon_sd.png differ
diff --git a/skin/default/sys.py/gameshell/icons/lock.png b/skin/default/sys.py/gameshell/icons/lock.png
index 1e9ac7a..89c46d5 100644
Binary files a/skin/default/sys.py/gameshell/icons/lock.png and b/skin/default/sys.py/gameshell/icons/lock.png differ
diff --git a/skin/default/sys.py/gameshell/icons/needwifi_bg.png b/skin/default/sys.py/gameshell/icons/needwifi_bg.png
index 0a58c6b..8d52f04 100644
Binary files a/skin/default/sys.py/gameshell/icons/needwifi_bg.png and b/skin/default/sys.py/gameshell/icons/needwifi_bg.png differ
diff --git a/skin/default/sys.py/gameshell/icons/online.png b/skin/default/sys.py/gameshell/icons/online.png
index 8be6bc4..7c38972 100644
Binary files a/skin/default/sys.py/gameshell/icons/online.png and b/skin/default/sys.py/gameshell/icons/online.png differ
diff --git a/skin/default/sys.py/gameshell/icons/pico8_md5_err.png b/skin/default/sys.py/gameshell/icons/pico8_md5_err.png
index 8b281a1..29574db 100644
Binary files a/skin/default/sys.py/gameshell/icons/pico8_md5_err.png and b/skin/default/sys.py/gameshell/icons/pico8_md5_err.png differ
diff --git a/skin/default/sys.py/gameshell/icons/pico8_notfound.png b/skin/default/sys.py/gameshell/icons/pico8_notfound.png
index f4f39af..f3936ff 100644
Binary files a/skin/default/sys.py/gameshell/icons/pico8_notfound.png and b/skin/default/sys.py/gameshell/icons/pico8_notfound.png differ
diff --git a/skin/default/sys.py/gameshell/icons/rom_download.png b/skin/default/sys.py/gameshell/icons/rom_download.png
index a704d0f..6ae3b0a 100644
Binary files a/skin/default/sys.py/gameshell/icons/rom_download.png and b/skin/default/sys.py/gameshell/icons/rom_download.png differ
diff --git a/skin/default/sys.py/gameshell/icons/star.png b/skin/default/sys.py/gameshell/icons/star.png
index 7910226..dcc5a4a 100644
Binary files a/skin/default/sys.py/gameshell/icons/star.png and b/skin/default/sys.py/gameshell/icons/star.png differ
diff --git a/skin/default/sys.py/gameshell/icons/sys.png b/skin/default/sys.py/gameshell/icons/sys.png
index aac76d3..2321dee 100644
Binary files a/skin/default/sys.py/gameshell/icons/sys.png and b/skin/default/sys.py/gameshell/icons/sys.png differ
diff --git a/skin/default/sys.py/gameshell/icons/tape.png b/skin/default/sys.py/gameshell/icons/tape.png
index f802820..9177266 100644
Binary files a/skin/default/sys.py/gameshell/icons/tape.png and b/skin/default/sys.py/gameshell/icons/tape.png differ
diff --git a/skin/default/sys.py/gameshell/titlebar_icons/battery_unknown.png b/skin/default/sys.py/gameshell/titlebar_icons/battery_unknown.png
index 24f681a..a1f4db7 100644
Binary files a/skin/default/sys.py/gameshell/titlebar_icons/battery_unknown.png and b/skin/default/sys.py/gameshell/titlebar_icons/battery_unknown.png differ
diff --git a/skin/default/sys.py/gameshell/titlebar_icons/bluetooth.png b/skin/default/sys.py/gameshell/titlebar_icons/bluetooth.png
index 439166b..5bfce49 100644
Binary files a/skin/default/sys.py/gameshell/titlebar_icons/bluetooth.png and b/skin/default/sys.py/gameshell/titlebar_icons/bluetooth.png differ
diff --git a/skin/default/sys.py/gameshell/titlebar_icons/soundvolume.png b/skin/default/sys.py/gameshell/titlebar_icons/soundvolume.png
index 0d3229b..413e321 100644
Binary files a/skin/default/sys.py/gameshell/titlebar_icons/soundvolume.png and b/skin/default/sys.py/gameshell/titlebar_icons/soundvolume.png differ
diff --git a/skin/default/sys.py/gameshell/titlebar_icons/wifi.png b/skin/default/sys.py/gameshell/titlebar_icons/wifi.png
index bc1e2c6..1b48d83 100644
Binary files a/skin/default/sys.py/gameshell/titlebar_icons/wifi.png and b/skin/default/sys.py/gameshell/titlebar_icons/wifi.png differ
diff --git a/skin/default/sys.py/gameshell/titlebar_icons/withcharging.png b/skin/default/sys.py/gameshell/titlebar_icons/withcharging.png
index 3b109a3..5672188 100644
Binary files a/skin/default/sys.py/gameshell/titlebar_icons/withcharging.png and b/skin/default/sys.py/gameshell/titlebar_icons/withcharging.png differ
diff --git a/skin/default/sys.py/gameshell/titlebar_icons/without_charging.png b/skin/default/sys.py/gameshell/titlebar_icons/without_charging.png
index ae46cd2..48338ae 100644
Binary files a/skin/default/sys.py/gameshell/titlebar_icons/without_charging.png and b/skin/default/sys.py/gameshell/titlebar_icons/without_charging.png differ
diff --git a/sys.py/UI/Emulator/fav_list_page.py b/sys.py/UI/Emulator/fav_list_page.py
index dc3f7d8..ee4277c 100644
--- a/sys.py/UI/Emulator/fav_list_page.py
+++ b/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
diff --git a/sys.py/UI/Emulator/rom_list_page.py b/sys.py/UI/Emulator/rom_list_page.py
index edc5d8a..45a5172 100644
--- a/sys.py/UI/Emulator/rom_list_page.py
+++ b/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
diff --git a/sys.py/UI/Emulator/rom_so_confirm_page.py b/sys.py/UI/Emulator/rom_so_confirm_page.py
index 34db516..89c0123 100644
--- a/sys.py/UI/Emulator/rom_so_confirm_page.py
+++ b/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
diff --git a/sys.py/UI/above_all_patch.py b/sys.py/UI/above_all_patch.py
index fee6853..ab272bb 100644
--- a/sys.py/UI/above_all_patch.py
+++ b/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)
diff --git a/sys.py/UI/counter_screen.py b/sys.py/UI/counter_screen.py
index 36bcd69..f8cd511 100644
--- a/sys.py/UI/counter_screen.py
+++ b/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
diff --git a/sys.py/UI/download_process_page.py b/sys.py/UI/download_process_page.py
index c1bfc43..2f99dd9 100644
--- a/sys.py/UI/download_process_page.py
+++ b/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 )
diff --git a/sys.py/UI/icon_item.py b/sys.py/UI/icon_item.py
index 237f3d1..1b6cafc 100644
--- a/sys.py/UI/icon_item.py
+++ b/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)
diff --git a/sys.py/UI/info_page_selector.py b/sys.py/UI/info_page_selector.py
index 69869e6..1be54d1 100644
--- a/sys.py/UI/info_page_selector.py
+++ b/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)
diff --git a/sys.py/UI/keyboard.py b/sys.py/UI/keyboard.py
index bd71987..e38e2dd 100644
--- a/sys.py/UI/keyboard.py
+++ b/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):
diff --git a/sys.py/UI/lang_manager.py b/sys.py/UI/lang_manager.py
index f2b86f2..e0ffce0 100644
--- a/sys.py/UI/lang_manager.py
+++ b/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
diff --git a/sys.py/UI/main_screen.py b/sys.py/UI/main_screen.py
index 56db8b3..93c4033 100644
--- a/sys.py/UI/main_screen.py
+++ b/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
diff --git a/sys.py/UI/page.py b/sys.py/UI/page.py
index f1a66bb..9ca3301 100644
--- a/sys.py/UI/page.py
+++ b/sys.py/UI/page.py
@@ -648,6 +648,6 @@ class Page(Widget):
def Draw(self):
self.ClearCanvas()
self.DrawIcons()
- #self.DrawPageSelector()
+ self.DrawPageSelector()
diff --git a/sys.py/UI/scroller.py b/sys.py/UI/scroller.py
index 9361ffd..f6d2490 100644
--- a/sys.py/UI/scroller.py
+++ b/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)
diff --git a/sys.py/UI/skin_manager.py b/sys.py/UI/skin_manager.py
index 03899d8..509ca58 100644
--- a/sys.py/UI/skin_manager.py
+++ b/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)
diff --git a/sys.py/UI/textarea.py b/sys.py/UI/textarea.py
index 5708223..6a056a2 100644
--- a/sys.py/UI/textarea.py
+++ b/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)
diff --git a/sys.py/config.py b/sys.py/config.py
index c5320c5..7596276 100644
--- a/sys.py/config.py
+++ b/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"
diff --git a/sys.py/gameshell/wallpaper/loading.png b/sys.py/gameshell/wallpaper/loading.png
index 63a69e1..304fe55 100644
Binary files a/sys.py/gameshell/wallpaper/loading.png and b/sys.py/gameshell/wallpaper/loading.png differ