52 files changed, 82 insertions, 33 deletions

diff --git a/HISTORY b/HISTORY
index 79ec737b..902e943e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4,6 +4,7 @@ VDR Plugin 'skinflatplus' Revision History
 - [fix] eMenuSortMode in displaymenu.h for compile with VDR < 2.2.0
 - [fix] position of widgets in main menu (add menu item border size)
 - [fix] wrong epg logo in epgsearch eventsview
+- [update] disk usage icons with 32 sections instead of 16, thanks to MegaV0lt
 
 2015-02-14: Version 0.5.1
 - [fix] topbar number recordings
diff --git a/baserender.c b/baserender.c
index 667f8371..5a97da09 100644
--- a/baserender.c
+++ b/baserender.c
@@ -231,22 +231,38 @@ void cFlatBaseRender::TopBarEnableDiskUsage(void) {
             extra2 = cString::sprintf("~ %02d:%02d", FreeMinutes / 60, FreeMinutes % 60);
         }
         switch(ChartDiskUsage) {                        // Show free space
-          case 0 ... 3:    iconName = "chart0b"; break; // Symbol free < 4% (chart1b in red)
-          case 4 ... 7:    iconName = "chart1b"; break; // 6,25
-          case 8 ... 13:   iconName = "chart2b"; break; // 12,5
-          case 14 ... 19:  iconName = "chart3b"; break; // 18,75
-          case 20 ... 25:  iconName = "chart4b"; break; // 25
-          case 26 ... 32:  iconName = "chart5b"; break; // 31,25
-          case 33 ... 38:  iconName = "chart6b"; break; // 37,5
-          case 39 ... 44:  iconName = "chart7b"; break; // 43,75
-          case 45 ... 50:  iconName = "chart8b"; break; // 50
-          case 51 ... 57:  iconName = "chart9b"; break; // 56,25
-          case 58 ... 63:  iconName = "chart10b"; break; // 62,5
-          case 64 ... 69:  iconName = "chart11b"; break; // 68,75
-          case 70 ... 75:  iconName = "chart12b"; break; // 75
-          case 76 ... 82:  iconName = "chart13b"; break; // 81,25
-          case 83 ... 88:  iconName = "chart14b"; break; // 87,5
-          case 89 ... 100: iconName = "chart15b"; break; // 93,75+
+          case 0 ... 2:    iconName = "chart0b"; break; // < 2% (chart1b in red)
+          case 3 ... 4:    iconName = "chart1b"; break; // 3,125 (4)
+          case 5 ... 6:    iconName = "chart2b"; break; // 6,25
+          case 7 ... 9:    iconName = "chart3b"; break; // 9,375
+          case 10 ... 13:  iconName = "chart4b"; break; // 12,5
+          case 14 ... 16:  iconName = "chart5b"; break; // 15,625
+          case 17 ... 19:  iconName = "chart6b"; break; // 18,75
+          case 20 ... 22:  iconName = "chart7b"; break; // 21,875
+          case 23 ... 25:  iconName = "chart8b"; break; // 25
+          case 26 ... 28:  iconName = "chart9b"; break; // 28,125
+          case 29 ... 31:  iconName = "chart10b"; break; // 31,25
+          case 32 ... 34:  iconName = "chart11b"; break; // 34,375
+          case 35 ... 38:  iconName = "chart12b"; break; // 37,5
+          case 39 ... 41:  iconName = "chart13b"; break; // 40,625
+          case 42 ... 44:  iconName = "chart14b"; break; // 43,75
+          case 45 ... 47:  iconName = "chart15b"; break; // 46,875
+          case 48 ... 50:  iconName = "chart16b"; break; // 50
+          case 51 ... 53:  iconName = "chart17b"; break; // 53,125
+          case 54 ... 56:  iconName = "chart18b"; break; // 56,25
+          case 57 ... 59:  iconName = "chart19b"; break; // 59,375
+          case 60 ... 63:  iconName = "chart20b"; break; // 62,5
+          case 64 ... 66:  iconName = "chart21b"; break; // 65,625
+          case 67 ... 69:  iconName = "chart22b"; break; // 68,75
+          case 70 ... 72:  iconName = "chart23b"; break; // 71,875
+          case 73 ... 75:  iconName = "chart24b"; break; // 75
+          case 76 ... 78:  iconName = "chart25b"; break; // 78,125
+          case 79 ... 81:  iconName = "chart26b"; break; // 81,25
+          case 82 ... 84:  iconName = "chart27b"; break; // 84,375
+          case 85 ... 88:  iconName = "chart28b"; break; // 87,5
+          case 89 ... 91:  iconName = "chart29b"; break; // 90,625
+          case 92 ... 94:  iconName = "chart30b"; break; // 93,75
+          case 95 ... 100: iconName = "chart31b"; break; // 96,875 - 100
         }
     } else {                                       // Show in occupied mode
         if( Config.DiskUsageShort == false ) {     // Long format
@@ -257,22 +273,38 @@ void cFlatBaseRender::TopBarEnableDiskUsage(void) {
             extra2 = cString::sprintf("~ %02d:%02d", OccupiedMinutes / 60, OccupiedMinutes % 60);
         }
         switch(ChartDiskUsage) {                       // show used space
-          case 0 ... 7:    iconName = "chart1"; break; // 6,25
-          case 8 ... 13:   iconName = "chart2"; break; // 12,5
-          case 14 ... 19:  iconName = "chart3"; break; // 18,75
-          case 20 ... 25:  iconName = "chart4"; break; // 25
-          case 26 ... 32:  iconName = "chart5"; break; // 31,25
-          case 33 ... 38:  iconName = "chart6"; break; // 37,5
-          case 39 ... 44:  iconName = "chart7"; break; // 43,75
-          case 45 ... 50:  iconName = "chart8"; break; // 50
-          case 51 ... 57:  iconName = "chart9"; break; // 56,25
-          case 58 ... 63:  iconName = "chart10"; break; // 62,5
-          case 64 ... 69:  iconName = "chart11"; break; // 68,75
-          case 70 ... 75:  iconName = "chart12"; break; // 75
-          case 76 ... 82:  iconName = "chart13"; break; // 81,25
-          case 83 ... 88:  iconName = "chart14"; break; // 87,5
-          case 89 ... 95:  iconName = "chart15"; break; // 93,75 (95)
-          case 96 ... 100: iconName = "chart16"; break; // symbol usage > 96% (chart15 in red)
+          case 0 ... 3:    iconName = "chart1"; break; // 3,125
+          case 4 ... 6:    iconName = "chart2"; break; // 6,25
+          case 7 ... 9:    iconName = "chart3"; break; // 9,375
+          case 10 ... 13:  iconName = "chart4"; break; // 12,5
+          case 14 ... 16:  iconName = "chart5"; break; // 15,625
+          case 17 ... 19:  iconName = "chart6"; break; // 18,75
+          case 20 ... 22:  iconName = "chart7"; break; // 21,875
+          case 23 ... 25:  iconName = "chart8"; break; // 25
+          case 26 ... 28:  iconName = "chart9"; break; // 28,125
+          case 29 ... 31:  iconName = "chart10"; break; // 31,25
+          case 32 ... 34:  iconName = "chart11"; break; // 34,375
+          case 35 ... 38:  iconName = "chart12"; break; // 37,5
+          case 39 ... 41:  iconName = "chart13"; break; // 40,625
+          case 42 ... 44:  iconName = "chart14"; break; // 43,75
+          case 45 ... 47:  iconName = "chart15"; break; // 46,875
+          case 48 ... 50:  iconName = "chart16"; break; // 50
+          case 51 ... 53:  iconName = "chart17"; break; // 53,125
+          case 54 ... 56:  iconName = "chart18"; break; // 56,25
+          case 57 ... 59:  iconName = "chart19"; break; // 59,375
+          case 60 ... 63:  iconName = "chart20"; break; // 62,5
+          case 64 ... 66:  iconName = "chart21"; break; // 65,625
+          case 67 ... 69:  iconName = "chart22"; break; // 68,75
+          case 70 ... 72:  iconName = "chart23"; break; // 71,875
+          case 73 ... 75:  iconName = "chart24"; break; // 75
+          case 76 ... 78:  iconName = "chart25"; break; // 78,125
+          case 79 ... 81:  iconName = "chart26"; break; // 81,25
+          case 82 ... 84:  iconName = "chart27"; break; // 84,375
+          case 85 ... 88:  iconName = "chart28"; break; // 87,5
+          case 89 ... 91:  iconName = "chart29"; break; // 90,625
+          case 92 ... 94:  iconName = "chart30"; break; // 93,75
+          case 95 ... 97:  iconName = "chart31"; break; // 96,875
+          case 98 ... 100: iconName = "chart32"; break; // > 98% (chart31 in red)
         }
     }
     TopBarSetTitleExtra(extra1, extra2);
diff --git a/icons/default/chart0b.png b/icons/default/chart0b.png
index 3197ea53..a1475ef0 100644..100755
--- a/icons/default/chart0b.png
+++ b/icons/default/chart0b.png
diff --git a/icons/default/chart1.png b/icons/default/chart1.png
index 85c8ab48..a3389974 100644..100755
--- a/icons/default/chart1.png
+++ b/icons/default/chart1.png
diff --git a/icons/default/chart10.png b/icons/default/chart10.png
index 013a1f4f..3d063a33 100644..100755
--- a/icons/default/chart10.png
+++ b/icons/default/chart10.png
diff --git a/icons/default/chart11.png b/icons/default/chart11.png
index e578d642..25b0b5b2 100644..100755
--- a/icons/default/chart11.png
+++ b/icons/default/chart11.png
diff --git a/icons/default/chart12.png b/icons/default/chart12.png
index 30ed6016..9bd88968 100644..100755
--- a/icons/default/chart12.png
+++ b/icons/default/chart12.png
diff --git a/icons/default/chart13.png b/icons/default/chart13.png
index c6dfccb0..a5a65d17 100644..100755
--- a/icons/default/chart13.png
+++ b/icons/default/chart13.png
diff --git a/icons/default/chart14.png b/icons/default/chart14.png
index 165b85b6..cbfeb92f 100644..100755
--- a/icons/default/chart14.png
+++ b/icons/default/chart14.png
diff --git a/icons/default/chart15.png b/icons/default/chart15.png
index 41809f0f..11115453 100644..100755
--- a/icons/default/chart15.png
+++ b/icons/default/chart15.png
diff --git a/icons/default/chart15b.png b/icons/default/chart15b.png
index a5db2d59..60d33e6b 120000
--- a/icons/default/chart15b.png
+++ b/icons/default/chart15b.png
@@ -1 +1 @@
-chart7.png
\ No newline at end of file
+chart15.png
\ No newline at end of file
diff --git a/icons/default/chart16.png b/icons/default/chart16.png
index 43cac07b..eaa6daf5 100644..100755
--- a/icons/default/chart16.png
+++ b/icons/default/chart16.png
diff --git a/icons/default/chart16b.png b/icons/default/chart16b.png
new file mode 120000
index 00000000..146f8097
--- /dev/null
+++ b/icons/default/chart16b.png
@@ -0,0 +1 @@
+chart16.png
\ No newline at end of file
diff --git a/icons/default/chart17.png b/icons/default/chart17.png
new file mode 100755
index 00000000..358c110a
--- /dev/null
+++ b/icons/default/chart17.png
diff --git a/icons/default/chart17b.png b/icons/default/chart17b.png
new file mode 120000
index 00000000..fa3981fb
--- /dev/null
+++ b/icons/default/chart17b.png
@@ -0,0 +1 @@
+chart17.png
\ No newline at end of file
diff --git a/icons/default/chart18.png b/icons/default/chart18.png
new file mode 100755
index 00000000..fcbe4d68
--- /dev/null
+++ b/icons/default/chart18.png
diff --git a/icons/default/chart18b.png b/icons/default/chart18b.png
new file mode 120000
index 00000000..1fa42f48
--- /dev/null
+++ b/icons/default/chart18b.png
@@ -0,0 +1 @@
+chart18.png
\ No newline at end of file
diff --git a/icons/default/chart19.png b/icons/default/chart19.png
new file mode 100755
index 00000000..8bc5e962
--- /dev/null
+++ b/icons/default/chart19.png
diff --git a/icons/default/chart19b.png b/icons/default/chart19b.png
new file mode 120000
index 00000000..32eb8acc
--- /dev/null
+++ b/icons/default/chart19b.png
@@ -0,0 +1 @@
+chart19.png
\ No newline at end of file
diff --git a/icons/default/chart2.png b/icons/default/chart2.png
index af6384a7..b700398e 100644..100755
--- a/icons/default/chart2.png
+++ b/icons/default/chart2.png
diff --git a/icons/default/chart20.png b/icons/default/chart20.png
new file mode 100755
index 00000000..9ef23de9
--- /dev/null
+++ b/icons/default/chart20.png
diff --git a/icons/default/chart20b.png b/icons/default/chart20b.png
new file mode 120000
index 00000000..b2431172
--- /dev/null
+++ b/icons/default/chart20b.png
@@ -0,0 +1 @@
+chart20.png
\ No newline at end of file
diff --git a/icons/default/chart21.png b/icons/default/chart21.png
new file mode 100755
index 00000000..bcd554d0
--- /dev/null
+++ b/icons/default/chart21.png
diff --git a/icons/default/chart21b.png b/icons/default/chart21b.png
new file mode 120000
index 00000000..2ca6ff55
--- /dev/null
+++ b/icons/default/chart21b.png
@@ -0,0 +1 @@
+chart21.png
\ No newline at end of file
diff --git a/icons/default/chart22.png b/icons/default/chart22.png
new file mode 100755
index 00000000..3e98d245
--- /dev/null
+++ b/icons/default/chart22.png
diff --git a/icons/default/chart22b.png b/icons/default/chart22b.png
new file mode 120000
index 00000000..d4fb84bc
--- /dev/null
+++ b/icons/default/chart22b.png
@@ -0,0 +1 @@
+chart22.png
\ No newline at end of file
diff --git a/icons/default/chart23.png b/icons/default/chart23.png
new file mode 100755
index 00000000..7252f19e
--- /dev/null
+++ b/icons/default/chart23.png
diff --git a/icons/default/chart23b.png b/icons/default/chart23b.png
new file mode 120000
index 00000000..e7319aa1
--- /dev/null
+++ b/icons/default/chart23b.png
@@ -0,0 +1 @@
+chart23.png
\ No newline at end of file
diff --git a/icons/default/chart24.png b/icons/default/chart24.png
new file mode 100755
index 00000000..93ff8ba7
--- /dev/null
+++ b/icons/default/chart24.png
diff --git a/icons/default/chart24b.png b/icons/default/chart24b.png
new file mode 120000
index 00000000..d8ee7bb6
--- /dev/null
+++ b/icons/default/chart24b.png
@@ -0,0 +1 @@
+chart24.png
\ No newline at end of file
diff --git a/icons/default/chart25.png b/icons/default/chart25.png
new file mode 100755
index 00000000..481a5b96
--- /dev/null
+++ b/icons/default/chart25.png
diff --git a/icons/default/chart25b.png b/icons/default/chart25b.png
new file mode 120000
index 00000000..831fed1a
--- /dev/null
+++ b/icons/default/chart25b.png
@@ -0,0 +1 @@
+chart25.png
\ No newline at end of file
diff --git a/icons/default/chart26.png b/icons/default/chart26.png
new file mode 100755
index 00000000..372c2fb8
--- /dev/null
+++ b/icons/default/chart26.png
diff --git a/icons/default/chart26b.png b/icons/default/chart26b.png
new file mode 120000
index 00000000..ffda06e1
--- /dev/null
+++ b/icons/default/chart26b.png
@@ -0,0 +1 @@
+chart26.png
\ No newline at end of file
diff --git a/icons/default/chart27.png b/icons/default/chart27.png
new file mode 100755
index 00000000..a69f322b
--- /dev/null
+++ b/icons/default/chart27.png
diff --git a/icons/default/chart27b.png b/icons/default/chart27b.png
new file mode 120000
index 00000000..cdd6f66d
--- /dev/null
+++ b/icons/default/chart27b.png
@@ -0,0 +1 @@
+chart27.png
\ No newline at end of file
diff --git a/icons/default/chart28.png b/icons/default/chart28.png
new file mode 100755
index 00000000..086ac229
--- /dev/null
+++ b/icons/default/chart28.png
diff --git a/icons/default/chart28b.png b/icons/default/chart28b.png
new file mode 120000
index 00000000..7401bde9
--- /dev/null
+++ b/icons/default/chart28b.png
@@ -0,0 +1 @@
+chart28.png
\ No newline at end of file
diff --git a/icons/default/chart29.png b/icons/default/chart29.png
new file mode 100755
index 00000000..0657ed11
--- /dev/null
+++ b/icons/default/chart29.png
diff --git a/icons/default/chart29b.png b/icons/default/chart29b.png
new file mode 120000
index 00000000..c81267ed
--- /dev/null
+++ b/icons/default/chart29b.png
@@ -0,0 +1 @@
+chart29.png
\ No newline at end of file
diff --git a/icons/default/chart3.png b/icons/default/chart3.png
index f845f92d..afc2d34b 100644..100755
--- a/icons/default/chart3.png
+++ b/icons/default/chart3.png
diff --git a/icons/default/chart30.png b/icons/default/chart30.png
new file mode 100755
index 00000000..33c1bef6
--- /dev/null
+++ b/icons/default/chart30.png
diff --git a/icons/default/chart30b.png b/icons/default/chart30b.png
new file mode 120000
index 00000000..279c86b5
--- /dev/null
+++ b/icons/default/chart30b.png
@@ -0,0 +1 @@
+chart30.png
\ No newline at end of file
diff --git a/icons/default/chart31.png b/icons/default/chart31.png
new file mode 100755
index 00000000..2894da24
--- /dev/null
+++ b/icons/default/chart31.png
diff --git a/icons/default/chart31b.png b/icons/default/chart31b.png
new file mode 120000
index 00000000..159b6bd2
--- /dev/null
+++ b/icons/default/chart31b.png
@@ -0,0 +1 @@
+chart31.png
\ No newline at end of file
diff --git a/icons/default/chart32.png b/icons/default/chart32.png
new file mode 100755
index 00000000..eff53a6f
--- /dev/null
+++ b/icons/default/chart32.png
diff --git a/icons/default/chart4.png b/icons/default/chart4.png
index c386d728..61724e3b 100644..100755
--- a/icons/default/chart4.png
+++ b/icons/default/chart4.png
diff --git a/icons/default/chart5.png b/icons/default/chart5.png
index 34bf78ea..21a330a4 100644..100755
--- a/icons/default/chart5.png
+++ b/icons/default/chart5.png
diff --git a/icons/default/chart6.png b/icons/default/chart6.png
index 8b28084d..a8854155 100644..100755
--- a/icons/default/chart6.png
+++ b/icons/default/chart6.png
diff --git a/icons/default/chart7.png b/icons/default/chart7.png
index 252d1c53..4af88ab5 100644..100755
--- a/icons/default/chart7.png
+++ b/icons/default/chart7.png
diff --git a/icons/default/chart8.png b/icons/default/chart8.png
index d73df381..57005e04 100644..100755
--- a/icons/default/chart8.png
+++ b/icons/default/chart8.png
diff --git a/icons/default/chart9.png b/icons/default/chart9.png
index 4ef7c934..3421dfb0 100644..100755
--- a/icons/default/chart9.png
+++ b/icons/default/chart9.png