From 5d93fda8134147ea68a8972184d4e6e9bae31f8d Mon Sep 17 00:00:00 2001
From: cuu <dexterkidd@gmail.com>
Date: Tue, 30 Apr 2019 14:23:32 +0800
Subject: [PATCH] gcores brightness theme

---
 .../10_Settings/Brightness/brightness_page.py | 79 ++++++++++---------
 .../GameShell/10_Settings/Sound/sound_page.py |  2 -
 2 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/Menu/GameShell/10_Settings/Brightness/brightness_page.py b/Menu/GameShell/10_Settings/Brightness/brightness_page.py
index 7494ff8..2d65fb2 100644
--- a/Menu/GameShell/10_Settings/Brightness/brightness_page.py
+++ b/Menu/GameShell/10_Settings/Brightness/brightness_page.py
@@ -15,19 +15,18 @@ from UI.keys_def   import CurKeys, IsKeyMenuOrB
 from UI.slider     import Slider
 from UI.icon_pool  import MyIconPool
 from UI.multi_icon_item import MultiIconItem
+from UI.skin_manager import MySkinManager
+
+
 from config import BackLight
+
+
 import myvars
 
 class BSlider(Slider):
 
     
     OnChangeCB = None
-    _BGpng = None
-    _BGwidth = 179
-    _BGheight = 153
-
-    _NeedleSurf = None
-    _Scale      = None
     _Parent     = None
     _Icons      = {}
     
@@ -38,22 +37,11 @@ class BSlider(Slider):
         self._Width = self._Parent._Width
         self._Height = self._Parent._Height
         
-        bgpng = IconItem()
-        bgpng._ImgSurf = MyIconPool._Icons["light"]
-        bgpng._MyType = ICON_TYPES["STAT"]
-        bgpng._Parent = self
-        bgpng.Adjust(0,0,self._BGwidth,self._BGheight,0)
-        self._Icons["bg"] = bgpng
-        ##self._NeedleSurf = pygame.Surface( (38,12),pygame.SRCALPHA )
+        self._BrightnessLabel = Label()
+        self._BrightnessLabel.SetCanvasHWND(self._CanvasHWND)
+        self._BrightnessLabel.Init("BRIGHT",MySkinManager.GiveFont("EurostileBold13"))
+        self._BrightnessLabel.SetColor(MySkinManager.GiveColor('Text'))
         
-        scale = MultiIconItem()
-        scale._MyType = ICON_TYPES["STAT"]
-        scale._Parent = self
-        scale._ImgSurf = MyIconPool._Icons["scale"]
-        scale._IconWidth = 82
-        scale._IconHeight = 63
-        scale.Adjust(0,0,82,63,0)
-        self._Icons["scale"] = scale
 
     def SetValue(self,brt):
         self._Value = brt
@@ -78,27 +66,40 @@ class BSlider(Slider):
                 self.OnChangeCB(self._Value)
     
     def Draw(self):
+        start_x = 82
+        start_y = self._Parent._Screen._Height/2-5
+        height = 30
+        width = 4
+        padding = 15
+        seg = self._Value-1
 
-        self._Icons["bg"].NewCoord(self._Width/2,self._Height/2 +11 )
-        self._Icons["bg"].Draw()
+        for i in range(0,9):
+            rect = pygame.Rect(start_x+i*(width+padding),start_y,width,height)
+            if i > seg:
+                pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'),rect, 1)
+                #aa_round_rect(self._CanvasHWND,rect, MySkinManager.GiveColor('Text'),1,1, MySkinManager.GiveColor('White'))
+            else:
+                pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'),rect, 0)   
+                #aa_round_rect(self._CanvasHWND,rect, MySkinManager.GiveColor('Text'),1,0, MySkinManager.GiveColor('White'))
+        
+        self._BrightnessLabel.NewCoord(118,self._Parent._Screen._Height/2-30)
+        self._BrightnessLabel.Draw(True)
+        
+        minus_box_rect = pygame.Rect(start_x- (4+6)*4,start_y,6*4,30)
+        pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'),minus_box_rect, 0) 
+        
+        minus_rect     = pygame.Rect(start_x-8*4,start_y+14,2*4,2)
+        pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('White'),minus_rect, 0) 
+        
+        plus_box_rect = pygame.Rect(start_x + 39*4 +4*4,start_y,6*4,30)
+        pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'),plus_box_rect, 0) 
+        
+        cross1_rect     = pygame.Rect(start_x+39*4+4*4+2*4,start_y+14,2*4,2)
+        pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('White'),cross1_rect, 0) 
+        cross2_rect     = pygame.Rect(start_x+39*4+4*4+2*4+3,start_y+14-3,2,2*4)
+        pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('White'),cross2_rect, 0) 
 
-        self._Icons["scale"].NewCoord(self._Width/2,self._Height/2 )
 
-        icon_idx = self._Value - 1
-        if icon_idx < 0:
-            icon_idx = 0
-        
-        self._Icons["scale"]._IconIndex = icon_idx
-        self._Icons["scale"].Draw()
-        """
-        pygame.draw.line(self._CanvasHWND,(255,0,0), (posx,self._PosY),(self._Width,self._PosY),3) ## range line
-        pygame.draw.line(self._CanvasHWND,(0,0,255), (self._PosX,self._PosY),(posx,self._PosY),3) ## range line
-        
-        pygame.draw.circle(self._CanvasHWND,(255,255,255),( posx, self._PosY),7,0)        
-        pygame.draw.circle(self._CanvasHWND,(0,0,0)      ,( posx, self._PosY),7,1)## outer border
-        """
-        
-        
         
 class BrightnessPage(Page):
 
diff --git a/Menu/GameShell/10_Settings/Sound/sound_page.py b/Menu/GameShell/10_Settings/Sound/sound_page.py
index dd6af2a..af6af38 100644
--- a/Menu/GameShell/10_Settings/Sound/sound_page.py
+++ b/Menu/GameShell/10_Settings/Sound/sound_page.py
@@ -26,8 +26,6 @@ import myvars
 class SoundSlider(Slider):
     OnChangeCB = None
     
-    _NeedleSurf = None
-    _Scale      = None
     _Parent     = None
     _VolumeLabel =None