changed tracks display to fixed track item height

11 files changed, 96 insertions, 67 deletions

diff --git a/HISTORY b/HISTORY
index 0728b23..b67dddd 100644
--- a/HISTORY
+++ b/HISTORY
@@ -183,4 +183,6 @@ Version 0.1.1
   (elapsed / remaining)
 - fixed a bug that extraIcons directory was not used
 - added background pixmaps for main menu timers and epg info window
-  to avoid nasty font pixelation effect 
+  to avoid nasty font pixelation effect
+- changed tracks display to fixed track item height
+- changed stereo and ac3 icons in tracks display
diff --git a/config.c b/config.c
index 8e91c17..1c4bb94 100644
--- a/config.c
+++ b/config.c
@@ -42,7 +42,7 @@ cNopacityConfig::cNopacityConfig() {
     //DisplayTracks
     tracksFadeTime = 300;
     tracksWidth = 25;
-    tracksHeight = 25;
+    tracksItemHeight = 80;
     tracksPosition = 0;
     tracksBorderHorizontal = 10;
     tracksBorderVertical = 10;
@@ -229,7 +229,7 @@ bool cNopacityConfig::SetupParse(const char *Name, const char *Value) {
     else if (strcmp(Name, "messageFadeTime") == 0)         messageFadeTime = atoi(Value);
     else if (strcmp(Name, "tracksFadeTime") == 0)          tracksFadeTime = atoi(Value);
     else if (strcmp(Name, "tracksWidth") == 0)             tracksWidth = atoi(Value);
-    else if (strcmp(Name, "tracksHeight") == 0)            tracksHeight = atoi(Value);
+    else if (strcmp(Name, "tracksItemHeight") == 0)        tracksItemHeight = atoi(Value);
     else if (strcmp(Name, "tracksPosition") == 0)          tracksPosition = atoi(Value);
     else if (strcmp(Name, "tracksBorderHorizontal") == 0)  tracksBorderHorizontal = atoi(Value);
     else if (strcmp(Name, "tracksBorderVertical") == 0)    tracksBorderVertical = atoi(Value);
diff --git a/config.h b/config.h
index bd4ea4d..7ec88d8 100644
--- a/config.h
+++ b/config.h
@@ -63,7 +63,7 @@ class cNopacityConfig {
         int tracksFadeTime;

         int tracksFrameTime;

         int tracksWidth;

-        int tracksHeight;

+        int tracksItemHeight;

         int tracksPosition;

         int tracksBorderHorizontal;

         int tracksBorderVertical;

diff --git a/displaytracks.c b/displaytracks.c
index d0b9071..8dcdc96 100644
--- a/displaytracks.c
+++ b/displaytracks.c
@@ -1,4 +1,3 @@
-
 #include "displaytracks.h"
 
 cNopacityDisplayTracks::cNopacityDisplayTracks(const char *Title, int NumTracks, const char * const *Tracks) {
@@ -6,6 +5,7 @@ cNopacityDisplayTracks::cNopacityDisplayTracks(const char *Title, int NumTracks,
     initial = true;
     currentIndex = -1;
     numTracks = NumTracks;
+    audioChannelLast = -5;
     FrameTime = config.tracksFrameTime; 
     FadeTime = config.tracksFadeTime;
     SetGeometry();
@@ -23,6 +23,7 @@ cNopacityDisplayTracks::~cNopacityDisplayTracks() {
         cCondWait::SleepMs(10);
     osd->DestroyPixmap(pixmapContainer);
     osd->DestroyPixmap(pixmapHeader);
+    osd->DestroyPixmap(pixmapHeaderAudio);
     menuItems.Clear();
     for (int i=0; i<2; i++)
         cOsdProvider::DropImage(handleBackgrounds[i]);
@@ -31,17 +32,12 @@ cNopacityDisplayTracks::~cNopacityDisplayTracks() {
     delete osd;
 }
 
-cBitmap cNopacityDisplayTracks::bmStereo(audio_xpm);
-cBitmap cNopacityDisplayTracks::bmDolbyDigital(dolbydigital_xpm);
-
 void cNopacityDisplayTracks::SetGeometry(void) {
     width = cOsd::OsdWidth() * config.tracksWidth / 100;
-    height = cOsd::OsdHeight() * config.tracksHeight / 100;
-    if (!height%(numTracks + 1)) {
-        height += numTracks + 1 - height%(numTracks + 1);
-    }
+    height = (config.tracksItemHeight +4) * (numTracks+1);
+
     menuItemWidth = width - 4;
-    menuItemHeight = (height - 2*(numTracks + 1)) / (numTracks + 1) - 1;
+    menuItemHeight = config.tracksItemHeight;
 
     int top, left;
     switch(config.tracksPosition) {
@@ -88,9 +84,11 @@ void cNopacityDisplayTracks::SetGeometry(void) {
 void cNopacityDisplayTracks::CreatePixmaps(void) {
     pixmapContainer = osd->CreatePixmap(1, cRect(0, 0, width, height));
     pixmapHeader = osd->CreatePixmap(2, cRect(2, 2, menuItemWidth, menuItemHeight));
+    pixmapHeaderAudio = osd->CreatePixmap(3, cRect(menuItemWidth - menuItemHeight, 2, menuItemHeight, menuItemHeight));
     if (config.tracksFadeTime) {
         pixmapContainer->SetAlpha(0);
         pixmapHeader->SetAlpha(0);
+        pixmapHeaderAudio->SetAlpha(0);
     }
 }
 
@@ -127,7 +125,7 @@ void cNopacityDisplayTracks::SetItem(const char *Text, int Index, bool Current)
     item = new cNopacityTrackMenuItem(osd, Text);
     item->SetCurrent(Current);
     item->SetFont(font);
-    item->SetGeometry(Index, menuItemHeight+5, 2, menuItemWidth, menuItemHeight, 5);
+    item->SetGeometry(Index, menuItemHeight+4, 2, menuItemWidth, menuItemHeight, 4);
     item->CreatePixmap();
     item->SetBackgrounds(handleBackgrounds);
     menuItems.Add(item);
@@ -148,14 +146,26 @@ void cNopacityDisplayTracks::SetTrack(int Index, const char * const *Tracks) {
 }
 
 void cNopacityDisplayTracks::SetAudioChannel(int AudioChannel) {
-    cBitmap *bm = NULL;
-    switch (AudioChannel) {
-        case -1: bm = &bmDolbyDigital; break;
-        case 0: bm = &bmStereo; break;
-        default: ;
+    if (AudioChannel != audioChannelLast) {
+        audioChannelLast = AudioChannel;
+        pixmapHeaderAudio->Fill(clrTransparent);
+        cString icon("");
+        switch (AudioChannel) {
+            case -1: 
+                icon = "skinIcons/ac3";
+                break;
+            case 0: 
+                icon = "skinIcons/stereo"; 
+                break;
+            default:
+                icon = "skinIcons/stereo"; 
+                break;
+        }
+        cImageLoader imgLoader;
+        if (imgLoader.LoadIcon(icon, menuItemHeight-2)) {
+            pixmapHeaderAudio->DrawImage(cPoint(1, 1), imgLoader.GetImage());
+        }
     }
-    if (bm)
-        pixmapHeader->DrawBitmap(cPoint(width - bm->Width() - 10, (menuItemHeight - bm->Width()) / 2), *bm, Theme.Color(clrChannelSymbolOn), Theme.Color(clrMenuBack));
 }
 
 void cNopacityDisplayTracks::Flush(void) {
@@ -175,6 +185,7 @@ void cNopacityDisplayTracks::Action(void) {
         int Alpha = t * ALPHA_OPAQUE;
         pixmapContainer->SetAlpha(Alpha);
         pixmapHeader->SetAlpha(Alpha);
+        pixmapHeaderAudio->SetAlpha(Alpha);
         for (cNopacityMenuItem *item = menuItems.First(); Running() && item; item = menuItems.Next(item)) {
             item->SetAlpha(Alpha);
         }
diff --git a/displaytracks.h b/displaytracks.h
index fddfe53..171b808 100644
--- a/displaytracks.h
+++ b/displaytracks.h
@@ -12,8 +12,10 @@ private:
     bool initial;
     int currentIndex;
     int numTracks;
+    int audioChannelLast;
     cPixmap *pixmapContainer;
     cPixmap *pixmapHeader;
+    cPixmap *pixmapHeaderAudio;
     cPixmap *pixmapIcon;
     cList<cNopacityMenuItem> menuItems;
     int handleBackgrounds[2];
@@ -21,7 +23,6 @@ private:
     cFont *fontHeader;
     virtual void Action(void);
     void SetItem(const char *Text, int Index, bool Current);
-    static cBitmap bmStereo, bmDolbyDigital;
     void SetGeometry(void);
     void CreatePixmaps(void);
     void CreateFonts(void);
diff --git a/icons/skinIcons/ac3.png b/icons/skinIcons/ac3.png
new file mode 100644
index 0000000..adbef68
--- /dev/null
+++ b/icons/skinIcons/ac3.png
diff --git a/icons/skinIcons/stereo.png b/icons/skinIcons/stereo.png
new file mode 100644
index 0000000..9f3b3e5
--- /dev/null
+++ b/icons/skinIcons/stereo.png
diff --git a/po/de_DE.po b/po/de_DE.po
index c5a9695..7b753ac 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: skinnopacity 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-03-23 11:49+0100\n"
+"POT-Creation-Date: 2013-03-24 11:09+0100\n"
 "PO-Revision-Date: 2012-11-11 17:49+0200\n"
 "Last-Translator: louis\n"
 "Language-Team: \n"
@@ -123,13 +123,13 @@ msgid "Scale Video size to fit into menu window"
 msgstr "TV-Bildgröße in Menüfenster einpassen"
 
 msgid "Header Height (Percent of OSD Height)"
-msgstr "Header Höhe (in Prozent der OSD Höhe)"
+msgstr "Header Höhe (in % der OSD Höhe)"
 
 msgid "Header Icon Size (Square Header Menu Icons)"
 msgstr "Größe der quadratischen Headericons"
 
 msgid "Footer Height (Percent of OSD Height)"
-msgstr "Footer Höhe (in Prozent der OSD Höhe)"
+msgstr "Footer Höhe (in % der OSD Höhe)"
 
 msgid "Rounded Corners for menu items and buttons"
 msgstr "Abgerundete Ecken für Menüelemente und Buttons"
@@ -180,7 +180,7 @@ msgid "Use narrow main menu"
 msgstr "Schmales Hauptmenü verwenden"
 
 msgid "Width (Percent of OSD Width)"
-msgstr "Breite (Prozent der OSD Breite)"
+msgstr "Breite (% der OSD Breite)"
 
 msgid "Use narrow setup menu"
 msgstr "Schmales Setup Menü verwenden"
@@ -198,13 +198,13 @@ msgid "Display Disk Usage"
 msgstr "Festplattenstatus anzeigen"
 
 msgid "Size (square, Percent of OSD Width)"
-msgstr "Größe (quadr., Proz. der OSD Breite)"
+msgstr "Größe (quadr., % der OSD Breite)"
 
 msgid "Adjust Font Size - free"
 msgstr "Schriftgröße anpassen - frei"
 
 msgid "Adjust Font Size - percent"
-msgstr "Schriftgröße anpassen - Prozent"
+msgstr "Schriftgröße anpassen - %"
 
 msgid "Display Timers"
 msgstr "Timer anzeigen"
@@ -213,7 +213,7 @@ msgid "Maximum number of Timers"
 msgstr "Maximale Timer Anzahl"
 
 msgid "Width of Timers (Percent of OSD Width)"
-msgstr "Breite der Timer (Proz. der OSD Breite)"
+msgstr "Breite der Timer (% der OSD Breite)"
 
 msgid "Channel Logo Width"
 msgstr "Breite der Kanallogos"
@@ -261,7 +261,7 @@ msgid "EPG Window Text Scrolling Speed"
 msgstr "Text Scroll Geschwindigkeit des EPG Fensters"
 
 msgid "Height of EPG Info Window (Percent of OSD Height)"
-msgstr "Höhe des EPG Info Fensters (Proz. der OSD Höhe)"
+msgstr "Höhe des EPG Info Fensters (% der OSD Höhe)"
 
 msgid "Display Reruns in detailed EPG View"
 msgstr "Wiederholungen in der detailierten EPG Ansicht anzeigen"
@@ -320,8 +320,8 @@ msgstr "vergangene Zeit anzeigen"
 msgid "show remaining time"
 msgstr "verbleibende Zeit anzeigen"
 
-msgid "Hight of Channel Display (Percent of OSD Height)"
-msgstr "Höhe der Kanalwechsel Anzeige (Proz. der OSD Höhe)"
+msgid "Height of Channel Display (Percent of OSD Height)"
+msgstr "Höhe der Kanalwechsel Anzeige (% der OSD Höhe)"
 
 msgid "Left & Right Border Width"
 msgstr "Breite des linken und rechten Rands"
@@ -353,17 +353,17 @@ msgstr "Schriftgröße anpassen - EPG Text"
 msgid "Adjust Font Size - EPG Infotext"
 msgstr "Schriftgröße anpassen - EPG Infotext"
 
-msgid "Hight of Replay Display (Percent of OSD Height)"
-msgstr "Höhe der Wiedergabe Anzeige (Proz. der OSD Höhe)"
+msgid "Height of Replay Display (Percent of OSD Height)"
+msgstr "Höhe der Wiedergabe Anzeige (% der OSD Höhe)"
 
 msgid "Adjust Font Size - Text"
 msgstr "Schriftgröße anpassen - Anzeigetext"
 
 msgid "Width of Tracks Display (Percent of OSD Width)"
-msgstr "Breite der Audio Tracks Anzeige (Proz. der OSD Breite)"
+msgstr "Breite der Audio Tracks Anzeige (% der OSD Breite)"
 
-msgid "Hight of Tracks Display (Percent of OSD Height)"
-msgstr "Höhe der Wiedergabe Anzeige (Proz. der OSD Höhe)"
+msgid "Height of Track Items (in pixels)"
+msgstr "Höhe der Track Elemente (in Pixel)"
 
 msgid "Position (0: bot. center, 1: bot. left, ... , 7: bot. right)"
 msgstr "Position (0: unten mitte, 1: unten links, ... , 7: unten rechts)"
@@ -378,10 +378,10 @@ msgid "Adjust Font Size - Buttons"
 msgstr "Schriftgröße anpassen - Buttons"
 
 msgid "Width of Message Display (Percent of OSD Height)"
-msgstr "Breite der Nachrichten Anzeige (Proz. der OSD Breite)"
+msgstr "Breite der Nachrichten Anzeige (% der OSD Breite)"
 
-msgid "Hight of Message Display (Percent of OSD Height)"
-msgstr "Höhe der Nachrichten Anzeige (Proz. der OSD Höhe)"
+msgid "Height of Message Display (Percent of OSD Height)"
+msgstr "Höhe der Nachrichten Anzeige (% der OSD Höhe)"
 
 msgid "Adjust Font Size"
 msgstr "Schriftgröße anpassen"
@@ -390,10 +390,10 @@ msgid "Volume Display"
 msgstr "Lautstärke Anzeige"
 
 msgid "Width of Volume Display (Percent of OSD Height)"
-msgstr "Breite der Lautstärken Anzeige (Proz. der OSD Breite)"
+msgstr "Breite der Lautstärken Anzeige (% der OSD Breite)"
 
-msgid "Hight of Volume Display (Percent of OSD Height)"
-msgstr "Breite der Lautstärken Anzeige (Proz. der OSD Breite)"
+msgid "Height of Volume Display (Percent of OSD Height)"
+msgstr "Höhe der Lautstärken Anzeige (% der OSD Höhe)"
 
 msgid "conflict"
 msgstr "Konflikt"
diff --git a/po/it_IT.po b/po/it_IT.po
index c877d6a..6d356fb 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: skinnopacity 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-03-23 11:49+0100\n"
+"POT-Creation-Date: 2013-03-24 11:09+0100\n"
 "PO-Revision-Date: 2013-03-19 22:56+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: \n"
@@ -323,7 +323,7 @@ msgstr ""
 msgid "show remaining time"
 msgstr ""
 
-msgid "Hight of Channel Display (Percent of OSD Height)"
+msgid "Height of Channel Display (Percent of OSD Height)"
 msgstr "Altezza di Mostra canale (% altezza OSD)"
 
 msgid "Left & Right Border Width"
@@ -356,7 +356,7 @@ msgstr "Adatta dim. caratteri - Testo EPG"
 msgid "Adjust Font Size - EPG Infotext"
 msgstr "Adatta dim. caratteri - Info testo EPG"
 
-msgid "Hight of Replay Display (Percent of OSD Height)"
+msgid "Height of Replay Display (Percent of OSD Height)"
 msgstr "Altezza di Mostra riproduzione (% altezza OSD)"
 
 msgid "Adjust Font Size - Text"
@@ -365,8 +365,8 @@ msgstr "Adatta dim. caratteri - Testo"
 msgid "Width of Tracks Display (Percent of OSD Width)"
 msgstr "Larghezza di Mostra tracce (% larghezza OSD)"
 
-msgid "Hight of Tracks Display (Percent of OSD Height)"
-msgstr "Altezza di Mostra tracce (% altezza OSD)"
+msgid "Height of Track Items (in pixels)"
+msgstr ""
 
 msgid "Position (0: bot. center, 1: bot. left, ... , 7: bot. right)"
 msgstr "Posizione (0: basso centrale, 1: basso sin., ... , 7: basso destra)"
@@ -383,7 +383,7 @@ msgstr "Adatta dim. caratteri - Tasti"
 msgid "Width of Message Display (Percent of OSD Height)"
 msgstr "Larghezza di Mostra messaggio (% altezza OSD)"
 
-msgid "Hight of Message Display (Percent of OSD Height)"
+msgid "Height of Message Display (Percent of OSD Height)"
 msgstr "Altezza di Mostra messaggio (% altezza OSD)"
 
 msgid "Adjust Font Size"
@@ -395,7 +395,7 @@ msgstr "Mostra volume"
 msgid "Width of Volume Display (Percent of OSD Height)"
 msgstr "Larghezza di Mostra volume (% altezza OSD)"
 
-msgid "Hight of Volume Display (Percent of OSD Height)"
+msgid "Height of Volume Display (Percent of OSD Height)"
 msgstr "Altezza di Mostra volume (% altezza OSD)"
 
 msgid "conflict"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 505aea2..dceb7e4 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-skinnopacity 0.0.6\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-03-23 11:49+0100\n"
+"POT-Creation-Date: 2013-03-24 11:09+0100\n"
 "PO-Revision-Date: 2013-03-12 15:59+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: \n"
@@ -323,8 +323,8 @@ msgstr ""
 msgid "show remaining time"
 msgstr ""
 
-msgid "Hight of Channel Display (Percent of OSD Height)"
-msgstr "Vý¹ka zobrazenia (Percento z OSD vý¹ky)"
+msgid "Height of Channel Display (Percent of OSD Height)"
+msgstr ""
 
 msgid "Left & Right Border Width"
 msgstr "©írka µavého a pravého okraja"
@@ -356,8 +356,8 @@ msgstr "Nastavenie veµkos»i písma - EPG text"
 msgid "Adjust Font Size - EPG Infotext"
 msgstr "Nastavenie veµkos»i písma - EPG informaèný text"
 
-msgid "Hight of Replay Display (Percent of OSD Height)"
-msgstr "Vý¹ka zobrazenia prehrávania (Percent z OSD vý¹ky)"
+msgid "Height of Replay Display (Percent of OSD Height)"
+msgstr ""
 
 msgid "Adjust Font Size - Text"
 msgstr "Nastavenie veµkos»i písma - textu"
@@ -365,8 +365,8 @@ msgstr "Nastavenie veµkos»i písma - textu"
 msgid "Width of Tracks Display (Percent of OSD Width)"
 msgstr "©írka zobrazenia výberu stopy (Percent z OSD ¹írky)"
 
-msgid "Hight of Tracks Display (Percent of OSD Height)"
-msgstr "Vý¹ka zobrazenia výberu stopy (Percent z OSD vý¹ky)"
+msgid "Height of Track Items (in pixels)"
+msgstr ""
 
 msgid "Position (0: bot. center, 1: bot. left, ... , 7: bot. right)"
 msgstr "Pozícia (0: dole uprostred, 1: vµavo dole, ... , 7: vpravo dole)"
@@ -383,8 +383,8 @@ msgstr "Nastavenie veµkosti písma - Tlaèítka"
 msgid "Width of Message Display (Percent of OSD Height)"
 msgstr "©írka zobrazenej správy (percento z èasti OSD)"
 
-msgid "Hight of Message Display (Percent of OSD Height)"
-msgstr "Vý¹ka zobrazenej správy (percento z èasti OSD vý¹ky)"
+msgid "Height of Message Display (Percent of OSD Height)"
+msgstr ""
 
 msgid "Adjust Font Size"
 msgstr "Nastavenie veµkosti písma"
@@ -395,8 +395,8 @@ msgstr "Zobrazenie hlasitosti"
 msgid "Width of Volume Display (Percent of OSD Height)"
 msgstr "©írka zobrazenia hlasitosti (Percent z OSD ¹írky)"
 
-msgid "Hight of Volume Display (Percent of OSD Height)"
-msgstr "Vý¹ka zobrazenia hlasitosti (Percent z OSD vý¹ky)"
+msgid "Height of Volume Display (Percent of OSD Height)"
+msgstr ""
 
 msgid "conflict"
 msgstr "konflikt"
@@ -404,6 +404,21 @@ msgstr "konflikt"
 msgid "conflicts"
 msgstr "konflikty"
 
+#~ msgid "Hight of Channel Display (Percent of OSD Height)"
+#~ msgstr "Vý¹ka zobrazenia (Percento z OSD vý¹ky)"
+
+#~ msgid "Hight of Replay Display (Percent of OSD Height)"
+#~ msgstr "Vý¹ka zobrazenia prehrávania (Percent z OSD vý¹ky)"
+
+#~ msgid "Hight of Message Display (Percent of OSD Height)"
+#~ msgstr "Vý¹ka zobrazenej správy (percento z èasti OSD vý¹ky)"
+
+#~ msgid "Hight of Volume Display (Percent of OSD Height)"
+#~ msgstr "Vý¹ka zobrazenia hlasitosti (Percent z OSD vý¹ky)"
+
+#~ msgid "Hight of Tracks Display (Percent of OSD Height)"
+#~ msgstr "Vý¹ka zobrazenia výberu stopy (Percent z OSD vý¹ky)"
+
 #~ msgid "VDR Menu: Dimensions Settings"
 #~ msgstr "VDR menu: Nastavenie veµkosti"
 
diff --git a/setup.c b/setup.c
index ae45b64..510f4c9 100644
--- a/setup.c
+++ b/setup.c
@@ -98,7 +98,7 @@ void cNopacitySetup::Store(void) {
     SetupStore("messageFadeTime", config.messageFadeTime);
     SetupStore("tracksFadeTime", config.tracksFadeTime);
     SetupStore("tracksWidth", config.tracksWidth);
-    SetupStore("tracksHeight", config.tracksHeight);
+    SetupStore("tracksItemHeight", config.tracksItemHeight);
     SetupStore("tracksPosition", config.tracksPosition);
     SetupStore("tracksBorderHorizontal", config.tracksBorderHorizontal);
     SetupStore("tracksBorderVertical", config.tracksBorderVertical);
@@ -435,7 +435,7 @@ void cNopacitySetupChannelDisplay::Set(void) {
     Clear();
 
     Add(new cMenuEditIntItem(tr("Fade-In Time in ms (Zero for switching off fading)"), &tmpNopacityConfig->channelFadeTime, 0, 1000));
-    Add(new cMenuEditIntItem(tr("Hight of Channel Display (Percent of OSD Height)"), &tmpNopacityConfig->channelHeight, 15, 100));
+    Add(new cMenuEditIntItem(tr("Height of Channel Display (Percent of OSD Height)"), &tmpNopacityConfig->channelHeight, 15, 100));
     Add(new cMenuEditIntItem(tr("Left & Right Border Width"), &tmpNopacityConfig->channelBorderVertical, 0, 300));
     Add(new cMenuEditIntItem(tr("Bottom Border Height"), &tmpNopacityConfig->channelBorderBottom, 0, 300));
     Add(new cMenuEditStraItem(tr("Channel Logo Position"), &tmpNopacityConfig->logoPosition, 3, logoPos));
@@ -467,7 +467,7 @@ void cNopacitySetupReplayDisplay::Set(void) {
     Clear();
 
     Add(new cMenuEditIntItem(tr("Fade-In Time in ms (Zero for switching off fading)"), &tmpNopacityConfig->replayFadeTime, 0, 1000));
-    Add(new cMenuEditIntItem(tr("Hight of Replay Display (Percent of OSD Height)"), &tmpNopacityConfig->replayHeight, 15, 100));
+    Add(new cMenuEditIntItem(tr("Height of Replay Display (Percent of OSD Height)"), &tmpNopacityConfig->replayHeight, 15, 100));
     Add(new cMenuEditIntItem(tr("Left & Right Border Width"), &tmpNopacityConfig->replayBorderVertical, 0, 300));
     Add(new cMenuEditIntItem(tr("Bottom Border Height"), &tmpNopacityConfig->replayBorderBottom, 0, 300));
     Add(new cMenuEditIntItem(tr("Adjust Font Size - Header"), &tmpNopacityConfig->fontReplayHeader, -20, 20));
@@ -488,7 +488,7 @@ void cNopacitySetupTrackDisplay::Set(void) {
     Clear();
     Add(new cMenuEditIntItem(tr("Fade-In Time in ms (Zero for switching off fading)"), &tmpNopacityConfig->tracksFadeTime, 0, 1000));
     Add(new cMenuEditIntItem(tr("Width of Tracks Display (Percent of OSD Width)"), &tmpNopacityConfig->tracksWidth, 10, 100));
-    Add(new cMenuEditIntItem(tr("Hight of Tracks Display (Percent of OSD Height)"), &tmpNopacityConfig->tracksHeight, 10, 100));
+    Add(new cMenuEditIntItem(tr("Height of Track Items (in pixels)"), &tmpNopacityConfig->tracksItemHeight, 30, 200));
     Add(new cMenuEditIntItem(tr("Position (0: bot. center, 1: bot. left, ... , 7: bot. right)"), &tmpNopacityConfig->tracksPosition, 0, 7));
     Add(new cMenuEditIntItem(tr("Border Top / Bottom"), &tmpNopacityConfig->tracksBorderHorizontal, 0, 100));
     Add(new cMenuEditIntItem(tr("Border Left / Right"), &tmpNopacityConfig->tracksBorderVertical, 0, 100));
@@ -511,7 +511,7 @@ void cNopacitySetupMessageDisplay::Set(void) {
 
     Add(new cMenuEditIntItem(tr("Fade-In Time in ms (Zero for switching off fading)"), &tmpNopacityConfig->messageFadeTime, 0, 1000));
     Add(new cMenuEditIntItem(tr("Width of Message Display (Percent of OSD Height)"), &tmpNopacityConfig->messageWidth, 30, 100));
-    Add(new cMenuEditIntItem(tr("Hight of Message Display (Percent of OSD Height)"), &tmpNopacityConfig->messageHeight, 5, 100));
+    Add(new cMenuEditIntItem(tr("Height of Message Display (Percent of OSD Height)"), &tmpNopacityConfig->messageHeight, 5, 100));
     Add(new cMenuEditIntItem(tr("Bottom Border Height"), &tmpNopacityConfig->messageBorderBottom, 0, 1000));
     Add(new cMenuEditIntItem(tr("Adjust Font Size"), &tmpNopacityConfig->fontMessage, -30, 30));
 
@@ -531,7 +531,7 @@ void cNopacitySetupVolumeDisplay::Set(void) {
 
     Add(new cMenuEditIntItem(tr("Fade-In Time in ms (Zero for switching off fading)"), &tmpNopacityConfig->volumeFadeTime, 0, 1000));
     Add(new cMenuEditIntItem(tr("Width of Volume Display (Percent of OSD Height)"), &tmpNopacityConfig->volumeWidth, 10, 100));
-    Add(new cMenuEditIntItem(tr("Hight of Volume Display (Percent of OSD Height)"), &tmpNopacityConfig->volumeHeight, 5, 100));
+    Add(new cMenuEditIntItem(tr("Height of Volume Display (Percent of OSD Height)"), &tmpNopacityConfig->volumeHeight, 5, 100));
     Add(new cMenuEditIntItem(tr("Bottom Border Height"), &tmpNopacityConfig->volumeBorderBottom, 0, 1000));
     Add(new cMenuEditIntItem(tr("Adjust Font Size"), &tmpNopacityConfig->fontVolume, -30, 30));