From 3c6416f85b1cc5d40a3aedee98c5af45e66b3e14 Mon Sep 17 00:00:00 2001 From: cuu Date: Fri, 30 Nov 2018 13:18:21 +0800 Subject: [PATCH] replace SkinManager() to MySkinManager --- .gitignore | 1 + Menu/GameShell/10_Settings/Wifi/wifi_list.py | 3 +-- sys.py/UI/Emulator/fav_list_page.py | 8 ++++---- sys.py/UI/Emulator/list_item.py | 4 ++-- sys.py/UI/Emulator/rom_list_page.py | 8 ++++---- sys.py/UI/above_all_patch.py | 8 ++++---- sys.py/UI/confirm_page.py | 8 ++++---- sys.py/UI/constants.py | 4 ++-- sys.py/UI/counter_screen.py | 6 +++--- sys.py/UI/createby_screen.py | 4 ++-- sys.py/UI/download_process_page.py | 10 +++++----- sys.py/UI/info_page_list_item.py | 8 ++++---- sys.py/UI/info_page_selector.py | 4 ++-- sys.py/UI/keyboard.py | 4 ++-- sys.py/UI/label.py | 6 +++--- sys.py/UI/main_screen.py | 17 ++++++++--------- sys.py/UI/multilabel.py | 6 +++--- sys.py/UI/scroller.py | 4 ++-- sys.py/UI/skin_manager.py | 13 +++++++++++++ sys.py/UI/text_item.py | 4 ++-- sys.py/UI/textarea.py | 6 +++--- sys.py/UI/untitled_icon.py | 4 ++-- 22 files changed, 76 insertions(+), 64 deletions(-) diff --git a/.gitignore b/.gitignore index 7015936..eab81b3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ retroarch-core-options.cfg *.pyc sys.py/.powerlevel sys.py/.buttonslayout +sys.py/.lang *.cfg **/Jobs/* !**/Jobs/.gitkeep diff --git a/Menu/GameShell/10_Settings/Wifi/wifi_list.py b/Menu/GameShell/10_Settings/Wifi/wifi_list.py index 2686611..d8103fa 100644 --- a/Menu/GameShell/10_Settings/Wifi/wifi_list.py +++ b/Menu/GameShell/10_Settings/Wifi/wifi_list.py @@ -547,7 +547,7 @@ class WifiList(Page): results = [] activeID = -1 for x,enc_type in enumerate(self._EncMethods): - if enc_type["type"] == self._Wireless.GetWirelessProperty(network_id,"enctype"): + if enc_type["type"] == self._Wireless.GetWirelessProperty(network_id,"encryption_method"): activeID = x break @@ -645,7 +645,6 @@ class WifiList(Page): return wicd_wirelss_encrypt_pwd = self.GetWirelessEncrypt(self._PsIndex) - if self._WirelessList[self._PsIndex]._IsActive: self.ShowBox( self._Wireless.GetWirelessIP('') ) else: diff --git a/sys.py/UI/Emulator/fav_list_page.py b/sys.py/UI/Emulator/fav_list_page.py index 06de248..e9fffc6 100644 --- a/sys.py/UI/Emulator/fav_list_page.py +++ b/sys.py/UI/Emulator/fav_list_page.py @@ -17,7 +17,7 @@ from UI.keys_def import CurKeys from UI.multi_icon_item import MultiIconItem from UI.icon_pool import MyIconPool from UI.scroller import ListScroller -from UI.skin_manager import SkinManager +from UI.skin_manager import MySkinManager from rom_so_confirm_page import RomSoConfirmPage @@ -52,7 +52,7 @@ class FavStack: return len(self.stack) class ListPageSelector(PageSelector): - _BackgroundColor = SkinManager().GiveColor('Front') + _BackgroundColor = MySkinManager.GiveColor('Front') def __init__(self): self._PosX = 0 @@ -231,7 +231,7 @@ class FavListPage(Page): bgpng._MyType = ICON_TYPES["STAT"] bgpng._Parent = self bgpng.AddLabel("my favourites games", fonts["varela18"]) - bgpng.SetLableColor(SkinManager().GiveColor('Disabled')) + bgpng.SetLableColor(MySkinManager.GiveColor('Disabled')) bgpng.Adjust(0,0,self._BGwidth,self._BGheight,0) self._Icons["bg"] = bgpng @@ -307,7 +307,7 @@ class FavListPage(Page): if cur_li._MyType == ICON_TYPES["DIR"]: return - if cur_li._MyType == ICON_TYPES["FILE"]: ## add to playlist only + if cur_li._MyType == ICON_TYPES["FILE"]: self._Screen._MsgBox.SetText("Launching...") self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() diff --git a/sys.py/UI/Emulator/list_item.py b/sys.py/UI/Emulator/list_item.py index fdb0117..e46df36 100644 --- a/sys.py/UI/Emulator/list_item.py +++ b/sys.py/UI/Emulator/list_item.py @@ -11,7 +11,7 @@ from UI.label import Label from UI.fonts import fonts from UI.icon_item import IconItem from UI.util_funcs import midRect -from UI.skin_manager import SkinManager +from UI.skin_manager import MySkinManager # a item for List # - - - - - - - - - - - -- @@ -113,6 +113,6 @@ class ListItem(object): self._Parent._Icons["sys"].NewCoord(self._PosX+12,self._PosY+ (self._Height - self._Parent._Icons["sys"]._Height)/2+self._Parent._Icons["sys"]._Height/2) self._Parent._Icons["sys"].Draw() - pygame.draw.line(self._Parent._CanvasHWND,SkinManager().GiveColor('Line'),(self._PosX,self._PosY+self._Height-1),(self._PosX+self._Width,self._PosY+self._Height-1),1) + pygame.draw.line(self._Parent._CanvasHWND,MySkinManager.GiveColor('Line'),(self._PosX,self._PosY+self._Height-1),(self._PosX+self._Width,self._PosY+self._Height-1),1) diff --git a/sys.py/UI/Emulator/rom_list_page.py b/sys.py/UI/Emulator/rom_list_page.py index 9738b78..fbb9338 100644 --- a/sys.py/UI/Emulator/rom_list_page.py +++ b/sys.py/UI/Emulator/rom_list_page.py @@ -24,7 +24,7 @@ from UI.keys_def import CurKeys from UI.multi_icon_item import MultiIconItem from UI.icon_pool import MyIconPool from UI.scroller import ListScroller -from UI.skin_manager import SkinManager +from UI.skin_manager import MySkinManager from rom_so_confirm_page import RomSoConfirmPage @@ -59,7 +59,7 @@ class RomStack: return len(self.stack) class ListPageSelector(PageSelector): - _BackgroundColor = SkinManager().GiveColor('Front') + _BackgroundColor = MySkinManager.GiveColor('Front') def __init__(self): self._PosX = 0 @@ -265,7 +265,7 @@ class RomListPage(Page): bgpng._MyType = ICON_TYPES["STAT"] bgpng._Parent = self bgpng.AddLabel("Please upload data over Wi-Fi", fonts["varela22"]) - bgpng.SetLableColor(SkinManager().GiveColor('Disabled')) + bgpng.SetLableColor(MySkinManager.GiveColor('Disabled')) bgpng.Adjust(0,0,self._BGwidth,self._BGheight,0) self._Icons["bg"] = bgpng @@ -346,7 +346,7 @@ class RomListPage(Page): self.SyncList( self._MyStack.Last() ) self._PsIndex = 0 - if cur_li._MyType == ICON_TYPES["FILE"]: ## add to playlist only + if cur_li._MyType == ICON_TYPES["FILE"]: self._Screen._MsgBox.SetText("Launching...") self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() diff --git a/sys.py/UI/above_all_patch.py b/sys.py/UI/above_all_patch.py index fb03cab..661cd8f 100644 --- a/sys.py/UI/above_all_patch.py +++ b/sys.py/UI/above_all_patch.py @@ -17,7 +17,7 @@ from util_funcs import midRect from fonts import fonts from keys_def import CurKeys from label import Label -from skin_manager import SkinManager +from skin_manager import MySkinManager @@ -30,8 +30,8 @@ class AboveAllPatch(object): _Text ="" _FontObj=fonts["veramono20"] _Parent =None - _Color = SkinManager().GiveColor('Text') - _ValColor = SkinManager().GiveColor('URL') + _Color = MySkinManager.GiveColor('Text') + _ValColor = MySkinManager.GiveColor('URL') _CanvasHWND = None _TextSurf = None _Icons = {} @@ -130,5 +130,5 @@ class SoundPatch(AboveAllPatch): #w = 10,h = 40 vol_rect = pygame.Rect(80+i*20, self._Height/2+20,10, 40) - aa_round_rect(self._CanvasHWND,vol_rect,SkinManager().GiveColor("Front"),3,0,SkinManager().GiveColor("Front")) + aa_round_rect(self._CanvasHWND,vol_rect,MySkinManager.GiveColor("Front"),3,0,MySkinManager.GiveColor("Front")) diff --git a/sys.py/UI/confirm_page.py b/sys.py/UI/confirm_page.py index 7d226f8..ec0cd95 100644 --- a/sys.py/UI/confirm_page.py +++ b/sys.py/UI/confirm_page.py @@ -12,12 +12,12 @@ from label import Label from fonts import fonts from util_funcs import midRect from keys_def import CurKeys -from skin_manager import SkinManager +from skin_manager import MySkinManager class ListPageSelector(PageSelector): - _BackgroundColor = SkinManager().GiveColor('Front') + _BackgroundColor = MySkinManager.GiveColor('Front') def __init__(self): self._PosX = 0 @@ -130,8 +130,8 @@ class ConfirmPage(Page): def DrawBG(self): _rect = pygame.Rect(self._BGPosX,self._BGPosY,self._BGWidth,self._BGHeight) - pygame.draw.rect(self._CanvasHWND,SkinManager().GiveColor('White'),_rect,0) - pygame.draw.rect(self._CanvasHWND,SkinManager().GiveColor('Text'),_rect,1) + pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('White'),_rect,0) + pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'),_rect,1) def Draw(self): #self.ClearCanvas() diff --git a/sys.py/UI/constants.py b/sys.py/UI/constants.py index 9d4c793..1f37a41 100644 --- a/sys.py/UI/constants.py +++ b/sys.py/UI/constants.py @@ -12,12 +12,12 @@ import base64 from beeprint import pp #UI lib -from skin_manager import SkinManager +from skin_manager import MySkinManager Width = 320 Height = 240 -bg_color = SkinManager().GiveColor('White') +bg_color = MySkinManager.GiveColor('White') icon_width = 80 icon_height = 80 diff --git a/sys.py/UI/counter_screen.py b/sys.py/UI/counter_screen.py index 3c879d5..77edaa3 100644 --- a/sys.py/UI/counter_screen.py +++ b/sys.py/UI/counter_screen.py @@ -8,7 +8,7 @@ from constants import Width,Height,RUNSYS from label import Label from fonts import fonts from full_screen import FullScreen -from skin_manager import SkinManager +from skin_manager import MySkinManager import config @@ -22,8 +22,8 @@ class CounterScreen(FullScreen): _BottomLabel = None _NumberLabel = None - _BGColor = SkinManager().GiveColor('Black') - _FGColor = SkinManager().GiveColor('White') + _BGColor = MySkinManager.GiveColor('Black') + _FGColor = MySkinManager.GiveColor('White') _Counting = False _Number = 10 diff --git a/sys.py/UI/createby_screen.py b/sys.py/UI/createby_screen.py index 890d607..194d695 100644 --- a/sys.py/UI/createby_screen.py +++ b/sys.py/UI/createby_screen.py @@ -4,7 +4,7 @@ import pygame import base64 ## local package import from full_screen import FullScreen -from skin_manager import SkinManager +from skin_manager import MySkinManager from createby_clockworkpi import createby_clockworkpi_b64 from constants import Width,Height @@ -12,7 +12,7 @@ from constants import Width,Height class CreateByScreen(FullScreen): _BG = None - _BGColor = SkinManager().GiveColor('Black') + _BGColor = MySkinManager.GiveColor('Black') def Init(self): self._BG = pygame.image.frombuffer(base64.b64decode(createby_clockworkpi_b64 ),(Width,Height),"RGBA") diff --git a/sys.py/UI/download_process_page.py b/sys.py/UI/download_process_page.py index efd4cc4..04a42c4 100644 --- a/sys.py/UI/download_process_page.py +++ b/sys.py/UI/download_process_page.py @@ -19,7 +19,7 @@ from UI.keys_def import CurKeys from UI.multi_icon_item import MultiIconItem from UI.icon_pool import MyIconPool from UI.download import Download -from UI.skin_manager import SkinManager +from UI.skin_manager import MySkinManager from libs.DBUS import is_wifi_connected_now @@ -39,8 +39,8 @@ class DownloadProcessPage(Page): _FileNameLabel = None _SizeLabel = None - _URLColor = SkinManager().GiveColor('URL') - _TextColor = SkinManager().GiveColor('Text') + _URLColor = MySkinManager.GiveColor('URL') + _TextColor = MySkinManager.GiveColor('Text') def __init__(self): Page.__init__(self) @@ -206,12 +206,12 @@ class DownloadProcessPage(Page): rect_ = midRect(self._Width/2,self._Height/2+33,170,17, Width,Height) - aa_round_rect(self._CanvasHWND,rect_,SkinManager().GiveColor('TitleBg'),5,0,SkinManager().GiveColor('TitleBg')) + aa_round_rect(self._CanvasHWND,rect_,MySkinManager.GiveColor('TitleBg'),5,0,MySkinManager.GiveColor('TitleBg')) rect2 = midRect(self._Width/2,self._Height/2+33,int(170*(percent/100.0)),17, Width,Height) rect2.left = rect_.left rect2.top = rect_.top - aa_round_rect(self._CanvasHWND,rect2,SkinManager().GiveColor('Front'),5,0,SkinManager().GiveColor('Front')) + aa_round_rect(self._CanvasHWND,rect2,MySkinManager.GiveColor('Front'),5,0,MySkinManager.GiveColor('Front')) rect3 = midRect(self._Width/2,self._Height/2+53,self._FileNameLabel._Width, self._FileNameLabel._Height,Width,Height) diff --git a/sys.py/UI/info_page_list_item.py b/sys.py/UI/info_page_list_item.py index 981b230..5174f70 100644 --- a/sys.py/UI/info_page_list_item.py +++ b/sys.py/UI/info_page_list_item.py @@ -2,7 +2,7 @@ import pygame from label import Label -from skin_manager import SkinManager +from skin_manager import MySkinManager class InfoPageListItem(object): _PosX = 0 @@ -43,9 +43,9 @@ class InfoPageListItem(object): def Draw(self): if self._ReadOnly == True: - self._Labels["Text"].SetColor(SkinManager().GiveColor("ReadOnlyText")) + self._Labels["Text"].SetColor(MySkinManager.GiveColor("ReadOnlyText")) else: - self._Labels["Text"].SetColor(SkinManager().GiveColor("Text")) + self._Labels["Text"].SetColor(MySkinManager.GiveColor("Text")) self._Labels["Text"]._PosX = self._Labels["Text"]._PosX + self._PosX @@ -59,4 +59,4 @@ class InfoPageListItem(object): self._Labels["Small"]._PosY = self._PosY + (self._Height - self._Labels["Small"]._Height)/2 self._Labels["Small"].Draw() - pygame.draw.line(self._Parent._CanvasHWND,SkinManager().GiveColor('Line'),(self._PosX,self._PosY+self._Height-1),(self._PosX+self._Width,self._PosY+self._Height-1),1) + pygame.draw.line(self._Parent._CanvasHWND,MySkinManager.GiveColor('Line'),(self._PosX,self._PosY+self._Height-1),(self._PosX+self._Width,self._PosY+self._Height-1),1) diff --git a/sys.py/UI/info_page_selector.py b/sys.py/UI/info_page_selector.py index e6955b5..a96b381 100644 --- a/sys.py/UI/info_page_selector.py +++ b/sys.py/UI/info_page_selector.py @@ -5,10 +5,10 @@ from libs.roundrects import aa_round_rect ## local UI import from UI.constants import Width,Height from UI.page import Page,PageSelector -from UI.skin_manager import SkinManager +from UI.skin_manager import MySkinManager class InfoPageSelector(PageSelector): - _BackgroundColor = SkinManager().GiveColor('Front') + _BackgroundColor = MySkinManager.GiveColor('Front') def __init__(self): self._PosX = 0 diff --git a/sys.py/UI/keyboard.py b/sys.py/UI/keyboard.py index 31cd9f0..cd75cd7 100644 --- a/sys.py/UI/keyboard.py +++ b/sys.py/UI/keyboard.py @@ -13,7 +13,7 @@ from UI.util_funcs import midRect from UI.keys_def import CurKeys from UI.icon_item import IconItem from UI.icon_pool import MyIconPool -from UI.skin_manager import SkinManager +from UI.skin_manager import MySkinManager from libs.roundrects import aa_round_rect @@ -27,7 +27,7 @@ class KeyboardIcon(IconItem): _PosY = 0 _Width = 0 _Height = 0 - _Color = SkinManager().GiveColor('Text') + _Color = MySkinManager.GiveColor('Text') _MyType = ICON_TYPES["NAV"] _Parent = None _Str = "" diff --git a/sys.py/UI/label.py b/sys.py/UI/label.py index 94b0bf3..657fd3f 100644 --- a/sys.py/UI/label.py +++ b/sys.py/UI/label.py @@ -8,7 +8,7 @@ from constants import Width,Height from util_funcs import midRect #UI lib -from skin_manager import SkinManager +from skin_manager import MySkinManager class Label: _PosX=0 @@ -17,13 +17,13 @@ class Label: _Height=0 _Text="" _FontObj=None - _Color = SkinManager().GiveColor('Text') + _Color = MySkinManager.GiveColor('Text') _CanvasHWND = None _TextSurf = None def __init__(self): pass - def Init(self, text, font_obj, color=SkinManager().GiveColor('Text')): + def Init(self, text, font_obj, color=MySkinManager.GiveColor('Text')): self._Color = color self._FontObj = font_obj self._Text = text diff --git a/sys.py/UI/main_screen.py b/sys.py/UI/main_screen.py index af0f401..c09dbf5 100644 --- a/sys.py/UI/main_screen.py +++ b/sys.py/UI/main_screen.py @@ -27,7 +27,7 @@ from label import Label from untitled_icon import UntitledIcon from Emulator import MyEmulator -from skin_manager import SkinManager +from skin_manager import MySkinManager from counter_screen import CounterScreen class MessageBox(Label): @@ -36,7 +36,7 @@ class MessageBox(Label): def __init__(self): pass - def Init(self,text,font_obj,color=SkinManager().GiveColor('Text')): + def Init(self,text,font_obj,color=MySkinManager.GiveColor('Text')): self._Color = color self._FontObj = font_obj self._Text = text @@ -52,7 +52,7 @@ class MessageBox(Label): def PreDraw(self): self._Width = 0 self._Height = 0 - self._CanvasHWND.fill(SkinManager().GiveColor('White')) + self._CanvasHWND.fill(MySkinManager.GiveColor('White')) words = self._Text.split(' ') space = self._FontObj.size(' ')[0] @@ -99,7 +99,7 @@ class MessageBox(Label): padding = 5 - pygame.draw.rect(self._HWND,SkinManager().GiveColor('White'),(x_-padding,y_-padding, self._Width+padding*2,self._Height+padding*2)) + pygame.draw.rect(self._HWND,MySkinManager.GiveColor('White'),(x_-padding,y_-padding, self._Width+padding*2,self._Height+padding*2)) if self._HWND != None: rect = pygame.Rect(x_,y_,self._Width,self._Height) @@ -107,7 +107,7 @@ class MessageBox(Label): #self._HWND.blit(self._CanvasHWND,rect) if withborder == True: - pygame.draw.rect(self._HWND,SkinManager().GiveColor('Black'),(x_-padding,y_-padding, self._Width+padding*2,self._Height+padding*2),1) + pygame.draw.rect(self._HWND,MySkinManager.GiveColor('Black'),(x_-padding,y_-padding, self._Width+padding*2,self._Height+padding*2),1) def Draw(self): x = (self._Parent._Width)/2 @@ -152,9 +152,8 @@ class MainScreen(object): self._MsgBox._Parent= self self._MsgBox.Init(" ", self._MsgBoxFont) - self._SkinManager = SkinManager() - self._SkinManager.Init() - + self._SkinManager = MySkinManager + self._CounterScreen = CounterScreen() self._CounterScreen._HWND = self._HWND @@ -349,7 +348,7 @@ class MainScreen(object): self._Pages.append(Page) def ClearCanvas(self): - self._CanvasHWND.fill(SkinManager().GiveColor('White')) + self._CanvasHWND.fill(self._SkinManager.GiveColor('White')) def SwapAndShow(self): if self._Closed == True: diff --git a/sys.py/UI/multilabel.py b/sys.py/UI/multilabel.py index 4784b94..0330580 100644 --- a/sys.py/UI/multilabel.py +++ b/sys.py/UI/multilabel.py @@ -2,7 +2,7 @@ import pygame -from skin_manager import SkinManager +from skin_manager import MySkinManager class MultiLabel: ##Multi Line Label @@ -12,7 +12,7 @@ class MultiLabel: ##Multi Line Label _Height=100 _Text="" _FontObj=None - _Color = SkinManager().GiveColor('Text') + _Color = MySkinManager.GiveColor('Text') _CanvasHWND = None _TextSurf = None _MaxWidth = 0 @@ -20,7 +20,7 @@ class MultiLabel: ##Multi Line Label def __init__(self): pass - def Init(self,text,font_obj,color=SkinManager().GiveColor('Text')): + def Init(self,text,font_obj,color=MySkinManager.GiveColor('Text')): self._Color = color self._FontObj = font_obj self._Text = text diff --git a/sys.py/UI/scroller.py b/sys.py/UI/scroller.py index a3b8244..9361ffd 100644 --- a/sys.py/UI/scroller.py +++ b/sys.py/UI/scroller.py @@ -5,7 +5,7 @@ from util_funcs import midRect from libs.roundrects import aa_round_rect -from skin_manager import SkinManager +from skin_manager import MySkinManager class ListScroller(object): _PosX = 0 @@ -14,7 +14,7 @@ class ListScroller(object): _Height = 0 _MinHeight = 6 ## tested _Parent = None - _Color = SkinManager().GiveColor('Front') + _Color = MySkinManager.GiveColor('Front') _StartX = 0 _StartY = 0 diff --git a/sys.py/UI/skin_manager.py b/sys.py/UI/skin_manager.py index e7e7e1e..1deee6a 100644 --- a/sys.py/UI/skin_manager.py +++ b/sys.py/UI/skin_manager.py @@ -78,3 +78,16 @@ class SkinManager(object): else: return pygame.Color(255,0,0) + +##global MySkinManager Handler +MySkinManager = None + +def InitMySkinManager(): + global MySkinManager + if MySkinManager == None: + MySkinManager = SkinManager() + + +InitMySkinManager() + + diff --git a/sys.py/UI/text_item.py b/sys.py/UI/text_item.py index f494eab..7469b92 100644 --- a/sys.py/UI/text_item.py +++ b/sys.py/UI/text_item.py @@ -3,7 +3,7 @@ from UI.constants import Width,Height,ICON_TYPES from UI.icon_item import IconItem from UI.util_funcs import midRect -from UI.skin_manager import SkinManager +from UI.skin_manager import MySkinManager class TextItem(IconItem): _PosX = 0 @@ -11,7 +11,7 @@ class TextItem(IconItem): _Width = 0 _Height = 0 _Str = "" - _Color = SkinManager().GiveColor('Text') + _Color = MySkinManager.GiveColor('Text') _FontObj = None _Bold = False _MyType = ICON_TYPES["LETTER"] diff --git a/sys.py/UI/textarea.py b/sys.py/UI/textarea.py index e1a1846..39f0b15 100644 --- a/sys.py/UI/textarea.py +++ b/sys.py/UI/textarea.py @@ -10,14 +10,14 @@ from libs.roundrects import aa_round_rect from UI.page import Page,PageStack,PageSelector from UI.label import Label from UI.fonts import fonts -from UI.skin_manager import SkinManager +from UI.skin_manager import MySkinManager class Textarea: _PosX =0 _PosY = 0 _Width = 0 _Height = 0 - _BackgroundColor = SkinManager().GiveColor('TitleBg') + _BackgroundColor = MySkinManager.GiveColor('TitleBg') _CanvasHWND = None _MyWords = [] _BlitWords = [] @@ -80,7 +80,7 @@ class Textarea: x = self._PosX+xmargin linenumber = 0 cursor_row = 0 - + for i, v in enumerate(self._MyWords): t = self._FontObj.render(v, True, (8, 135, 174)) t_width = t.get_width() diff --git a/sys.py/UI/untitled_icon.py b/sys.py/UI/untitled_icon.py index 447eca7..c7f2b70 100644 --- a/sys.py/UI/untitled_icon.py +++ b/sys.py/UI/untitled_icon.py @@ -14,7 +14,7 @@ from beeprint import pp from util_funcs import midRect, SkinMap from fonts import fonts -from skin_manager import SkinManager +from skin_manager import MySkinManager BlankPng = SkinMap("gameshell/blank.png") # 80x80 ## use blank circle as bg, Two alpha As Icon Label @@ -32,7 +32,7 @@ class UntitledIcon(object): _BG = None # initial surface - _Color = SkinManager().GiveColor('Text') + _Color = MySkinManager.GiveColor('Text') def __init__(self): self._Words = ["G", "s"]