From fef4bff9faaabd22a8e94a1bf652fcd576991627 Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Thu, 30 Jun 2016 20:36:11 +0200
Subject: [PATCH] 3djc/horus cosmetics (#3640)

* Move miscellaneous bitmaps load to a specific function

* Adujst channel monitors colors for Darkblue
---
 radio/src/gui/horus/themes/darkblue.cpp | 11 +++++++----
 radio/src/gui/horus/themes/default.cpp  | 13 +++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/radio/src/gui/horus/themes/darkblue.cpp b/radio/src/gui/horus/themes/darkblue.cpp
index e1c3eed9c..997d2fc6a 100644
--- a/radio/src/gui/horus/themes/darkblue.cpp
+++ b/radio/src/gui/horus/themes/darkblue.cpp
@@ -56,9 +56,9 @@ class DarkblueTheme: public Theme
       lcdColorTable[HEADER_ICON_BGCOLOR_INDEX] = BLACK;
       lcdColorTable[HEADER_CURRENT_BGCOLOR_INDEX] = RGB(10, 78, 121);
       lcdColorTable[OVERLAY_COLOR_INDEX] = BLACK;
-      lcdColorTable[BARGRAPH1_COLOR_INDEX] = RED;
+      lcdColorTable[BARGRAPH1_COLOR_INDEX] = RGB(15, 150, 250);
       lcdColorTable[BARGRAPH2_COLOR_INDEX] = RGB(167, 167, 167);
-      lcdColorTable[BARGRAPH_BGCOLOR_INDEX] = RGB(222, 222, 222);
+      lcdColorTable[BARGRAPH_BGCOLOR_INDEX] = RGB(97, 97, 102);
     }
 
     void loadMenuIcon(uint8_t index, const char * filename) const
@@ -116,7 +116,10 @@ class DarkblueTheme: public Theme
       loadMenuIcon(ICON_MONITOR_CHANNELS3, "mask_monitor_channels3.png");
       loadMenuIcon(ICON_MONITOR_CHANNELS4, "mask_monitor_channels4.png");
       loadMenuIcon(ICON_MONITOR_LOGICAL_SWITCHES, "/mask_monitor_logsw.png");
-      
+    }
+    
+    void loadThemeBitmaps() const
+    {          
       // Channels monitor screen
       delete chanMonLockedBitmap;
       chanMonLockedBitmap = BitmapBuffer::loadMaskOnBackground("mask_monitor_lockch.png", TEXT_COLOR, TEXT_BGCOLOR);
@@ -143,12 +146,12 @@ class DarkblueTheme: public Theme
       delete mixerSetupReplaceBitmap;
       mixerSetupReplaceBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_replace.png", TEXT_COLOR, TEXT_BGCOLOR); 
     }
-    
 
     virtual void load() const
     {
       loadColors();
       loadMenusIcons();
+      loadThemeBitmaps();
       loadFontCache();
     }
 
diff --git a/radio/src/gui/horus/themes/default.cpp b/radio/src/gui/horus/themes/default.cpp
index b8003d8f1..6bac0c825 100644
--- a/radio/src/gui/horus/themes/default.cpp
+++ b/radio/src/gui/horus/themes/default.cpp
@@ -143,10 +143,17 @@ class DefaultTheme: public Theme
       currentMenuBackground->drawMask(0, 0, background, HEADER_CURRENT_BGCOLOR);
       currentMenuBackground->drawMask(0, 0, shadow, TRIM_SHADOW_COLOR);
       currentMenuBackground->drawMask(10, 39, dot, MENU_TITLE_COLOR);
-
+      
       delete topleftBitmap;
       topleftBitmap = BitmapBuffer::loadMaskOnBackground("topleft.png", TITLE_BGCOLOR, HEADER_BGCOLOR);
 
+      delete background;
+      delete shadow;
+      delete dot;
+    }
+
+    void loadThemeBitmaps() const
+    {
       // Model Selection screen
       delete modelselIconBitmap;
       modelselIconBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_iconback.png", TITLE_BGCOLOR, TEXT_BGCOLOR);
@@ -194,9 +201,6 @@ class DefaultTheme: public Theme
       delete mixerSetupReplaceBitmap;
       mixerSetupReplaceBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_replace.png", TEXT_COLOR, TEXT_BGCOLOR); 
       
-      delete background;
-      delete shadow;
-      delete dot;
     }
 
     virtual void load() const
@@ -223,6 +227,7 @@ class DefaultTheme: public Theme
       lcdColorTable[HEADER_ICON_BGCOLOR_INDEX] = color;
       lcdColorTable[HEADER_CURRENT_BGCOLOR_INDEX] = color;
       loadIcons();
+      loadThemeBitmaps();
       loadFontCache();
     }