Changed Disc Usage Icon for default theme

12 files changed, 12 insertions, 2 deletions

diff --git a/HISTORY b/HISTORY
index cca8e4e..d462a72 100644
--- a/HISTORY
+++ b/HISTORY
@@ -370,3 +370,4 @@ Version 0.1.4
 - updated slovakian translation
 - Added EPG Info in narrow Timers Menu
 - Freestyle Theme new default theme, old default renamed to "blue"
+- Changed Disc Usage Icon for default theme
diff --git a/config.h b/config.h
index c6038c8..fab00b0 100644
--- a/config.h
+++ b/config.h
@@ -164,7 +164,8 @@ THEME_CLR(Theme, clrTimersBack,             CLR_TIMERS);
 THEME_CLR(Theme, clrTimersBackBlend,        CLR_TRANSPARENT);
 THEME_CLR(Theme, clrMenuFontHeader,         CLR_FONT);
 THEME_CLR(Theme, clrMenuFontDate,           CLR_FONT);
-THEME_CLR(Theme, clrMenuFontDiscUsage,      CLR_FONT);
+THEME_CLR(Theme, clrMenuFontDiscUsage,      CLR_FONTDARK);
+THEME_CLR(Theme, clrMenuFontDiscUsagePerc,  CLR_FONT);
 THEME_CLR(Theme, clrMenuFontTimers,         CLR_FONT);
 THEME_CLR(Theme, clrMenuFontTimersHeader,   CLR_FONT);
 THEME_CLR(Theme, clrMenuFontDetailViewText, CLR_FONT);
diff --git a/displaymenuview.c b/displaymenuview.c
index 7298311..09a07f2 100644
--- a/displaymenuview.c
+++ b/displaymenuview.c
@@ -547,7 +547,7 @@ void cNopacityDisplayMenuView::DrawDiskUsage(void) {
     else
         rest = cString::sprintf("%d GB %s", cVideoDiskUsage::FreeMB() / 1024, tr("free"));
     pixmapDiskUsageLabel->DrawRectangle(cRect((geoManager->menuDiskUsageWidth - 4)*DiskUsage/100,4*geoManager->menuDiskUsageHeight/5, (geoManager->menuDiskUsageWidth - 4) - (geoManager->menuDiskUsageWidth - 4)*DiskUsage/100, geoManager->menuDiskUsageHeight/5), 0xDD000000);
-    pixmapDiskUsageLabel->DrawText(cPoint((geoManager->menuDiskUsageWidth - fontManager->menuDiskUsagePercent->Width(*usage))/2, 4*geoManager->menuDiskUsageHeight/5), *usage, Theme.Color(clrMenuFontDiscUsage), clrTransparent, fontManager->menuDiskUsagePercent);
+    pixmapDiskUsageLabel->DrawText(cPoint((geoManager->menuDiskUsageWidth - fontManager->menuDiskUsagePercent->Width(*usage))/2, 4*geoManager->menuDiskUsageHeight/5), *usage, Theme.Color(clrMenuFontDiscUsagePerc), clrTransparent, fontManager->menuDiskUsagePercent);
     pixmapDiskUsageLabel->DrawText(cPoint((geoManager->menuDiskUsageWidth - fontManager->menuDiskUsage->Width(*rest))/2, (geoManager->menuDiskUsageHeight - fontManager->menuDiskUsage->Height())/2), *rest, Theme.Color(clrMenuFontDiscUsage), clrTransparent, fontManager->menuDiskUsage);
 
     pixmapDiskUsage->SetLayer(2);
diff --git a/icons/default/skinIcons/DiskUsage.png b/icons/default/skinIcons/DiskUsage.png
index 35ca6f7..de1dfbb 100644
--- a/icons/default/skinIcons/DiskUsage.png
+++ b/icons/default/skinIcons/DiskUsage.png
diff --git a/themes/nOpacity-blue.theme b/themes/nOpacity-blue.theme
index 150ac75..42e630f 100644
--- a/themes/nOpacity-blue.theme
+++ b/themes/nOpacity-blue.theme
@@ -44,6 +44,7 @@ clrTimersBackBlend = DD000000
 clrMenuFontHeader = FFFFFFFF
 clrMenuFontDate = FFFFFFFF
 clrMenuFontDiscUsage = FFFFFFFF
+clrMenuFontDiscUsagePerc = FFFFFFFF
 clrMenuFontTimers = FFFFFFFF
 clrMenuFontTimersHeader = FFFFFFFF
 clrMenuFontDetailViewText = FFFFFFFF
diff --git a/themes/nOpacity-darkblue.theme b/themes/nOpacity-darkblue.theme
index 94a17ff..34dd385 100644
--- a/themes/nOpacity-darkblue.theme
+++ b/themes/nOpacity-darkblue.theme
@@ -44,6 +44,7 @@ clrTimersBackBlend = DD000000
 clrMenuFontHeader = FFFFFFFF
 clrMenuFontDate = FFFFFFFF
 clrMenuFontDiscUsage = FFFFFFFF
+clrMenuFontDiscUsagePerc = FFFFFFFF
 clrMenuFontTimers = FFFFFFFF
 clrMenuFontTimersHeader = FFFFFFFF
 clrMenuFontDetailViewText = FFFFFFFF
diff --git a/themes/nOpacity-darkgrey.theme b/themes/nOpacity-darkgrey.theme
index 14bb13b..ee5d1bb 100644
--- a/themes/nOpacity-darkgrey.theme
+++ b/themes/nOpacity-darkgrey.theme
@@ -44,6 +44,7 @@ clrTimersBackBlend = FE999999
 clrMenuFontHeader = FFFFFFFF
 clrMenuFontDate = FFFFFFFF
 clrMenuFontDiscUsage = FFFFFFFF
+clrMenuFontDiscUsagePerc = FFFFFFFF
 clrMenuFontTimers = FFFFFFFF
 clrMenuFontTimersHeader = FFFFFFFF
 clrMenuFontDetailViewText = FFFFFFFF
diff --git a/themes/nOpacity-darkred.theme b/themes/nOpacity-darkred.theme
index cf35c56..94ef612 100644
--- a/themes/nOpacity-darkred.theme
+++ b/themes/nOpacity-darkred.theme
@@ -44,6 +44,7 @@ clrTimersBackBlend = DDBB0000
 clrMenuFontHeader = FFCCCCCC
 clrMenuFontDate = FFCCCCCC
 clrMenuFontDiscUsage = FFCCCCCC
+clrMenuFontDiscUsagePerc = FFCCCCCC
 clrMenuFontTimers = FFCCCCCC
 clrMenuFontTimersHeader = FFCCCCCC
 clrMenuFontDetailViewText = FFCCCCCC
diff --git a/themes/nOpacity-default.theme b/themes/nOpacity-default.theme
index de85b8b..8fed3ee 100644
--- a/themes/nOpacity-default.theme
+++ b/themes/nOpacity-default.theme
@@ -44,6 +44,7 @@ clrTimersBackBlend = FE999999
 clrMenuFontHeader = FFFFFFFF
 clrMenuFontDate = FFFFFFFF
 clrMenuFontDiscUsage = FFFFFFFF
+clrMenuFontDiscUsagePerc = FFFFFFFF
 clrMenuFontTimers = FFFFFFFF
 clrMenuFontTimersHeader = FFFFFFFF
 clrMenuFontDetailViewText = FFFFFFFF
diff --git a/themes/nOpacity-green.theme b/themes/nOpacity-green.theme
index 5beb36d..499f80c 100644
--- a/themes/nOpacity-green.theme
+++ b/themes/nOpacity-green.theme
@@ -44,6 +44,7 @@ clrTimersBackBlend = EE006600
 clrMenuFontHeader = FFFFFFFF
 clrMenuFontDate = FFFFFFFF
 clrMenuFontDiscUsage = FFFFFFFF
+clrMenuFontDiscUsagePerc = FFFFFFFF
 clrMenuFontTimers = FFFFFFFF
 clrMenuFontTimersHeader = FFFFFFFF
 clrMenuFontDetailViewText = FFFFFFFF
diff --git a/themes/nOpacity-iceblue.theme b/themes/nOpacity-iceblue.theme
index c6dbadf..76a06c9 100644
--- a/themes/nOpacity-iceblue.theme
+++ b/themes/nOpacity-iceblue.theme
@@ -44,6 +44,7 @@ clrTimersBackBlend = FFFFFFFF
 clrMenuFontHeader = FF000000
 clrMenuFontDate = FF000000
 clrMenuFontDiscUsage = FF000000
+clrMenuFontDiscUsagePerc = FF000000
 clrMenuFontTimers = FF000000
 clrMenuFontTimersHeader = FF000000
 clrMenuFontDetailViewText = FF000000
diff --git a/themes/nOpacity-light.theme b/themes/nOpacity-light.theme
index 3ad3b95..3b8775e 100644
--- a/themes/nOpacity-light.theme
+++ b/themes/nOpacity-light.theme
@@ -44,6 +44,7 @@ clrTimersBackBlend = D0000000
 clrMenuFontHeader = FFFFFFFF
 clrMenuFontDate = FFFFFFFF
 clrMenuFontDiscUsage = FFFFFFFF
+clrMenuFontDiscUsagePerc = FFFFFFFF
 clrMenuFontTimers = FFFFFFFF
 clrMenuFontTimersHeader = FFFFFFFF
 clrMenuFontDetailViewText = FFE6E6E6