diff --git a/Menu/GameShell/10_Settings/Brightness/brightness_page.py b/Menu/GameShell/10_Settings/Brightness/brightness_page.py index 7494ff8..2d65fb2 100644 --- a/Menu/GameShell/10_Settings/Brightness/brightness_page.py +++ b/Menu/GameShell/10_Settings/Brightness/brightness_page.py @@ -15,19 +15,18 @@ from UI.keys_def import CurKeys, IsKeyMenuOrB from UI.slider import Slider from UI.icon_pool import MyIconPool from UI.multi_icon_item import MultiIconItem +from UI.skin_manager import MySkinManager + + from config import BackLight + + import myvars class BSlider(Slider): OnChangeCB = None - _BGpng = None - _BGwidth = 179 - _BGheight = 153 - - _NeedleSurf = None - _Scale = None _Parent = None _Icons = {} @@ -38,22 +37,11 @@ class BSlider(Slider): self._Width = self._Parent._Width self._Height = self._Parent._Height - bgpng = IconItem() - bgpng._ImgSurf = MyIconPool._Icons["light"] - bgpng._MyType = ICON_TYPES["STAT"] - bgpng._Parent = self - bgpng.Adjust(0,0,self._BGwidth,self._BGheight,0) - self._Icons["bg"] = bgpng - ##self._NeedleSurf = pygame.Surface( (38,12),pygame.SRCALPHA ) + self._BrightnessLabel = Label() + self._BrightnessLabel.SetCanvasHWND(self._CanvasHWND) + self._BrightnessLabel.Init("BRIGHT",MySkinManager.GiveFont("EurostileBold13")) + self._BrightnessLabel.SetColor(MySkinManager.GiveColor('Text')) - scale = MultiIconItem() - scale._MyType = ICON_TYPES["STAT"] - scale._Parent = self - scale._ImgSurf = MyIconPool._Icons["scale"] - scale._IconWidth = 82 - scale._IconHeight = 63 - scale.Adjust(0,0,82,63,0) - self._Icons["scale"] = scale def SetValue(self,brt): self._Value = brt @@ -78,27 +66,40 @@ class BSlider(Slider): self.OnChangeCB(self._Value) def Draw(self): + start_x = 82 + start_y = self._Parent._Screen._Height/2-5 + height = 30 + width = 4 + padding = 15 + seg = self._Value-1 - self._Icons["bg"].NewCoord(self._Width/2,self._Height/2 +11 ) - self._Icons["bg"].Draw() + for i in range(0,9): + rect = pygame.Rect(start_x+i*(width+padding),start_y,width,height) + if i > seg: + pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'),rect, 1) + #aa_round_rect(self._CanvasHWND,rect, MySkinManager.GiveColor('Text'),1,1, MySkinManager.GiveColor('White')) + else: + pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'),rect, 0) + #aa_round_rect(self._CanvasHWND,rect, MySkinManager.GiveColor('Text'),1,0, MySkinManager.GiveColor('White')) + + self._BrightnessLabel.NewCoord(118,self._Parent._Screen._Height/2-30) + self._BrightnessLabel.Draw(True) + + minus_box_rect = pygame.Rect(start_x- (4+6)*4,start_y,6*4,30) + pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'),minus_box_rect, 0) + + minus_rect = pygame.Rect(start_x-8*4,start_y+14,2*4,2) + pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('White'),minus_rect, 0) + + plus_box_rect = pygame.Rect(start_x + 39*4 +4*4,start_y,6*4,30) + pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'),plus_box_rect, 0) + + cross1_rect = pygame.Rect(start_x+39*4+4*4+2*4,start_y+14,2*4,2) + pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('White'),cross1_rect, 0) + cross2_rect = pygame.Rect(start_x+39*4+4*4+2*4+3,start_y+14-3,2,2*4) + pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('White'),cross2_rect, 0) - self._Icons["scale"].NewCoord(self._Width/2,self._Height/2 ) - icon_idx = self._Value - 1 - if icon_idx < 0: - icon_idx = 0 - - self._Icons["scale"]._IconIndex = icon_idx - self._Icons["scale"].Draw() - """ - pygame.draw.line(self._CanvasHWND,(255,0,0), (posx,self._PosY),(self._Width,self._PosY),3) ## range line - pygame.draw.line(self._CanvasHWND,(0,0,255), (self._PosX,self._PosY),(posx,self._PosY),3) ## range line - - pygame.draw.circle(self._CanvasHWND,(255,255,255),( posx, self._PosY),7,0) - pygame.draw.circle(self._CanvasHWND,(0,0,0) ,( posx, self._PosY),7,1)## outer border - """ - - class BrightnessPage(Page): diff --git a/Menu/GameShell/10_Settings/Sound/sound_page.py b/Menu/GameShell/10_Settings/Sound/sound_page.py index fd18b9c..af6af38 100644 --- a/Menu/GameShell/10_Settings/Sound/sound_page.py +++ b/Menu/GameShell/10_Settings/Sound/sound_page.py @@ -15,25 +15,19 @@ from UI.util_funcs import midRect from UI.keys_def import CurKeys, IsKeyMenuOrB from UI.slider import Slider from UI.multi_icon_item import MultiIconItem - +from UI.skin_manager import MySkinManager from UI.icon_pool import MyIconPool +from libs.roundrects import aa_round_rect + import myvars class SoundSlider(Slider): OnChangeCB = None - _BGpng = None - _BGwidth = 192 - _BGheight = 173 - - _NeedleSurf = None - _Scale = None _Parent = None - - snd_segs = [ [0,20],[21,40],[41,50],[51,60],[61,70],[71,85],[86,90],[91,95],[96,100] ] - + _VolumeLabel =None def __init__(self): Slider.__init__(self) @@ -42,64 +36,67 @@ class SoundSlider(Slider): self._Width = self._Parent._Width self._Height = self._Parent._Height - self._BGpng = IconItem() - self._BGpng._ImgSurf = MyIconPool._Icons["vol"] - self._BGpng._MyType = ICON_TYPES["STAT"] - self._BGpng._Parent = self - self._BGpng.Adjust(0,0,self._BGwidth,self._BGheight,0) - - ##self._NeedleSurf = pygame.Surface( (38,12),pygame.SRCALPHA ) - - self._Scale = MultiIconItem() - self._Scale._MyType = ICON_TYPES["STAT"] - self._Scale._Parent = self - self._Scale._ImgSurf = MyIconPool._Icons["scale"] - self._Scale._IconWidth = 82 - self._Scale._IconHeight = 63 - self._Scale.Adjust(0,0,82,63,0) + self._VolumeLabel = Label() + self._VolumeLabel.SetCanvasHWND(self._CanvasHWND) + self._VolumeLabel.Init("VOLUME",MySkinManager.GiveFont("EurostileBold13")) + self._VolumeLabel.SetColor(MySkinManager.GiveColor('Text')) def SetValue(self,vol):#pct 0-100 - for i,v in enumerate(self.snd_segs): - if vol >= v[0] and vol <= v[1]: - self._Value = i # self._Value : 0 - 8 - break + if vol >= 0 and vol <= 100: + self._Value = vol def Further(self): - self._Value+=1 + self._Value+=5 - if self._Value > len(self.snd_segs)-1: - self._Value = len(self.snd_segs) -1 - - vol = self.snd_segs[self._Value][0] + (self.snd_segs[self._Value][1] - self.snd_segs[self._Value][0])/2 + if self._Value > 100: + self._Value = 100 if self.OnChangeCB != None: if callable(self.OnChangeCB): - self.OnChangeCB( vol ) + self.OnChangeCB( self._Value ) def StepBack(self): - self._Value-=1 + self._Value-=5 if self._Value < 0: self._Value = 0 - - vol = self.snd_segs[self._Value][0] + (self.snd_segs[self._Value][1] - self.snd_segs[self._Value][0])/2 - + if self.OnChangeCB != None: if callable(self.OnChangeCB): - self.OnChangeCB( vol ) + self.OnChangeCB( self._Value ) def Draw(self): - - self._BGpng.NewCoord(self._Width/2,self._Height/2 ) - self._BGpng.Draw() + start_x = 82 + start_y = self._Parent._Screen._Height/2-5 + height = 30 + width = 4 + seg = self._Value / 5 - self._Scale.NewCoord(self._Width/2,self._Height/2) - - self._Scale._IconIndex = self._Value + for i in range(0, 20): + rect = pygame.Rect(start_x+i*(width*2),start_y,width,height) + if i > seg: + pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'),rect, 1) + #aa_round_rect(self._CanvasHWND,rect, MySkinManager.GiveColor('Text'),1,1, MySkinManager.GiveColor('White')) + else: + pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'),rect, 0) + #aa_round_rect(self._CanvasHWND,rect, MySkinManager.GiveColor('Text'),1,0, MySkinManager.GiveColor('White')) - self._Scale.Draw() + self._VolumeLabel.NewCoord(118,self._Parent._Screen._Height/2-30) + self._VolumeLabel.Draw(True) + minus_box_rect = pygame.Rect(start_x- (4+6)*4,start_y,6*4,30) + pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'),minus_box_rect, 0) + minus_rect = pygame.Rect(start_x-8*4,start_y+14,2*4,2) + pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('White'),minus_rect, 0) + + plus_box_rect = pygame.Rect(start_x + 39*4 +4*4,start_y,6*4,30) + pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'),plus_box_rect, 0) + + cross1_rect = pygame.Rect(start_x+39*4+4*4+2*4,start_y+14,2*4,2) + pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('White'),cross1_rect, 0) + cross2_rect = pygame.Rect(start_x+39*4+4*4+2*4+3,start_y+14-3,2,2*4) + pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('White'),cross2_rect, 0) class SoundPage(Page): diff --git a/Menu/GameShell/10_Settings/Storage/__init__.py b/Menu/GameShell/10_Settings/Storage/__init__.py index 0cd306a..b52bec6 100644 --- a/Menu/GameShell/10_Settings/Storage/__init__.py +++ b/Menu/GameShell/10_Settings/Storage/__init__.py @@ -13,8 +13,6 @@ from UI.icon_pool import MyIconPool from UI.label import Label from UI.util_funcs import midRect -from libs.roundrects import aa_round_rect - class StoragePage(Page): _Icons = {} @@ -24,10 +22,10 @@ class StoragePage(Page): _BGlabel = None _FreeLabel = None - _BGmsg = "%.1fGB of %.1fGB Used" + _GBmsg = "%.1fGB of %.1fGB Used" _DskUsg = None - _HighColor = MySkinManager.GiveColor('High') + _TextColor = MySkinManager.GiveColor('Text') _FootMsg = ["Nav.","","","Back",""] def __init__(self): @@ -53,60 +51,83 @@ class StoragePage(Page): self._Width = self._Screen._Width self._Height = self._Screen._Height - self._BGpng = IconItem() - self._BGpng._ImgSurf = MyIconPool._Icons["icon_sd"] - self._BGpng._MyType = ICON_TYPES["STAT"] - self._BGpng._Parent = self + self._GBLabel = Label() + self._GBLabel.SetCanvasHWND(self._CanvasHWND) + self._GBLabel.Init(self._GBmsg % (self._DskUsg[1]-self._DskUsg[0], self._DskUsg[1]),MySkinManager.GiveFont("varela11") ) + self._GBLabel.SetColor(self._TextColor) - self._BGpng.AddLabel(self._BGmsg % (self._DskUsg[1]-self._DskUsg[0], self._DskUsg[1]), MySkinManager.GiveFont("varela15")) - self._BGpng.Adjust(0,0,self._BGwidth,self._BGheight,0) - - - self._BGlabel = Label() - self._BGlabel.SetCanvasHWND(self._CanvasHWND) + self._PctLabel = Label() + self._PctLabel.SetCanvasHWND(self._CanvasHWND) usage_percent = (self._DskUsg[0]/self._DskUsg[1] )*100.0 - self._BGlabel.Init("%d%%"% int(usage_percent),MySkinManager.GiveFont("varela25")) - self._BGlabel.SetColor( self._HighColor ) + + self._PctLabel.Init("%d%%"% int(usage_percent),MySkinManager.GiveFont("EurostileBold30")) + self._PctLabel.SetColor( self._TextColor ) self._FreeLabel = Label() self._FreeLabel.SetCanvasHWND(self._CanvasHWND) - self._FreeLabel.Init("Free",MySkinManager.GiveFont("varela13")) - self._FreeLabel.SetColor(self._BGlabel._Color) + self._FreeLabel.Init("FREE",MySkinManager.GiveFont("Eurostile12")) + self._FreeLabel.SetColor(self._PctLabel._Color) def OnLoadCb(self): pass + def DrawCross(self,topleft,top): + start_x = topleft + start_y = top + width = 2 + height = 10 + padding = 4 + + rect1 = pygame.Rect(start_x+padding,start_y,width,height) + rect2 = pygame.Rect(start_x,start_y+padding,height,width) + + pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'),rect1, 0) + pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'),rect2, 0) + + def Draw(self): self.ClearCanvas() - self._BGpng.NewCoord(self._Width/2,self._Height/2-10) - self._BGpng.Draw() - self._BGlabel.NewCoord(self._Width/2-28,self._Height/2-30) - self._BGlabel.Draw() + self._PctLabel.NewCoord(32,102- 33) + self._PctLabel.Draw() - self._FreeLabel.NewCoord(self._BGlabel._PosX+10 ,self._Height/2) + self._FreeLabel.NewCoord(33 ,130-25) self._FreeLabel.Draw() + self._GBLabel.NewCoord(145,103-29) + self._GBLabel.Draw() + #bgcolor = (238,238,238), fgcolor = (126,206,244) - #aa_round_rect + usage_percent = (self._DskUsg[0]/self._DskUsg[1] ) if usage_percent < 0.1: usage_percent = 0.1 - rect_ = midRect(self._Width/2,self._Height-30,170,17, Width,Height) + rect_ = pygame.Rect(144,118-25, 283-144,139-117) - aa_round_rect(self._CanvasHWND, rect_, MySkinManager.GiveColor('Line'), 5, 0, MySkinManager.GiveColor('Line')) + pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'), rect_, 1) - rect2 = midRect(self._Width/2,self._Height-30,int(170*(1.0-usage_percent)),17, Width,Height) + rect2 = pygame.Rect(144,118-25,int((283-144)*(1.0-usage_percent)),139-117) rect2.left = rect_.left rect2.top = rect_.top - aa_round_rect(self._CanvasHWND,rect2, MySkinManager.GiveColor('Front'),5,0,MySkinManager.GiveColor('Front')) + pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'),rect2, 0) + + sep_rect = pygame.Rect(129,99-25,2,42) + + pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Inactive'),sep_rect, 0) + + ##4 cross + self.DrawCross(10,10) + self.DrawCross(self._Screen._Width-20,10) + self.DrawCross(10,self._Screen._Height-20) + self.DrawCross(self._Screen._Width-20,self._Screen._Height-20) + class APIOBJ(object): diff --git a/Menu/GameShell/10_Settings/list_item.py b/Menu/GameShell/10_Settings/list_item.py index 52f83ca..27c7fa6 100644 --- a/Menu/GameShell/10_Settings/list_item.py +++ b/Menu/GameShell/10_Settings/list_item.py @@ -8,6 +8,8 @@ import pygame from UI.page import Page from UI.label import Label from UI.lang_manager import MyLangManager +from UI.skin_manager import MySkinManager + # a item for List # - - - - - - - - - - - -- # | Icon Text..... > | @@ -50,6 +52,6 @@ class ListItem(object): self._Labels["Text"]._PosY = self._PosY + (self._Height - self._Labels["Text"]._Height)/2 self._Labels["Text"].Draw() - pygame.draw.line(self._Parent._CanvasHWND,(169,169,169),(self._PosX,self._PosY+self._Height-1),(self._PosX+self._Width,self._PosY+self._Height-1),1) + pygame.draw.line(self._Parent._CanvasHWND,MySkinManager.GiveColor('Line'),(self._PosX,self._PosY+self._Height-1),(self._PosX+self._Width,self._PosY+self._Height-1),1) diff --git a/skin/default/Menu/GameShell/20_Retro Games/MAME.png b/skin/default/Menu/GameShell/20_Retro Games/MAME.png index 9a859f5..3f87af9 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 e8c575b..4eb6e25 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 57dbd7d..5c84328 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 5faa2ee..1ea789c 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 1d397ad..cbbdaf6 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 26b80d2..c8f0664 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 57ee7f9..25370da 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 28c504a..9dd1179 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 2733820..3debc72 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 b7bd33e..f694f6e 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 3e194ac..471a3aa 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 b2d7dd1..16c27b0 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 9ba0dff..70cdc35 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 bf4d479..dcc1208 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 077c8a6..999a1e8 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/footbar_icons/footbar.png b/skin/default/sys.py/gameshell/footbar_icons/footbar.png index 954e2de..24789f6 100644 Binary files a/skin/default/sys.py/gameshell/footbar_icons/footbar.png and b/skin/default/sys.py/gameshell/footbar_icons/footbar.png differ diff --git a/skin/default/sys.py/gameshell/icons/GS.png b/skin/default/sys.py/gameshell/icons/GS.png index 68b8aff..d73bbb6 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/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/skin/default/truetype/EurostileMN-ExtendedBold.pfb.ttf b/skin/default/truetype/EurostileMN-ExtendedBold.pfb.ttf new file mode 100644 index 0000000..e9188fb Binary files /dev/null and b/skin/default/truetype/EurostileMN-ExtendedBold.pfb.ttf differ diff --git a/skin/default/truetype/EurostileMN-Medium.pfb.ttf b/skin/default/truetype/EurostileMN-Medium.pfb.ttf new file mode 100644 index 0000000..50349ba Binary files /dev/null and b/skin/default/truetype/EurostileMN-Medium.pfb.ttf differ diff --git a/sys.py/UI/Emulator/rom_list_page.py b/sys.py/UI/Emulator/rom_list_page.py index ef5a4a0..edc5d8a 100644 --- a/sys.py/UI/Emulator/rom_list_page.py +++ b/sys.py/UI/Emulator/rom_list_page.py @@ -100,7 +100,7 @@ class RomListPage(Page): _Selector=None _FootMsg = ["Nav","Del","Scan","Back","Run","AddFav"] _MyList = [] - _ListFont = MyLangManager.Tr("notosanscjk15") + _ListFont = MyLangManager.TrFont("notosanscjk15") _MyStack = None _Emulator = None _Parent = None diff --git a/sys.py/UI/page.py b/sys.py/UI/page.py index c5a3105..f1a66bb 100644 --- a/sys.py/UI/page.py +++ b/sys.py/UI/page.py @@ -157,7 +157,7 @@ class Page(Widget): ps = PageSelector() ps._IconSurf = MyIconPool._Icons["blueselector"] ps._Parent = self - ps.Init(start_x,start_y,92,92,128) + ps.Init(start_x,start_y,MyIconPool._Sizes["blueselector"][0],MyIconPool._Sizes["blueselector"][1],128) self._Ps = ps self._PsIndex = 0 @@ -209,7 +209,7 @@ class Page(Widget): ps = PageSelector() ps._IconSurf = MyIconPool._Icons["blueselector"] ps._Parent = self - ps.Init(start_x,start_y,92,92,128) + ps.Init(start_x,start_y,MyIconPool._Sizes["blueselector"][0],MyIconPool._Sizes["blueselector"][1],128) self._Ps = ps self._PsIndex = 0 @@ -247,7 +247,7 @@ class Page(Widget): ps = PageSelector() ps._IconSurf = MyIconPool._Icons["blueselector"] ps._Parent = self - ps.Init(icon_width/2,icon_height/2,92,92,128) + ps.Init(icon_width/2,icon_height/2,MyIconPool._Sizes["blueselector"][0],MyIconPool._Sizes["blueselector"][1],128) self._Ps = ps self._PsIndex = 0 self._OnShow = False @@ -270,7 +270,7 @@ class Page(Widget): ps = PageSelector() ps._IconSurf = MyIconPool._Icons["blueselector"] ps._Parent = self - ps.Init(start_x,start_y,92,92,128) + ps.Init(start_x,start_y,MyIconPool._Sizes["blueselector"][0],MyIconPool._Sizes["blueselector"][1],128) self._Ps = ps self._PsIndex = 0 self._OnShow = False @@ -289,7 +289,7 @@ class Page(Widget): ps = PageSelector() ps._IconSurf = MyIconPool._Icons["blueselector"] ps._Parent = self - ps.Init(start_x,start_y-self._SelectedIconTopOffset,92,92,128) + ps.Init(start_x,start_y-self._SelectedIconTopOffset,MyIconPool._Sizes["blueselector"][0],MyIconPool._Sizes["blueselector"][1],128) self._Ps = ps self._PsIndex = 0 @@ -325,7 +325,7 @@ class Page(Widget): ps = PageSelector() ps._IconSurf = MyIconPool._Icons["blueselector"] ps._Parent = self - ps.Init(start_x,start_y,icon_width+4,icon_height+4,128) + ps.Init(start_x,start_y,MyIconPool._Sizes["blueselector"][0]+4,MyIconPool._Sizes["blueselector"][1]+4,128) self._Ps = ps self._PsIndex = 0 self._OnShow = False @@ -648,6 +648,6 @@ class Page(Widget): def Draw(self): self.ClearCanvas() self.DrawIcons() - self.DrawPageSelector() + #self.DrawPageSelector() diff --git a/sys.py/UI/skin_manager.py b/sys.py/UI/skin_manager.py index c0cbdb0..03899d8 100644 --- a/sys.py/UI/skin_manager.py +++ b/sys.py/UI/skin_manager.py @@ -47,11 +47,22 @@ class SkinManager(object): skinpath = config.SKIN+"/truetype" fonts_path = {} fonts_path["varela"] = "%s/VarelaRound-Regular.ttf" % skinpath - print(fonts_path["varela"]) + fonts_path["veramono"] = "%s/VeraMono.ttf" % skinpath fonts_path["noto"] = "%s/NotoSansMono-Regular.ttf" % skinpath fonts_path["notocjk"] = "%s/NotoSansCJK-Regular.ttf" % skinpath - + 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["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) @@ -73,15 +84,16 @@ class SkinManager(object): def SetColors(self): Colors = {} Colors["High"] = pygame.Color(51, 166, 255) - Colors["Text"] = pygame.Color(83, 83, 83) + Colors["Text"] = pygame.Color(42, 140, 121) Colors["ReadOnlyText"] = pygame.Color(130,130,130) Colors["Front"] = pygame.Color(131, 199, 219) Colors["URL"] = pygame.Color(51, 166, 255) - Colors["Line"] = pygame.Color(169, 169, 169) - Colors["TitleBg"] = pygame.Color(228, 228, 228) + Colors["Line"] = pygame.Color(42, 140, 121) + Colors["TitleBg"] = pygame.Color(11, 16, 22) Colors["Active"] = pygame.Color(175, 90, 0) + Colors["Inactive"] = pygame.Color(27,78,72) Colors["Disabled"] = pygame.Color(204, 204, 204) - Colors["White"] = pygame.Color(255, 255, 255) + Colors["White"] = pygame.Color(11, 16, 22) Colors["Black"] = pygame.Color(0, 0, 0) SkinManager._Colors = Colors diff --git a/sys.py/config.py b/sys.py/config.py index 4225c11..c5320c5 100644 --- a/sys.py/config.py +++ b/sys.py/config.py @@ -12,7 +12,7 @@ MPD_socket = "/tmp/mpd.socket" UPDATE_URL="https://raw.githubusercontent.com/clockworkpi/CPI/master/launcher_ver.json" -VERSION="stable 1.24" +VERSION="gcores stable 1.0" SKIN="../skin/default"