diff --git a/.gitignore b/.gitignore index 007206a..324403f 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ screenshots/* .DS_Store sys.py/.* sys.py/*.db +launcher.sublime-workspace +.screenshot.png +version.json diff --git a/.screenshot.png b/.screenshot.png new file mode 100644 index 0000000..0a31c1c Binary files /dev/null and b/.screenshot.png differ diff --git a/Menu/GameShell/10_Settings/.Airplane.deot/__init__.py b/Menu/GameShell/10_Settings/.Airplane.deot/__init__.py deleted file mode 100644 index 81d9bc2..0000000 --- a/Menu/GameShell/10_Settings/.Airplane.deot/__init__.py +++ /dev/null @@ -1,285 +0,0 @@ -# -*- coding: utf-8 -*- - -import pygame -#import math -import commands - -#from beeprint import pp -from libs.roundrects import aa_round_rect -#import gobject -#from wicd import misc -## local UI import -from UI.constants import Width,Height,ICON_TYPES -from UI.page import Page,PageSelector -from UI.label import Label -from UI.util_funcs import midRect -from UI.keys_def import CurKeys, IsKeyStartOrA, IsKeyMenuOrB -from UI.scroller import ListScroller -from UI.icon_pool import MyIconPool -from UI.icon_item import IconItem -from UI.multi_icon_item import MultiIconItem -from UI.lang_manager import MyLangManager -from UI.skin_manager import MySkinManager -from UI.multilabel import MultiLabel - -class AirplanePage(Page): - _FootMsg = ["Nav","","Rescue","Back","Toggle"] - _MyList = [] - _ListFontObj = MyLangManager.TrFont("varela13") - - _AList = {} - - _Scrolled = 0 - - _BGwidth = 320 - _BGheight = 240-24-20 - - _DrawOnce = False - _Scroller = None - - _EasingDur = 30 - - _airwire_y = 0 - _dialog_index = 0 - - def __init__(self): - Page.__init__(self) - self._Icons = {} - - def GenList(self): - - self._MyList = [] - - - - def Init(self): - if self._Screen != None: - if self._Screen._CanvasHWND != None and self._CanvasHWND == None: - self._HWND = self._Screen._CanvasHWND - self._CanvasHWND = pygame.Surface( (self._Screen._Width,self._BGheight) ) - - self._PosX = self._Index*self._Screen._Width - self._Width = self._Screen._Width ## equal to screen width - self._Height = self._Screen._Height - - - """ - airwire = IconItem() - airwire._ImgSurf = MyIconPool._Icons["airwire"] - airwire._MyType = ICON_TYPES["STAT"] - airwire._Parent = self - airwire.Adjust(0,0,5,43,0) - self._Icons["airwire"] = airwire - - GS = IconItem() - GS._ImgSurf = MyIconPool._Icons["GS"] - GS._MyType = ICON_TYPES["STAT"] - GS._Parent = self - GS.Adjust(0,0,72,95,0) - self._Icons["GS"] = GS - """ - - DialogBoxs = MultiIconItem() - DialogBoxs._ImgSurf = MyIconPool._Icons["DialogBoxs"] - DialogBoxs._MyType = ICON_TYPES["STAT"] - DialogBoxs._Parent = self - DialogBoxs._IconWidth = 180 - DialogBoxs._IconHeight = 80 - DialogBoxs.Adjust(0,0,180,320,0) - self._Icons["DialogBoxs"] = DialogBoxs - - - """ - bgpng = MultiIconItem() - bgpng._ImgSurf = MyIconPool._Icons["about_bg"] - bgpng._MyType = ICON_TYPES["STAT"] - bgpng._Parent = self - bgpng.Adjust(0,0,self._BGwidth,self._BGheight,0) - self._Icons["bg"] = bgpng - """ - - - self.GenList() - - self._Scroller = ListScroller() - self._Scroller._Parent = self - self._Scroller._PosX = self._Width - 10 - self._Scroller._PosY = 2 - self._Scroller.Init() - self._Scroller.SetCanvasHWND(self._HWND) - - self.OnLoadCb() - - def ScrollDown(self): - dis = 10 - if abs(self._Scrolled) < (self._BGheight - self._Height)/2 + 0: - self._PosY -= dis - self._Scrolled -= dis - - def ScrollUp(self): - dis = 10 - if self._PosY < 0: - self._PosY += dis - self._Scrolled += dis - - def ToggleModeAni(self): ## with animation - out = commands.getstatusoutput('sudo rfkill list | grep yes | cut -d " " -f3') - if "yes" in out[1]: - data = self.EasingData(0,43) - for _,v in enumerate(data): - self._airwire_y -= v - self._dialog_index = 2 - pygame.time.delay(40) - - self._Screen.Draw() - self._Screen.SwapAndShow() - - commands.getstatusoutput("sudo rfkill unblock all") - self._Screen._TitleBar._InAirPlaneMode = False - - else: - data = self.EasingData(0,43) - data.reverse() - for _,v in enumerate(data): - self._airwire_y += v - self._dialog_index = 3 - pygame.time.delay(40) - self._Screen.Draw() - self._Screen.SwapAndShow() - - commands.getstatusoutput("sudo rfkill block all") - self._Screen._TitleBar._InAirPlaneMode = True - - - def ToggleMode(self): - out = commands.getstatusoutput('sudo rfkill list | grep yes | cut -d " " -f3') - print out - if "yes" in out[1]: - self._Screen._MsgBox.SetText("TurningOn") - self._Screen._MsgBox.Draw() - commands.getstatusoutput("sudo rfkill unblock all") - self._Screen._TitleBar._InAirPlaneMode = False - - else: - self._Screen._MsgBox.SetText("TurningOff") - self._Screen._MsgBox.Draw() - commands.getstatusoutput("sudo rfkill block all") - self._Screen._TitleBar._InAirPlaneMode = True - - def UnBlockAll(self): - self._Screen._MsgBox.SetText("TurningOn") - self._Screen._MsgBox.Draw() - commands.getstatusoutput("sudo rfkill unblock all") - self._Screen._TitleBar._InAirPlaneMode = False - - - def OnLoadCb(self): - self._Scrolled = 0 - self._PosY = 0 - self._DrawOnce = False - out = commands.getstatusoutput('sudo rfkill list | grep yes | cut -d " " -f3') - if "yes" in out[1]: - self._Screen._TitleBar._InAirPlaneMode = True - self._airwire_y = 50+43 - self._dialog_index = 1 - else: - self._airwire_y = 50 - self._dialog_index = 0 - self._Screen._TitleBar._InAirPlaneMode = False - - - def OnReturnBackCb(self): - self.ReturnToUpLevelPage() - self._Screen.Draw() - self._Screen.SwapAndShow() - - def KeyDown(self,event): - if IsKeyMenuOrB(event.key): - self.ReturnToUpLevelPage() - self._Screen.Draw() - self._Screen.SwapAndShow() - - if IsKeyStartOrA(event.key): - self.ToggleModeAni() - """ - self.ToggleMode() - self._Screen.SwapAndShow() - - pygame.time.delay(1000) - - self._Screen.Draw() - self._Screen.SwapAndShow() - """ - """ - if event.key == CurKeys["Up"]: - self.ScrollUp() - self._Screen.Draw() - self._Screen.SwapAndShow() - if event.key == CurKeys["Down"]: - self.ScrollDown() - self._Screen.Draw() - self._Screen.SwapAndShow() - """ - - if event.key == CurKeys["X"]: - self.UnBlockAll() - self._Screen.SwapAndShow() - pygame.time.delay(1000) - self._Screen.Draw() - self._Screen.SwapAndShow() - - - def Draw(self): - self.ClearCanvas() - - self._Icons["DialogBoxs"].NewCoord(70,58) - #self._Icons["airwire"].NewCoord(80,self._airwire_y) - - self._Icons["DialogBoxs"]._IconIndex = self._dialog_index - - self._Icons["DialogBoxs"].DrawTopLeft() - #self._Icons["airwire"].Draw() - - #self._Icons["GS"].NewCoord(98,118) - #self._Icons["GS"].Draw() - - 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) - - if self._HWND != None: - self._HWND.fill(MySkinManager.GiveColor("White")) - - self._HWND.blit(self._CanvasHWND,(self._PosX,self._PosY,self._Width, self._Height ) ) - -# self._Scroller.UpdateSize(self._BGheight,abs(self._Scrolled)*3) -# self._Scroller.Draw() - - - - -class APIOBJ(object): - - _Page = None - def __init__(self): - pass - def Init(self,main_screen): - self._Page = AirplanePage() - self._Page._Screen = main_screen - self._Page._Name ="Airplane Mode" - self._Page.Init() - - def API(self,main_screen): - if main_screen !=None: - main_screen.PushPage(self._Page) - main_screen.Draw() - main_screen.SwapAndShow() - -OBJ = APIOBJ() -def Init(main_screen): - OBJ.Init(main_screen) -def API(main_screen): - OBJ.API(main_screen) - - diff --git "a/Menu/GameShell/10_Settings/.Brightness.stock/Icon\r" "b/Menu/GameShell/10_Settings/.Brightness.stock/Icon\r" deleted file mode 100644 index e69de29..0000000 diff --git a/Menu/GameShell/10_Settings/.Brightness.stock/__init__.py b/Menu/GameShell/10_Settings/.Brightness.stock/__init__.py deleted file mode 100644 index 5f8fd9a..0000000 --- a/Menu/GameShell/10_Settings/.Brightness.stock/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -*- coding: utf-8 -*- - -## local UI import -import pages -import myvars - -def Init(main_screen): - pages.InitBrightnessPage(main_screen) - -def API(main_screen): - - if main_screen !=None: - main_screen.PushCurPage() - main_screen.SetCurPage(myvars.BrightnessPage) - main_screen.Draw() - main_screen.SwapAndShow() - diff --git a/Menu/GameShell/10_Settings/.Brightness.stock/brightness_page.py b/Menu/GameShell/10_Settings/.Brightness.stock/brightness_page.py deleted file mode 100644 index 8b56473..0000000 --- a/Menu/GameShell/10_Settings/.Brightness.stock/brightness_page.py +++ /dev/null @@ -1,186 +0,0 @@ -# -*- coding: utf-8 -*- - -import pygame - - -#import math - -## local UI import -from UI.constants import Width,Height,ICON_TYPES -from UI.page import Page,PageSelector -from UI.label import Label -from UI.icon_item import IconItem -from UI.util_funcs import midRect -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 config import BackLight -import myvars - -class BSlider(Slider): - - - OnChangeCB = None - _BGpng = None - _BGwidth = 179 - _BGheight = 153 - - _NeedleSurf = None - _Scale = None - _Parent = None - _Icons = {} - - def __init__(self): - Slider.__init__(self) - self._Icons = {} - def Init(self): - self._Width = self._Parent._Width - self._Height = self._Parent._Height - - bgpng = IconItem() - bgpng._ImgSurf = MyIconPool.GiveIconSurface("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 ) - - scale = MultiIconItem() - scale._MyType = ICON_TYPES["STAT"] - scale._Parent = self - scale._ImgSurf = MyIconPool.GiveIconSurface("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 - - def Further(self): - self._Value+=1 - if self._Value > 9: - self._Value = 9 - - if self.OnChangeCB != None: - if callable(self.OnChangeCB): - self.OnChangeCB(self._Value) - - def StepBack(self): - self._Value-=1 - - if self._Value < 1: - self._Value = 1 - - if self.OnChangeCB != None: - if callable(self.OnChangeCB): - self.OnChangeCB(self._Value) - - def Draw(self): - - self._Icons["bg"].NewCoord(self._Width/2,self._Height/2 +11 ) - self._Icons["bg"].Draw() - - 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): - - _MySlider = None - _FootMsg = ["Nav","","","Back","Enter"] - - - def Init(self): - self._CanvasHWND = self._Screen._CanvasHWND - self._Width = self._Screen._Width - self._Height = self._Screen._Height - - self._MySlider = BSlider() -# self._MySlider._Width = Width - 20 -# self._MySlider._Height = 30 -# self._MySlider._PosX = (self._Width - self._MySlider._Width)/2 -# self._MySlider._PosY = 40 - self._MySlider._Parent = self - self._MySlider.SetCanvasHWND(self._CanvasHWND) - self._MySlider.OnChangeCB = self.WhenSliderDrag - self._MySlider.Init() - - brt = self.ReadBackLight() - - self._MySlider.SetValue( brt) - - - def ReadBackLight(self): - try: - f = open(BackLight) - except IOError: - return 0 - else: - with f: - content = f.readlines() - content = [x.strip() for x in content] - return int(content[0]) - - return 0 - - def OnLoadCb(self): - brt = self.ReadBackLight() - - self._MySlider.SetValue( brt) - - def SetBackLight(self,newbrt): - try: - f = open(BackLight,'w') - except IOError: - print("Open write %s failed %d" % (BackLight,newbrt)) - return False - else: - with f: - f.write(str(newbrt)) - return True - - def WhenSliderDrag(self,value): ##value - self.SetBackLight(value) - - def KeyDown(self,event): - - if IsKeyMenuOrB(event.key): - self.ReturnToUpLevelPage() - self._Screen.Draw() - self._Screen.SwapAndShow() - - if event.key == CurKeys["Right"]: - self._MySlider.Further() - self._Screen.Draw() - self._Screen.SwapAndShow() - - if event.key == CurKeys["Left"]: - self._MySlider.StepBack() - self._Screen.Draw() - self._Screen.SwapAndShow() - - def Draw(self): - self.ClearCanvas() - - self._MySlider.Draw() - - - - - diff --git a/Menu/GameShell/10_Settings/.Brightness.stock/myvars.py b/Menu/GameShell/10_Settings/.Brightness.stock/myvars.py deleted file mode 100644 index caa03de..0000000 --- a/Menu/GameShell/10_Settings/.Brightness.stock/myvars.py +++ /dev/null @@ -1,6 +0,0 @@ -# -*- coding: utf-8 -*- - -import os -import sys - -SoundPage = None diff --git a/Menu/GameShell/10_Settings/.Brightness.stock/pages.py b/Menu/GameShell/10_Settings/.Brightness.stock/pages.py deleted file mode 100644 index 643adb9..0000000 --- a/Menu/GameShell/10_Settings/.Brightness.stock/pages.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- - -from brightness_page import BrightnessPage - -import myvars - -def InitBrightnessPage(main_screen): - - myvars.BrightnessPage = BrightnessPage() - - myvars.BrightnessPage._Screen = main_screen - myvars.BrightnessPage._Name = "Brightness" - myvars.BrightnessPage.Init() diff --git a/Menu/GameShell/10_Settings/.LauncherGo.stock/__init__.py b/Menu/GameShell/10_Settings/.LauncherGo.stock/__init__.py deleted file mode 100644 index 7480ac0..0000000 --- a/Menu/GameShell/10_Settings/.LauncherGo.stock/__init__.py +++ /dev/null @@ -1,55 +0,0 @@ -# -*- coding: utf-8 -*- -import os -import pygame -#import math -#mport subprocess -#from beeprint import pp -from libs.roundrects import aa_round_rect - -## local UI import -from UI.keys_def import CurKeys, IsKeyStartOrA, IsKeyMenuOrB -from UI.util_funcs import ArmSystem -from UI.lang_manager import MyLangManager -from UI.confirm_page import ConfirmPage - -class SwitchToLauncherGoConfirmPage(ConfirmPage): - - def KeyDown(self,event): - - if IsKeyMenuOrB(event.key): - self.ReturnToUpLevelPage() - self._Screen.Draw() - self._Screen.SwapAndShow() - - if IsKeyStartOrA(event.key): - self._Screen._MsgBox.SetText("Rebooting to LauncherGo") - self._Screen._MsgBox.Draw() - self._Screen.SwapAndShow() - pygame.time.delay(300) - ArmSystem("sed -i s/launcher/launchergo/g ~/.bashrc" ) - ArmSystem("sudo reboot") - - -class APIOBJ(object): - - _Page = None - - def __init__(self): - pass - def Init(self,main_screen): - self._Page = SwitchToLauncherGoConfirmPage() - self._Page._Screen = main_screen - self._Page._Name ="Switch To LauncherGo" - self._Page.Init() - - def API(self,main_screen): - if main_screen !=None: - main_screen.PushPage(self._Page) - main_screen.Draw() - main_screen.SwapAndShow() - -OBJ = APIOBJ() -def Init(main_screen): - OBJ.Init(main_screen) -def API(main_screen): - OBJ.API(main_screen) diff --git "a/Menu/GameShell/10_Settings/.Sound.stock/Icon\r" "b/Menu/GameShell/10_Settings/.Sound.stock/Icon\r" deleted file mode 100644 index e69de29..0000000 diff --git a/Menu/GameShell/10_Settings/.Sound.stock/__init__.py b/Menu/GameShell/10_Settings/.Sound.stock/__init__.py deleted file mode 100644 index db9da3e..0000000 --- a/Menu/GameShell/10_Settings/.Sound.stock/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -*- coding: utf-8 -*- - -## local UI import -import pages -import myvars - -def Init(main_screen): - pages.InitSoundPage(main_screen) - -def API(main_screen): - - if main_screen !=None: - main_screen.PushCurPage() - main_screen.SetCurPage(myvars.SoundPage) - main_screen.Draw() - main_screen.SwapAndShow() - diff --git a/Menu/GameShell/10_Settings/.Sound.stock/myvars.py b/Menu/GameShell/10_Settings/.Sound.stock/myvars.py deleted file mode 100644 index caa03de..0000000 --- a/Menu/GameShell/10_Settings/.Sound.stock/myvars.py +++ /dev/null @@ -1,6 +0,0 @@ -# -*- coding: utf-8 -*- - -import os -import sys - -SoundPage = None diff --git a/Menu/GameShell/10_Settings/.Sound.stock/pages.py b/Menu/GameShell/10_Settings/.Sound.stock/pages.py deleted file mode 100644 index 41754d8..0000000 --- a/Menu/GameShell/10_Settings/.Sound.stock/pages.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- - -from sound_page import SoundPage - -import myvars - -def InitSoundPage(main_screen): - - myvars.SoundPage = SoundPage() - - myvars.SoundPage._Screen = main_screen - myvars.SoundPage._Name = "Sound Volume" - myvars.SoundPage.Init() diff --git a/Menu/GameShell/10_Settings/.Sound.stock/sound_page.py b/Menu/GameShell/10_Settings/.Sound.stock/sound_page.py deleted file mode 100644 index 2a3c026..0000000 --- a/Menu/GameShell/10_Settings/.Sound.stock/sound_page.py +++ /dev/null @@ -1,170 +0,0 @@ -# -*- coding: utf-8 -*- - -import pygame - -#from libs.roundrects import aa_round_rect - -import alsaaudio - -## local UI import -from UI.constants import Width,Height,ICON_TYPES -from UI.page import Page,PageSelector -from UI.icon_item import IconItem -from UI.label import Label -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.icon_pool import MyIconPool - -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] ] - - - def __init__(self): - Slider.__init__(self) - - def Init(self): - self._Width = self._Parent._Width - self._Height = self._Parent._Height - - self._BGpng = IconItem() - self._BGpng._ImgSurf = MyIconPool.GiveIconSurface("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.GiveIconSurface("scale") - self._Scale._IconWidth = 82 - self._Scale._IconHeight = 63 - self._Scale.Adjust(0,0,82,63,0) - - 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 - - def Further(self): - self._Value+=1 - - 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.OnChangeCB != None: - if callable(self.OnChangeCB): - self.OnChangeCB( vol ) - - def StepBack(self): - self._Value-=1 - - 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 ) - - def Draw(self): - - self._BGpng.NewCoord(self._Width/2,self._Height/2 ) - self._BGpng.Draw() - - self._Scale.NewCoord(self._Width/2,self._Height/2) - - self._Scale._IconIndex = self._Value - - self._Scale.Draw() - - - -class SoundPage(Page): - - _MySlider = None - _FootMsg = ["Nav","","","Back","Enter"] - - def Init(self): - self._CanvasHWND = self._Screen._CanvasHWND - self._Width = self._Screen._Width - self._Height = self._Screen._Height - - self._MySlider = SoundSlider() - - self._MySlider._Parent = self - self._MySlider.SetCanvasHWND(self._CanvasHWND) - - self._MySlider.OnChangeCB = self.WhenSliderDrag - - self._MySlider.Init() - - try: - m = alsaaudio.Mixer() - self._MySlider.SetValue(m.getvolume()[0]) - except Exception,e: - print(str(e)) - self._MySlider.SetValue(0) - - - def OnLoadCb(self): - try: - m = alsaaudio.Mixer() - self._MySlider.SetValue(m.getvolume()[0]) - except Exception,e: - print(str(e)) - - def WhenSliderDrag(self,value): ##value 0-100 - if value < 0 or value > 100: - return - - m = alsaaudio.Mixer() - m.setvolume(int(value)) - - def KeyDown(self,event): - - if IsKeyMenuOrB(event.key): - self.ReturnToUpLevelPage() - self._Screen.Draw() - self._Screen.SwapAndShow() - - if event.key == CurKeys["Right"]: - self._MySlider.Further() - self._Screen.Draw() - self._Screen.SwapAndShow() - - if event.key == CurKeys["Left"]: - self._MySlider.StepBack() - self._Screen.Draw() - self._Screen.SwapAndShow() - - def Draw(self): - self.ClearCanvas() - - self._MySlider.Draw() - - - - - diff --git a/Menu/GameShell/10_Settings/.Storage.deot/__init__.py b/Menu/GameShell/10_Settings/.Storage.deot/__init__.py deleted file mode 100644 index 22dafa6..0000000 --- a/Menu/GameShell/10_Settings/.Storage.deot/__init__.py +++ /dev/null @@ -1,145 +0,0 @@ -# -*- coding: utf-8 -*- - -import pygame -import os - - -## local UI import -from UI.page import Page -from UI.skin_manager import MySkinManager -from UI.constants import ICON_TYPES,Width,Height -from UI.icon_item import IconItem -from UI.icon_pool import MyIconPool -from UI.label import Label -from UI.util_funcs import midRect - -class StoragePage(Page): - - _Icons = {} - _BGpng = None - _BGwidth = 96 - _BGheight = 73 - _BGlabel = None - _FreeLabel = None - - _GBmsg = "%.1fGB of %.1fGB Used" - _DskUsg = None - - _TextColor = MySkinManager.GiveColor('Text') - _FootMsg = ["Nav.","","","Back",""] - - def __init__(self): - Page.__init__(self) - - self._Icons = {} - - - def DiskUsage(self): - statvfs = os.statvfs('/') - - total_space = (statvfs.f_frsize * statvfs.f_blocks)/1024.0/1024.0/1024.0 - - avail_space = ( statvfs.f_frsize * statvfs.f_bavail) / 1024.0 / 1024.0/ 1024.0 - - return avail_space,total_space - - def Init(self): - - self._DskUsg = self.DiskUsage() - - self._CanvasHWND = self._Screen._CanvasHWND - self._Width = self._Screen._Width - self._Height = self._Screen._Height - - 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._PctLabel = Label() - self._PctLabel.SetCanvasHWND(self._CanvasHWND) - - usage_percent = (self._DskUsg[0]/self._DskUsg[1] )*100.0 - - - 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("varela12")) - self._FreeLabel.SetColor(self._PctLabel._Color) - - - def OnLoadCb(self): - pass - - def Draw(self): - self.ClearCanvas() - - self._PctLabel.NewCoord(32,102- 33) - self._PctLabel.Draw() - - 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) - - usage_percent = (self._DskUsg[0]/self._DskUsg[1] ) - if usage_percent < 0.1: - usage_percent = 0.1 - - rect_ = pygame.Rect(144,118-25, 283-144,139-117) - - pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'), rect_, 1) - - - rect2 = pygame.Rect(144,118-25,int((283-144)*(1.0-usage_percent)),139-117) - - rect2.left = rect_.left - rect2.top = rect_.top - - 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): - - _StoragePage = None - def __init__(self): - pass - def Init(self,main_screen): - self._StoragePage = StoragePage() - - self._StoragePage._Screen = main_screen - self._StoragePage._Name ="Storage" - self._StoragePage.Init() - - - def API(self,main_screen): - if main_screen !=None: - main_screen.PushPage(self._StoragePage) - main_screen.Draw() - main_screen.SwapAndShow() - - - -OBJ = APIOBJ() -def Init(main_screen): - OBJ.Init(main_screen) -def API(main_screen): - OBJ.API(main_screen) - - diff --git a/Menu/GameShell/10_Settings/.list_page.py.stock b/Menu/GameShell/10_Settings/.list_page.py.stock deleted file mode 100644 index 954e1ad..0000000 --- a/Menu/GameShell/10_Settings/.list_page.py.stock +++ /dev/null @@ -1,155 +0,0 @@ -# -*- coding: utf-8 -*- - -import pygame -import sys - -from libs.roundrects import aa_round_rect - -## local UI import -from UI.constants import Width,Height -from UI.page import Page,PageSelector -from UI.label import Label -from UI.util_funcs import midRect,FileExists -from UI.keys_def import CurKeys, IsKeyStartOrA, IsKeyMenuOrB -from UI.scroller import ListScroller -from UI.skin_manager import MySkinManager -from UI.lang_manager import MyLangManager -from UI.info_page_selector import InfoPageSelector - -from list_item import ListItem - -import myvars - -class ListPage(Page): - - _Icons = {} - _Selector=None - - _FootMsg = ["Nav","","","Back","Enter"] - _MyList = [] - _ListFontObj = MyLangManager.TrFont("varela15") - - _Scroller = None - - def __init__(self): - Page.__init__(self) - self._Icons = {} - self._CanvasHWND = None - self._MyList = [] - - def Init(self): - self._PosX = self._Index * self._Screen._Width - self._Width = self._Screen._Width - self._Height = self._Screen._Height - - self._CanvasHWND = self._Screen._CanvasHWND - - ps = InfoPageSelector() - ps._Parent = self - ps._PosX = 2 - self._Ps = ps - self._PsIndex = 0 - - # "" pkgname, label - alist = [["","Airplane","Airplane Mode"], - ["","PowerOptions","Power Options"], - ["","Wifi","Wi-Fi"], - ["","Bluetooth","Bluetooth"], - ["","Sound","Sound Volume"], - ["","Brightness","BackLight Brightness"], - ["","Storage",""], - ["","Time","Timezone"], - ["","Languages","Languages"], - ["","Notification","Notification"], - ["","Update", "Update Launcher"], - ["","Cores", "Retroarch cores manager"], - ["","About", "About"], - ["","PowerOFF","Power OFF"], - ["","ButtonsLayout","Buttons Layout"], - ["","Skins","Theme Manager"], - #["","LauncherGo","Switch to LauncherGo"], - ["","Lima","GPU Driver Switch"], - ["","GateWay","Network Gateway Switch"]] - - start_x = 0 - start_y = 0 - - - sys.path.append(myvars.basepath)# add self as import path - for i,v in enumerate(alist): - li = ListItem() - li._Parent = self - li._PosX = start_x - li._PosY = start_y + i*ListItem._Height - li._Width = Width - li._Fonts["normal"] = self._ListFontObj - - if v[2] != "": - li.Init(v[2]) - else: - li.Init(v[1]) - - #if v[1] == "Wifi" or v[1] == "Sound" or v[1] == "Brightness" or v[1] == "Storage" or v[1] == "Update" or v[1] == "About" or v[1] == "PowerOFF" or v[1] == "HelloWorld": - if FileExists(myvars.basepath+"/"+ v[1]): - li._LinkObj = __import__(v[1]) - init_cb = getattr(li._LinkObj,"Init",None) - if init_cb != None: - if callable(init_cb): - li._LinkObj.Init(self._Screen) - - self._MyList.append(li) - - self._Scroller = ListScroller() - self._Scroller._Parent = self - self._Scroller._PosX = self._Width - 10 - self._Scroller._PosY = 2 - self._Scroller.Init() - - def Click(self): - cur_li = self._MyList[self._PsIndex] - if cur_li._LinkObj != None: - api_cb = getattr(cur_li._LinkObj,"API",None) - if api_cb != None: - if callable(api_cb): - cur_li._LinkObj.API(self._Screen) - - - def KeyDown(self,event): - if IsKeyMenuOrB(event.key): - self.ReturnToUpLevelPage() - self._Screen.Draw() - self._Screen.SwapAndShow() - - if event.key == CurKeys["Up"]: - self.ScrollUp() - self._Screen.Draw() - self._Screen.SwapAndShow() - if event.key == CurKeys["Down"]: - self.ScrollDown() - self._Screen.Draw() - self._Screen.SwapAndShow() - - - if IsKeyStartOrA(event.key): - self.Click() - - def Draw(self): - self.ClearCanvas() - - if len(self._MyList) * ListItem._Height > self._Height: - self._Ps._Width = self._Width - 11 - - self._Ps.Draw() - - for i in self._MyList: - i.Draw() - - self._Scroller.UpdateSize( len(self._MyList)*ListItem._Height, self._PsIndex*ListItem._Height) - self._Scroller.Draw() - else: - self._Ps._Width = self._Width - self._Ps.Draw() - for i in self._MyList: - i.Draw() - - diff --git a/Menu/GameShell/10_Settings/About/__init__.py b/Menu/GameShell/10_Settings/About/__init__.py index 78f3877..d5080ea 100644 --- a/Menu/GameShell/10_Settings/About/__init__.py +++ b/Menu/GameShell/10_Settings/About/__init__.py @@ -41,7 +41,6 @@ class InfoPageListItem(object): self._Fonts = {} def SetSmallText(self,text): - l = MultiLabel() l.SetCanvasHWND(self._Parent._CanvasHWND) l.Init(text,self._Fonts["small"]) @@ -80,8 +79,9 @@ class InfoPageListItem(object): class AboutPage(Page): _FootMsg = ["Nav.","","","Back",""] _MyList = [] - _ListFontObj = MyLangManager.TrFont("varela13") - + #_ListFontObj = MyLangManager.TrFont("Eurostile13") + _ListFontObj = MySkinManager.GiveFont("Eurostile13") + _AList = {} _Scrolled = 0 @@ -89,7 +89,7 @@ class AboutPage(Page): _BGwidth = 320 _BGheight = 300 - _DrawOnce = False + #_DrawOnce = False _Scroller = None def __init__(self): @@ -106,7 +106,7 @@ class AboutPage(Page): st = st.strip("\t") out["value"] = st self._AList["uname"] = out - + return def CpuMhz(self): @@ -142,7 +142,7 @@ class AboutPage(Page): if line.startswith("model name"): parts = line.split(":") -# print( parts[1].strip() ) + #print( parts[1].strip() ) processor = {} processor["key"]="processor" processor["label"] = "Processor:" @@ -152,7 +152,7 @@ class AboutPage(Page): if line.startswith("cpu MHz"): parts = line.split(":") -# print(parts[1].strip() ) + #print(parts[1].strip() ) cpumhz = {} cpumhz["key"] = "cpumhz" cpumhz["label"] = "CPU MHz:" @@ -161,7 +161,7 @@ class AboutPage(Page): self._AList["cpumhz"] = cpumhz if line.startswith("cpu cores"): parts = line.split(":") -# print(parts[1].strip() ) + #print(parts[1].strip() ) cpucores = {} cpucores["key"] = "cpucores" cpucores["label"] = "CPU cores:" @@ -169,7 +169,7 @@ class AboutPage(Page): self._AList["cpucores"] = cpucores if line.startswith("Features"): parts = line.split(":") -# print(parts[1].strip() ) + #print(parts[1].strip() ) f_ = {} f_["key"] = "features" f_["label"] = "Features:" @@ -178,7 +178,7 @@ class AboutPage(Page): if line.startswith("flags"): parts = line.split(":") -# print(parts[1].strip() ) + #print(parts[1].strip() ) flags = {} flags["key"] = "flags" flags["label"] = "Flags:" @@ -200,7 +200,7 @@ class AboutPage(Page): if line.startswith("MemTotal"): parts = line.split(":") parts[1] = parts[1].replace("kB","") - print( parts[1].strip() ) + #print( parts[1].strip() ) memory = {} memory["key"] = "memory" @@ -275,8 +275,7 @@ class AboutPage(Page): if self._Screen._CanvasHWND != None and self._CanvasHWND == None: self._HWND = self._Screen._CanvasHWND self._CanvasHWND = pygame.Surface( (self._Screen._Width,self._BGheight+50) ) - self._CanvasHWND_Wallpaper = pygame.Surface( (self._Screen._Width,self._Screen._Height) ) - + self._PosX = self._Index*self._Screen._Width self._Width = self._Screen._Width ## equal to screen width self._Height = self._Screen._Height @@ -317,12 +316,11 @@ class AboutPage(Page): if self._PosY < 0: self._PosY += dis self._Scrolled += dis - def OnLoadCb(self): self._Scrolled = 0 self._PosY = 0 - self._DrawOnce = False + #self._DrawOnce = False def OnReturnBackCb(self): self.ReturnToUpLevelPage() @@ -346,42 +344,44 @@ class AboutPage(Page): def Draw(self): + # if self._DrawOnce == False: + + # self.ClearCanvas() + ##self._Ps.Draw() - if self._DrawOnce == False: - if self._Wallpaper: - self._CanvasHWND.fill((0,0,0,)) - self._CanvasHWND.set_colorkey((0,0,0)) - else: - self._CanvasHWND.fill(MySkinManager.GiveColor("White")) + # for i in self._MyList: + # i.Draw() + + # self._DrawOnce = True - #self._Ps.Draw() + # self._Icons["bg"].DrawRect((230,0,82,184),(228,0,82,184)) + + # y = self._MyList[len(self._MyList)-1]._PosY+30 + + # self._Icons["bg"].DrawRect(( (self._Width-191)/2,y,191,68),(65,232,191,68)) + + # always redraw + if self._Wallpaper: + self._CanvasHWND.blit(self._Wallpaper,(0, self._PosY * -1)) + else: + self.ClearCanvas() - for i in self._MyList: - i.Draw() - - self._DrawOnce = True - - self._Icons["bg"].DrawRect((230,0,82,184),(228,0,82,184)) - - y = self._MyList[len(self._MyList)-1]._PosY+30 - - self._Icons["bg"].DrawRect(( (self._Width-191)/2,y,191,68),(65,232,191,68)) + for i in self._MyList: + i.Draw() + + self._Icons["bg"].DrawRect((230,0,82,184),(228,0,82,184)) + + y = self._MyList[len(self._MyList)-1]._PosY+30 + + self._Icons["bg"].DrawRect(( (self._Width-191)/2,y,191,68),(65,232,191,68)) if self._HWND != None: self._HWND.fill(MySkinManager.GiveColor("White")) - if self._Wallpaper: - self._CanvasHWND_Wallpaper.blit(self._Wallpaper,(0,0)) - self._CanvasHWND_Wallpaper.blit(self._CanvasHWND,(self._PosX,self._PosY,self._Width, self._Height )) - self._HWND.blit(self._CanvasHWND_Wallpaper,(0,0,self._Width, self._Height ) ) - else: - self._HWND.blit(self._CanvasHWND,(self._PosX,self._PosY,self._Width, self._Height )) - + self._HWND.blit(self._CanvasHWND, (self._PosX, self._PosY, self._Width, self._Height )) + self._Scroller.UpdateSize(self._BGheight,abs(self._Scrolled)*3) self._Scroller.Draw() - - - class APIOBJ(object): @@ -405,5 +405,3 @@ def Init(main_screen): OBJ.Init(main_screen) def API(main_screen): OBJ.API(main_screen) - - diff --git "a/Menu/GameShell/10_Settings/Airplane/Icon\r" "b/Menu/GameShell/10_Settings/Airplane/Icon\r" deleted file mode 100644 index e69de29..0000000 diff --git a/Menu/GameShell/10_Settings/Airplane/__init__.py b/Menu/GameShell/10_Settings/Airplane/__init__.py index 9e4d6bc..b971c41 100644 --- a/Menu/GameShell/10_Settings/Airplane/__init__.py +++ b/Menu/GameShell/10_Settings/Airplane/__init__.py @@ -19,7 +19,7 @@ from UI.icon_pool import MyIconPool from UI.icon_item import IconItem from UI.multi_icon_item import MultiIconItem from UI.lang_manager import MyLangManager - +from UI.skin_manager import MySkinManager from UI.multilabel import MultiLabel class AirplanePage(Page): @@ -63,23 +63,24 @@ class AirplanePage(Page): self._Height = self._Screen._Height - + """ airwire = IconItem() - airwire._ImgSurf = MyIconPool.GiveIconSurface("airwire") + airwire._ImgSurf = MyIconPool._Icons["airwire"] airwire._MyType = ICON_TYPES["STAT"] airwire._Parent = self airwire.Adjust(0,0,5,43,0) self._Icons["airwire"] = airwire GS = IconItem() - GS._ImgSurf = MyIconPool.GiveIconSurface("GS") + GS._ImgSurf = MyIconPool._Icons["GS"] GS._MyType = ICON_TYPES["STAT"] GS._Parent = self GS.Adjust(0,0,72,95,0) self._Icons["GS"] = GS + """ DialogBoxs = MultiIconItem() - DialogBoxs._ImgSurf = MyIconPool.GiveIconSurface("DialogBoxs") + DialogBoxs._ImgSurf = MyIconPool._Icons["DialogBoxs"] DialogBoxs._MyType = ICON_TYPES["STAT"] DialogBoxs._Parent = self DialogBoxs._IconWidth = 180 @@ -90,7 +91,7 @@ class AirplanePage(Page): """ bgpng = MultiIconItem() - bgpng._ImgSurf = MyIconPool.GiveIconSurface("about_bg") + bgpng._ImgSurf = MyIconPool._Icons["about_bg"] bgpng._MyType = ICON_TYPES["STAT"] bgpng._Parent = self bgpng.Adjust(0,0,self._BGwidth,self._BGheight,0) @@ -231,19 +232,24 @@ class AirplanePage(Page): def Draw(self): self.ClearCanvas() - self._Icons["DialogBoxs"].NewCoord(145,23) - self._Icons["airwire"].NewCoord(80,self._airwire_y) + self._Icons["DialogBoxs"].NewCoord(70,58) + #self._Icons["airwire"].NewCoord(80,self._airwire_y) self._Icons["DialogBoxs"]._IconIndex = self._dialog_index self._Icons["DialogBoxs"].DrawTopLeft() - self._Icons["airwire"].Draw() + #self._Icons["airwire"].Draw() - self._Icons["GS"].NewCoord(98,118) - self._Icons["GS"].Draw() + #self._Icons["GS"].NewCoord(98,118) + #self._Icons["GS"].Draw() + + 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) 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 ) ) @@ -275,5 +281,3 @@ def Init(main_screen): OBJ.Init(main_screen) def API(main_screen): OBJ.API(main_screen) - - diff --git a/Menu/GameShell/10_Settings/Bluetooth/__init__.py b/Menu/GameShell/10_Settings/Bluetooth/__init__.py index 4a943ab..25e7e36 100644 --- a/Menu/GameShell/10_Settings/Bluetooth/__init__.py +++ b/Menu/GameShell/10_Settings/Bluetooth/__init__.py @@ -253,9 +253,9 @@ class BleInfoPage(Page): if self._AList != None: if "Connected" in self._AList: if self._AList["Connected"] == 1: - self._FootMsg[1] = "Disconnect" + self._FootMsg[2] = "Disconnect" else: - self._FootMsg[1] = "" + self._FootMsg[2] = "" self.GenList() @@ -425,7 +425,7 @@ class BluetoothPage(Page): msgbox = BleListMessageBox() msgbox._CanvasHWND = self._CanvasHWND - msgbox.Init(" ",MyLangManager.TrFont("veramono12")) + msgbox.Init(" ",MyLangManager.TrFont("veramono15")) msgbox._Parent = self self._MsgBox = msgbox diff --git a/Menu/GameShell/10_Settings/BranchSelect/__init__.py b/Menu/GameShell/10_Settings/BranchSelect/__init__.py new file mode 100644 index 0000000..7e3be1a --- /dev/null +++ b/Menu/GameShell/10_Settings/BranchSelect/__init__.py @@ -0,0 +1,275 @@ +import git + +from libs.roundrects import aa_round_rect + +from UI.constants import Width +from UI.page import Page, PageSelector +from UI.scroller import ListScroller +from UI.info_page_list_item import InfoPageListItem +from UI.keys_def import CurKeys, IsKeyStartOrA, IsKeyMenuOrB +from UI.skin_manager import MySkinManager +from UI.lang_manager import MyLangManager + +class SelectPage(Page): + _MyList = [] + + def __init__(self): + Page.__init__(self) + self._Icons = {} + + def Init(self): + self._ListFontObj = MyLangManager.TrFont("varela15") + self._ListSmFontObj = MySkinManager.GiveFont("varela12") + if self._Screen != None: + if self._Screen._CanvasHWND != None and self._CanvasHWND == None: + self._HWND = self._Screen._CanvasHWND + self._CanvasHWND = self._Screen._CanvasHWND + + self._PosX = self._Index*self._Screen._Width + self._Width = self._Screen._Width ## equal to screen width + self._Height = self._Screen._Height + + ps = GamePageSelector() + ps._Parent = self + + self._Ps = ps + self._PsIndex = 0 + + self._Scroller = ListScroller() + self._Scroller._Parent = self + self._Scroller._PosX = 2 + self._Scroller._PosY = 2 + self._Scroller.Init() + + def Generate(self, game, branches, current): + start_x = 0 + start_y = 0 + i = 0 + self._Game = game + + for branch in branches: + li = InfoPageListItem() + li._Parent = self + li._PosX = start_x + li._PosY = start_y + i*InfoPageListItem._Height + + li._Width = Width + li._Fonts["normal"] = self._ListFontObj + + li._Fonts["small"] = self._ListSmFontObj + + li._LinkObj = branch + + li.Init(branch) + + if branch == current: + self._PsIndex = i + + li._PosX = 2 + self._MyList.append(li) + + i = i + 1 + + def Draw(self): + self.ClearCanvas() + if len(self._MyList) * InfoPageListItem._Height > self._Height: + self._Ps._Width = self._Width - 10 + self._Ps._PosX = 9 + self._Ps.Draw() + for i in self._MyList: + i.Draw() + + self._Scroller.UpdateSize(len(self._MyList)*InfoPageListItem._Height, self._PsIndex*InfoPageListItem._Height) + self._Scroller.Draw() + + else: + self._Ps._Width = self._Width + self._Ps.Draw() + for i in self._MyList: + i.Draw() + + def KeyDown(self, event): + if IsKeyMenuOrB(event.key): + self.ReturnToUpLevelPage() + self._Screen.Draw() + self._Screen.SwapAndShow() + + if event.key == CurKeys["Up"]: + self.ScrollUp() + self._Screen.Draw() + self._Screen.SwapAndShow() + if event.key == CurKeys["Down"]: + self.ScrollDown() + self._Screen.Draw() + self._Screen.SwapAndShow() + + if IsKeyStartOrA(event.key): + self.Click() + + def Click(self): + if self._PsIndex >= len(self._MyList): + return + + cur_li = self._MyList[self._PsIndex] + git.checkout_branch(self._Game, cur_li._LinkObj) + + +class GamePageSelector(PageSelector): + _BackgroundColor = MySkinManager.GiveColor('Front') + + def __init__(self): + self._PosX = 0 + self._PosY = 0 + self._Height = 0 + + def AnimateDraw(self, x2, y2): + pass + + def Draw(self): + idx = self._Parent._PsIndex + if idx < len( self._Parent._MyList): + x = self._PosX+2 + y = self._Parent._MyList[idx]._PosY+1 + h = self._Parent._MyList[idx]._Height -3 + + self._PosX = x + self._PosY = y + self._Height = h + + aa_round_rect(self._Parent._CanvasHWND, + (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor) + +class BranchSelectPage(Page): + _MyList = [] + + def __init__(self): + Page.__init__(self) + self._Icons = {} + + def Init(self): + self._SubPage = SelectPage() + self._SubPage._Screen = self._Screen + self._SubPage._Name = "Select Branch" + self._SubPage.Init() + + self._ListFontObj = MyLangManager.TrFont("varela15") + self._ListSmFontObj = MySkinManager.GiveFont("varela12") + if self._Screen != None: + if self._Screen._CanvasHWND != None and self._CanvasHWND == None: + self._HWND = self._Screen._CanvasHWND + self._CanvasHWND = self._Screen._CanvasHWND + + self._PosX = self._Index*self._Screen._Width + self._Width = self._Screen._Width ## equal to screen width + self._Height = self._Screen._Height + + ps = GamePageSelector() + ps._Parent = self + + self._Ps = ps + self._PsIndex = 0 + + self._Scroller = ListScroller() + self._Scroller._Parent = self + self._Scroller._PosX = 2 + self._Scroller._PosY = 2 + self._Scroller.Init() + + start_x = 0 + start_y = 0 + i = 0 + games = git.get_games() + for game in games: + li = InfoPageListItem() + li._Parent = self + li._PosX = start_x + li._PosY = start_y + i*InfoPageListItem._Height + + li._Width = Width + li._Fonts["normal"] = self._ListFontObj + + li._Fonts["small"] = self._ListSmFontObj + + li._LinkObj = game + + li.Init( game.split("/")[-1] ) + + sm_text = str(len(git.get_branches(game)[0])) + li.SetSmallText(sm_text) + + li._PosX = 2 + self._MyList.append(li) + + i = i + 1 + + def Draw(self): + self.ClearCanvas() + if len(self._MyList) * InfoPageListItem._Height > self._Height: + self._Ps._Width = self._Width - 10 + self._Ps._PosX = 9 + self._Ps.Draw() + for i in self._MyList: + i.Draw() + + self._Scroller.UpdateSize(len(self._MyList)*InfoPageListItem._Height, self._PsIndex*InfoPageListItem._Height) + self._Scroller.Draw() + + else: + self._Ps._Width = self._Width + self._Ps.Draw() + for i in self._MyList: + i.Draw() + + def KeyDown(self, event): + if IsKeyMenuOrB(event.key): + self.ReturnToUpLevelPage() + self._Screen.Draw() + self._Screen.SwapAndShow() + + if event.key == CurKeys["Up"]: + self.ScrollUp() + self._Screen.Draw() + self._Screen.SwapAndShow() + if event.key == CurKeys["Down"]: + self.ScrollDown() + self._Screen.Draw() + self._Screen.SwapAndShow() + + if IsKeyStartOrA(event.key): + self.Click() + + def Click(self): + if self._PsIndex >= len(self._MyList): + return + + cur_li = self._MyList[self._PsIndex] + branches, current = git.get_branches(cur_li._LinkObj) + + self._SubPage.Generate(cur_li._LinkObj, branches, current) + self._Screen.PushPage(self._SubPage) + self._Screen.Draw() + self._Screen.SwapAndShow() + + +class APIOBJ(object): + + _Page = None + def __init__(self): + pass + def Init(self,main_screen): + self._Page = BranchSelectPage() + self._Page._Screen = main_screen + self._Page._Name ="Branch Select" + self._Page.Init() + + def API(self,main_screen): + if main_screen !=None: + main_screen.PushPage(self._Page) + main_screen.Draw() + main_screen.SwapAndShow() + +OBJ = APIOBJ() +def Init(main_screen): + OBJ.Init(main_screen) +def API(main_screen): + OBJ.API(main_screen) diff --git a/Menu/GameShell/10_Settings/BranchSelect/git.py b/Menu/GameShell/10_Settings/BranchSelect/git.py new file mode 100644 index 0000000..6198c62 --- /dev/null +++ b/Menu/GameShell/10_Settings/BranchSelect/git.py @@ -0,0 +1,26 @@ +import subprocess +import os + +def get_branches(path): + branches = subprocess.check_output(["git", "branch"], cwd=path).decode("utf-8").split("\n")[0:-1] + current = "" + result = [] + for branch in branches: + if branch[0] == "*": + current = branch + result.append(branch[2:]) + return result, current + +def checkout_branch(path, branch): + return subprocess.check_call(["git", "checkout", branch], cwd=path) + +def get_games(): + result = [] + for filename in os.listdir("/home/cpi/games"): + filename = os.path.join("/home/cpi/games", filename) + if os.path.isdir(filename) and is_git(filename): + result.append(filename) + return result + +def is_git(path): + return os.path.join(path, ".git") \ No newline at end of file diff --git "a/Menu/GameShell/10_Settings/Brightness/Icon\r" "b/Menu/GameShell/10_Settings/Brightness/Icon\r" deleted file mode 100644 index e69de29..0000000 diff --git "a/Menu/GameShell/10_Settings/ButtonsLayout/Icon\r" "b/Menu/GameShell/10_Settings/ButtonsLayout/Icon\r" deleted file mode 100644 index e69de29..0000000 diff --git a/Menu/GameShell/10_Settings/Lima/__init__.py b/Menu/GameShell/10_Settings/Lima/__init__.py index ca198f6..f271d65 100644 --- a/Menu/GameShell/10_Settings/Lima/__init__.py +++ b/Menu/GameShell/10_Settings/Lima/__init__.py @@ -102,7 +102,7 @@ class GPUDriverPage(Page): last_height = 0 drivers = [["fbturbo","FBTURBO driver (Software Rendering)"], - ["modesetting","LIMA driver (Experimental GPU Rendering)"]] + ["modesetting","LIMA driver (GPU Rendering)"]] for i,u in enumerate( drivers ): diff --git "a/Menu/GameShell/10_Settings/Sound/Icon\r" "b/Menu/GameShell/10_Settings/Sound/Icon\r" deleted file mode 100644 index e69de29..0000000 diff --git "a/Menu/GameShell/10_Settings/Storage/Icon\r" "b/Menu/GameShell/10_Settings/Storage/Icon\r" deleted file mode 100644 index e69de29..0000000 diff --git a/Menu/GameShell/10_Settings/Storage/__init__.py b/Menu/GameShell/10_Settings/Storage/__init__.py index 5e9dfd7..44fc593 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,27 +51,24 @@ class StoragePage(Page): self._Width = self._Screen._Width self._Height = self._Screen._Height - self._BGpng = IconItem() - self._BGpng._ImgSurf = MyIconPool.GiveIconSurface("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("varela21")) - 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("varela12")) + self._FreeLabel.SetColor(self._PctLabel._Color) def OnLoadCb(self): @@ -82,31 +77,43 @@ class StoragePage(Page): 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('High'),5,0,MySkinManager.GiveColor('High')) + 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('Text'),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): @@ -134,5 +141,3 @@ def Init(main_screen): OBJ.Init(main_screen) def API(main_screen): OBJ.API(main_screen) - - diff --git a/Menu/GameShell/10_Settings/Update/__init__.py b/Menu/GameShell/10_Settings/Update/__init__.py index 8588cd2..d293dea 100644 --- a/Menu/GameShell/10_Settings/Update/__init__.py +++ b/Menu/GameShell/10_Settings/Update/__init__.py @@ -253,7 +253,11 @@ class UpdatePage(Page): self._Screen.PushPage(self._ConfirmPage) self._Screen.Draw() - self._ConfirmPage.SnapMsg(MyLangManager.Tr("UpdateToFQ") % json_["gitversion"] ) + + if "version" in json_: + self._ConfirmPage.SnapMsg(MyLangManager.Tr("ConfirmUpdateToFQ") % json_["version"] ) + else: + self._ConfirmPage.SnapMsg(MyLangManager.Tr("UpdateToFQ") % json_["gitversion"] ) self._Screen.SwapAndShow() else: self._Screen.Draw() @@ -330,5 +334,3 @@ def Init(main_screen): OBJ.Init(main_screen) def API(main_screen): OBJ.API(main_screen) - - diff --git a/Menu/GameShell/10_Settings/Wifi/wifi_list.py b/Menu/GameShell/10_Settings/Wifi/wifi_list.py index c5882d7..56b3ea5 100644 --- a/Menu/GameShell/10_Settings/Wifi/wifi_list.py +++ b/Menu/GameShell/10_Settings/Wifi/wifi_list.py @@ -10,7 +10,7 @@ from wicd import misc from UI.constants import Width,Height from UI.page import Page,PageSelector from UI.label import Label -from UI.util_funcs import midRect,SwapAndShow +from UI.util_funcs import midRect,SwapAndShow,FileExists,ReadTheFileContent from UI.keys_def import CurKeys, IsKeyStartOrA, IsKeyMenuOrB from UI.scroller import ListScroller from UI.confirm_page import ConfirmPage @@ -82,7 +82,11 @@ class WifiInfoPage(Page): self._AList["ip"]["value"] = ip self._AList["bssid"]["value"] = self._Wireless.GetWirelessProperty(self._NetworkId,"bssid") - + if FileExists("/sys/class/net/wlan0/address"): + self._AList["mac_addr"]["value"] = ReadTheFileContent("/sys/class/net/wlan0/address").strip().upper() + else: + self._AList["mac_addr"]["value"] = "" + start_x = 0 start_y = 0 @@ -130,10 +134,16 @@ class WifiInfoPage(Page): bssid["key"] = "bssid" bssid["label"] = "BSSID" bssid["value"] = "" - + + mac_addr = {} + mac_addr["key"] = "mac_addr" + mac_addr["label"] = "MAC ADDR" + mac_addr["value"] = "" + self._AList["ip"] = ip self._AList["bssid"] = bssid - + self._AList["mac_addr"] = mac_addr + self.GenList() self._DisconnectConfirmPage = WifiDisconnectConfirmPage() @@ -453,7 +463,6 @@ class WifiList(Page): in DbusConnectResultsSent 'dhcp_failed' dbus says start scan... - """ if result != None: print(result) @@ -550,10 +559,8 @@ class WifiList(Page): results.append({text:value}) """ [{'preshared_key': 'blah blah blah',},] - or nothing [{'identity': None,},{'password': None,},] - """ return results diff --git a/Menu/GameShell/30_RetroArch.sh b/Menu/GameShell/30_RetroArch.sh index 44f0c2a..8bbfa4c 100755 --- a/Menu/GameShell/30_RetroArch.sh +++ b/Menu/GameShell/30_RetroArch.sh @@ -1 +1,3 @@ -retroarch +#!/bin/bash + +retroarch diff --git a/Menu/GameShell/31_CaveStory.sh b/Menu/GameShell/31_CaveStory.sh index aed9656..f972dbd 100755 --- a/Menu/GameShell/31_CaveStory.sh +++ b/Menu/GameShell/31_CaveStory.sh @@ -1 +1,4 @@ +#!/bin/bash +#retroarch -L /home/cpi/.config/retroarch/cores/nxengine_libretro.so /home/cpi/games/nxengine/cavestory/data + retroarch -L /home/cpi/apps/emulators/nxengine_libretro.so /home/cpi/games/nxengine/cavestory/data diff --git a/Menu/GameShell/50_PICO-8/PICO-8.sh b/Menu/GameShell/50_PICO-8/PICO-8.sh index 54cc66f..be527fd 100755 --- a/Menu/GameShell/50_PICO-8/PICO-8.sh +++ b/Menu/GameShell/50_PICO-8/PICO-8.sh @@ -1,5 +1,4 @@ #!/bin/bash -#SDL_VIDEODRIVER=x11 DISPLAY=:0 ./pico-8/pico8_dyn -splore -draw_rect 32,0,256,240 -cd /home/cpi/games/PICO-8/pico-8 +cd /home/cpi/games/PICO-8/pico-8 || exit SDL_VIDEODRIVER=x11 DISPLAY=:0 ./pico8_dyn -splore -draw_rect 32,0,256,240 diff --git a/Menu/GameShell/50_PICO-8/Post-Up.sh b/Menu/GameShell/50_PICO-8/Post-Up.sh index e8c38e0..acbdf77 100755 --- a/Menu/GameShell/50_PICO-8/Post-Up.sh +++ b/Menu/GameShell/50_PICO-8/Post-Up.sh @@ -9,4 +9,3 @@ mkdir ~/.lexaloffle/pico-8/carts ln -s ~/.lexaloffle/pico-8/carts/ ~/games/PICO-8/carts touch .done - diff --git a/Menu/GameShell/50_PICO-8/compkginfo.json b/Menu/GameShell/50_PICO-8/compkginfo.json index 84af577..503ef14 100644 --- a/Menu/GameShell/50_PICO-8/compkginfo.json +++ b/Menu/GameShell/50_PICO-8/compkginfo.json @@ -3,7 +3,8 @@ "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", +"MD5":{"pico-8_0.2.0i_raspi.zip":"be0c708d707fa967c77455512bd456c7", + "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", diff --git a/Menu/GameShell/97_Music Player/__init__.py b/Menu/GameShell/95_Music Player/__init__.py similarity index 100% rename from Menu/GameShell/97_Music Player/__init__.py rename to Menu/GameShell/95_Music Player/__init__.py diff --git a/Menu/GameShell/97_Music Player/list_item.py b/Menu/GameShell/95_Music Player/list_item.py similarity index 97% rename from Menu/GameShell/97_Music Player/list_item.py rename to Menu/GameShell/95_Music Player/list_item.py index 23ba788..9880693 100644 --- a/Menu/GameShell/97_Music Player/list_item.py +++ b/Menu/GameShell/95_Music Player/list_item.py @@ -127,7 +127,7 @@ class ListItem(object): if self._PlayingProcess > 0: seek_posx = int(self._Width * self._PlayingProcess/100.0) - pygame.draw.line(self._Parent._CanvasHWND,MySkinManager.GiveColor('Active'),(self._PosX,self._PosY+self._Height-2),(self._PosX+seek_posx,self._PosY+self._Height-2),2) + pygame.draw.line(self._Parent._CanvasHWND,MySkinManager.GiveColor('Text'),(self._PosX,self._PosY+self._Height-2),(self._PosX+seek_posx,self._PosY+self._Height-2),2) else: self._Labels["Text"].Draw() diff --git a/Menu/GameShell/97_Music Player/mpd_spectrum_page.py b/Menu/GameShell/95_Music Player/mpd_spectrum_page.py similarity index 96% rename from Menu/GameShell/97_Music Player/mpd_spectrum_page.py rename to Menu/GameShell/95_Music Player/mpd_spectrum_page.py index 92bf899..d9340e3 100644 --- a/Menu/GameShell/97_Music Player/mpd_spectrum_page.py +++ b/Menu/GameShell/95_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() @@ -410,11 +410,8 @@ 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 - - - + self._vis_values[i] -= 2 diff --git a/Menu/GameShell/97_Music Player/music_lib_list_page.py b/Menu/GameShell/95_Music Player/music_lib_list_page.py similarity index 99% rename from Menu/GameShell/97_Music Player/music_lib_list_page.py rename to Menu/GameShell/95_Music Player/music_lib_list_page.py index 9202710..1b6ed24 100644 --- a/Menu/GameShell/97_Music Player/music_lib_list_page.py +++ b/Menu/GameShell/95_Music Player/music_lib_list_page.py @@ -325,4 +325,4 @@ class MusicLibListPage(Page): if i._PosY < 0: continue - i.Draw() + i.Draw() diff --git a/Menu/GameShell/97_Music Player/myvars.py b/Menu/GameShell/95_Music Player/myvars.py similarity index 96% rename from Menu/GameShell/97_Music Player/myvars.py rename to Menu/GameShell/95_Music Player/myvars.py index d327570..7d7007e 100644 --- a/Menu/GameShell/97_Music Player/myvars.py +++ b/Menu/GameShell/95_Music Player/myvars.py @@ -1,8 +1,5 @@ - - Poller = None # MPD Poller PlayListPage = None MusicLibListPage = None SpectrumPage = None - diff --git a/Menu/GameShell/97_Music Player/pages.py b/Menu/GameShell/95_Music Player/pages.py similarity index 100% rename from Menu/GameShell/97_Music Player/pages.py rename to Menu/GameShell/95_Music Player/pages.py diff --git a/Menu/GameShell/97_Music Player/play_list_page.py b/Menu/GameShell/95_Music Player/play_list_page.py similarity index 99% rename from Menu/GameShell/97_Music Player/play_list_page.py rename to Menu/GameShell/95_Music Player/play_list_page.py index 52710a9..6cda511 100644 --- a/Menu/GameShell/97_Music Player/play_list_page.py +++ b/Menu/GameShell/95_Music Player/play_list_page.py @@ -235,7 +235,7 @@ class PlayListPage(Page): self._MyList[i]._PosY += self._Scrolled * self._MyList[i]._Height def Click(self): - self.RefreshPsIndex() + #self.RefreshPsIndex() if len(self._MyList) == 0: return @@ -325,4 +325,3 @@ class PlayListPage(Page): continue i.Draw() - diff --git a/Menu/GameShell/98_TinyCloud/__init__.py b/Menu/GameShell/96_TinyCloud/__init__.py similarity index 99% rename from Menu/GameShell/98_TinyCloud/__init__.py rename to Menu/GameShell/96_TinyCloud/__init__.py index 89f2363..82d0b99 100644 --- a/Menu/GameShell/98_TinyCloud/__init__.py +++ b/Menu/GameShell/96_TinyCloud/__init__.py @@ -243,5 +243,3 @@ def Init(main_screen): OBJ.Init(main_screen) def API(main_screen): OBJ.API(main_screen) - - diff --git a/Menu/GameShell/98_Sleep.sh b/Menu/GameShell/98_Sleep.sh new file mode 100644 index 0000000..d4da4bd --- /dev/null +++ b/Menu/GameShell/98_Sleep.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +kernel=$(uname -r) +if [[ $kernel == *"5.7"* ]]; then + systemctl suspend +fi + +exit 0 diff --git a/Menu/GameShell/99_PowerOFF/__init__.py b/Menu/GameShell/99_PowerOFF/__init__.py index 740d0aa..2ef02e4 100644 --- a/Menu/GameShell/99_PowerOFF/__init__.py +++ b/Menu/GameShell/99_PowerOFF/__init__.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import pygame +import subprocess #UI lib from UI.constants import RUNSYS @@ -14,7 +15,16 @@ import config class PowerOffConfirmPage(ConfirmPage): _ConfirmText = MyLangManager.Tr("Awaiting Input") + #_FootMsg = ["Nav","Suspend","Reboot","Cancel","Shutdown"] _FootMsg = ["Nav","","Reboot","Cancel","Shutdown"] + + # uname -r + st = subprocess.check_output(["uname","-r"]) + st = st.strip("\n") + st = st.strip("\t") + + if "5.7" in st: + _FootMsg[1] = "Sleep" def CheckBattery(self): try: @@ -67,6 +77,12 @@ class PowerOffConfirmPage(ConfirmPage): cmdpath += "sudo reboot" pygame.event.post( pygame.event.Event(RUNSYS, message=cmdpath)) + if event.key == CurKeys["Y"]: + if self._FootMsg[1] != "": + cmdpath = "feh --bg-center %s;" % MySkinManager.GiveWallpaper("seeyou.png") + cmdpath += "sleep 3;" + cmdpath += "sudo pm-suspend" + pygame.event.post( pygame.event.Event(RUNSYS, message=cmdpath)) class APIOBJ(object): @@ -92,4 +108,3 @@ def Init(main_screen): OBJ.Init(main_screen) def API(main_screen): OBJ.API(main_screen) - diff --git a/README.md b/README.md index 30e6b0e..6fe8d64 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ -# GameShell launcher -This is the launcher for GameShell based on 320x240 resolution and D-Pad layout. -![Screenshot](https://github.com/clockworkpi/GameShellDocs/blob/master/screenshot.png) +# GameShell DEOT launcher +This is the DEOT UI launcher for GameShell based on 320x240 resolution and D-Pad layout. +![Screenshot](https://raw.githubusercontent.com/hi80482/launcher_deot/master/.screenshot.png) + +Screenshot Source: https://alioss.gcores.com/site/deot/index.html # Create the necessary user and group * User name: cpi @@ -13,19 +15,40 @@ sudo groupadd cpifav -g 31415 sudo adduser cpi cpifav ``` +# Clone the GitHub repository +* Login as: cpi +* Get launcher (System Apps) +``` +cd +git clone https://github.com/your_launcher.git ~/launcher +``` + +* Get Menu (Custom Apps) +``` +cd +git clone https://github.com/your_menu.git ~/apps/Menu +``` + # Directory structure ``` /home/cpi/ ├── apps +│   ├── Menu <-Custom Apps │   ├── emulators -│   └── launcher <-Here we are -│   ├── Menu -│   ├── sys.py -│   └── truetype +│ └── ... +│ +├── launcher <-Here we are +│   ├── Menu <-System apps +│   ├── sys.py +│   ├── skin +│ └── ... +│ ├── games │   ├── FreeDM │   ├── MAME -│   └── nxengine +│   ├── nxengine +│   └── ... +│ └── music ``` ## Create the necessary directories @@ -46,7 +69,7 @@ sudo apt-get -y install mpd ncmpcpp git libuser sudo apt-get -y install python-wicd wicd wicd-curses python-pycurl python-alsaaudio python-pygame python-gobject python-xlib sudo apt-get -y install python-pip -sudo pip install validators numpy requests python-mpd2 beeprint +sudo pip install validators numpy requests python-mpd2 ``` ### With pip install and virtualenv @@ -56,39 +79,78 @@ mkvirtualenv launcher pip install -r requirements.txt ``` -# Create “.mpd_cpi.conf” config +# Create “.mpd.conf” config -vim ~/.mpd_cpi.conf +vim ~/.mpd.conf ``` -music_directory "/home/cpi/music" -playlist_directory "/home/cpi/music/playlists" -db_file "/home/cpi/music/tag_cache" -log_file "/tmp/mpd.log" -pid_file "/tmp/mpd.pid" -state_file "/home/cpi/music/mpd_state" -sticker_file "/home/cpi/music/sticker.sql" -user "cpi" -bind_to_address "/tmp/mpd.socket" -auto_update "yes" -auto_update_depth "3" +music_directory "/home/cpi/music" +playlist_directory "/home/cpi/.mpd/playlists" +db_file "/home/cpi/.mpd/tag_cache" +log_file "/home/cpi/.mpd/mpd.log" +pid_file "/home/cpi/.mpd/pid" +state_file "/home/cpi/.mpd/state" +sticker_file "/home/cpi/.mpd/sticker.sql" +user "cpi" +bind_to_address "/tmp/mpd.socket" + +auto_update "yes" +auto_update_depth "2" + input { - plugin "curl" + plugin "curl" } audio_output { - type "alsa" - name "My ALSA Device" + type "alsa" + name "ALSA Device" } audio_output { - type "fifo" - name "my_fifo" - path "/tmp/mpd.fifo" - format "44100:16:2" + type "fifo" + name "my_fifo" + path "/tmp/mpd.fifo" + format "44100:16:2" } -filesystem_charset "UTF-8" +filesystem_charset "UTF-8" +# id3v1_encoding "UTF-8" + +# QOBUZ input plugin +input { + enabled "no" + plugin "qobuz" +# app_id "ID" +# app_secret "SECRET" +# username "USERNAME" +# password "PASSWORD" +# format_id "N" +} + +# TIDAL input plugin +input { + enabled "no" + plugin "tidal" +# token "TOKEN" +# username "USERNAME" +# password "PASSWORD" +# audioquality "Q" +} + +# Decoder ##################################################################### +# + +decoder { + plugin "hybrid_dsd" + enabled "no" +# gapless "no" +} ``` +# Create “.gameshell_skin” config +vim ~/.gameshell_skin + +``` +/home/cpi/launcher/skin/DEOT +``` diff --git a/awesome/themes/default/background.png b/awesome/themes/default/background.png index 22e67fe..a7e9601 100644 Binary files a/awesome/themes/default/background.png and b/awesome/themes/default/background.png differ diff --git a/awesome/themes/default/background_white.png b/awesome/themes/default/background_white.png index 22e67fe..1e547da 100644 Binary files a/awesome/themes/default/background_white.png and b/awesome/themes/default/background_white.png differ diff --git a/awesome/themes/default/layouts/cornerne.png b/awesome/themes/default/layouts/cornerne.png index 8cfa09c..8a51924 100644 Binary files a/awesome/themes/default/layouts/cornerne.png and b/awesome/themes/default/layouts/cornerne.png differ diff --git a/awesome/themes/default/layouts/cornernew.png b/awesome/themes/default/layouts/cornernew.png index 7f6d554..8a3b9b7 100644 Binary files a/awesome/themes/default/layouts/cornernew.png and b/awesome/themes/default/layouts/cornernew.png differ diff --git a/awesome/themes/default/layouts/cornernw.png b/awesome/themes/default/layouts/cornernw.png index 1cb50a4..7670895 100644 Binary files a/awesome/themes/default/layouts/cornernw.png and b/awesome/themes/default/layouts/cornernw.png differ diff --git a/awesome/themes/default/layouts/cornernww.png b/awesome/themes/default/layouts/cornernww.png index 86a36d8..75ede11 100644 Binary files a/awesome/themes/default/layouts/cornernww.png and b/awesome/themes/default/layouts/cornernww.png differ diff --git a/awesome/themes/default/layouts/cornerse.png b/awesome/themes/default/layouts/cornerse.png index 70d5731..89d780c 100644 Binary files a/awesome/themes/default/layouts/cornerse.png and b/awesome/themes/default/layouts/cornerse.png differ diff --git a/awesome/themes/default/layouts/cornersew.png b/awesome/themes/default/layouts/cornersew.png index cdf602e..caa2836 100644 Binary files a/awesome/themes/default/layouts/cornersew.png and b/awesome/themes/default/layouts/cornersew.png differ diff --git a/awesome/themes/default/layouts/cornersw.png b/awesome/themes/default/layouts/cornersw.png index f23f19a..1df96d5 100644 Binary files a/awesome/themes/default/layouts/cornersw.png and b/awesome/themes/default/layouts/cornersw.png differ diff --git a/awesome/themes/default/layouts/cornersww.png b/awesome/themes/default/layouts/cornersww.png index 7f13d5b..186ffab 100644 Binary files a/awesome/themes/default/layouts/cornersww.png and b/awesome/themes/default/layouts/cornersww.png differ diff --git a/awesome/themes/default/layouts/dwindle.png b/awesome/themes/default/layouts/dwindle.png index 0ec7a35..6331273 100644 Binary files a/awesome/themes/default/layouts/dwindle.png and b/awesome/themes/default/layouts/dwindle.png differ diff --git a/awesome/themes/default/layouts/dwindlew.png b/awesome/themes/default/layouts/dwindlew.png index 8457892..aa95ba1 100644 Binary files a/awesome/themes/default/layouts/dwindlew.png and b/awesome/themes/default/layouts/dwindlew.png differ diff --git a/awesome/themes/default/layouts/fairh.png b/awesome/themes/default/layouts/fairh.png index 3c2d36b..15adeb8 100644 Binary files a/awesome/themes/default/layouts/fairh.png and b/awesome/themes/default/layouts/fairh.png differ diff --git a/awesome/themes/default/layouts/fairhw.png b/awesome/themes/default/layouts/fairhw.png index 410e292..b72096d 100644 Binary files a/awesome/themes/default/layouts/fairhw.png and b/awesome/themes/default/layouts/fairhw.png differ diff --git a/awesome/themes/default/layouts/fairv.png b/awesome/themes/default/layouts/fairv.png index ad99f4b..45756aa 100644 Binary files a/awesome/themes/default/layouts/fairv.png and b/awesome/themes/default/layouts/fairv.png differ diff --git a/awesome/themes/default/layouts/fairvw.png b/awesome/themes/default/layouts/fairvw.png index 1a4ee27..1e9eeb9 100644 Binary files a/awesome/themes/default/layouts/fairvw.png and b/awesome/themes/default/layouts/fairvw.png differ diff --git a/awesome/themes/default/layouts/floating.png b/awesome/themes/default/layouts/floating.png index bf74990..8a31fd3 100644 Binary files a/awesome/themes/default/layouts/floating.png and b/awesome/themes/default/layouts/floating.png differ diff --git a/awesome/themes/default/layouts/floatingw.png b/awesome/themes/default/layouts/floatingw.png index 7aecb06..cb0cee3 100644 Binary files a/awesome/themes/default/layouts/floatingw.png and b/awesome/themes/default/layouts/floatingw.png differ diff --git a/awesome/themes/default/layouts/fullscreen.png b/awesome/themes/default/layouts/fullscreen.png index d02f6fc..9141fb6 100644 Binary files a/awesome/themes/default/layouts/fullscreen.png and b/awesome/themes/default/layouts/fullscreen.png differ diff --git a/awesome/themes/default/layouts/fullscreenw.png b/awesome/themes/default/layouts/fullscreenw.png index 5c35bfa..83d0ea3 100644 Binary files a/awesome/themes/default/layouts/fullscreenw.png and b/awesome/themes/default/layouts/fullscreenw.png differ diff --git a/awesome/themes/default/layouts/magnifier.png b/awesome/themes/default/layouts/magnifier.png index 2ea2792..89aec5c 100644 Binary files a/awesome/themes/default/layouts/magnifier.png and b/awesome/themes/default/layouts/magnifier.png differ diff --git a/awesome/themes/default/layouts/magnifierw.png b/awesome/themes/default/layouts/magnifierw.png index 5cd5e16..7eb643f 100644 Binary files a/awesome/themes/default/layouts/magnifierw.png and b/awesome/themes/default/layouts/magnifierw.png differ diff --git a/awesome/themes/default/layouts/max.png b/awesome/themes/default/layouts/max.png index 8d20844..a660640 100644 Binary files a/awesome/themes/default/layouts/max.png and b/awesome/themes/default/layouts/max.png differ diff --git a/awesome/themes/default/layouts/maxw.png b/awesome/themes/default/layouts/maxw.png index 85f5ce3..2c53d76 100644 Binary files a/awesome/themes/default/layouts/maxw.png and b/awesome/themes/default/layouts/maxw.png differ diff --git a/awesome/themes/default/layouts/spiral.png b/awesome/themes/default/layouts/spiral.png index ca41814..859b97c 100644 Binary files a/awesome/themes/default/layouts/spiral.png and b/awesome/themes/default/layouts/spiral.png differ diff --git a/awesome/themes/default/layouts/spiralw.png b/awesome/themes/default/layouts/spiralw.png index d128461..f605231 100644 Binary files a/awesome/themes/default/layouts/spiralw.png and b/awesome/themes/default/layouts/spiralw.png differ diff --git a/awesome/themes/default/layouts/tile.png b/awesome/themes/default/layouts/tile.png index db1ce15..b1f72b7 100644 Binary files a/awesome/themes/default/layouts/tile.png and b/awesome/themes/default/layouts/tile.png differ diff --git a/awesome/themes/default/layouts/tilebottom.png b/awesome/themes/default/layouts/tilebottom.png index 73a72fe..98518a4 100644 Binary files a/awesome/themes/default/layouts/tilebottom.png and b/awesome/themes/default/layouts/tilebottom.png differ diff --git a/awesome/themes/default/layouts/tilebottomw.png b/awesome/themes/default/layouts/tilebottomw.png index 64aa289..874daa4 100644 Binary files a/awesome/themes/default/layouts/tilebottomw.png and b/awesome/themes/default/layouts/tilebottomw.png differ diff --git a/awesome/themes/default/layouts/tileleft.png b/awesome/themes/default/layouts/tileleft.png index 829475a..d4ac5db 100644 Binary files a/awesome/themes/default/layouts/tileleft.png and b/awesome/themes/default/layouts/tileleft.png differ diff --git a/awesome/themes/default/layouts/tileleftw.png b/awesome/themes/default/layouts/tileleftw.png index 24c3941..3b73d03 100644 Binary files a/awesome/themes/default/layouts/tileleftw.png and b/awesome/themes/default/layouts/tileleftw.png differ diff --git a/awesome/themes/default/layouts/tiletop.png b/awesome/themes/default/layouts/tiletop.png index 1964d4d..14ae923 100644 Binary files a/awesome/themes/default/layouts/tiletop.png and b/awesome/themes/default/layouts/tiletop.png differ diff --git a/awesome/themes/default/layouts/tiletopw.png b/awesome/themes/default/layouts/tiletopw.png index d2eee79..2c06f0b 100644 Binary files a/awesome/themes/default/layouts/tiletopw.png and b/awesome/themes/default/layouts/tiletopw.png differ diff --git a/awesome/themes/default/layouts/tilew.png b/awesome/themes/default/layouts/tilew.png index 4451a66..04ba9dd 100644 Binary files a/awesome/themes/default/layouts/tilew.png and b/awesome/themes/default/layouts/tilew.png differ diff --git a/awesome/themes/default/submenu.png b/awesome/themes/default/submenu.png index b2778e2..e1c8f96 100644 Binary files a/awesome/themes/default/submenu.png and b/awesome/themes/default/submenu.png differ diff --git a/awesome/themes/default/taglist/squarefw.png b/awesome/themes/default/taglist/squarefw.png index 5b4f194..7ea40fd 100644 Binary files a/awesome/themes/default/taglist/squarefw.png and b/awesome/themes/default/taglist/squarefw.png differ diff --git a/awesome/themes/default/taglist/squarew.png b/awesome/themes/default/taglist/squarew.png index f9725dd..c48adc9 100644 Binary files a/awesome/themes/default/taglist/squarew.png and b/awesome/themes/default/taglist/squarew.png differ diff --git a/awesome/themes/default/titlebar/close_focus.png b/awesome/themes/default/titlebar/close_focus.png index e4763b6..e9a6854 100644 Binary files a/awesome/themes/default/titlebar/close_focus.png and b/awesome/themes/default/titlebar/close_focus.png differ diff --git a/awesome/themes/default/titlebar/close_normal.png b/awesome/themes/default/titlebar/close_normal.png index 7702839..389dbc1 100644 Binary files a/awesome/themes/default/titlebar/close_normal.png and b/awesome/themes/default/titlebar/close_normal.png differ diff --git a/awesome/themes/default/titlebar/floating_focus_active.png b/awesome/themes/default/titlebar/floating_focus_active.png index 80c1b4a..2b95974 100644 Binary files a/awesome/themes/default/titlebar/floating_focus_active.png and b/awesome/themes/default/titlebar/floating_focus_active.png differ diff --git a/awesome/themes/default/titlebar/floating_focus_inactive.png b/awesome/themes/default/titlebar/floating_focus_inactive.png index a96f00c..d669b1e 100644 Binary files a/awesome/themes/default/titlebar/floating_focus_inactive.png and b/awesome/themes/default/titlebar/floating_focus_inactive.png differ diff --git a/awesome/themes/default/titlebar/floating_normal_active.png b/awesome/themes/default/titlebar/floating_normal_active.png index b9c70ca..e6145e3 100644 Binary files a/awesome/themes/default/titlebar/floating_normal_active.png and b/awesome/themes/default/titlebar/floating_normal_active.png differ diff --git a/awesome/themes/default/titlebar/floating_normal_inactive.png b/awesome/themes/default/titlebar/floating_normal_inactive.png index 55cbc0c..e67256f 100644 Binary files a/awesome/themes/default/titlebar/floating_normal_inactive.png and b/awesome/themes/default/titlebar/floating_normal_inactive.png differ diff --git a/awesome/themes/default/titlebar/maximized_focus_active.png b/awesome/themes/default/titlebar/maximized_focus_active.png index dad461d..2ebca2e 100644 Binary files a/awesome/themes/default/titlebar/maximized_focus_active.png and b/awesome/themes/default/titlebar/maximized_focus_active.png differ diff --git a/awesome/themes/default/titlebar/maximized_focus_inactive.png b/awesome/themes/default/titlebar/maximized_focus_inactive.png index 3cc46fe..d4fea2f 100644 Binary files a/awesome/themes/default/titlebar/maximized_focus_inactive.png and b/awesome/themes/default/titlebar/maximized_focus_inactive.png differ diff --git a/awesome/themes/default/titlebar/maximized_normal_active.png b/awesome/themes/default/titlebar/maximized_normal_active.png index 0bbbf6a..8af382a 100644 Binary files a/awesome/themes/default/titlebar/maximized_normal_active.png and b/awesome/themes/default/titlebar/maximized_normal_active.png differ diff --git a/awesome/themes/default/titlebar/maximized_normal_inactive.png b/awesome/themes/default/titlebar/maximized_normal_inactive.png index 5f1e98f..8ba28ce 100644 Binary files a/awesome/themes/default/titlebar/maximized_normal_inactive.png and b/awesome/themes/default/titlebar/maximized_normal_inactive.png differ diff --git a/awesome/themes/default/titlebar/minimize_focus.png b/awesome/themes/default/titlebar/minimize_focus.png index 1b2629f..bf0a4f8 100644 Binary files a/awesome/themes/default/titlebar/minimize_focus.png and b/awesome/themes/default/titlebar/minimize_focus.png differ diff --git a/awesome/themes/default/titlebar/minimize_normal.png b/awesome/themes/default/titlebar/minimize_normal.png index 55d804f..a395e20 100644 Binary files a/awesome/themes/default/titlebar/minimize_normal.png and b/awesome/themes/default/titlebar/minimize_normal.png differ diff --git a/awesome/themes/default/titlebar/ontop_focus_active.png b/awesome/themes/default/titlebar/ontop_focus_active.png index d79c8e2..b54dcc4 100644 Binary files a/awesome/themes/default/titlebar/ontop_focus_active.png and b/awesome/themes/default/titlebar/ontop_focus_active.png differ diff --git a/awesome/themes/default/titlebar/ontop_focus_inactive.png b/awesome/themes/default/titlebar/ontop_focus_inactive.png index 03aef5a..c57990d 100644 Binary files a/awesome/themes/default/titlebar/ontop_focus_inactive.png and b/awesome/themes/default/titlebar/ontop_focus_inactive.png differ diff --git a/awesome/themes/default/titlebar/ontop_normal_active.png b/awesome/themes/default/titlebar/ontop_normal_active.png index e09f32d..9f76a1e 100644 Binary files a/awesome/themes/default/titlebar/ontop_normal_active.png and b/awesome/themes/default/titlebar/ontop_normal_active.png differ diff --git a/awesome/themes/default/titlebar/ontop_normal_inactive.png b/awesome/themes/default/titlebar/ontop_normal_inactive.png index 9917b9e..1121eae 100644 Binary files a/awesome/themes/default/titlebar/ontop_normal_inactive.png and b/awesome/themes/default/titlebar/ontop_normal_inactive.png differ diff --git a/awesome/themes/default/titlebar/sticky_focus_active.png b/awesome/themes/default/titlebar/sticky_focus_active.png index 8019463..c892419 100644 Binary files a/awesome/themes/default/titlebar/sticky_focus_active.png and b/awesome/themes/default/titlebar/sticky_focus_active.png differ diff --git a/awesome/themes/default/titlebar/sticky_focus_inactive.png b/awesome/themes/default/titlebar/sticky_focus_inactive.png index 6d7fe40..d0dde24 100644 Binary files a/awesome/themes/default/titlebar/sticky_focus_inactive.png and b/awesome/themes/default/titlebar/sticky_focus_inactive.png differ diff --git a/awesome/themes/default/titlebar/sticky_normal_active.png b/awesome/themes/default/titlebar/sticky_normal_active.png index 0d003ef..9b83548 100644 Binary files a/awesome/themes/default/titlebar/sticky_normal_active.png and b/awesome/themes/default/titlebar/sticky_normal_active.png differ diff --git a/awesome/themes/default/titlebar/sticky_normal_inactive.png b/awesome/themes/default/titlebar/sticky_normal_inactive.png index f1e8789..d85162b 100644 Binary files a/awesome/themes/default/titlebar/sticky_normal_inactive.png and b/awesome/themes/default/titlebar/sticky_normal_inactive.png differ diff --git a/bluetooth_firmware.sh b/bluetooth_firmware.sh index dc9ef66..2b25e96 100755 --- a/bluetooth_firmware.sh +++ b/bluetooth_firmware.sh @@ -1,6 +1,6 @@ #!/bin/bash -FIRM=`cat /proc/driver/brcmf_fw` +FIRM=$(cat /proc/driver/brcmf_fw) if [[ $FIRM =~ .*a0.* ]] then diff --git a/load.sh b/load.sh index c3a78c9..ad0f003 100755 --- a/load.sh +++ b/load.sh @@ -4,6 +4,7 @@ BASENAME=`dirname "$0"` cd $BASENAME/sys.py +# boot sound +mplayer -volume 75 /home/cpi/music/startup.mp3 + python run.py - - diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/BeetleVB.png b/skin/DEOT/Menu/GameShell/20_Retro Games/BeetleVB.png index 255f476..2c4ae47 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/BeetleVB.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/BeetleVB.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/Coleco.png b/skin/DEOT/Menu/GameShell/20_Retro Games/Coleco.png index 0cbffd0..66c04c0 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/Coleco.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/Coleco.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/Drastic+.png b/skin/DEOT/Menu/GameShell/20_Retro Games/Drastic+.png index a8fcd94..0731ac5 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/Drastic+.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/Drastic+.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/FBA.png b/skin/DEOT/Menu/GameShell/20_Retro Games/FBA.png index ca82e63..2629569 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/FBA.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/FBA.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/Fceux+.png b/skin/DEOT/Menu/GameShell/20_Retro Games/Fceux+.png index f69ea6e..37a1bbd 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/Fceux+.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/Fceux+.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/Fuse.png b/skin/DEOT/Menu/GameShell/20_Retro Games/Fuse.png index 7dd5350..a76b1fd 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/Fuse.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/Fuse.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/GGEAR.png b/skin/DEOT/Menu/GameShell/20_Retro Games/GGEAR.png index 807ee99..d7f2427 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/GGEAR.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/GGEAR.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/GPSP.png b/skin/DEOT/Menu/GameShell/20_Retro Games/GPSP.png index fdd3c7e..1833b86 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/GPSP.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/GPSP.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/LYNX.png b/skin/DEOT/Menu/GameShell/20_Retro Games/LYNX.png index dfea5a8..c0d2d41 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/LYNX.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/LYNX.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/MAME alt.png b/skin/DEOT/Menu/GameShell/20_Retro Games/MAME alt.png index ca82e63..ac002fc 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/MAME alt.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/MAME alt.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/MAME.png b/skin/DEOT/Menu/GameShell/20_Retro Games/MAME.png index c7dd4ed..750fc93 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/MAME.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/MAME.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/MGBA alt.png b/skin/DEOT/Menu/GameShell/20_Retro Games/MGBA alt.png index 116763e..f24e529 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/MGBA alt.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/MGBA alt.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/MGBA.png b/skin/DEOT/Menu/GameShell/20_Retro Games/MGBA.png index 8f9f29d..e373873 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/MGBA.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/MGBA.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/MGBAalt.png b/skin/DEOT/Menu/GameShell/20_Retro Games/MGBAalt.png index 116763e..c1d70e3 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/MGBAalt.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/MGBAalt.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/Mednafen.png b/skin/DEOT/Menu/GameShell/20_Retro Games/Mednafen.png index 9e2371f..9b7913b 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/Mednafen.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/Mednafen.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/MednafenVB.png b/skin/DEOT/Menu/GameShell/20_Retro Games/MednafenVB.png index c2f45c7..8a87cef 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/MednafenVB.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/MednafenVB.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/NESTOPIA alt.png b/skin/DEOT/Menu/GameShell/20_Retro Games/NESTOPIA alt.png index a6e0dc7..c5745f1 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/NESTOPIA alt.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/NESTOPIA alt.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/NESTOPIA.png b/skin/DEOT/Menu/GameShell/20_Retro Games/NESTOPIA.png index 06956a8..00ddee4 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/NESTOPIA.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/NESTOPIA.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/NESTOPIAalt.png b/skin/DEOT/Menu/GameShell/20_Retro Games/NESTOPIAalt.png index 06956a8..4284ab6 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/NESTOPIAalt.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/NESTOPIAalt.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/Ohboy+.png b/skin/DEOT/Menu/GameShell/20_Retro Games/Ohboy+.png index ff323e2..1a4d05d 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/Ohboy+.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/Ohboy+.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/PCSX.png b/skin/DEOT/Menu/GameShell/20_Retro Games/PCSX.png index e6408e5..104c214 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/PCSX.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/PCSX.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/Pcsx+.png b/skin/DEOT/Menu/GameShell/20_Retro Games/Pcsx+.png index 68fd25e..c6acd4e 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/Pcsx+.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/Pcsx+.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/PicoDrive+.png b/skin/DEOT/Menu/GameShell/20_Retro Games/PicoDrive+.png index 253050f..97a2899 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/PicoDrive+.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/PicoDrive+.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/PicoDrive.png b/skin/DEOT/Menu/GameShell/20_Retro Games/PicoDrive.png index f9ee178..e5596cb 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/PicoDrive.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/PicoDrive.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/PocketSNES+.png b/skin/DEOT/Menu/GameShell/20_Retro Games/PocketSNES+.png index 35789e5..3b64c54 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/PocketSNES+.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/PocketSNES+.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/Quake II.png b/skin/DEOT/Menu/GameShell/20_Retro Games/Quake II.png index ba9e225..f0ac64b 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/Quake II.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/Quake II.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/SCUMMVM.png b/skin/DEOT/Menu/GameShell/20_Retro Games/SCUMMVM.png index f37f915..e8f2271 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/SCUMMVM.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/SCUMMVM.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/SFC9X.png b/skin/DEOT/Menu/GameShell/20_Retro Games/SFC9X.png index 1f70629..a4b5374 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/SFC9X.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/SFC9X.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/UAE+.png b/skin/DEOT/Menu/GameShell/20_Retro Games/UAE+.png index f71aafa..5233005 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/UAE+.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/UAE+.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/Wswan.png b/skin/DEOT/Menu/GameShell/20_Retro Games/Wswan.png index fe4d06b..a87bf54 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/Wswan.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/Wswan.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/gpSP+.png b/skin/DEOT/Menu/GameShell/20_Retro Games/gpSP+.png index 0ee0c3b..099f2c0 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/gpSP+.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/gpSP+.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/id.png b/skin/DEOT/Menu/GameShell/20_Retro Games/id.png index 223f3ac..ae924be 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/id.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/id.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/mupen64+.png b/skin/DEOT/Menu/GameShell/20_Retro Games/mupen64+.png index 8047992..f887aab 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/mupen64+.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/mupen64+.png differ diff --git a/skin/DEOT/Menu/GameShell/20_Retro Games/mupen64.png b/skin/DEOT/Menu/GameShell/20_Retro Games/mupen64.png index 8047992..f887aab 100644 Binary files a/skin/DEOT/Menu/GameShell/20_Retro Games/mupen64.png and b/skin/DEOT/Menu/GameShell/20_Retro Games/mupen64.png differ diff --git a/skin/DEOT/Menu/GameShell/21_Indie Games/2048.png b/skin/DEOT/Menu/GameShell/21_Indie Games/2048.png index 804d5ef..6fb0d7c 100644 Binary files a/skin/DEOT/Menu/GameShell/21_Indie Games/2048.png and b/skin/DEOT/Menu/GameShell/21_Indie Games/2048.png differ diff --git a/skin/DEOT/Menu/GameShell/21_Indie Games/Abbaye.png b/skin/DEOT/Menu/GameShell/21_Indie Games/Abbaye.png index e7d22ab..d8697bd 100644 Binary files a/skin/DEOT/Menu/GameShell/21_Indie Games/Abbaye.png and b/skin/DEOT/Menu/GameShell/21_Indie Games/Abbaye.png differ diff --git a/skin/DEOT/Menu/GameShell/21_Indie Games/GSPLauncher.png b/skin/DEOT/Menu/GameShell/21_Indie Games/GSPLauncher.png index 861a60e..ec3586a 100644 Binary files a/skin/DEOT/Menu/GameShell/21_Indie Games/GSPLauncher.png and b/skin/DEOT/Menu/GameShell/21_Indie Games/GSPLauncher.png differ diff --git a/skin/DEOT/Menu/GameShell/21_Indie Games/Hurrican.png b/skin/DEOT/Menu/GameShell/21_Indie Games/Hurrican.png index 0a1c541..04747d5 100644 Binary files a/skin/DEOT/Menu/GameShell/21_Indie Games/Hurrican.png and b/skin/DEOT/Menu/GameShell/21_Indie Games/Hurrican.png differ diff --git a/skin/DEOT/Menu/GameShell/21_Indie Games/No.909.png b/skin/DEOT/Menu/GameShell/21_Indie Games/No.909.png index 2952bb8..479bd9b 100644 Binary files a/skin/DEOT/Menu/GameShell/21_Indie Games/No.909.png and b/skin/DEOT/Menu/GameShell/21_Indie Games/No.909.png differ diff --git a/skin/DEOT/Menu/GameShell/21_Indie Games/NyanCat.png b/skin/DEOT/Menu/GameShell/21_Indie Games/NyanCat.png index 8cc9f33..2fb2f23 100644 Binary files a/skin/DEOT/Menu/GameShell/21_Indie Games/NyanCat.png and b/skin/DEOT/Menu/GameShell/21_Indie Games/NyanCat.png differ diff --git a/skin/DEOT/Menu/GameShell/21_Indie Games/OpenTyrian.png b/skin/DEOT/Menu/GameShell/21_Indie Games/OpenTyrian.png index ab674d5..70bfd27 100644 Binary files a/skin/DEOT/Menu/GameShell/21_Indie Games/OpenTyrian.png and b/skin/DEOT/Menu/GameShell/21_Indie Games/OpenTyrian.png differ diff --git a/skin/DEOT/Menu/GameShell/21_Indie Games/Planet-Busters.png b/skin/DEOT/Menu/GameShell/21_Indie Games/Planet-Busters.png index 58ba750..4956357 100644 Binary files a/skin/DEOT/Menu/GameShell/21_Indie Games/Planet-Busters.png and b/skin/DEOT/Menu/GameShell/21_Indie Games/Planet-Busters.png differ diff --git a/skin/DEOT/Menu/GameShell/59_D.E.O.T. Extra/MAIL.png b/skin/DEOT/Menu/GameShell/59_D.E.O.T. Extra/MAIL.png index fd37af6..47c71d0 100644 Binary files a/skin/DEOT/Menu/GameShell/59_D.E.O.T. Extra/MAIL.png and b/skin/DEOT/Menu/GameShell/59_D.E.O.T. Extra/MAIL.png differ diff --git a/skin/DEOT/Menu/GameShell/59_D.E.O.T. Extra/MANUAL.png b/skin/DEOT/Menu/GameShell/59_D.E.O.T. Extra/MANUAL.png index 08e3346..0410414 100644 Binary files a/skin/DEOT/Menu/GameShell/59_D.E.O.T. Extra/MANUAL.png and b/skin/DEOT/Menu/GameShell/59_D.E.O.T. Extra/MANUAL.png differ diff --git a/skin/DEOT/Menu/GameShell/59_D.E.O.T. Extra/OPERATION.png b/skin/DEOT/Menu/GameShell/59_D.E.O.T. Extra/OPERATION.png index bccb664..f0ba3f5 100644 Binary files a/skin/DEOT/Menu/GameShell/59_D.E.O.T. Extra/OPERATION.png and b/skin/DEOT/Menu/GameShell/59_D.E.O.T. Extra/OPERATION.png differ diff --git a/skin/DEOT/Menu/GameShell/60_Utils/BatMon.png b/skin/DEOT/Menu/GameShell/60_Utils/BatMon.png index 22d3443..29b1448 100644 Binary files a/skin/DEOT/Menu/GameShell/60_Utils/BatMon.png and b/skin/DEOT/Menu/GameShell/60_Utils/BatMon.png differ diff --git a/skin/DEOT/Menu/GameShell/60_Utils/Bean.png b/skin/DEOT/Menu/GameShell/60_Utils/Bean.png index 521958a..39cf523 100644 Binary files a/skin/DEOT/Menu/GameShell/60_Utils/Bean.png and b/skin/DEOT/Menu/GameShell/60_Utils/Bean.png differ diff --git a/skin/DEOT/Menu/GameShell/60_Utils/Clockspeed.png b/skin/DEOT/Menu/GameShell/60_Utils/Clockspeed.png index 521958a..013f792 100644 Binary files a/skin/DEOT/Menu/GameShell/60_Utils/Clockspeed.png and b/skin/DEOT/Menu/GameShell/60_Utils/Clockspeed.png differ diff --git a/skin/DEOT/Menu/GameShell/60_Utils/DEOT Settings.png b/skin/DEOT/Menu/GameShell/60_Utils/DEOT Settings.png index 7d802a6..d71bbbc 100644 Binary files a/skin/DEOT/Menu/GameShell/60_Utils/DEOT Settings.png and b/skin/DEOT/Menu/GameShell/60_Utils/DEOT Settings.png differ diff --git a/skin/DEOT/Menu/GameShell/60_Utils/DinguxCommander.png b/skin/DEOT/Menu/GameShell/60_Utils/DinguxCommander.png index 521958a..39cf523 100644 Binary files a/skin/DEOT/Menu/GameShell/60_Utils/DinguxCommander.png and b/skin/DEOT/Menu/GameShell/60_Utils/DinguxCommander.png differ diff --git a/skin/DEOT/Menu/GameShell/60_Utils/EmptyMail.png b/skin/DEOT/Menu/GameShell/60_Utils/EmptyMail.png index 521958a..39cf523 100644 Binary files a/skin/DEOT/Menu/GameShell/60_Utils/EmptyMail.png and b/skin/DEOT/Menu/GameShell/60_Utils/EmptyMail.png differ diff --git a/skin/DEOT/Menu/GameShell/60_Utils/Kernel.png b/skin/DEOT/Menu/GameShell/60_Utils/Kernel.png index 521958a..39cf523 100644 Binary files a/skin/DEOT/Menu/GameShell/60_Utils/Kernel.png and b/skin/DEOT/Menu/GameShell/60_Utils/Kernel.png differ diff --git a/skin/DEOT/Menu/GameShell/60_Utils/Resize.png b/skin/DEOT/Menu/GameShell/60_Utils/Resize.png index 521958a..013f792 100644 Binary files a/skin/DEOT/Menu/GameShell/60_Utils/Resize.png and b/skin/DEOT/Menu/GameShell/60_Utils/Resize.png differ diff --git a/skin/DEOT/Menu/GameShell/60_Utils/Retroarch Update.png b/skin/DEOT/Menu/GameShell/60_Utils/Retroarch Update.png index ce13655..13b107c 100644 Binary files a/skin/DEOT/Menu/GameShell/60_Utils/Retroarch Update.png and b/skin/DEOT/Menu/GameShell/60_Utils/Retroarch Update.png differ diff --git a/skin/DEOT/Menu/GameShell/60_Utils/Samplerbox.png b/skin/DEOT/Menu/GameShell/60_Utils/Samplerbox.png index 210053c..7cab038 100644 Binary files a/skin/DEOT/Menu/GameShell/60_Utils/Samplerbox.png and b/skin/DEOT/Menu/GameShell/60_Utils/Samplerbox.png differ diff --git a/skin/DEOT/Menu/GameShell/60_Utils/SwapFile.png b/skin/DEOT/Menu/GameShell/60_Utils/SwapFile.png index 521958a..4918088 100644 Binary files a/skin/DEOT/Menu/GameShell/60_Utils/SwapFile.png and b/skin/DEOT/Menu/GameShell/60_Utils/SwapFile.png differ diff --git a/skin/DEOT/Menu/GameShell/CaveStory alt.png b/skin/DEOT/Menu/GameShell/CaveStory alt.png index ebeb378..da58070 100644 Binary files a/skin/DEOT/Menu/GameShell/CaveStory alt.png and b/skin/DEOT/Menu/GameShell/CaveStory alt.png differ diff --git a/skin/DEOT/Menu/GameShell/CaveStory.png b/skin/DEOT/Menu/GameShell/CaveStory.png index 4b11a04..6ae4d77 100644 Binary files a/skin/DEOT/Menu/GameShell/CaveStory.png and b/skin/DEOT/Menu/GameShell/CaveStory.png differ diff --git a/skin/DEOT/Menu/GameShell/ChocoDM alt.png b/skin/DEOT/Menu/GameShell/ChocoDM alt.png index d3fd5d7..f91ba3f 100644 Binary files a/skin/DEOT/Menu/GameShell/ChocoDM alt.png and b/skin/DEOT/Menu/GameShell/ChocoDM alt.png differ diff --git a/skin/DEOT/Menu/GameShell/ChocoDM.png b/skin/DEOT/Menu/GameShell/ChocoDM.png index f63e021..9f7bf56 100644 Binary files a/skin/DEOT/Menu/GameShell/ChocoDM.png and b/skin/DEOT/Menu/GameShell/ChocoDM.png differ diff --git a/skin/DEOT/Menu/GameShell/D.E.O.T. Extra.png b/skin/DEOT/Menu/GameShell/D.E.O.T. Extra.png index 7d802a6..8cc311e 100644 Binary files a/skin/DEOT/Menu/GameShell/D.E.O.T. Extra.png and b/skin/DEOT/Menu/GameShell/D.E.O.T. Extra.png differ diff --git a/skin/DEOT/Menu/GameShell/Indie Games.png b/skin/DEOT/Menu/GameShell/Indie Games.png index fd37af6..5e4c2ff 100644 Binary files a/skin/DEOT/Menu/GameShell/Indie Games.png and b/skin/DEOT/Menu/GameShell/Indie Games.png differ diff --git a/skin/DEOT/Menu/GameShell/Love2D.png b/skin/DEOT/Menu/GameShell/Love2D.png index c3ec1e8..e97778f 100644 Binary files a/skin/DEOT/Menu/GameShell/Love2D.png and b/skin/DEOT/Menu/GameShell/Love2D.png differ diff --git a/skin/DEOT/Menu/GameShell/LowResNX alt.png b/skin/DEOT/Menu/GameShell/LowResNX alt.png index c6ada69..0c9b731 100644 Binary files a/skin/DEOT/Menu/GameShell/LowResNX alt.png and b/skin/DEOT/Menu/GameShell/LowResNX alt.png differ diff --git a/skin/DEOT/Menu/GameShell/LowResNX.png b/skin/DEOT/Menu/GameShell/LowResNX.png index 567d92d..99b0073 100644 Binary files a/skin/DEOT/Menu/GameShell/LowResNX.png and b/skin/DEOT/Menu/GameShell/LowResNX.png differ diff --git a/skin/DEOT/Menu/GameShell/Music Player.png b/skin/DEOT/Menu/GameShell/Music Player.png index 08e3346..1743609 100644 Binary files a/skin/DEOT/Menu/GameShell/Music Player.png and b/skin/DEOT/Menu/GameShell/Music Player.png differ diff --git a/skin/DEOT/Menu/GameShell/PICO-8.png b/skin/DEOT/Menu/GameShell/PICO-8.png index 64df2d0..ab0453c 100644 Binary files a/skin/DEOT/Menu/GameShell/PICO-8.png and b/skin/DEOT/Menu/GameShell/PICO-8.png differ diff --git a/skin/DEOT/Menu/GameShell/PowerOFF.png b/skin/DEOT/Menu/GameShell/PowerOFF.png index 187ce88..599dcc4 100644 Binary files a/skin/DEOT/Menu/GameShell/PowerOFF.png and b/skin/DEOT/Menu/GameShell/PowerOFF.png differ diff --git a/skin/DEOT/Menu/GameShell/Reload UI.png b/skin/DEOT/Menu/GameShell/Reload UI.png index 781cb73..ce65d79 100644 Binary files a/skin/DEOT/Menu/GameShell/Reload UI.png and b/skin/DEOT/Menu/GameShell/Reload UI.png differ diff --git a/skin/DEOT/Menu/GameShell/Retro Games.png b/skin/DEOT/Menu/GameShell/Retro Games.png index be9c7cb..fffde55 100644 Binary files a/skin/DEOT/Menu/GameShell/Retro Games.png and b/skin/DEOT/Menu/GameShell/Retro Games.png differ diff --git a/skin/DEOT/Menu/GameShell/RetroArch.png b/skin/DEOT/Menu/GameShell/RetroArch.png index ce13655..418350e 100644 Binary files a/skin/DEOT/Menu/GameShell/RetroArch.png and b/skin/DEOT/Menu/GameShell/RetroArch.png differ diff --git a/skin/DEOT/Menu/GameShell/Settings.png b/skin/DEOT/Menu/GameShell/Settings.png index 040dd51..75fece6 100644 Binary files a/skin/DEOT/Menu/GameShell/Settings.png and b/skin/DEOT/Menu/GameShell/Settings.png differ diff --git a/skin/DEOT/Menu/GameShell/Sleep.png b/skin/DEOT/Menu/GameShell/Sleep.png index 3b654f5..2294a56 100644 Binary files a/skin/DEOT/Menu/GameShell/Sleep.png and b/skin/DEOT/Menu/GameShell/Sleep.png differ diff --git a/skin/DEOT/Menu/GameShell/TIC-80.png b/skin/DEOT/Menu/GameShell/TIC-80.png index 22953e1..1833ac2 100644 Binary files a/skin/DEOT/Menu/GameShell/TIC-80.png and b/skin/DEOT/Menu/GameShell/TIC-80.png differ diff --git a/skin/DEOT/Menu/GameShell/TinyCloud.png b/skin/DEOT/Menu/GameShell/TinyCloud.png index fbd56a3..a16b650 100644 Binary files a/skin/DEOT/Menu/GameShell/TinyCloud.png and b/skin/DEOT/Menu/GameShell/TinyCloud.png differ diff --git a/skin/DEOT/Menu/GameShell/Utils.png b/skin/DEOT/Menu/GameShell/Utils.png index 67df9ce..eb531a7 100644 Binary files a/skin/DEOT/Menu/GameShell/Utils.png and b/skin/DEOT/Menu/GameShell/Utils.png differ diff --git a/skin/DEOT/Menu/GameShell/Warehouse.png b/skin/DEOT/Menu/GameShell/Warehouse.png index bccb664..4bd38be 100644 Binary files a/skin/DEOT/Menu/GameShell/Warehouse.png and b/skin/DEOT/Menu/GameShell/Warehouse.png differ diff --git a/skin/DEOT/background.png b/skin/DEOT/background.png index ae52adb..b19450b 100644 Binary files a/skin/DEOT/background.png and b/skin/DEOT/background.png differ diff --git a/skin/DEOT/sys.py/gameshell/blank.png b/skin/DEOT/sys.py/gameshell/blank.png index fcabc8c..cb2f61e 100644 Binary files a/skin/DEOT/sys.py/gameshell/blank.png and b/skin/DEOT/sys.py/gameshell/blank.png differ diff --git a/skin/DEOT/sys.py/gameshell/footbar_icons/footbar.png b/skin/DEOT/sys.py/gameshell/footbar_icons/footbar.png index 24789f6..32b2fbc 100644 Binary files a/skin/DEOT/sys.py/gameshell/footbar_icons/footbar.png and b/skin/DEOT/sys.py/gameshell/footbar_icons/footbar.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/DialogBoxs.png b/skin/DEOT/sys.py/gameshell/icons/DialogBoxs.png index 787faee..2a01904 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/DialogBoxs.png and b/skin/DEOT/sys.py/gameshell/icons/DialogBoxs.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/GS.png b/skin/DEOT/sys.py/gameshell/icons/GS.png index 3a5877c..5e17ec4 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/GS.png and b/skin/DEOT/sys.py/gameshell/icons/GS.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/_L.png b/skin/DEOT/sys.py/gameshell/icons/_L.png index f872581..504f50f 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/_L.png and b/skin/DEOT/sys.py/gameshell/icons/_L.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/_R.png b/skin/DEOT/sys.py/gameshell/icons/_R.png index 348e2cf..5f53f74 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/_R.png and b/skin/DEOT/sys.py/gameshell/icons/_R.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/about_bg.png b/skin/DEOT/sys.py/gameshell/icons/about_bg.png index 4c0e235..25ed292 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/about_bg.png and b/skin/DEOT/sys.py/gameshell/icons/about_bg.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/airwire.png b/skin/DEOT/sys.py/gameshell/icons/airwire.png index b443c96..fde3f88 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/airwire.png and b/skin/DEOT/sys.py/gameshell/icons/airwire.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/blueselector.png b/skin/DEOT/sys.py/gameshell/icons/blueselector.png index 56994bf..2e77c16 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/blueselector.png and b/skin/DEOT/sys.py/gameshell/icons/blueselector.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/buttonslayout.png b/skin/DEOT/sys.py/gameshell/icons/buttonslayout.png index 4ce4191..77cbb6f 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/buttonslayout.png and b/skin/DEOT/sys.py/gameshell/icons/buttonslayout.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/done.png b/skin/DEOT/sys.py/gameshell/icons/done.png index 6a7727f..72f89ca 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/done.png and b/skin/DEOT/sys.py/gameshell/icons/done.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/empty.png b/skin/DEOT/sys.py/gameshell/icons/empty.png index eafc21c..a9437e5 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/empty.png and b/skin/DEOT/sys.py/gameshell/icons/empty.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/heart.png b/skin/DEOT/sys.py/gameshell/icons/heart.png index e0b38f1..00a3ea8 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/heart.png and b/skin/DEOT/sys.py/gameshell/icons/heart.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/icon_sd.png b/skin/DEOT/sys.py/gameshell/icons/icon_sd.png index 72e3163..66792ce 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/icon_sd.png and b/skin/DEOT/sys.py/gameshell/icons/icon_sd.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/light.png b/skin/DEOT/sys.py/gameshell/icons/light.png index 2f4382d..909560e 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/light.png and b/skin/DEOT/sys.py/gameshell/icons/light.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/lock.png b/skin/DEOT/sys.py/gameshell/icons/lock.png index 89c46d5..de096e7 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/lock.png and b/skin/DEOT/sys.py/gameshell/icons/lock.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/needwifi_bg.png b/skin/DEOT/sys.py/gameshell/icons/needwifi_bg.png index 8d52f04..1b21e34 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/needwifi_bg.png and b/skin/DEOT/sys.py/gameshell/icons/needwifi_bg.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/online.png b/skin/DEOT/sys.py/gameshell/icons/online.png index 7c38972..24dc285 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/online.png and b/skin/DEOT/sys.py/gameshell/icons/online.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/pico8_md5_err.png b/skin/DEOT/sys.py/gameshell/icons/pico8_md5_err.png index 29574db..45918da 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/pico8_md5_err.png and b/skin/DEOT/sys.py/gameshell/icons/pico8_md5_err.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/pico8_notfound.png b/skin/DEOT/sys.py/gameshell/icons/pico8_notfound.png index f3936ff..3a4d9e6 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/pico8_notfound.png and b/skin/DEOT/sys.py/gameshell/icons/pico8_notfound.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/rom_download.png b/skin/DEOT/sys.py/gameshell/icons/rom_download.png index 6ae3b0a..c3a52d0 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/rom_download.png and b/skin/DEOT/sys.py/gameshell/icons/rom_download.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/roundcorners.png b/skin/DEOT/sys.py/gameshell/icons/roundcorners.png index cd8fce6..f2e8f2a 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/roundcorners.png and b/skin/DEOT/sys.py/gameshell/icons/roundcorners.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/scale.png b/skin/DEOT/sys.py/gameshell/icons/scale.png index f7e2dd4..46e0998 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/scale.png and b/skin/DEOT/sys.py/gameshell/icons/scale.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/sheep_bg.png b/skin/DEOT/sys.py/gameshell/icons/sheep_bg.png index f373475..eeedf83 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/sheep_bg.png and b/skin/DEOT/sys.py/gameshell/icons/sheep_bg.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/sheep_body.png b/skin/DEOT/sys.py/gameshell/icons/sheep_body.png index 148ff46..190431c 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/sheep_body.png and b/skin/DEOT/sys.py/gameshell/icons/sheep_body.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/sheep_head.png b/skin/DEOT/sys.py/gameshell/icons/sheep_head.png index 615246b..e4a8bbe 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/sheep_head.png and b/skin/DEOT/sys.py/gameshell/icons/sheep_head.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/star.png b/skin/DEOT/sys.py/gameshell/icons/star.png index dcc5a4a..8c1f685 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/star.png and b/skin/DEOT/sys.py/gameshell/icons/star.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/sys.png b/skin/DEOT/sys.py/gameshell/icons/sys.png index 2321dee..723b28d 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/sys.png and b/skin/DEOT/sys.py/gameshell/icons/sys.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/tape.png b/skin/DEOT/sys.py/gameshell/icons/tape.png index 9177266..8e3ab1f 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/tape.png and b/skin/DEOT/sys.py/gameshell/icons/tape.png differ diff --git a/skin/DEOT/sys.py/gameshell/icons/vol.png b/skin/DEOT/sys.py/gameshell/icons/vol.png index aed502a..21023fc 100644 Binary files a/skin/DEOT/sys.py/gameshell/icons/vol.png and b/skin/DEOT/sys.py/gameshell/icons/vol.png differ diff --git a/skin/DEOT/sys.py/gameshell/titlebar_icons/battery_unknown.png b/skin/DEOT/sys.py/gameshell/titlebar_icons/battery_unknown.png index a1f4db7..7e5496b 100644 Binary files a/skin/DEOT/sys.py/gameshell/titlebar_icons/battery_unknown.png and b/skin/DEOT/sys.py/gameshell/titlebar_icons/battery_unknown.png differ diff --git a/skin/DEOT/sys.py/gameshell/titlebar_icons/bluetooth.png b/skin/DEOT/sys.py/gameshell/titlebar_icons/bluetooth.png index 5bfce49..ce82efe 100644 Binary files a/skin/DEOT/sys.py/gameshell/titlebar_icons/bluetooth.png and b/skin/DEOT/sys.py/gameshell/titlebar_icons/bluetooth.png differ diff --git a/skin/DEOT/sys.py/gameshell/titlebar_icons/soundvolume.png b/skin/DEOT/sys.py/gameshell/titlebar_icons/soundvolume.png index 413e321..54821aa 100644 Binary files a/skin/DEOT/sys.py/gameshell/titlebar_icons/soundvolume.png and b/skin/DEOT/sys.py/gameshell/titlebar_icons/soundvolume.png differ diff --git a/skin/DEOT/sys.py/gameshell/titlebar_icons/wifi.png b/skin/DEOT/sys.py/gameshell/titlebar_icons/wifi.png index 1b48d83..06679c1 100644 Binary files a/skin/DEOT/sys.py/gameshell/titlebar_icons/wifi.png and b/skin/DEOT/sys.py/gameshell/titlebar_icons/wifi.png differ diff --git a/skin/DEOT/sys.py/gameshell/titlebar_icons/withcharging.png b/skin/DEOT/sys.py/gameshell/titlebar_icons/withcharging.png index 5672188..e0128f2 100644 Binary files a/skin/DEOT/sys.py/gameshell/titlebar_icons/withcharging.png and b/skin/DEOT/sys.py/gameshell/titlebar_icons/withcharging.png differ diff --git a/skin/DEOT/sys.py/gameshell/titlebar_icons/without_charging.png b/skin/DEOT/sys.py/gameshell/titlebar_icons/without_charging.png index 48338ae..a6763f3 100644 Binary files a/skin/DEOT/sys.py/gameshell/titlebar_icons/without_charging.png and b/skin/DEOT/sys.py/gameshell/titlebar_icons/without_charging.png differ diff --git a/skin/DEOT/sys.py/gameshell/wallpaper/gameover.png b/skin/DEOT/sys.py/gameshell/wallpaper/gameover.png index 971022c..568450e 100644 Binary files a/skin/DEOT/sys.py/gameshell/wallpaper/gameover.png and b/skin/DEOT/sys.py/gameshell/wallpaper/gameover.png differ diff --git a/skin/DEOT/sys.py/gameshell/wallpaper/loading.png b/skin/DEOT/sys.py/gameshell/wallpaper/loading.png index e06064b..5313f7e 100644 Binary files a/skin/DEOT/sys.py/gameshell/wallpaper/loading.png and b/skin/DEOT/sys.py/gameshell/wallpaper/loading.png differ diff --git a/skin/DEOT/sys.py/gameshell/wallpaper/seeyou.png b/skin/DEOT/sys.py/gameshell/wallpaper/seeyou.png index 971022c..568450e 100644 Binary files a/skin/DEOT/sys.py/gameshell/wallpaper/seeyou.png and b/skin/DEOT/sys.py/gameshell/wallpaper/seeyou.png differ diff --git a/skin/DEOT/sys.py/gameshell/wallpaper/updating.png b/skin/DEOT/sys.py/gameshell/wallpaper/updating.png index 88a92c1..68b1614 100644 Binary files a/skin/DEOT/sys.py/gameshell/wallpaper/updating.png and b/skin/DEOT/sys.py/gameshell/wallpaper/updating.png differ diff --git a/skin/DEOT/truetype/VarelaRound-Regular.ttf b/skin/DEOT/truetype/VarelaRound-Regular.ttf index 50349ba..54fa9f9 100644 Binary files a/skin/DEOT/truetype/VarelaRound-Regular.ttf and b/skin/DEOT/truetype/VarelaRound-Regular.ttf differ diff --git a/skin/default/Menu/GameShell/20_Retro Games/Coleco.png b/skin/default/Menu/GameShell/20_Retro Games/Coleco.png index 066c818..171a8c7 100644 Binary files a/skin/default/Menu/GameShell/20_Retro Games/Coleco.png and b/skin/default/Menu/GameShell/20_Retro Games/Coleco.png differ diff --git a/skin/default/Menu/GameShell/20_Retro Games/Fuse.png b/skin/default/Menu/GameShell/20_Retro Games/Fuse.png index 112c7d7..59edcce 100644 Binary files a/skin/default/Menu/GameShell/20_Retro Games/Fuse.png and b/skin/default/Menu/GameShell/20_Retro Games/Fuse.png differ diff --git a/skin/default/Menu/GameShell/20_Retro Games/GGEAR.png b/skin/default/Menu/GameShell/20_Retro Games/GGEAR.png index 23b92f0..0c043e1 100644 Binary files a/skin/default/Menu/GameShell/20_Retro Games/GGEAR.png and b/skin/default/Menu/GameShell/20_Retro Games/GGEAR.png differ diff --git a/skin/default/Menu/GameShell/20_Retro Games/GPSP.png b/skin/default/Menu/GameShell/20_Retro Games/GPSP.png index deafec9..fe8cea5 100644 Binary files a/skin/default/Menu/GameShell/20_Retro Games/GPSP.png and b/skin/default/Menu/GameShell/20_Retro Games/GPSP.png differ diff --git a/skin/default/Menu/GameShell/20_Retro Games/LYNX.png b/skin/default/Menu/GameShell/20_Retro Games/LYNX.png index 289b69c..1de8939 100644 Binary files a/skin/default/Menu/GameShell/20_Retro Games/LYNX.png and b/skin/default/Menu/GameShell/20_Retro Games/LYNX.png differ diff --git a/skin/default/Menu/GameShell/20_Retro Games/MAME.png b/skin/default/Menu/GameShell/20_Retro Games/MAME.png index 0f800d7..d8bfc64 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 4e2dda6..cb9fe92 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 086e694..b2f195a 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/20_Retro Games/Pcsx+.png b/skin/default/Menu/GameShell/20_Retro Games/Pcsx+.png index d05300d..143c369 100644 Binary files a/skin/default/Menu/GameShell/20_Retro Games/Pcsx+.png and b/skin/default/Menu/GameShell/20_Retro Games/Pcsx+.png differ diff --git a/skin/default/Menu/GameShell/20_Retro Games/PicoDrive+.png b/skin/default/Menu/GameShell/20_Retro Games/PicoDrive+.png index 03ff9a8..264fc89 100644 Binary files a/skin/default/Menu/GameShell/20_Retro Games/PicoDrive+.png and b/skin/default/Menu/GameShell/20_Retro Games/PicoDrive+.png differ diff --git a/skin/default/Menu/GameShell/20_Retro Games/PocketSNES+.png b/skin/default/Menu/GameShell/20_Retro Games/PocketSNES+.png index 0a43e69..52589e8 100644 Binary files a/skin/default/Menu/GameShell/20_Retro Games/PocketSNES+.png and b/skin/default/Menu/GameShell/20_Retro Games/PocketSNES+.png differ diff --git a/skin/default/Menu/GameShell/20_Retro Games/SFC9X.png b/skin/default/Menu/GameShell/20_Retro Games/SFC9X.png index 7c38fdc..b5ba177 100644 Binary files a/skin/default/Menu/GameShell/20_Retro Games/SFC9X.png and b/skin/default/Menu/GameShell/20_Retro Games/SFC9X.png differ diff --git a/skin/default/Menu/GameShell/20_Retro Games/UAE+.png b/skin/default/Menu/GameShell/20_Retro Games/UAE+.png index 413ad01..6bab242 100644 Binary files a/skin/default/Menu/GameShell/20_Retro Games/UAE+.png and b/skin/default/Menu/GameShell/20_Retro Games/UAE+.png differ diff --git a/skin/default/Menu/GameShell/20_Retro Games/gpSP+.png b/skin/default/Menu/GameShell/20_Retro Games/gpSP+.png index deafec9..9a05734 100644 Binary files a/skin/default/Menu/GameShell/20_Retro Games/gpSP+.png and b/skin/default/Menu/GameShell/20_Retro Games/gpSP+.png differ diff --git a/skin/default/Menu/GameShell/20_Retro Games/mupen64+.png b/skin/default/Menu/GameShell/20_Retro Games/mupen64+.png index 8eec6f1..e6e5192 100644 Binary files a/skin/default/Menu/GameShell/20_Retro Games/mupen64+.png and b/skin/default/Menu/GameShell/20_Retro Games/mupen64+.png differ diff --git a/skin/default/Menu/GameShell/21_Indie Games/2048.png b/skin/default/Menu/GameShell/21_Indie Games/2048.png index ac58de0..e266c5d 100644 Binary files a/skin/default/Menu/GameShell/21_Indie Games/2048.png and b/skin/default/Menu/GameShell/21_Indie Games/2048.png differ diff --git a/skin/default/Menu/GameShell/21_Indie Games/Hurrican.png b/skin/default/Menu/GameShell/21_Indie Games/Hurrican.png index 42f1eff..7daa839 100644 Binary files a/skin/default/Menu/GameShell/21_Indie Games/Hurrican.png and b/skin/default/Menu/GameShell/21_Indie Games/Hurrican.png differ diff --git a/skin/default/Menu/GameShell/21_Indie Games/No.909.png b/skin/default/Menu/GameShell/21_Indie Games/No.909.png index 673244d..28fc3f9 100644 Binary files a/skin/default/Menu/GameShell/21_Indie Games/No.909.png and b/skin/default/Menu/GameShell/21_Indie Games/No.909.png differ diff --git a/skin/default/Menu/GameShell/21_Indie Games/NyanCat.png b/skin/default/Menu/GameShell/21_Indie Games/NyanCat.png index 028a752..0cf517d 100644 Binary files a/skin/default/Menu/GameShell/21_Indie Games/NyanCat.png and b/skin/default/Menu/GameShell/21_Indie Games/NyanCat.png differ diff --git a/skin/default/Menu/GameShell/21_Indie Games/Planet-Busters.png b/skin/default/Menu/GameShell/21_Indie Games/Planet-Busters.png index 7581b14..801859b 100644 Binary files a/skin/default/Menu/GameShell/21_Indie Games/Planet-Busters.png and b/skin/default/Menu/GameShell/21_Indie Games/Planet-Busters.png differ diff --git a/skin/default/Menu/GameShell/CaveStory.png b/skin/default/Menu/GameShell/CaveStory.png index 5faa2ee..6ba5a9b 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/ChocoDM.png b/skin/default/Menu/GameShell/ChocoDM.png index 1d6a9e3..b32110d 100644 Binary files a/skin/default/Menu/GameShell/ChocoDM.png and b/skin/default/Menu/GameShell/ChocoDM.png differ diff --git a/skin/default/Menu/GameShell/Indie Games.png b/skin/default/Menu/GameShell/Indie Games.png index deecb6b..2e525c2 100644 Binary files a/skin/default/Menu/GameShell/Indie Games.png and b/skin/default/Menu/GameShell/Indie Games.png differ diff --git a/skin/default/Menu/GameShell/Love2D.png b/skin/default/Menu/GameShell/Love2D.png index 1f125d8..c96175e 100644 Binary files a/skin/default/Menu/GameShell/Love2D.png and b/skin/default/Menu/GameShell/Love2D.png differ diff --git a/skin/default/Menu/GameShell/LowResNX.png b/skin/default/Menu/GameShell/LowResNX.png index 15d2e68..d90ffe5 100644 Binary files a/skin/default/Menu/GameShell/LowResNX.png and b/skin/default/Menu/GameShell/LowResNX.png differ diff --git a/skin/default/Menu/GameShell/Music Player.png b/skin/default/Menu/GameShell/Music Player.png index 1d397ad..3d7ee78 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 4c437bb..0d4e74b 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 3b05b4e..495ba34 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..3090473 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..40fdeaf 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..cc8dd88 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..53c636e 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..f38c931 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/TIC-80.png b/skin/default/Menu/GameShell/TIC-80.png index ef1aab4..ddf9ff9 100644 Binary files a/skin/default/Menu/GameShell/TIC-80.png and b/skin/default/Menu/GameShell/TIC-80.png differ diff --git a/skin/default/Menu/GameShell/TinyCloud.png b/skin/default/Menu/GameShell/TinyCloud.png index 9ba0dff..a0b6a35 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/Utils.png b/skin/default/Menu/GameShell/Utils.png index b9a7f7d..9a8091d 100644 Binary files a/skin/default/Menu/GameShell/Utils.png and b/skin/default/Menu/GameShell/Utils.png differ diff --git a/skin/default/Menu/GameShell/Warehouse.png b/skin/default/Menu/GameShell/Warehouse.png index f658b28..1ed2475 100644 Binary files a/skin/default/Menu/GameShell/Warehouse.png and b/skin/default/Menu/GameShell/Warehouse.png differ diff --git a/skin/default/Menu/GameShell/freeDM.png b/skin/default/Menu/GameShell/freeDM.png index bf4d479..200c7d2 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..851b7a5 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..beced39 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/DialogBoxs.png b/skin/default/sys.py/gameshell/icons/DialogBoxs.png index e38d227..506088d 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..c613b3e 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..30dae8c 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..df01602 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..e229a01 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/add.png b/skin/default/sys.py/gameshell/icons/add.png index 4ffcda7..d3f3f37 100644 Binary files a/skin/default/sys.py/gameshell/icons/add.png and b/skin/default/sys.py/gameshell/icons/add.png differ diff --git a/skin/default/sys.py/gameshell/icons/airwire.png b/skin/default/sys.py/gameshell/icons/airwire.png index 625d004..bad3400 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/app.png b/skin/default/sys.py/gameshell/icons/app.png index 3d3c2db..e390ef5 100644 Binary files a/skin/default/sys.py/gameshell/icons/app.png and b/skin/default/sys.py/gameshell/icons/app.png differ diff --git a/skin/default/sys.py/gameshell/icons/appdling.png b/skin/default/sys.py/gameshell/icons/appdling.png index c4ab447..f75149e 100644 Binary files a/skin/default/sys.py/gameshell/icons/appdling.png and b/skin/default/sys.py/gameshell/icons/appdling.png differ diff --git a/skin/default/sys.py/gameshell/icons/blackheart.png b/skin/default/sys.py/gameshell/icons/blackheart.png index 2540295..3b786e0 100644 Binary files a/skin/default/sys.py/gameshell/icons/blackheart.png and b/skin/default/sys.py/gameshell/icons/blackheart.png differ diff --git a/skin/default/sys.py/gameshell/icons/blueselector.png b/skin/default/sys.py/gameshell/icons/blueselector.png index 82e285b..96cb22b 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/buttonslayout.png b/skin/default/sys.py/gameshell/icons/buttonslayout.png index 99a2531..ccdc33c 100644 Binary files a/skin/default/sys.py/gameshell/icons/buttonslayout.png and b/skin/default/sys.py/gameshell/icons/buttonslayout.png differ diff --git a/skin/default/sys.py/gameshell/icons/done.png b/skin/default/sys.py/gameshell/icons/done.png index ceeadbf..5f4f153 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..cf24dcf 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..9ee9eb0 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..b6daf62 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/light.png b/skin/default/sys.py/gameshell/icons/light.png index f581a7b..973dc28 100644 Binary files a/skin/default/sys.py/gameshell/icons/light.png and b/skin/default/sys.py/gameshell/icons/light.png differ diff --git a/skin/default/sys.py/gameshell/icons/lock.png b/skin/default/sys.py/gameshell/icons/lock.png index 1e9ac7a..6dd0ecd 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..64be631 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..970a7d6 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..fff191c 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..970aff9 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..6b326be 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/roundcorners.png b/skin/default/sys.py/gameshell/icons/roundcorners.png index cd8fce6..b609e0d 100644 Binary files a/skin/default/sys.py/gameshell/icons/roundcorners.png and b/skin/default/sys.py/gameshell/icons/roundcorners.png differ diff --git a/skin/default/sys.py/gameshell/icons/scale.png b/skin/default/sys.py/gameshell/icons/scale.png index f7e2dd4..1478d21 100644 Binary files a/skin/default/sys.py/gameshell/icons/scale.png and b/skin/default/sys.py/gameshell/icons/scale.png differ diff --git a/skin/default/sys.py/gameshell/icons/sheep_bg.png b/skin/default/sys.py/gameshell/icons/sheep_bg.png index f373475..ff886b6 100644 Binary files a/skin/default/sys.py/gameshell/icons/sheep_bg.png and b/skin/default/sys.py/gameshell/icons/sheep_bg.png differ diff --git a/skin/default/sys.py/gameshell/icons/sheep_body.png b/skin/default/sys.py/gameshell/icons/sheep_body.png index 148ff46..77570d5 100644 Binary files a/skin/default/sys.py/gameshell/icons/sheep_body.png and b/skin/default/sys.py/gameshell/icons/sheep_body.png differ diff --git a/skin/default/sys.py/gameshell/icons/sheep_head.png b/skin/default/sys.py/gameshell/icons/sheep_head.png index 615246b..077c2eb 100644 Binary files a/skin/default/sys.py/gameshell/icons/sheep_head.png and b/skin/default/sys.py/gameshell/icons/sheep_head.png differ diff --git a/skin/default/sys.py/gameshell/icons/star.png b/skin/default/sys.py/gameshell/icons/star.png index 7910226..fa34388 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..733c242 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..a45aa18 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/icons/vol.png b/skin/default/sys.py/gameshell/icons/vol.png index 49b56fe..23edf71 100644 Binary files a/skin/default/sys.py/gameshell/icons/vol.png and b/skin/default/sys.py/gameshell/icons/vol.png differ diff --git a/skin/default/sys.py/gameshell/icons/ware.png b/skin/default/sys.py/gameshell/icons/ware.png index fbc955c..ec52997 100644 Binary files a/skin/default/sys.py/gameshell/icons/ware.png and b/skin/default/sys.py/gameshell/icons/ware.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..c065f33 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..36cf4a5 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/dlstatus18.png b/skin/default/sys.py/gameshell/titlebar_icons/dlstatus18.png index 0b3eab4..1ae3ed7 100644 Binary files a/skin/default/sys.py/gameshell/titlebar_icons/dlstatus18.png and b/skin/default/sys.py/gameshell/titlebar_icons/dlstatus18.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..c8b689e 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..013e9ef 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..b821214 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..f24c5e2 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/.above_all_patch.py.deot b/sys.py/UI/.above_all_patch.py.deot deleted file mode 100644 index ab272bb..0000000 --- a/sys.py/UI/.above_all_patch.py.deot +++ /dev/null @@ -1,135 +0,0 @@ -# -*- coding: utf-8 -*- - -import pygame - -from libs.roundrects import aa_round_rect - -import alsaaudio - -## local package import -from constants import ICON_TYPES,icon_ext,icon_width,icon_height,RUNEVT -from icon_item import IconItem -from page import Page,PageStack -from title_bar import TitleBar -from foot_bar import FootBar -from constants import Width,Height,bg_color -from util_funcs import midRect -from keys_def import CurKeys -from label import Label -from skin_manager import MySkinManager -from lang_manager import MyLangManager -from widget import Widget - - -class AboveAllPatch(Widget): - _PosX =Width/2 - _PosY =Height/2 - _Width =50 - _Height=120 - - _Text ="" - _FontObj= MyLangManager.TrFont("veramono20") - _Parent =None - _Color = MySkinManager.GiveColor('Text') - _ValColor = MySkinManager.GiveColor('Text') - _CanvasHWND = None - _TextSurf = None - _Icons = {} - _Value = 0 - - def __init__(self): - self._Icons = {} - - def Init(self): - pass - - def SetCanvasHWND(self,_canvashwnd): - self._CanvasHWND = _canvashwnd - - def Draw(self): - start_rect = midRect(self._PosX,self._PosY,self._Width,self._Height,Width,Height) - aa_round_rect(self._CanvasHWND,start_rect, self._Color,3,0, self._Color) - - if self._Value > 10: - vol_height = int(self._Height * (float( self._Value)/100.0)) - dheight = self._Height - vol_height - - vol_rect = pygame.Rect(self._PosX-self._Width/2, self._PosY-self._Height/2+dheight, self._Width, vol_height) - - aa_round_rect(self._CanvasHWND,vol_rect, self._ValColor,3,0, self._ValColor) - - else: - vol_height = 10 - dheight = self._Height - vol_height - vol_rect = pygame.Rect(self._PosX-self._Width/2, self._PosY-self._Height/2+dheight, self._Width, vol_height) - - aa_round_rect(self._CanvasHWND,vol_rect, self._ValColor,3,0, self._ValColor) - - -class SoundPatch(AboveAllPatch): - -# _Segs = [0,15,29, 45,55,65, 75,90,100] - snd_segs = [ [0,20],[21,40],[41,50],[51,60],[61,70],[71,85],[86,90],[91,95],[96,100] ] - _Needle = 0 - - def Init(self): - self.SetCanvasHWND(self._Parent._CanvasHWND) - - def VolumeUp(self): - m = alsaaudio.Mixer() - vol = m.getvolume()[0] - - # print("VolumeUp vol %d " % vol) - for i,v in enumerate(self.snd_segs): - if vol >= v[0] and vol <= v[1]: - self._Needle = i - break - - self._Needle += 1 - - if self._Needle > len(self.snd_segs) -1: - self._Needle = len(self.snd_segs) -1 - -# print("Set volume %d" % self.snd_segs[self._Needle][1] ) - m.setvolume( self.snd_segs[self._Needle][0] + (self.snd_segs[self._Needle][1] - self.snd_segs[self._Needle][0])/2 ) ## prefer bigger one - - self._Value = self.snd_segs[self._Needle][1] - -# print( self._Value) - return self._Value - - def VolumeDown(self): - m = alsaaudio.Mixer() - vol = m.getvolume()[0] - - for i,v in enumerate(self.snd_segs): - if vol >= v[0] and vol <= v[1]: - self._Needle = i - break - - self._Needle -= 1 - if self._Needle < 0: - self._Needle = 0 - - vol = self.snd_segs[self._Needle][0] ## prefer smaller one - - if vol < 0: - vol = 0 - m.setvolume(vol) - -# print(vol) - - self._Value = vol - return vol - - - def Draw(self): - # 200 total width - # h = 40 - for i in range(0,self._Needle+1): - #w = 10,h = 40 - vol_rect = pygame.Rect(80+i*20, self._Height/2+20,10, 40) - - 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/.scroller.py b/sys.py/UI/.scroller.py deleted file mode 100644 index 9361ffd..0000000 --- a/sys.py/UI/.scroller.py +++ /dev/null @@ -1,63 +0,0 @@ -# -*- coding: utf-8 -*- -import pygame - -from util_funcs import midRect - -from libs.roundrects import aa_round_rect - -from skin_manager import MySkinManager - -class ListScroller(object): - _PosX = 0 - _PosY = 0 - _Width = 7 - _Height = 0 - _MinHeight = 6 ## tested - _Parent = None - _Color = MySkinManager.GiveColor('Front') - - _StartX = 0 - _StartY = 0 - _EndX = 0 - _EndY = 0 - _Value = 0 - _CanvasHWND = None - - def __init__(self): - pass - - def Init(self): - self.SetCanvasHWND(self._Parent._CanvasHWND) - - def SetCanvasHWND(self,canvas): - self._CanvasHWND = canvas - - def AnimateDraw(self,x2,y2): - pass - - def UpdateSize(self,bigheight,dirtyheight): - bodyheight = float(self._Parent._Height) / float(bigheight) - if bodyheight > 1: - bodyheight = 1 ## 100% - - margin = 4 - self._Height = bodyheight * self._Parent._Height - margin ## Draw body - - if self._Height < self._MinHeight: - self._Height = self._MinHeight - - self._StartX = self._Width/2 - self._StartY = margin/2+self._Height/2 - - self._EndX = self._Width/2 - self._EndY = self._Parent._Height - margin/2 - self._Height/2 - - process = float(dirtyheight) / float(bigheight) - value = process* (self._EndY - self._StartY) - - self._Value = int(value) - - 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) diff --git a/sys.py/UI/.skin_manager.py b/sys.py/UI/.skin_manager.py deleted file mode 100644 index 7064d4e..0000000 --- a/sys.py/UI/.skin_manager.py +++ /dev/null @@ -1,165 +0,0 @@ -# -*- coding: utf-8 -*- - -import pygame -import config -import ConfigParser - -from util_funcs import FileExists - -class CaseConfigParser(ConfigParser.SafeConfigParser): - def optionxform(self, optionstr): - return optionstr - -class SkinManager(object): - """ - _HighColor = pygame.Color(51,166,255) # #33a6ff - _TextColor = pygame.Color(83,83,83) # #535353 - _FrontColor = pygame.Color(131,199,219) ## light blue,#83c7db - _URLColor = pygame.Color(51,166,255) ## blue more #33a6ff - _LineColor = pygame.Color(169,169,169) # #a9a9a9 - _TitleBgColor = pygame.Color(228,228,228) # #e4e4e4 - _ActiveColor = pygame.Color(175,90,0) ## light brown #af5a00 - """ - - _Colors = {} - _Config = None - _Fonts = {} - DefaultSkin = "../skin/default" - - def __init__(self): - self.Init() - - def ConvertToRGB(self,hexstr): - - h = hexstr.lstrip('#') - return tuple(int(h[i:i+2], 16) for i in (0, 2 ,4)) - - def Init(self): - if not SkinManager._Colors: - self.SetColors() - if not SkinManager._Fonts: - self.SetFonts() - - def SetFonts(self): - if not pygame.font.get_init(): - pygame.font.init() - - 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 - - for i in range(10,29): - self._Fonts["varela%d"%i] = pygame.font.Font(fonts_path["varela"],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) - - for i in range(10,26): - self._Fonts["veramono%d"%i] = pygame.font.Font(fonts_path["veramono"],i) - - for i in range(10,28): - self._Fonts["notosansmono%d"%i] = pygame.font.Font(fonts_path["noto"],i) - - for i in range(10,28): - self._Fonts["notosanscjk%d"%i] = pygame.font.Font(fonts_path["notocjk"],i) - - self._Fonts["arial"] = pygame.font.SysFont("arial",16) - - def SetColors(self): - Colors = {} - Colors["High"] = pygame.Color(51, 166, 255) - Colors["Text"] = pygame.Color(83, 83, 83) - 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["Active"] = pygame.Color(175, 90, 0) - Colors["Disabled"] = pygame.Color(204, 204, 204) - Colors["White"] = pygame.Color(255, 255, 255) - Colors["Black"] = pygame.Color(0, 0, 0) - - SkinManager._Colors = Colors - - self._Config = CaseConfigParser() - - fname = config.SKIN+"/config.ini" - - try: - self._Config.read(fname) - except Exception, e: - print("read skin config.cfg error %s" % str(e)) - return - else: - if "Colors" in self._Config.sections(): - colour_opts = self._Config.options("Colors") -# print(colour_opts) - for i in SkinManager._Colors: - if i in colour_opts: - try: - SkinManager._Colors[i] = self.ConvertToRGB( - self._Config.get("Colors", i)) - except Exception, e: - print("error in ConvertToRGB %s" % str(e)) - continue - - def GiveFont(self,name): - return SkinManager._Fonts[name] - - def GiveColor(self,name): - if name in SkinManager._Colors: - return SkinManager._Colors[name] - else: - return pygame.Color(255,0,0) - - def GiveIcon(self,orig_file_or_dir): ## return is string,not Surface - #doing a wrapper for items under /home/cpi/apps/Menu/*, to be like Menu/GameShell/* - if orig_file_or_dir.startswith("/home/cpi/apps/Menu"): - orig_file_or_dir = orig_file_or_dir.replace("/home/cpi/apps/Menu/","../Menu/GameShell/") - - if orig_file_or_dir.startswith(".."): - ret = orig_file_or_dir.replace("..",config.SKIN) - if FileExists(ret) == False: - ret = orig_file_or_dir.replace("..",self.DefaultSkin) - else: - ret = config.SKIN+"/sys.py/"+orig_file_or_dir - if FileExists(ret) == False: - ret = self.DefaultSkin+"/sys.py/"+orig_file_or_dir - - if FileExists( ret ): - return ret - else: ## if not existed both in default or custom skin ,return where it is - return orig_file_or_dir - - def GiveWallpaper(self,png_name): - #first SKIN/wallpapers/xxxx.png - #second ../skin/default/wallpapers/xxxx.png - #finnal gameshell/wallpaper/xxxx.png - #loading.png,seeyou.png,updating.png,gameover.png,desktopbg.png - wlp = "/wallpaper/" - if FileExists(config.SKIN+wlp+png_name): - return config.SKIN+wlp+png_name - elif FileExists(self.DefaultSkin+wlp+png_name): - return self.DefaultSkin+wlp+png_name - else: - return "gameshell/wallpaper/"+png_name - - - -##global MySkinManager Handler -MySkinManager = None - -def InitMySkinManager(): - global MySkinManager - if MySkinManager == None: - MySkinManager = SkinManager() - - -InitMySkinManager() - - diff --git a/sys.py/UI/.slider.py b/sys.py/UI/.slider.py deleted file mode 100644 index 864ce0e..0000000 --- a/sys.py/UI/.slider.py +++ /dev/null @@ -1,40 +0,0 @@ - - -class Slider(object): - _PosX = 0 - _PosY = 0 - _Width = 0 - _Height = 0 - - _Value = 0 - _CanvasHWND = None - - _Range = [] - - def __init__(self): - self._Range = [0,255] - - def Init(self): - self._Value = 0 - - def SetValue(self,v): - self._Value = int(v) - - def SetRange(self,m1,m2): - if m1 >= m2: - return - - self._Range[0] = m1 - self._Range[1] = m2 - - - def SetCanvasHWND(self,cav): - self._CanvasHWND = cav - - def KeyDown(self): - pass - - def Draw(self): - pass - - diff --git a/sys.py/UI/CommercialSoftwarePackage/__init__.py b/sys.py/UI/CommercialSoftwarePackage/__init__.py index d4c1f0a..7252984 100644 --- a/sys.py/UI/CommercialSoftwarePackage/__init__.py +++ b/sys.py/UI/CommercialSoftwarePackage/__init__.py @@ -2,21 +2,16 @@ """ Package /home/cpi/games/xxx/yyy.zip ,only support in zip - com_pkg_info /home/cpi/launcher/Menu/GameShell/xxxx/compkginfo.json use https://jsonlint.com/ to validate first in case syntax err - ``` { "NotFoundMsg":["Please Go to \n|None|varela14|True", "https://www.lexaloffle.com/pico-8.php|URL|None|True|True", "buy a pico-8 raspi and put zip into \n/home/cpi/games/PICO-8"] - "MD5":{"pico-8_0.1.11g_raspi.zip":"a3f2995cf117499f880bd964d6a0e1f2","pico-8_0.1.11g_amd64.zip":"6726141c784afd4a41be6b7414c1b932"} } - ``` - """ import pygame @@ -368,4 +363,3 @@ class MyCommercialSoftwarePackage(object): main_screen.SwapAndShow() else: self.InstallPackage(main_screen) - diff --git a/sys.py/UI/confirm_page.py b/sys.py/UI/confirm_page.py index db36a66..6163858 100644 --- a/sys.py/UI/confirm_page.py +++ b/sys.py/UI/confirm_page.py @@ -52,7 +52,7 @@ class ConfirmPage(Page): _Selector=None _FootMsg = ["Nav","","","Cancel","Yes"] _MyList = [] - _ListFont = MyLangManager.TrFont("veramono20") + _ListFont = MyLangManager.TrFont("Eurostile20") _MyStack = None _FileName = "" _TrashDir = "" diff --git a/sys.py/UI/counter_screen.py b/sys.py/UI/counter_screen.py index 36bcd69..74a978d 100644 --- a/sys.py/UI/counter_screen.py +++ b/sys.py/UI/counter_screen.py @@ -15,10 +15,10 @@ import config class CounterScreen(FullScreen): - _CounterFont = MyLangManager.TrFont("varela120") - _TextFont1 = MyLangManager.TrFont("varela15") - _TextFont2 = MyLangManager.TrFont("varela12") - + _CounterFont = MyLangManager.TrFont("Eurostile120") + _TextFont1 = MyLangManager.TrFont("Eurostile15") + _TextFont2 = MyLangManager.TrFont("Eurostile12") + _TopLabel = None _BottomLabel = None _NumberLabel = None diff --git a/sys.py/UI/download_process_page.py b/sys.py/UI/download_process_page.py index 060eea7..e10110a 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("", MyLangManager.TrFont("varela12")) + self._FileNameLabel.Init("", MyLangManager.TrFont("Eurostile12")) self._SizeLabel = Label() self._SizeLabel.SetCanvasHWND(self._CanvasHWND) - self._SizeLabel.Init("0/0Kb",MyLangManager.TrFont("varela12")) + self._SizeLabel.Init("0/0Kb",MyLangManager.TrFont("Eurostile12")) self._SizeLabel.SetColor( self._URLColor ) diff --git a/sys.py/UI/foot_bar.py b/sys.py/UI/foot_bar.py index 7524637..156516e 100644 --- a/sys.py/UI/foot_bar.py +++ b/sys.py/UI/foot_bar.py @@ -53,7 +53,7 @@ class FootBar(Widget): _Icons = {} _IconWidth = 18 _IconHeight = 18 - _LabelFont = MyLangManager.TrFont("veramono10") + _LabelFont = MyLangManager.TrFont("Eurostile10") _State = "normal" _SkinManager = None diff --git a/sys.py/UI/info_page_list_item.py b/sys.py/UI/info_page_list_item.py index bfbd8c7..d5c0f8b 100644 --- a/sys.py/UI/info_page_list_item.py +++ b/sys.py/UI/info_page_list_item.py @@ -29,7 +29,7 @@ class InfoPageListItem(Widget): def Init(self,text): - #self._Fonts["normal"] = fonts["veramono12"] + #self._Fonts["normal"] = fonts["Eurostile12"] l = Label() l._PosX = 10 diff --git a/sys.py/UI/keyboard.py b/sys.py/UI/keyboard.py index 51aa395..6c58652 100644 --- a/sys.py/UI/keyboard.py +++ b/sys.py/UI/keyboard.py @@ -107,7 +107,7 @@ class Keyboard(Page): self._Width = self._Screen._Width self._Height = self._Screen._Height - fontobj = MySkinManager.GiveFont("veramono24") + fontobj = MySkinManager.GiveFont("varela24") word_margin = 15 start_x = (self._Width - fontobj.size( "".join(self._Secs[0][0]))[0]-len(self._Secs[0][0])*word_margin)/2+word_margin/2 @@ -140,7 +140,7 @@ class Keyboard(Page): else: if val == "_S": val = "Space" - ti._FontObj = MySkinManager.GiveFont("veramono15") + ti._FontObj = MySkinManager.GiveFont("Eurostile15") ti._Bold = True cur_alpha_size = ti._FontObj.size( val) diff --git a/sys.py/UI/lang_manager.py b/sys.py/UI/lang_manager.py index e0ffce0..058345d 100644 --- a/sys.py/UI/lang_manager.py +++ b/sys.py/UI/lang_manager.py @@ -31,15 +31,16 @@ class LangManager(object): self.SetLangs() def IsCJKMode(self):## in MultiLabel, latins seped by white spaces,CJK no needs for that - latins = ["English"] - self._CJKMode = True + # latins = ["English"] + # self._CJKMode = True - for i in latins: - if i in self._ConfigFileName: - self._CJKMode= False - break + # for i in latins: + # if i in self._ConfigFileName: + # self._CJKMode= False + # break - return self._CJKMode + # return self._CJKMode + return False def SetLangs(self): self._Config = CaseConfigParser() diff --git a/sys.py/UI/main_screen.py b/sys.py/UI/main_screen.py index 27891ee..936493b 100644 --- a/sys.py/UI/main_screen.py +++ b/sys.py/UI/main_screen.py @@ -138,8 +138,8 @@ class MainScreen(Widget): _TitleBar = None _FootBar = None _MsgBox = None - _MsgBoxFont = MyLangManager.TrFont("veramono20") - _IconFont = MyLangManager.TrFont("varela15") + _MsgBoxFont = MyLangManager.TrFont("Eurostile20") + _IconFont = MyLangManager.TrFont("Eurostile12") _SkinManager = None _Closed = False @@ -661,4 +661,3 @@ class MainScreen(Widget): if hasattr(self._CurrentPage,"_FootMsg"): self._FootBar.SetLabelTexts(self._CurrentPage._FootMsg) self._FootBar.Draw() - diff --git a/sys.py/UI/page.py b/sys.py/UI/page.py index 9816150..9a45b47 100644 --- a/sys.py/UI/page.py +++ b/sys.py/UI/page.py @@ -21,6 +21,7 @@ from util_funcs import midRect,FileExists from keys_def import CurKeys, IsKeyStartOrA, IsKeyMenuOrB from icon_pool import MyIconPool from lang_manager import MyLangManager +from skin_manager import MySkinManager from widget import Widget import config @@ -668,8 +669,21 @@ class Page(Widget): self._Screen.Draw() self._Screen.SwapAndShow() + ##for gcores + 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.DrawIcons() self.DrawPageSelector() - diff --git a/sys.py/UI/skin_manager.py b/sys.py/UI/skin_manager.py index a99bc8b..f148b1e 100644 --- a/sys.py/UI/skin_manager.py +++ b/sys.py/UI/skin_manager.py @@ -24,6 +24,8 @@ class SkinManager(object): _Colors = {} _Config = None _Fonts = {} + + #backup skin DefaultSkin = "../skin/default" def __init__(self): @@ -47,33 +49,17 @@ 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 + #print(fonts_path["Eurostile"]) fonts_path["EurostileBold"] = "%s/EurostileMN-ExtendedBold.pfb.ttf" % skinpath - - 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["Eurostile"],i) - - 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,29): self._Fonts["varela%d"%i] = pygame.font.Font(fonts_path["varela"],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) - for i in range(10,26): + for i in range(10,26): self._Fonts["veramono%d"%i] = pygame.font.Font(fonts_path["veramono"],i) for i in range(10,28): @@ -81,6 +67,23 @@ class SkinManager(object): for i in range(10,28): self._Fonts["notosanscjk%d"%i] = pygame.font.Font(fonts_path["notocjk"],i) + + for i in range(10,29): + self._Fonts["Eurostile%d"%i] = pygame.font.Font(fonts_path["Eurostile"],i) + + self._Fonts["Eurostile11"] = pygame.font.Font(fonts_path["Eurostile"],11) + self._Fonts["Eurostile12"] = pygame.font.Font(fonts_path["Eurostile"],12) + self._Fonts["Eurostile15"] = pygame.font.Font(fonts_path["Eurostile"],15) + self._Fonts["Eurostile34"] = pygame.font.Font(fonts_path["Eurostile"],34) + self._Fonts["Eurostile40"] = pygame.font.Font(fonts_path["Eurostile"],40) + self._Fonts["Eurostile120"] = pygame.font.Font(fonts_path["Eurostile"],120) + + for i in range(10,30): + self._Fonts["EurostileBold%d"%i] = pygame.font.Font(fonts_path["EurostileBold"],i) + + self._Fonts["EurostileBold13"] = pygame.font.Font(fonts_path["EurostileBold"],13) + self._Fonts["EurostileBold30"] = pygame.font.Font(fonts_path["EurostileBold"],30) + self._Fonts["arial"] = pygame.font.SysFont("arial",16) @@ -94,8 +97,9 @@ class SkinManager(object): Colors["Line"] = pygame.Color(169, 169, 169) Colors["TitleBg"] = pygame.Color(228, 228, 228) Colors["Active"] = pygame.Color(175, 90, 0) - Colors["Disabled"] = pygame.Color(204, 204, 204) - Colors["White"] = pygame.Color(255, 255, 255) + Colors["Inactive"] = pygame.Color(120, 160, 140) + Colors["Disabled"] = pygame.Color(204, 204, 204) + Colors["White"] = pygame.Color(255, 255, 255) Colors["Black"] = pygame.Color(0, 0, 0) SkinManager._Colors = Colors @@ -152,7 +156,7 @@ class SkinManager(object): def GiveWallpaper(self,png_name): #first SKIN/wallpapers/xxxx.png - #second ../skin/default/wallpapers/xxxx.png + #second ../skin/DEOT/wallpapers/xxxx.png #finnal gameshell/wallpaper/xxxx.png #loading.png,seeyou.png,updating.png,gameover.png,desktopbg.png wlp = "/wallpaper/" @@ -175,5 +179,3 @@ def InitMySkinManager(): InitMySkinManager() - - diff --git a/sys.py/UI/text_bulletinboard.py b/sys.py/UI/text_bulletinboard.py index 52f9c86..2df2085 100644 --- a/sys.py/UI/text_bulletinboard.py +++ b/sys.py/UI/text_bulletinboard.py @@ -14,7 +14,7 @@ from textarea import Textarea class Word: _T = "" _Color = MySkinManager.GiveColor('Text') ## default text color - _FontObj = MyLangManager.TrFont("varela12") ##default font + _FontObj = MyLangManager.TrFont("Eurostile12") ##default font _Size = 12 _Bold = False _UndLine = False diff --git a/sys.py/UI/textarea.py b/sys.py/UI/textarea.py index 5708223..b1d71af 100644 --- a/sys.py/UI/textarea.py +++ b/sys.py/UI/textarea.py @@ -26,8 +26,8 @@ class Textarea(Widget): pass def Init(self): - self._FontObj = MyLangManager.TrFont("veramono24") - #pygame.font.Font(fonts_path["veramono"],24) + self._FontObj = MyLangManager.TrFont("Eurostile15") + #pygame.font.Font(fonts_path["Eurostile"],20) def SubTextIndex(self): diff --git a/sys.py/UI/title_bar.py b/sys.py/UI/title_bar.py index 12a3e1c..a58f99c 100644 --- a/sys.py/UI/title_bar.py +++ b/sys.py/UI/title_bar.py @@ -316,7 +316,6 @@ class TitleBar(Widget): """ aa_round_rect(self._CanvasHWND, (0,0,self._Width,self._Height),self._BgColor,8,0, self._BgColor) - pygame.draw.rect(self._CanvasHWND,self._BgColor,(0,self._Height/2,Width,self._BarHeight), 0 ) """ @@ -324,13 +323,21 @@ class TitleBar(Widget): self.ClearCanvas() title = MyLangManager.Tr(title) self._Title = title + + # get battery percentage, but not for music spectrum(GameShell RTA) + RTA_title = "GameShell RTA" + bat_pct = "" + if title != RTA_title and title != MyLangManager.Tr(RTA_title): + out = commands.getstatusoutput("upower -i /org/freedesktop/UPower/devices/battery_axp20x_battery | grep percentage | tail -c 5") + bat_pct = "".join(out[1]).strip() + " " cur_time = datetime.now().strftime("%H:%M") - time_text_font = MySkinManager.GiveFont("varela12") + cur_time = bat_pct + cur_time + time_text_font = MySkinManager.GiveFont("Eurostile12") time_text_size = time_text_font.size(cur_time) - title_text_size = MyLangManager.TrFont("varela16").size(title) + title_text_size = MyLangManager.TrFont("Eurostile16").size(title) - self._CanvasHWND.blit(MyLangManager.TrFont("varela16").render(title,True,self._SkinManager.GiveColor("Text")),midRect(title_text_size[0]/2+self._LOffset, + self._CanvasHWND.blit(MyLangManager.TrFont("Eurostile16").render(title,True,self._SkinManager.GiveColor("Text")),midRect(title_text_size[0]/2+self._LOffset, title_text_size[1]/2+(self._BarHeight-title_text_size[1])/2, title_text_size[0],title_text_size[1],Width,Height)) self._CanvasHWND.blit( time_text_font.render(cur_time,True,self._SkinManager.GiveColor("Text")),midRect(Width-time_text_size[0]/2-self._ROffset, diff --git a/sys.py/UI/untitled_icon.py b/sys.py/UI/untitled_icon.py index 978edaf..bf3b7f9 100644 --- a/sys.py/UI/untitled_icon.py +++ b/sys.py/UI/untitled_icon.py @@ -27,7 +27,7 @@ class UntitledIcon(object): _Height = 80 _Words = ["G", "s"] - _FontObj = MySkinManager.GiveFont("varela40") + _FontObj = MySkinManager.GiveFont("EurostileBold30") _BG = None # initial surface diff --git a/sys.py/config.py b/sys.py/config.py index a543cdf..f274559 100644 --- a/sys.py/config.py +++ b/sys.py/config.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import os import platform -from UI.util_funcs import FileExists,ArmSystem +from UI.util_funcs import FileExists,ArmSystem,ReadTheFileContent from pyaria2_rpc.pyaria2 import Xmlrpc CurKeySet = "GameShell" ## >>> PC or GameShell <<< @@ -10,16 +10,18 @@ DontLeave = False BackLight = "/proc/driver/backlight" Battery = "/sys/class/power_supply/axp20x-battery/uevent" +FB_Modes = "/sys/class/graphics/fb0/modes" MPD_socket = "/tmp/mpd.socket" -UPDATE_URL="https://raw.githubusercontent.com/clockworkpi/CPI_DEOT/master/version.json" +#UPDATE_URL="https://raw.githubusercontent.com/clockworkpi/CPI_DEOT/master/version.json" +UPDATE_URL="https://raw.githubusercontent.com/hi80482/launcher_deot/master/version.json" -VERSION="stable 1.25" +VERSION="D.E.O.T. v2+ 200626" SKIN=None -ButtonsLayout="xbox" +ButtonsLayout="snes" RPC = None ## three timer values in seconds: dim screen, close screen,PowerOff @@ -32,14 +34,17 @@ PowerLevels["balance_saving"] = [40,0,0] PowerLevel = "balance_saving" +GlobalCanvas=None +GlobalScale = 1 + def PreparationInAdv(): - global SKIN,ButtonsLayout + global SKIN,ButtonsLayout,FB_Modes,GlobalScale global PowerLevel global RPC if SKIN != None: return - SKIN= "../skin/default" + SKIN= "../skin/DEOT" if FileExists("%s/.gameshell_skin" % os.path.expanduser('~')) == True: with open("%s/.gameshell_skin" % os.path.expanduser('~'),"r") as f: @@ -55,7 +60,8 @@ def PreparationInAdv(): btnlayout = btnlayout.strip() ButtonsLayout = btnlayout if ButtonsLayout != "xbox" and ButtonsLayout != "snes": - ButtonsLayout = "xbox" + #ButtonsLayout = "xbox" + ButtonsLayout = "snes" if FileExists(".powerlevel") == False: os.system("touch .powerlevel") @@ -73,7 +79,17 @@ def PreparationInAdv(): else: ArmSystem("sudo iw wlan0 set power_save off >/dev/null") - RPC = Xmlrpc('localhost', 6800) + if FileExists(FB_Modes): + modes = ReadTheFileContent(FB_Modes) + if "320x240" in modes: + GlobalScale = 1 + if "640x480" in modes: + GlobalScale = 2 + if "480x640" in modes: + GlobalScale = 2 + else: + GlobalScale = 1 + + RPC = Xmlrpc('localhost', 6800) PreparationInAdv() ##sys.py/.powerlevel - diff --git a/sys.py/gameshell/wallpaper/gameover.png b/sys.py/gameshell/wallpaper/gameover.png index 971022c..942c9b0 100644 Binary files a/sys.py/gameshell/wallpaper/gameover.png and b/sys.py/gameshell/wallpaper/gameover.png differ diff --git a/sys.py/gameshell/wallpaper/loading.png b/sys.py/gameshell/wallpaper/loading.png index e06064b..2d7c6db 100644 Binary files a/sys.py/gameshell/wallpaper/loading.png and b/sys.py/gameshell/wallpaper/loading.png differ diff --git a/sys.py/gameshell/wallpaper/seeyou.png b/sys.py/gameshell/wallpaper/seeyou.png index 971022c..942c9b0 100644 Binary files a/sys.py/gameshell/wallpaper/seeyou.png and b/sys.py/gameshell/wallpaper/seeyou.png differ diff --git a/sys.py/gameshell/wallpaper/updating.png b/sys.py/gameshell/wallpaper/updating.png index 88a92c1..4b51035 100644 Binary files a/sys.py/gameshell/wallpaper/updating.png and b/sys.py/gameshell/wallpaper/updating.png differ diff --git a/sys.py/gsnotify/Jobs/00_lowpower.sh b/sys.py/gsnotify/Jobs/00_lowpower.sh index 33ff5ab..adb92b8 100755 --- a/sys.py/gsnotify/Jobs/00_lowpower.sh +++ b/sys.py/gsnotify/Jobs/00_lowpower.sh @@ -1,15 +1,15 @@ #!/bin/bash -BAT_PNT=`upower -i $(upower -e | grep 'battery') | grep -E "state|to\ full|percentage" | awk '/perc/{print $2}' | cut -d % -f1 ` +BAT_PNT=$(upower -i "$(upower -e | grep 'battery')" | grep -E "state|to\ full|percentage" | awk '/perc/{print $2}' | cut -d % -f1 ) if [ "$BAT_PNT" -lt "20" ]; then - if [ "$BAT_PNT" -lt "5" ]; then - echo '{"type":"once","content":"Low Battery: 5% of battery remaining"}' - elif [ "$BAT_PNT" -lt "10" ]; then - echo '{"type":"once","content":"Low Battery: 10% of battery remaining"}' - fi + if [ "$BAT_PNT" -lt "5" ]; then + echo '{"type":"once","content":"Low Battery: 5% of battery remaining"}' + elif [ "$BAT_PNT" -lt "10" ]; then + echo '{"type":"once","content":"Low Battery: 10% of battery remaining"}' + fi else - echo $BAT_PNT + echo "$BAT_PNT" fi diff --git a/sys.py/gsnotify/Jobs/gsnotify.cfg b/sys.py/gsnotify/Jobs/gsnotify.cfg new file mode 100644 index 0000000..19f449d --- /dev/null +++ b/sys.py/gsnotify/Jobs/gsnotify.cfg @@ -0,0 +1,10 @@ +[Settings] +DELAY_MS = 2000 +DELAY_FREQ = 30000 +BGCOLOR = #eab934 +TXTCOLOR = #ffffff +Width = 320 +Height = 20 +FTSIZE = 14 +Enabled = False + diff --git a/sys.py/gsnotify/gsnotify.cfg b/sys.py/gsnotify/gsnotify.cfg new file mode 100644 index 0000000..ea77225 --- /dev/null +++ b/sys.py/gsnotify/gsnotify.cfg @@ -0,0 +1,9 @@ +[Settings] +DELAY_MS=2000 +DELAY_FREQ=30000 +BGCOLOR=#eab934 +TXTCOLOR=#ffffff +Width=320 +Height=20 +FTSIZE=14 +Enabled=True \ No newline at end of file diff --git a/sys.py/langs/00_English.ini b/sys.py/langs/00_English.ini index 1b0ea2e..7789ec8 100644 --- a/sys.py/langs/00_English.ini +++ b/sys.py/langs/00_English.ini @@ -79,7 +79,7 @@ Notify=Notify Setting List=Setting List Wi-Fi=Wi-Fi Bluetooth=Bluetooth -Sound Volume=Sound Volume +Sound Volume=Sound Volume Brightness=Brightness BackLight Brightness=BackLight Brightness Storage=Storage @@ -91,7 +91,7 @@ Power off=Power off Buttons Layout=Buttons Layout UpdateRetroArch=UpdateRetroArch Wifi scanning=Wifi scanning... -Power option detail=Power option detail +Power option detail=Power Option Detail Screen dimming=Screen dimming Screen OFF=Screen OFF Power OFF=Power OFF @@ -104,3 +104,4 @@ Reboot=Reboot Shutdown=Shutdown my favorite music=my favorite music Check Update=Check Update +Play/Pause=Play/Pause diff --git a/sys.py/langs/01_日本語.ini b/sys.py/langs/01_日本語.ini index fb1ef32..72a95da 100644 --- a/sys.py/langs/01_日本語.ini +++ b/sys.py/langs/01_日本語.ini @@ -1,18 +1,18 @@ [Langs] Settings=設定 -Retro Games=Retro Games +Retro Games=レトロゲーム Music Player=音楽プレーヤー TinyCloud=Tiny Cloud PowerOFF=電源オフ Reload UI=リロードUI -freeDM=デュークニューケム +freeDM=freeDM CaveStory=洞窟物語 RetroArch=RetroArch Launching=起動中... Nav=ナビ Scan=スキャン -Back=後ろ -Enter=エンター +Back=戻る +Enter=決定 Remove=削除 Backspace=後退 Done=完了 @@ -55,7 +55,7 @@ Scanning=スキャン中 ShutDownConnecting=接続を切断 Select=選択 Detail=詳細 -Applying=応用中 +Applying=適用中 DownloadFailed=ダウンロード失敗 LauncherIsUpToDate=Launcher更新済み CheckWifiConnection=wifi接続をチェックしてください @@ -80,14 +80,13 @@ Setting List=設定リスト Wi-Fi=Wi-Fi Bluetooth=ブルートゥース Sound Volume=音量 -Sound Volume=音量 Brightness=明るさ BackLight Brightness=バックライトの明るさ Storage=ストレージ -Timezone=時地 +Timezone=タイムゾーン Timezone Selection=タイムゾーン選択 -Notification=注意を通知する -About=について +Notification=通知設定 +About=GameShellについて Power off=電源オフ Buttons Layout=ボタンの配置 UpdateRetroArch=RetroArchを更新 diff --git a/sys.py/langs/02_한국어.ini b/sys.py/langs/02_한국어.ini index 7e11cd8..b831f47 100644 --- a/sys.py/langs/02_한국어.ini +++ b/sys.py/langs/02_한국어.ini @@ -81,7 +81,6 @@ Setting List=설정 목록 Wi-Fi=Wi-Fi Bluetooth=블루투스 Sound Volume=사운드 볼륨 -Sound volume=사운드 볼륨 Brightness=밝기 BackLight Brightness=백라이트 밝기 Storage=저장공간 @@ -110,4 +109,4 @@ GPU Driver Switch=GPU 드라이버 변경 Switch to LauncherGo=런처고로 변경 Network gateway switch=네트워크 게이트웨이 변경 Update Launcher=런처 업데이트 -Theme Manager=테마 매니저 \ No newline at end of file +Theme Manager=테마 매니저 diff --git a/sys.py/langs/03_简体中文.ini b/sys.py/langs/03_简体中文.ini index 8469662..5b38eca 100644 --- a/sys.py/langs/03_简体中文.ini +++ b/sys.py/langs/03_简体中文.ini @@ -78,8 +78,6 @@ Setting List=设置列表 Wi-Fi=Wi-Fi Bluetooth=蓝牙 Sound Volume=音量 -Sound volume=音量 -Sound Volume=音量 Brightness=亮度 BackLight Brightness=背光亮度 Storage=存储空间 diff --git a/sys.py/langs/04_正體中文.ini b/sys.py/langs/04_正體中文.ini new file mode 100644 index 0000000..94b5a76 --- /dev/null +++ b/sys.py/langs/04_正體中文.ini @@ -0,0 +1,228 @@ +[Langs] +#主畫面 +Settings=設定 +CaveStory=洞窟物語 +Utils=工具 +Reload UI=重新整理 +Music Player=音樂播放器 +TinyCloud=Tiny Cloud +PowerOFF=關機 +Nav=瀏覽 +Enter=確定 +Back=上一頁 +Launching=載入... +Applying=套用... + +#設定畫面 +Setting List=設定 +Airplane Mode=飛航模式 +Power Options=電源計畫 +Wi-Fi=無線網路 +Bluetooth=藍牙 +Sound Volume=音量 +BackLight Brightness=背光亮度 +Storage=記憶卡 +Timezone=時區 +Languages=Language +Notification=提示訊息 +Update Launcher=更新 Launcher +Retroarch cores manager=管理 RetroArch 核心 +About=關於 GameShell +Buttons Layout=按鈕對應 +Theme Manager=佈景主題 +Switch to LauncherGo=啟動 LauncherGo +GPU Driver Switch=顯示卡驅動程式 +Network Gateway Switch=主網路卡 +Network gateway switch=主網路卡 + + +#飛航模式 +Rescue=重設無線裝置 +Toggle=開關 +TurningOn=開啟 +TurningOff=關閉 + +#電源計畫 +Power saving=省電 +Balanced=平衡 +Server=伺服器 +Performance=高效能 +Detail=內容 +Select=選擇 +Power option detail=電源計畫內容 +Screen dimming=調暗螢幕 +Screen OFF=關閉螢幕 +Power OFF=關機 +seconds=秒 +minutes=分 +Never=永不 + +#無線網路 +Scan wifi=無線網路 +Scan=掃描 +Info=資訊 +Wifi scanning=掃描無線網路... +Wifi info=無線網路資訊 + +Enter wifi password=輸入無線網路密碼 +Connecting=連線... +ShutDownConnecting=停止連線... +Nav.=瀏覽 +ABC=大小寫 +Done=完成 +Backspace=倒退 + +Disconnect=斷線 +Confirm Disconnect=網路斷線 +ConfirmDisconnectQ=確定斷線? +Yes=是 +Cancel=取消 +Disconnecting=斷線... +#Putting interface down...=停用網路介面... +#Putting interface up...=啟用網路介面... +#Generating WPA Configuration file...=建立 WPA 設定檔... +#Validating authentication...=驗證帳號... +#Obtaining IP address...=取得 IP 位址... + +#藍牙 +TryConnect=連線 +BluetoothScanning=掃描藍牙裝置... +Scanning=掃描... +BluetoothInfo=藍牙裝置資訊 +Timed out. Cancelling pairing=連線逾時，取消配對... +Authentication Canceled=驗證取消 +Page Timeout=連線逾時 +Already Exists=配對錯誤 +Pair error=配對失敗 +Authentication Failed=驗證失敗 +Forget=略過 +#ConfirmForget=確定略過 +#ConfirmForgetQ=確定略過? +Forgeting=略過此裝置... +Device paired=裝置已配對 + +#音量 +Sound Volume=音量 +Sound volume=音量 + +#背光亮度 +Brightness=背光亮度 + +#時區 +Timezone Selection=時區 + +#提示訊息 +Notify=提示訊息 + +#更新 Launcher +Check Update=檢查更新 +CheckingUpdate=檢查更新... +CheckingUpdateFailed=檢查更新失敗 +CheckWifiConnection=請檢查無線網路 +LauncherIsUpToDate=Launcher 已是最新版 +Update Confirm=確定更新 +UpdateToFQ=更新至版本 %%s ? +ConfirmUpdateToFQ=確定更新至版本 %%s ? + +#管理 RetroArch 核心 +Del=刪除 +OK=確定 +Confirm to Delete?=確定刪除? +Awaiting Input=等候輸入 + +#關機 +Confirm Power OFF?=確定關機? + +#按鈕對應 +UpdateRetroArch=套用至 RetroArch +Overwrite RA conf=套用至 RetroArch +Apply to RetroArch?=確定套用至 RetroArch + +#佈景主題 +Skin selection=佈景主題 + +#啟動 LauncherGo +Switch To LauncherGo=啟動 LauncherGo +ConfirmQ=確定? +Rebooting to LauncherGo=重新開機啟動 LauncherGo + +#主網路卡 +Gateway switch=主網路卡 +Clear All=全部不選 +Cleaning up=清除選擇 +Wi-Fi is not connected=無線網路未連線 + +#Retro Games +Please upload data over Wi-Fi=請透過Wi-Fi上傳檔案 +AddFav=收藏 +Run=執行 +AddFavList=收藏至我的最愛 +FavouriteGames=我的最愛遊戲 +MyFavGames=我的最愛遊戲 +Remove=刪除 +Deleting=刪除... +DeleteConfirm=確定刪除 +ConfirmDeleteQ=確定刪除? +Download Confirm=下載核心 +SetupGameEngineAutoQ=是否下載遊戲引擎核心? +Downloading=下載... +DownloadFailed=下載失敗 +Invaid=設定失效 + +#Warehouse +Update=更新 +Preview=預覽 +Add=新增 +Warehouse existed!=Warehouse 已存在 +Loading=讀取... +Fetch house failed=讀取失敗 +Are you sure?=確定刪除? + +#PICO-8 +Not Found=未找到 +Starting=啟動... +Verify the package=驗證套件 +Md5sum check failed=MD5 驗證失敗 +Continue=繼續 +Installing the package=正在安裝套件 +Package Installed=套件安裝完成 + +#D.E.O.T. Extra +MANUAL=工程師手冊 +OPERATION=工作台 +MAIL=信箱 + +#工具 +Resize=擴充記憶卡 +EmptyMail=清空系統郵件 +Clockspeed=處理器速度 +Kernel=系統核心 +Retroarch Update=更新 RetroArch +Recover=還原 +SwapFile=虛擬記憶體 +swapcheck=檢查 +swapoff=關閉 +swapon=開啟 +swapremove=刪除 +swapsetup=設定 +DEOT Settings=DEOT 佈景主題 +activate=開 +deactivate=關 + +#音樂播放器 +Play List=播放清單 +RTA=頻譜 +GameShell RTA=音樂頻譜 +Play/Pause=播放/暫停 +Music Library=媒體庫 +Add to Playlist=新增至播放清單 +my favorite music=我的最愛音樂 + +#Tiny Cloud +Tiny cloud=Tiny Cloud + +#關機 +Reboot=重新啟動 +Shutdown=關機 +Sleep=睡眠 +Suspend=睡眠 diff --git a/sys.py/langs/04_繁体中文.ini b/sys.py/langs/04_繁体中文.ini deleted file mode 100644 index 5a84662..0000000 --- a/sys.py/langs/04_繁体中文.ini +++ /dev/null @@ -1,112 +0,0 @@ -[Langs] -Settings=設置 -Retro Games=Retro Games -Music Player=音樂播放器 -TinyCloud=Tiny Cloud -PowerOFF=關機 -Reload UI=重載菜單 -freeDM=freeDM -CaveStory=洞窟物語 -Launching=正在啟動... -Nav=導航 -Scan=掃描 -Back=返回 -Enter=進入 -Remove=刪除 -Backspace=退格 -Done=完成 -Run=運行 -AddToPlayList=添加到播放列表 -Add to Playlist=添加到播放列表 -DownloadConfirm=下載確認 -MyFavGames=加星遊戲列表 -Deleting=刪除中... -AddFav=加星 -Del=刪 -Please upload data over Wi-Fi=請通過無線Wifi上傳數據 -ConfirmDeleteQ=確認刪除? -AlreadyExisted=已存在 -Cancel=取消 -Yes=是 -ConfirmQ=確認? -Disconnecting=斷開連接... -ConfirmUpdateToFQ=確認升級至 %%s ? -UpdateToFQ=更新至 %%s ? -SetupGameEngineAutoQ=你希望自動安裝遊戲引擎部件嗎? -Downloading=下載中... -BATOver5Pct=電量必須多余5%% -DeleteConfirm=刪除確認 -FavouriteGames=偏好遊戲 -ConfirmForgetQ=確認忽略? -ConfirmForget=確認忽略 -Disconnect=斷開 -ConfirmDisconnectQ=確認斷開? -Confirm Disconnect=確認斷開 -Forget=忽略 -Forgeting=忽略中... -Info=屬性 -TryConnect=試連接 -Bluetooth Info=藍牙屬性 -Connecting=連接中 -BluetoothScanning=藍牙搜索中... -Scanning=搜索中.. -ShutDownConnecting=斷開連接... -Select=選擇 -Detail=詳細 -Applying=設置中... -DownloadFailed=下載失敗 -LauncherIsUpToDate=Launcher已是最新 -CheckWifiConnection=請檢查 Wi-Fi 連接 -TurningOn=打開 -TurningOff=關閉 -Invalid=非法 -CheckingUpdate=檢查更新... -CheckingUpdateFailed=檢查更新失敗 -Update=更新 -Toggle=切換 -Rescue=重置無線設備 -Airplane Mode=飛行模式 -minutes=分 -seconds=秒 -second=秒 -minute=分 -Never=永不 -Power Options=電源選項 -Languages=語言 -Notify=提醒 -Setting List=設置列表 -Wi-Fi=Wi-Fi -Bluetooth=藍牙 -Sound Volume=音量 -Sound volume=音量 -Sound Volume=音量 -Brightness=亮度 -BackLight Brightness=背光亮度 -Storage=存儲空間 -Timezone=時區 -Timezone Selection=時區選擇 -Notification=提醒控件 -Update Launcher=更新啟動器 -About=關於GameShell -Power off=關機 -Buttons Layout=按鈕布局 -UpdateRetroArch=更新RetroArch -Wifi scanning=WiFi掃描中 -Power option detail=電源選項 -Screen dimming=屏幕變暗 -Screen OFF=關閉屏幕 -Power OFF=關機 -Power saving=節能 -Balanced=平衡 -Server=服務器 -Performance=性能 -Confirm Power OFF?=確認關機? -Reboot=重啟 -Shutdown=關閉 -Play List=播放列表 -Music Library=樂庫 -Play/Pause=播放/暫停 -my favorite music=我的音樂庫 -Check Update=檢查更新 -Theme Manager=主題管理 -GPU Driver Switch=切換GPU驅動 diff --git a/sys.py/langs/05_Spanish.ini b/sys.py/langs/05_Spanish.ini index 14b92ae..13ca163 100644 --- a/sys.py/langs/05_Spanish.ini +++ b/sys.py/langs/05_Spanish.ini @@ -82,7 +82,6 @@ Setting List=Lista de opciones Wi-Fi=Wi-Fi Bluetooth=Bluetooth Sound Volume=Volumen de sonido -Sound volume=Volumen de sonido Brightness=Brillo BackLight Brightness=Brillo de pantalla Storage=Almacenamiento @@ -119,4 +118,4 @@ Play List=Lista de reproducción Play/Pause=Repr/Pausa Awaiting Input=Escoge una opción Scan wifi=Escanear Wifi -Wifi info=Información Wifi \ No newline at end of file +Wifi info=Información Wifi diff --git a/sys.py/langs/06_French.ini b/sys.py/langs/06_French.ini index 8ed94c4..5d3bc2c 100644 --- a/sys.py/langs/06_French.ini +++ b/sys.py/langs/06_French.ini @@ -80,7 +80,6 @@ Setting List=Liste des réglages Wi-Fi=Wi-Fi Bluetooth=Bluetooth Sound Volume=Volume sonore -Sound volume=Volume sonore Brightness=Luminosité BackLight Brightness=Rétroéclairage Storage=Stockage @@ -104,4 +103,4 @@ Confirm Power OFF?=Confirmer l’arrêt ? Reboot=Redémarrage Shutdown=Extinction my favorite music=Ma musique favorite -Check Update=Vérifier les mises à jour \ No newline at end of file +Check Update=Vérifier les mises à jour diff --git a/sys.py/langs/07_Deutsch.ini b/sys.py/langs/07_Deutsch.ini index 662da3b..c3f0bd4 100644 --- a/sys.py/langs/07_Deutsch.ini +++ b/sys.py/langs/07_Deutsch.ini @@ -80,7 +80,6 @@ Setting List=Einstellungen Wi-Fi=Wi-Fi Bluetooth=Bluetooth Sound Volume=Lautsprecher -Sound Volume=Lautsprecher Brightness=Helligkeit BackLight Brightness=Display Helligkeit Storage=Speicher @@ -104,4 +103,4 @@ Confirm Power OFF?=Ausschalten bestätigen? Reboot=Neustart Shutdown=Ausschalten my favorite music=Meine Lieblingsmusik -Check Update=Auf Update überprüfen \ No newline at end of file +Check Update=Auf Update überprüfen diff --git a/sys.py/langs/08_Bulgarian.ini b/sys.py/langs/08_Bulgarian.ini index 38fd35d..e72a549 100644 --- a/sys.py/langs/08_Bulgarian.ini +++ b/sys.py/langs/08_Bulgarian.ini @@ -80,7 +80,6 @@ Setting List=Настройките Wi-Fi=Wi-Fi Bluetooth=Bluetooth Sound Volume=Сила на звука -Sound Volume=Сила на звука Brightness=Яркост BackLight Brightness=Яркост на задната светлина Storage=памет diff --git a/sys.py/langs/09_Russian.ini b/sys.py/langs/09_Russian.ini new file mode 100644 index 0000000..b6ac2be --- /dev/null +++ b/sys.py/langs/09_Russian.ini @@ -0,0 +1,123 @@ +[Langs] +Settings=Настройки +Retro Games=Ретро-игры +Indie Games=Инди-игры +Utils = Утилиты +Music Player=Плеер +TinyCloud=Tiny Cloud +PowerOFF=Выключить +Reload UI=Обновить UI +freeDM=freeDM +CaveStory=CaveStory +RetroArch=RetroArch +Launching=Запускается.... +Nav=Нав. +Scan=Скан. +Back=Назад +Enter=Ввод +Remove=Удалить +Backspace=Стереть +Done=Выполнено +Run=Старт +AddToPlayList=Добавить в Плейлист +Add to Playlist=Добавить в Плейлист +DownloadConfirm=Подтвердить Скачивание +MyFavGames=избранные игры +Deleting=Удаляю... +AddFav=Доб Изб +ADdFavList=Добавить в избранное +Del=Удалить +Please upload data over Wi-Fi=Пожалуйста, загрузите данные по Wi-Fi +ConfirmDeleteQ=Подтвердить Удаление ? +AlreadyExisted=Уже существует +Cancel=Отмена +Yes=Да +ConfirmQ=Подтвердить? +Disconnecting=Отключение... +ConfirmUpdateToFQ=Подтвердить Обновление до %%s ? +UpdateToFQ=Обновить до %%s ? +SetupGameEngineAutoQ=Хотите автоматически установить движок для этой игры? +Downloading=Скачиваю... +BATOver5Pct=Батарея должна быть заряжена больше, чем на 5%% +DeleteConfirm=Подтвердить Удаление +FavouriteGames=Избранные Игры +ConfirmForgetQ=Забыть? +ConfirmForget=Подтвердить Забытие +Disconnect=Отключиться +ConfirmDisconnectQ=Подтвердить Отключение ? +Confirm Disconnect=Подтвердить отключение +Forget=Забыть +Forgeting=Забываю... +Info=Инфо +TryConnect=TryConnect +Bluetooth Info=Настройки Bluetooth +Connecting=Подключаюсь +BluetoothScanning=Сканирую Bluetooth... +Scanning=Сканирую.. +ShutDownConnecting=ShutDownConnecting... +Select=Выбрать +Detail=Подробнее +Applying=Применяю... +DownloadFailed=Не удалось скачать +LauncherIsUpToDate=Лаунчер актуален +CheckWifiConnection=Пожалуйста, Проверьте ваше Wi-Fi соединение +TurningOn=Включить +TurningOff=Выключить +Invalid=Недействительно +CheckingUpdate=Проверяю обновления... +CheckingUpdateFailed=Не удалось проверить обновления +Update=Обновить +Toggle=Переключить +Rescue=Сохранить +Airplane Mode=Авиарежим +minutes=минут(ы) +seconds=секунд(ы) +second=секунда +minute=минута +Never=Никогда +Power Options=Настройки питания +Languages=Языки +Notify=Уведомления +Setting List=Список настроек +Wi-Fi=Wi-Fi +Bluetooth=Bluetooth +Sound Volume=Громкость звука +Brightness=Яркость +BackLight Brightness=Яркость подсветки +Storage=Хранилище +Timezone=Часовой пояс +Timezone Selection=Выбор часового пояса +Notification=Уведомления +About=About +Power off=Выключить питание +Buttons Layout=Расположение кнопок +UpdateRetroArch=Обновить RetroArch +Update Launcher=Обновить лаунчер +About=Об устройстве +Theme Manager=Темы оформления +Wifi scanning=Сканирую сеть Wi-Fi... +Power option detail=Настройки питания +Screen dimming=Затемнение экрана +Screen OFF=Выключить экран +Power OFF=Выключить питание +Power saving=Энергосбережение +Balanced=Сбалансированный +Server=Сервер +Performance=Производительность +Confirm Power OFF?=Подтвердить выключение? +Reboot=Перезагрузка +Shutdown=Выключить +my favorite music=избранная музыка +Check Update=Проверить Обновления +Switch to LauncherGo=Переключиться на LauncherGo +GPU Driver Switch=Переключить драйвер GPU +Network gateway switch=Переключить сетевой шлюз +Gateway switch=Переключить шлюз +Clear All=Очистить все +Cleaning up=Стереть +Music Library=Библиотека музыки +Play List=Плейлист +Play/Pause=Играть/Пауза +Awaiting Input=Выберите опцию +Scan wifi=Wi-Fi +Wifi info=Настройки Wi-Fi \ No newline at end of file diff --git a/sys.py/langs/99_DEOT_English.ini b/sys.py/langs/99_DEOT_English.ini new file mode 100644 index 0000000..af6b7ff --- /dev/null +++ b/sys.py/langs/99_DEOT_English.ini @@ -0,0 +1,114 @@ +[Langs] +Settings=SETTINGS +Retro Games=PLAY +Music Player=MUSIC +TinyCloud=CONNECT +Sleep=SUSPEND +PowerOFF=POWEROFF +Reload UI=RELOAD +ChocoDM=FREEDM +CaveStory=CAVESTORY +RetroArch=RETROARCH +Warehouse=WAREHOUSE +Indie Games=INDIE +Love2D=LOVE2D +LowResNX=LOWRESNX +D.E.O.T. Extra=DEOT +Utils=TOOLS +Launching=Projecting.... +Nav=Nav +Scan=Scan +Back=Back +Enter=Enter +Remove=Remove +Backspace=Backspace +Done=Done +Run=Run +AddToPlayList=Add to Playlist +Add to Playlist=Add to Playlist +DownloadConfirm=Download Confirm +MyFavGames=FAVOURITE GAMES +Deleting=Deleting... +AddFav=Add Fav +ADdFavList=Add to favourite list +Del=Del +Please upload data over Wi-Fi=Please upload data over Wi-Fi +ConfirmDeleteQ=Confirm Delete ? +AlreadyExisted=Already exists +Cancel=Cancel +Yes=Yes +ConfirmQ=Confirm? +Disconnecting=Disconnecting... +ConfirmUpdateToFQ=Confirm Update to %%s ? +UpdateToFQ=Update to %%s ? +SetupGameEngineAutoQ=Do you want to setup this game engine automatically? +Downloading=Downloading... +BATOver5Pct=Battery must over 5%% +DeleteConfirm=Confirm Delete +FavouriteGames=Favourite Games +ConfirmForgetQ=Confirm Forget? +ConfirmForget=Confirm Forget +Disconnect=Disconnect +ConfirmDisconnectQ=Confirm Disconnect ? +Confirm Disconnect=Confirm Disconnect +Forget=Forget +Forgeting=Forgetting... +Info=Info +TryConnect=TryConnect +Bluetooth Info=Bluetooth info +Connecting=Connecting +BluetoothScanning=Bluetooth scanning... +Scanning=Scanning... +ShutDownConnecting=ShutDownConnecting... +Select=Select +Detail=Detail +Applying=Applying... +DownloadFailed=Download failed +LauncherIsUpToDate=Launcher is up to date +CheckWifiConnection=Please Check your Wi-Fi connection +TurningOn=Turning On +TurningOff=Turning Off +Invalid=Invalid +CheckingUpdate=Checking update... +CheckingUpdateFailed=Checking update failed +Update=Update +Toggle=Toggle +Rescue=Rescue +Airplane Mode=Flight Mode +minutes=minutes +seconds=seconds +second=second +minute=minute +Never=Never +Power Options=Power Options +Languages=Languages +Notify=Notify +Setting List=Setting List +Wi-Fi=Wi-Fi +Bluetooth=Bluetooth +Sound Volume=Sound Volume +Brightness=Brightness +BackLight Brightness=BackLight Brightness +Storage=Storage +Timezone=Timezone +Timezone Selection=Timezone Selection +Notification=Notification +About=About +Power off=Power off +Buttons Layout=Buttons Layout +UpdateRetroArch=Update RetroArch Keybinds +Wifi scanning=Wifi scanning... +Power option detail=Power Option Detail +Screen dimming=Screen dimming +Screen OFF=Screen OFF +Power OFF=Power OFF +Power saving=Power saving +Balanced=Balanced +Server=Server +Performance=Performance +Confirm Power OFF?=Confirm Power OFF? +Reboot=Reboot +Shutdown=Shutdown +my favorite music=FAVOURITE MUSIC +Check Update=Check Update +Play/Pause=Play/Pause \ No newline at end of file diff --git a/update.sh b/update.sh index cb2312b..f393598 100755 --- a/update.sh +++ b/update.sh @@ -1,14 +1,14 @@ #!/bin/bash -cd /home/cpi/launcher +cd /home/cpi/launcher || exit feh --bg-center /home/cpi/launcher/sys.py/gameshell/wallpaper/updating.png git pull -git reset --hard $1 +git reset --hard "$1" git submodule init git submodule update -cd ~/apps/Menu && git pull && cd - +#disable update Menu +#cd ~/apps/Menu && git pull && cd - || exit -feh --bg-center /home/cpi/launcher/sys.py/gameshell/wallpaper/loading.png +feh --bg-center /home/cpi/launcher/sys.py/gameshell/wallpaper/loading.png ./load.sh - diff --git a/version.json b/version.json new file mode 100644 index 0000000..1429d50 --- /dev/null +++ b/version.json @@ -0,0 +1,4 @@ +{ + "gitversion":"6843aea", + "version":"200626" +}