add audio channel icons, update topbar conflicts

15 files changed, 146 insertions, 35 deletions

diff --git a/HISTORY b/HISTORY
index 5d71ee7b..8b8c8e16 100644
--- a/HISTORY
+++ b/HISTORY
@@ -13,6 +13,8 @@ VDR Plugin 'skinflatplus' Revision History
 - [add] show cutted length of recording in replay info
 - [add] update script to update MV-Themes (contrib/flatPlus_MV_Update.sh)
 - [add] timer conflicts in TopBar, active epgsearch is needed, configurable via menu settings
+        you can configure a min value at which it will shown in red (otherwise yellow)        
+- [add] display audio channel icons in audio tracks menu
 
 2014-02-22: Version 0.2.0
 - [fix] load user decor settings
diff --git a/baserender.c b/baserender.c
index 486ed7b0..53c3dc56 100644
--- a/baserender.c
+++ b/baserender.c
@@ -263,16 +263,19 @@ void cFlatBaseRender::TopBarUpdate(void) {
 
         int RecW = 0;
         int numRec = 0;
+        cImage *imgRec = imgLoader.LoadIcon("topbar_timer", topBarFontHeight - marginItem*2, topBarFontHeight - marginItem*2);
+        if( imgRec )
+            RecW = imgRec->Width();
         if( Config.TopBarRecordingShow ) {
             // look for timers
             for(cTimer *ti = Timers.First(); ti; ti = Timers.Next(ti)) {
                 if( ti->Matches(t) ) {
                     numRec++;
-                }        
-            }        
+                }
+            }
             if( numRec ) {
-                cString Rec = cString::sprintf("REC %d", numRec);
-                RecW = topBarFont->Width(*Rec);
+                cString Rec = cString::sprintf("%d", numRec);
+                RecW += topBarFont->Width(*Rec);
                 TitleWidthLeft -= RecW + marginItem*2;
             }
         }
@@ -294,10 +297,17 @@ void cFlatBaseRender::TopBarUpdate(void) {
                 }
             }
         }
-
+        cImage *imgCon = NULL;
+        if( numConflicts < Config.TopBarRecConflictsHigh )
+            imgCon = imgLoader.LoadIcon("topbar_timerconflict_low", topBarFontHeight - marginItem*2, topBarFontHeight - marginItem*2);
+        else
+            imgCon = imgLoader.LoadIcon("topbar_timerconflict_high", topBarFontHeight - marginItem*2, topBarFontHeight - marginItem*2);
+        
+        if( imgCon )
+            ConW = imgCon->Width();
         if( numConflicts ) {
-            cString Con = cString::sprintf("%s %d", tr("C"), numRec);
-            ConW = topBarFont->Width(*Con);
+            cString Con = cString::sprintf("%d", numRec);
+            ConW += topBarFont->Width(*Con);
             TitleWidthLeft -= ConW + marginItem*2;
         }
 
@@ -315,21 +325,29 @@ void cFlatBaseRender::TopBarUpdate(void) {
         if( TitleWidth > RecLeft )
             RecLeft = TitleWidth + marginItem*2;
         if( numRec > 0 && Config.TopBarRecordingShow && (RecLeft + RecW) < DateRight ) {
-            cString Rec = cString::sprintf("REC");
-            RecW = topBarFont->Width(*Rec);
+            if( imgRec ) {
+                int iconTop = (topBarFontHeight - imgRec->Height()) / 2;
+                topBarIconPixmap->DrawImage( cPoint(RecLeft, iconTop), *imgRec );
+                RecW = imgRec->Width() + marginItem;
+            }
             cString RecNum = cString::sprintf("%d", numRec);
-            topBarPixmap->DrawText(cPoint(RecLeft, fontTop), Rec, Theme.Color(clrTopBarRecordingActiveFg), Theme.Color(clrTopBarRecordingActiveBg), topBarFont);
-            topBarPixmap->DrawText(cPoint(RecLeft + RecW + marginItem, fontSmlTop), RecNum, Theme.Color(clrTopBarRecordingActiveFg), Theme.Color(clrTopBarRecordingActiveBg), topBarFontSml);
+            topBarPixmap->DrawText(cPoint(RecLeft + RecW, fontSmlTop), RecNum, Theme.Color(clrTopBarRecordingActiveFg), Theme.Color(clrTopBarRecordingActiveBg), topBarFontSml);
             RecLeft += RecW + marginItem*2 + topBarFontSml->Width(RecNum);
         }
 
         int ConLeft = RecLeft + marginItem;
         if( numConflicts > 0 && Config.TopBarRecConflictsShow && (ConLeft + ConW) < DateRight ) {
-            cString Con = cString::sprintf(tr("C"));
-            ConW = topBarFont->Width(*Con);
+            if( imgCon ) {
+                int iconTop = (topBarFontHeight - imgCon->Height()) / 2;
+                topBarIconPixmap->DrawImage( cPoint(RecLeft, iconTop), *imgCon );
+                ConW = imgCon->Width();
+            }
+            
             cString ConNum = cString::sprintf("%d", numConflicts);
-            topBarPixmap->DrawText(cPoint(ConLeft, fontTop), Con, Theme.Color(clrTopBarRecordingActiveFg), Theme.Color(clrTopBarRecordingActiveBg), topBarFont);
-            topBarPixmap->DrawText(cPoint(ConLeft + ConW + marginItem, fontSmlTop), ConNum, Theme.Color(clrTopBarRecordingActiveFg), Theme.Color(clrTopBarRecordingActiveBg), topBarFontSml);
+            if( numConflicts < Config.TopBarRecConflictsHigh )
+                topBarPixmap->DrawText(cPoint(ConLeft + ConW + marginItem, fontSmlTop), ConNum, Theme.Color(clrTopBarConflictLowFg), Theme.Color(clrTopBarConflictLowBg), topBarFontSml);
+            else
+                topBarPixmap->DrawText(cPoint(ConLeft + ConW + marginItem, fontSmlTop), ConNum, Theme.Color(clrTopBarConflictHighFg), Theme.Color(clrTopBarConflictHighBg), topBarFontSml);
         }
         
     }
diff --git a/config.c b/config.c
index 4e3b7de6..85905c6c 100644
--- a/config.c
+++ b/config.c
@@ -31,6 +31,7 @@ cFlatConfig::cFlatConfig(void) {
     
     TopBarRecordingShow = true;
     TopBarRecConflictsShow = true;
+    TopBarRecConflictsHigh = 2;
     
     MenuItemIconsShow = true;
     TopBarMenuIconShow = true;
@@ -195,6 +196,7 @@ bool cFlatConfig::SetupParse(const char *Name, const char *Value) {
     else if (strcmp(Name, "MenuItemRecordingShowFolderDate") == 0)      MenuItemRecordingShowFolderDate = atoi(Value);
     else if (strcmp(Name, "MenuItemParseTilde") == 0)                   MenuItemParseTilde = atoi(Value);
     else if (strcmp(Name, "TopBarRecConflictsShow") == 0)               TopBarRecConflictsShow = atoi(Value);
+    else if (strcmp(Name, "TopBarRecConflictsHigh") == 0)               TopBarRecConflictsHigh = atoi(Value);
 
     else return false;
     
@@ -373,7 +375,9 @@ void cFlatConfig::ThemeInit(void) {
     decorBorderTrackBg = Theme.Color(clrTrackItemBorderBg);
     decorBorderTrackCurFg = Theme.Color(clrTrackItemCurrentBorderFg);
     decorBorderTrackCurBg = Theme.Color(clrTrackItemCurrentBorderBg);
-
+    decorBorderTrackSelFg = Theme.Color(clrTrackItemSelableBorderFg);
+    decorBorderTrackSelBg = Theme.Color(clrTrackItemSelableBorderBg);
+    
     decorBorderReplayFg = Theme.Color(clrReplayBorderFg);
     decorBorderReplayBg = Theme.Color(clrReplayBorderBg);
 
diff --git a/config.h b/config.h
index c3876b6b..b682c6a7 100644
--- a/config.h
+++ b/config.h
@@ -74,6 +74,7 @@ class cFlatConfig
         int decorBorderTrackTypeUser, decorBorderTrackSizeUser;
         int decorBorderTrackType, decorBorderTrackSize;
         tColor decorBorderTrackFg, decorBorderTrackBg;
+        tColor decorBorderTrackSelFg, decorBorderTrackSelBg;
         tColor decorBorderTrackCurFg, decorBorderTrackCurBg;
 
         int decorBorderReplayByTheme;
@@ -173,6 +174,7 @@ class cFlatConfig
         int EpgAdditionalInfoShow;
         int TopBarRecordingShow;
         int TopBarRecConflictsShow;
+        int TopBarRecConflictsHigh;
         int MenuItemIconsShow;
         int TopBarMenuIconShow;
         
diff --git a/displaytracks.c b/displaytracks.c
index e53e0142..655ef148 100644
--- a/displaytracks.c
+++ b/displaytracks.c
@@ -6,13 +6,26 @@ cFlatDisplayTracks::cFlatDisplayTracks(const char *Title, int NumTracks, const c
     CreateFullOsd();
     TopBarCreate();
 
+    img_ac3 = imgLoader.LoadIcon("tracks_ac3", 999, fontHeight);
+    img_stereo = imgLoader.LoadIcon("tracks_stereo", 999, fontHeight);
+
+    ac3Width = stereoWidth = 0;
+    if( img_ac3 )
+        ac3Width = img_ac3->Width();
+    if( img_stereo )
+        stereoWidth = img_stereo->Width();
+        
+    int imgWidthMax = max(ac3Width, stereoWidth);
     itemHeight = fontHeight + Config.MenuItemPadding + Config.decorBorderTrackSize*2;
     currentIndex = -1;
     maxItemWidth = font->Width(Title) + marginItem*2;
     for (int i = 0; i < NumTracks; i++)
         maxItemWidth = max(maxItemWidth, font->Width(Tracks[i]) + marginItem*2);
-
-    itemsHeight = NumTracks * itemHeight;
+    
+    int headerWidth = font->Width(tr("Audio Tracks")) + font->Width(" ") + imgWidthMax;
+    maxItemWidth = max(maxItemWidth, headerWidth);
+    
+    itemsHeight = (NumTracks+1) * itemHeight;
     int left = osdWidth - maxItemWidth;
     left /= 2;
     TopBarSetTitle(Title);
@@ -20,16 +33,22 @@ cFlatDisplayTracks::cFlatDisplayTracks(const char *Title, int NumTracks, const c
     tracksPixmap = osd->CreatePixmap(1, cRect(left, osdHeight - itemsHeight - marginItem, maxItemWidth, itemsHeight));
     tracksPixmap->Fill(clrTransparent);
 
+    tracksLogoPixmap = osd->CreatePixmap(1, cRect(left, osdHeight - itemsHeight - marginItem, maxItemWidth, itemsHeight));
+    tracksLogoPixmap->Fill(clrTransparent);
+
+    SetItem(tr("Audio Tracks"), -1, false);
+    
     for (int i = 0; i < NumTracks; i++)
         SetItem(Tracks[i], i, false);
 }
 
 cFlatDisplayTracks::~cFlatDisplayTracks() {
     osd->DestroyPixmap(tracksPixmap);
+    osd->DestroyPixmap(tracksLogoPixmap);
 }
 
 void cFlatDisplayTracks::SetItem(const char *Text, int Index, bool Current) {
-    int y = Index * itemHeight;
+    int y = (Index+1) * itemHeight;
     tColor ColorFg, ColorBg;
     if (Current) {
         ColorFg = Theme.Color(clrTrackItemCurrentFont);
@@ -37,10 +56,19 @@ void cFlatDisplayTracks::SetItem(const char *Text, int Index, bool Current) {
         currentIndex = Index;
     }
     else {
-        ColorFg = Theme.Color(clrTrackItemFont);
-        ColorBg = Theme.Color(clrTrackItemBg);
+        if( Index >= 0 ) {
+            ColorFg = Theme.Color(clrTrackItemSelableFont);
+            ColorBg = Theme.Color(clrTrackItemSelableBg);
+        } else {
+            ColorFg = Theme.Color(clrTrackItemFont);
+            ColorBg = Theme.Color(clrTrackItemBg);
+        }
     }
-    tracksPixmap->DrawText(cPoint(0, y), Text, ColorFg, ColorBg, font, maxItemWidth, itemHeight - Config.MenuItemPadding - Config.decorBorderTrackSize*2, taCenter);
+
+    if( Index == -1 )
+        tracksPixmap->DrawText(cPoint(0, y), Text, ColorFg, ColorBg, font, maxItemWidth, itemHeight - Config.MenuItemPadding - Config.decorBorderTrackSize*2, taLeft);
+    else
+        tracksPixmap->DrawText(cPoint(0, y), Text, ColorFg, ColorBg, font, maxItemWidth, itemHeight - Config.MenuItemPadding - Config.decorBorderTrackSize*2, taCenter);
 
     int left = osdWidth - maxItemWidth;
     left /= 2;
@@ -50,9 +78,13 @@ void cFlatDisplayTracks::SetItem(const char *Text, int Index, bool Current) {
     if( Current )
         DecorBorderDraw(left, top, maxItemWidth, fontHeight,
             Config.decorBorderTrackSize, Config.decorBorderTrackType, Config.decorBorderTrackCurFg, Config.decorBorderTrackCurBg);
+    else if( Index >= 0 )
+        DecorBorderDraw(left, top, maxItemWidth, fontHeight,
+            Config.decorBorderTrackSize, Config.decorBorderTrackType, Config.decorBorderTrackSelFg, Config.decorBorderTrackSelBg);
     else
         DecorBorderDraw(left, top, maxItemWidth, fontHeight,
             Config.decorBorderTrackSize, Config.decorBorderTrackType, Config.decorBorderTrackFg, Config.decorBorderTrackBg);
+    
 }
 
 void cFlatDisplayTracks::SetTrack(int Index, const char * const *Tracks) {
@@ -62,6 +94,18 @@ void cFlatDisplayTracks::SetTrack(int Index, const char * const *Tracks) {
 }
 
 void cFlatDisplayTracks::SetAudioChannel(int AudioChannel) {
+    // from vdr 0=stereo, 1=left, 2=right, -1=don't display the audio channel indicator.
+    // from skinnopacity -1 ac3, else stero
+    tracksLogoPixmap->Fill(clrTransparent);
+    if( AudioChannel == -1 && img_ac3 ) {
+        int IconLeft = maxItemWidth - img_ac3->Width() - marginItem;
+        int IconTop = (fontHeight - img_ac3->Height()) / 2;
+        tracksLogoPixmap->DrawImage( cPoint(IconLeft, IconTop), *img_ac3 );
+    } else if( img_stereo ){
+        int IconLeft = maxItemWidth - img_stereo->Width() - marginItem;
+        int IconTop = (fontHeight - img_stereo->Height()) / 2;
+        tracksLogoPixmap->DrawImage( cPoint(IconLeft, IconTop), *img_stereo );
+    }
     return;
 }
 
diff --git a/displaytracks.h b/displaytracks.h
index 23076a6d..a194158b 100644
--- a/displaytracks.h
+++ b/displaytracks.h
@@ -5,11 +5,16 @@
 class cFlatDisplayTracks : public cFlatBaseRender, public cSkinDisplayTracks {
     private:
         cPixmap *tracksPixmap;
+        cPixmap *tracksLogoPixmap;
 
+        cImage *img_ac3;
+        cImage *img_stereo;
+        int ac3Width, stereoWidth;
+        
         int itemHeight, itemsHeight;
         int maxItemWidth;
         int currentIndex;
-
+        
         void SetItem(const char *Text, int Index, bool Current);
     public:
         cFlatDisplayTracks(const char *Title, int NumTracks, const char * const *Tracks);
diff --git a/flat.h b/flat.h
index d50bdc75..bb56cd5a 100644
--- a/flat.h
+++ b/flat.h
@@ -43,6 +43,11 @@ THEME_CLR(Theme, clrTopBarBorderBg,         0xC0101010);
 THEME_CLR(Theme, clrTopBarRecordingActiveFg,  0xFF880000);
 THEME_CLR(Theme, clrTopBarRecordingActiveBg,  0xC0101010);
 
+THEME_CLR(Theme, clrTopBarConflictLowFg,      0xFFBBBB00);
+THEME_CLR(Theme, clrTopBarConflictLowBg,      0xC0101010);
+THEME_CLR(Theme, clrTopBarConflictHighFg,     0xFF880000);
+THEME_CLR(Theme, clrTopBarConflictHighBg,    0xC0101010);
+
 // Buttons
 THEME_CLR(Theme, clrButtonBg,               0xC0101010);
 THEME_CLR(Theme, clrButtonFont,             0xFFEEEEEE);
@@ -155,13 +160,17 @@ THEME_CLR(Theme, clrReplayBorderFg,         0xC0101010);
 THEME_CLR(Theme, clrReplayBorderBg,         0xC0101010);
 
 // Tracks
-THEME_CLR(Theme, clrTrackItemBg,            0xC0101010);
+THEME_CLR(Theme, clrTrackItemBg,            0xC0909090);
 THEME_CLR(Theme, clrTrackItemFont,          0xFFEEEEEE);
+THEME_CLR(Theme, clrTrackItemSelableBg,     0xC0101010);
+THEME_CLR(Theme, clrTrackItemSelableFont,   0xFFEEEEEE);
 THEME_CLR(Theme, clrTrackItemCurrentBg,     0xC03090B0);
 THEME_CLR(Theme, clrTrackItemCurrentFont,   0xFFEEEEEE);
 
-THEME_CLR(Theme, clrTrackItemBorderFg,      0xC0101010);
-THEME_CLR(Theme, clrTrackItemBorderBg,      0xC0101010);
+THEME_CLR(Theme, clrTrackItemBorderFg,      0xC0909090);
+THEME_CLR(Theme, clrTrackItemBorderBg,      0xC0909090);
+THEME_CLR(Theme, clrTrackItemSelableBorderFg,      0xC0101010);
+THEME_CLR(Theme, clrTrackItemSelableBorderBg,      0xC0101010);
 THEME_CLR(Theme, clrTrackItemCurrentBorderFg,      0xC03090B0);
 THEME_CLR(Theme, clrTrackItemCurrentBorderBg,      0xC03090B0);
 
diff --git a/icons/default/topbar_timer.png b/icons/default/topbar_timer.png
new file mode 100644
index 00000000..b25c4801
--- /dev/null
+++ b/icons/default/topbar_timer.png
diff --git a/icons/default/topbar_timerconflict_high.png b/icons/default/topbar_timerconflict_high.png
new file mode 100644
index 00000000..956050ff
--- /dev/null
+++ b/icons/default/topbar_timerconflict_high.png
diff --git a/icons/default/topbar_timerconflict_low.png b/icons/default/topbar_timerconflict_low.png
new file mode 100644
index 00000000..695ae9fc
--- /dev/null
+++ b/icons/default/topbar_timerconflict_low.png
diff --git a/icons/default/tracks_ac3.png b/icons/default/tracks_ac3.png
new file mode 100644
index 00000000..78da7036
--- /dev/null
+++ b/icons/default/tracks_ac3.png
diff --git a/icons/default/tracks_stereo.png b/icons/default/tracks_stereo.png
new file mode 100644
index 00000000..9c3e3d9e
--- /dev/null
+++ b/icons/default/tracks_stereo.png
diff --git a/po/de_DE.po b/po/de_DE.po
index 502ccd95..71e6466d 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-skinflat 0.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-19 20:01+0100\n"
+"POT-Creation-Date: 2014-03-21 23:40+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,9 +18,6 @@ msgstr ""
 msgid "clock"
 msgstr "Uhr"
 
-msgid "C"
-msgstr "K"
-
 msgid "disk usage"
 msgstr "Plattennutzung"
 
@@ -66,6 +63,9 @@ msgstr "Kanal"
 msgid "search pattern"
 msgstr "Suchmuster"
 
+msgid "Audio Tracks"
+msgstr "Audio Tracks"
+
 msgid "Volume"
 msgstr "Lautstärke"
 
@@ -183,6 +183,9 @@ msgstr "TopBar zeige Aufnahme"
 msgid "TopBar show conflicts"
 msgstr "TopBar zeige Konflikte"
 
+msgid "Conflicts min value for red"
+msgstr "Konflikte min Wert für Rot"
+
 msgid "Message bottom offset"
 msgstr "Meldung unterer Abstand"
 
@@ -366,6 +369,9 @@ msgstr "Audiospur Rand Typ"
 msgid "Tracks border size"
 msgstr "Audiospur Rand Größe"
 
+#~ msgid "C"
+#~ msgstr "K"
+
 #~ msgid "Recordings"
 #~ msgstr "Aufnahmen"
 
diff --git a/setup.c b/setup.c
index 7b3d9666..957e664a 100644
--- a/setup.c
+++ b/setup.c
@@ -187,6 +187,7 @@ void cFlatSetup::Store(void) {
     SetupStore("MenuItemRecordingShowFolderDate", Config.MenuItemRecordingShowFolderDate);
     SetupStore("MenuItemParseTilde", Config.MenuItemParseTilde);
     SetupStore("TopBarRecConflictsShow", Config.TopBarRecConflictsShow);
+    SetupStore("TopBarRecConflictsHigh", Config.TopBarRecConflictsHigh);
 
     Config.Init();
 }
@@ -228,6 +229,7 @@ void cFlatSetupGeneral::Setup(void) {
     Add(new cMenuEditPrcItem(tr("TopBar font size"), &SetupConfig->TopBarFontSize, 0.01, 0.2, 1));
     Add(new cMenuEditBoolItem(tr("TopBar show recording"), &SetupConfig->TopBarRecordingShow));
     Add(new cMenuEditBoolItem(tr("TopBar show conflicts"), &SetupConfig->TopBarRecConflictsShow));
+    Add(new cMenuEditIntItem(tr("Conflicts min value for red"), &SetupConfig->TopBarRecConflictsHigh));
     Add(new cMenuEditIntItem(tr("Message bottom offset"), &SetupConfig->MessageOffset));
 
 
diff --git a/themes/flatPlus-default.theme b/themes/flatPlus-default.theme
index b78fc39f..cf25a040 100644
--- a/themes/flatPlus-default.theme
+++ b/themes/flatPlus-default.theme
@@ -5,6 +5,12 @@ clrTopBarTimeFont = FFEEEEEE
 clrTopBarDateFont = FFA0A0A0
 clrTopBarBorderFg = C0101010
 clrTopBarBorderBg = C0101010
+clrTopBarRecordingActiveFg = FF880000
+clrTopBarRecordingActiveBg = C0101010
+clrTopBarConflictLowFg = FFBBBB00
+clrTopBarConflictLowBg = C0101010
+clrTopBarConflictHighFg = FF880000
+clrTopBarConflictHighBg = C0101010
 clrButtonBg = C0101010
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFBB0000
@@ -34,6 +40,10 @@ clrChannelSignalFont = FFA0A0A0
 clrChannelSignalProgressFg = FFA0A0A0
 clrChannelSignalProgressBarFg = FFA0A0A0
 clrChannelSignalProgressBg = C0101010
+clrChannelRecordingPresentFg = FFAA0000
+clrChannelRecordingPresentBg = C0101010
+clrChannelRecordingFollowFg = FFA0A0A0
+clrChannelRecordingFollowBg = C0101010
 clrItemBg = C0909090
 clrItemFont = FFEEEEEE
 clrItemCurrentBg = C03090B0
@@ -51,8 +61,9 @@ clrMenuRecFontTitle = FF3090B0
 clrMenuRecFontInfo = FFEEEEEE
 clrMenuTextBg = C0101010
 clrMenuTextFont = FFEEEEEE
-clrMenuContentHeadBorderFg = C0101010
-clrMenuContentHeadBorderBg = C0101010
+clrMenuTextFixedFont = FFEEEEEE
+clrMenuContentHeadBorderFg = C03090B0
+clrMenuContentHeadBorderBg = C03090B0
 clrMenuContentBorderFg = C03090B0
 clrMenuContentBorderBg = C03090B0
 clrMenuItemProgressFg = FFEEEEEE
@@ -67,6 +78,10 @@ clrMenuItemSelableBorderFg = C0101010
 clrMenuItemSelableBorderBg = C0101010
 clrMenuItemCurrentBorderFg = C03090B0
 clrMenuItemCurrentBorderBg = C03090B0
+clrMenuTimerItemDisabledFont = FFA0A0A0
+clrMenuTimerItemRecordingFont = FFEEEEEE
+clrMenuItemExtraTextFont = FFA0A0A0
+clrMenuItemExtraTextCurrentFont = FFA0A0A0
 clrReplayBg = C0101010
 clrReplayFont = FFEEEEEE
 clrReplayFontSpeed = FF3090B0
@@ -78,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FF3090B0
 clrReplayBorderFg = C0101010
 clrReplayBorderBg = C0101010
-clrTrackItemBg = C0101010
+clrTrackItemBg = C0909090
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C0101010
+clrTrackItemSelableFont = FFEEEEEE
 clrTrackItemCurrentBg = C03090B0
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C0101010
-clrTrackItemBorderBg = C0101010
+clrTrackItemBorderFg = C0909090
+clrTrackItemBorderBg = C0909090
+clrTrackItemSelableBorderFg = C0101010
+clrTrackItemSelableBorderBg = C0101010
 clrTrackItemCurrentBorderFg = C03090B0
 clrTrackItemCurrentBorderBg = C03090B0
 clrVolumeBg = C0101010