|
@@ -20,6 +20,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 threading import Thread
|
|
|
|
|
@@ -82,7 +83,7 @@ class MPDSpectrumPage(Page):
|
|
|
_SongFont = fonts["notosanscjk12"]
|
|
|
_PIFI = None
|
|
|
_FIFO = None
|
|
|
- _Color = pygame.Color(126,206,244)
|
|
|
+ _Color = SkinManager().GiveColor('Front')
|
|
|
_GobjectIntervalId = -1
|
|
|
_Queue = None
|
|
|
_KeepReading = True
|
|
@@ -162,21 +163,22 @@ class MPDSpectrumPage(Page):
|
|
|
|
|
|
self._song_title = Label()
|
|
|
self._song_title.SetCanvasHWND(self._RollCanvas)
|
|
|
- self._song_title.Init("Untitled",self._SongFont,(255,255,255))
|
|
|
+ self._song_title.Init("Untitled",self._SongFont,SkinManager().GiveColor('White'))
|
|
|
|
|
|
|
|
|
self._title = Label()
|
|
|
self._title.SetCanvasHWND(self._CanvasHWND)
|
|
|
- self._title.Init("Title:",self._ListFont,(255,255,255))
|
|
|
+ self._title.Init("Title:",self._ListFont,SkinManager().GiveColor('White'))
|
|
|
|
|
|
self._time = Label()
|
|
|
self._time.SetCanvasHWND(self._CanvasHWND)
|
|
|
- self._time.Init("Time:",self._ListFont,(255,255,255))
|
|
|
+ self._time.Init("Time:",self._ListFont,SkinManager().GiveColor('White'))
|
|
|
|
|
|
|
|
|
self._time2 = Label()
|
|
|
self._time2.SetCanvasHWND(self._CanvasHWND)
|
|
|
- self._time2.Init("00:00-00:00",self._ListFont,(255,255,255))
|
|
|
+ self._time2.Init("00:00-00:00", self._ListFont,
|
|
|
+ SkinManager().GiveColor('White'))
|
|
|
|
|
|
|
|
|
self.Start()
|
|
@@ -227,7 +229,7 @@ class MPDSpectrumPage(Page):
|
|
|
|
|
|
|
|
|
def ClearCanvas(self):
|
|
|
- self._CanvasHWND.fill((0,0,0))
|
|
|
+ self._CanvasHWND.fill(SkinManager().GiveColor('Black'))
|
|
|
|
|
|
def SgsSmooth(self):
|
|
|
passes = 1
|
|
@@ -341,7 +343,7 @@ class MPDSpectrumPage(Page):
|
|
|
|
|
|
if self._RollCanvas != None:
|
|
|
# self._RollCanvas.fill((111,22,33))
|
|
|
- self._RollCanvas.fill((0,0,0))
|
|
|
+ self._RollCanvas.fill(SkinManager().GiveColor('Black'))
|
|
|
if self._song_title._Width > self._RollW:
|
|
|
if (self._song_title._PosX + self._song_title._Width) > self._RollW and self._frames % 30 == 0:
|
|
|
self._song_title._PosX -= 1
|
|
@@ -415,9 +417,9 @@ class MPDSpectrumPage(Page):
|
|
|
else:
|
|
|
self._capYPositionArray[i] = value
|
|
|
|
|
|
- pygame.draw.rect(self._CanvasHWND,(255,255,255),(i*(bw+gap)+margin_left,self._Height-gap-self._capYPositionArray[i]-margin_bottom,bw,gap),0)
|
|
|
+ pygame.draw.rect(self._CanvasHWND,SkinManager().GiveColor('White'),(i*(bw+gap)+margin_left,self._Height-gap-self._capYPositionArray[i]-margin_bottom,bw,gap),0)
|
|
|
|
|
|
- pygame.draw.rect(self._CanvasHWND,(255,255,255),(i*(bw+gap)+margin_left,self._Height-value-gap-margin_bottom,bw,value+gap),0)
|
|
|
+ pygame.draw.rect(self._CanvasHWND,SkinManager().GiveColor('White'),(i*(bw+gap)+margin_left,self._Height-value-gap-margin_bottom,bw,value+gap),0)
|
|
|
|
|
|
self._vis_values[i] -= 2
|
|
|
|