diff options
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | config.c | 2 | ||||
| -rw-r--r-- | config.h | 1 | ||||
| -rw-r--r-- | displaymenu.c | 7 | ||||
| -rw-r--r-- | displaymenu.h | 2 | ||||
| -rw-r--r-- | displaymenuview.c | 18 | ||||
| -rw-r--r-- | displaymenuview.h | 2 | ||||
| -rw-r--r-- | helpers.c | 3 | ||||
| -rw-r--r-- | menuitem.c | 9 | ||||
| -rw-r--r-- | menuitem.h | 3 | ||||
| -rw-r--r-- | po/de_DE.po | 297 | ||||
| -rw-r--r-- | setup.c | 237 | ||||
| -rw-r--r-- | setup.h | 33 |
13 files changed, 351 insertions, 264 deletions
@@ -151,3 +151,4 @@ Version 0.0.7: rounded corners with the same corner radius - Changed plugin icons filename for loading icons in main menu, plugin name is now used +- Restructured Setup Menü @@ -78,6 +78,7 @@ cNopacityConfig::cNopacityConfig() { menuWidthChannels = 30; menuWidthTimers = 30; menuWidthRecordings = 30; + menuWidthSetup = 30; menuHeightInfoWindow = 20; menuScrollDelay = 1; menuScrollSpeed = 2; @@ -263,6 +264,7 @@ bool cNopacityConfig::SetupParse(const char *Name, const char *Value) { else if (strcmp(Name, "menuWidthChannels") == 0) menuWidthChannels = atoi(Value); else if (strcmp(Name, "menuWidthTimers") == 0) menuWidthTimers = atoi(Value); else if (strcmp(Name, "menuWidthRecordings") == 0) menuWidthRecordings = atoi(Value); + else if (strcmp(Name, "menuWidthSetup") == 0) menuWidthSetup = atoi(Value); else if (strcmp(Name, "menuWidthRightItems") == 0) menuWidthRightItems = atoi(Value); else if (strcmp(Name, "menuSizeDiskUsage") == 0) menuSizeDiskUsage = atoi(Value); else if (strcmp(Name, "menuHeightInfoWindow") == 0) menuHeightInfoWindow = atoi(Value); @@ -109,6 +109,7 @@ class cNopacityConfig { int menuWidthChannels;
int menuWidthTimers;
int menuWidthRecordings;
+ int menuWidthSetup;
int menuHeightInfoWindow;
int menuWidthRightItems;
int menuSizeDiskUsage;
diff --git a/displaymenu.c b/displaymenu.c index 4b8f274..d4ef064 100644 --- a/displaymenu.c +++ b/displaymenu.c @@ -44,7 +44,7 @@ cNopacityDisplayMenu::~cNopacityDisplayMenu() { delete detailView; } timers.Clear(); - for (int i=0; i<12; i++) + for (int i=0; i<14; i++) cOsdProvider::DropImage(handleBackgrounds[i]); for (int i=0; i<4; i++) cOsdProvider::DropImage(handleButtons[i]); @@ -530,8 +530,9 @@ void cNopacityDisplayMenu::SetItem(const char *Text, int Index, bool Current, bo cNopacityMenuItem *item; cPoint itemSize; if (((MenuCategory() == mcMain)&&(config.narrowMainMenu)) || ((MenuCategory() == mcSetup)&&(config.narrowSetupMenu))){ - item = new cNopacityMainMenuItem(osd, Text, Selectable); - menuView->GetMenuItemSize(mcMain, &itemSize); + bool isSetup = (MenuCategory() == mcSetup)?true:false; + item = new cNopacityMainMenuItem(osd, Text, Selectable, isSetup); + menuView->GetMenuItemSize(MenuCategory(), &itemSize); item->SetFont(menuView->GetMenuItemFont(mcMain)); if (config.useMenuIcons) hasIcons = true; diff --git a/displaymenu.h b/displaymenu.h index 8752cfa..3089f0d 100644 --- a/displaymenu.h +++ b/displaymenu.h @@ -19,7 +19,7 @@ private: int currentNumItems; cList<cNopacityTimer> timers; cList<cNopacityMenuItem> menuItems; - int handleBackgrounds[12]; + int handleBackgrounds[14]; int handleButtons[4]; int positionButtons[4]; cRect videoWindowRect; diff --git a/displaymenuview.c b/displaymenuview.c index 3c856ec..420e5d1 100644 --- a/displaymenuview.c +++ b/displaymenuview.c @@ -62,18 +62,21 @@ void cNopacityDisplayMenuView::SetGeometry(void) { contentWidthChannels = osdWidth * config.menuWidthChannels / 100; contentWidthTimers = osdWidth * config.menuWidthTimers / 100; contentWidthRecordings = osdWidth * config.menuWidthRecordings / 100; + contentWidthSetup = osdWidth * config.menuWidthSetup / 100; contentWidthFull = osdWidth - widthScrollbar - spaceMenu; contentWidthMinimum = Minimum(contentWidthMain, contentWidthSchedules, contentWidthChannels, contentWidthTimers, - contentWidthRecordings); + contentWidthRecordings, + contentWidthSetup); menuItemWidthDefault = contentWidthFull - 4 * spaceMenu; menuItemWidthMain = contentWidthMain - 4*spaceMenu; menuItemWidthSchedule = contentWidthSchedules - 4*spaceMenu; menuItemWidthChannel = contentWidthChannels - 4*spaceMenu; menuItemWidthTimer = contentWidthTimers - 4*spaceMenu; menuItemWidthRecording = contentWidthRecordings - 4*spaceMenu; + menuItemWidthSetup = contentWidthSetup - 4*spaceMenu; menuItemHeightMain = config.iconHeight + 2; menuItemHeightSchedule = config.menuItemLogoHeight + 2; menuItemHeightDefault = contentHeight / config.numDefaultMenuItems - spaceMenu; @@ -120,7 +123,7 @@ int cNopacityDisplayMenuView::GetContentWidth(eMenuCategory menuCat) { return contentWidthFull; case mcSetup: if (config.narrowSetupMenu) - return contentWidthMain; + return contentWidthSetup; else return contentWidthFull; case mcSchedule: @@ -275,10 +278,13 @@ void cNopacityDisplayMenuView::GetMenuItemSize(eMenuCategory menuCat, cPoint *it itemHeight = menuItemHeightDefault; break; case mcMain: - case mcSetup: itemWidth = menuItemWidthMain; itemHeight = menuItemHeightMain; break; + case mcSetup: + itemWidth = menuItemWidthSetup; + itemHeight = menuItemHeightMain; + break; case mcSchedule: case mcScheduleNow: case mcScheduleNext: @@ -408,6 +414,12 @@ void cNopacityDisplayMenuView::CreateBackgroundImages(int *handleBackgrounds, in handleBackgrounds[10] = cOsdProvider::StoreImage(imgLoader.GetImage()); imgLoader.DrawBackground(Theme.Color(clrMenuItemHigh), Theme.Color(clrMenuItemHighBlend), itemSize.X()-2, itemSize.Y()-2); handleBackgrounds[11] = cOsdProvider::StoreImage(imgLoader.GetImage()); + //Setup Menu + GetMenuItemSize(mcSetup, &itemSize); + imgLoader.DrawBackground(Theme.Color(clrMenuItem), Theme.Color(clrMenuItemBlend), itemSize.X()-2, itemSize.Y()-2); + handleBackgrounds[12] = cOsdProvider::StoreImage(imgLoader.GetImage()); + imgLoader.DrawBackground(Theme.Color(clrMenuItemHigh), Theme.Color(clrMenuItemHighBlend), itemSize.X()-2, itemSize.Y()-2); + handleBackgrounds[13] = cOsdProvider::StoreImage(imgLoader.GetImage()); imgLoader.DrawBackground(Theme.Color(clrMenuBack), Theme.Color(clrButtonRed), buttonWidth-4, buttonHeight-4); handleButtons[0] = cOsdProvider::StoreImage(imgLoader.GetImage()); diff --git a/displaymenuview.h b/displaymenuview.h index f090f4f..63af3c8 100644 --- a/displaymenuview.h +++ b/displaymenuview.h @@ -50,6 +50,7 @@ class cNopacityDisplayMenuView { int contentWidthChannels; int contentWidthTimers; int contentWidthRecordings; + int contentWidthSetup; int contentWidthMinimum; int menuItemWidthDefault, menuItemHeightDefault; int menuItemWidthMain, menuItemHeightMain; @@ -57,6 +58,7 @@ class cNopacityDisplayMenuView { int menuItemWidthChannel; int menuItemWidthTimer; int menuItemWidthRecording, menuItemHeightRecordings; + int menuItemWidthSetup; int diskUsageWidth, diskUsageHeight; int timersWidth; int buttonsBorder, buttonWidth, buttonHeight; @@ -37,11 +37,12 @@ static void DrawBlendedBackground(cPixmap *pixmap, tColor color, tColor colorBle } } -static int Minimum(int a, int b, int c, int d, int e) { +static int Minimum(int a, int b, int c, int d, int e, int f) { int min = a; if (b < min) min = b; if (c < min) min = c; if (d < min) min = d; if (e < min) min = e; + if (f < min) min = f; return min; }
\ No newline at end of file @@ -193,7 +193,8 @@ void cNopacityMenuItem::DrawRoundedCorners(tColor borderColor) { } // cNopacityMainMenuItem ------------- -cNopacityMainMenuItem::cNopacityMainMenuItem(cOsd *osd, const char *text, bool sel) : cNopacityMenuItem (osd, text, sel) { +cNopacityMainMenuItem::cNopacityMainMenuItem(cOsd *osd, const char *text, bool sel, bool setup) : cNopacityMenuItem (osd, text, sel) { + this->isSetup = setup; } cNopacityMainMenuItem::~cNopacityMainMenuItem(void) { @@ -326,7 +327,11 @@ void cNopacityMainMenuItem::SetTextShort(void) { void cNopacityMainMenuItem::Render() { pixmap->Fill(Theme.Color(clrMenuBorder)); - int handleBgrd = (current)?handleBackgrounds[3]:handleBackgrounds[2]; + int handleBgrd; + if (!isSetup) + handleBgrd = (current)?handleBackgrounds[3]:handleBackgrounds[2]; + else + handleBgrd = (current)?handleBackgrounds[13]:handleBackgrounds[12]; pixmap->DrawImage(cPoint(1, 1), handleBgrd); if (config.roundedCorners) DrawRoundedCorners(Theme.Color(clrMenuBorder)); @@ -58,6 +58,7 @@ public: class cNopacityMainMenuItem : public cNopacityMenuItem { private: + bool isSetup; cString menuNumber; cString menuEntry; std::string strEntry; @@ -67,7 +68,7 @@ private: void SetTextFull(void); void SetTextShort(void); public: - cNopacityMainMenuItem(cOsd *osd, const char *text, bool sel); + cNopacityMainMenuItem(cOsd *osd, const char *text, bool sel, bool setup); ~cNopacityMainMenuItem(void); void CreatePixmapTextScroller(int totalWidth); void CreateText(void); diff --git a/po/de_DE.po b/po/de_DE.po index 4f96357..e53e348 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-02-27 16:55+0100\n" +"POT-Creation-Date: 2013-03-09 15:43+0100\n" "PO-Revision-Date: 2012-11-11 17:49+0200\n" "Last-Translator: louis\n" "Language-Team: \n" @@ -65,11 +65,20 @@ msgstr "Schriftart" msgid "VDR Menu: Common Settings" msgstr "VDR Menü: Allgemeine Einstellungen" -msgid "VDR Menu: Dimensions Settings" -msgstr "VDR Menü: Größeneinstellungen" +msgid "VDR Menu: Main and Setup Menu" +msgstr "VDR Menü: Haupt- und Setup Menü" -msgid "VDR Menu: Font Sizes" -msgstr "VDR Menü: Schriftgrößen" +msgid "VDR Menu: Schedules Menu" +msgstr "VDR Menü: Programm Menü" + +msgid "VDR Menu: Channels Menu" +msgstr "VDR Menü: Kanal Menü" + +msgid "VDR Menu: Timers Menu" +msgstr "VDR Menü: Timer Menü" + +msgid "VDR Menu: Recordings Menu" +msgstr "VDR Menü: Aufzeichnungs Menü" msgid "Channel Switching" msgstr "Kanalwechsel" @@ -89,15 +98,6 @@ msgstr "rechts" msgid "left" msgstr "links" -msgid "never" -msgstr "nie" - -msgid "if exists" -msgstr "falls vorhanden" - -msgid "always" -msgstr "immer" - msgid "off" msgstr "aus" @@ -113,143 +113,155 @@ msgstr "schnell" msgid "Number of Default Menu Entries per Page" msgstr "Anzahl der Default-Menüelemente pro Seite" +msgid "Adjust Font Size - Default Menu Item" +msgstr "Schriftgröße anpassen - Default Menübuttons" + msgid "Adjustment of narrow menus" msgstr "Ausrichtung der schmalen Menüs" -msgid "Use narrow main menu" -msgstr "Schmales Hauptmenü verwenden" - -msgid "Use narrow schedules menu" -msgstr "Schmales Programm Menü verwenden" - -msgid "Use narrow channel menu" -msgstr "Schmales Kanalmenü verwenden" - -msgid "Use narrow timer menu" -msgstr "Schmales Timermenü verwenden" +msgid "Scale Video size to fit into menu window" +msgstr "TV-Bildgröße in Menüfenster einpassen" -msgid "Use narrow recording menu" -msgstr "Schmales Aufzeichnungsmenü verwenden" +msgid "Header Height (Percent of OSD Height)" +msgstr "Header Höhe (in Prozent der OSD Höhe)" -msgid "Use narrow setup menu" -msgstr "Schmales Setup Menü verwenden" +msgid "Header Icon Size (Square Header Menu Icons)" +msgstr "Größe der quadratischen Headericons" -msgid "Scale Video size to fit into menu window" -msgstr "TV-Bildgröße in Menüfenster einpassen" +msgid "Footer Height (Percent of OSD Height)" +msgstr "Footer Höhe (in Prozent der OSD Höhe)" msgid "Rounded Corners for menu items and buttons" msgstr "Abgerundete Ecken für Menüelemente und Buttons" +msgid "Radius of rounded corners" +msgstr "Radius der abgerundeten Ecken" + msgid "Fade-In Time in ms (Zero for switching off fading)" msgstr "Fade-In Zeit in ms (Null zum Abschalten)" -msgid "Use menu icons in main and setup menu" -msgstr "Menü Icons im Haupt- und Setupmenü benutzen" - -msgid "Display Disk Usage in main menu" -msgstr "Festplattenstatus im Hauptmenü anzeigen" - -msgid "Display Timers in main menu" -msgstr "Timer im Hauptmenü anzeigen" - -msgid "Show Timer Conflicts in main menu" -msgstr "Timerkonflikte im Hauptmenü anzeigen" - msgid "Menu Items Scrolling Speed" msgstr "Scroll Geschwindigkeit der Menüelemente" msgid "Menu Items Scrolling Delay in s" msgstr "Scroll Verzögerung der Menüelemente in s" -msgid "EPG Window Fade-In Time in ms (Zero for switching off fading)" -msgstr "Fade-In Zeit des EPG Fensters in ms (Null zum Abschalten)" +msgid "Adjust Font Size - Header" +msgstr "Schriftgröße anpassen - Header" -msgid "EPG Window Display Delay in s" -msgstr "Anzeigeverzögerung des EPG Fensters in s" +msgid "Adjust Font Size - Date" +msgstr "Schriftgröße anpassen - Datum und Uhrzeit" -msgid "EPG Window Scroll Delay in s" -msgstr "Scroll Verzögerung des EPG Fensters in s" +msgid "Adjust Font Size - Color Buttons" +msgstr "Schriftgröße anpassen - Farbbuttons" -msgid "EPG Window Text Scrolling Speed" -msgstr "Text Scroll Geschwindigkeit des EPG Fensters" +msgid "Adjust Font Size - Messages" +msgstr "Schriftgröße anpassen - Nachrichten" -msgid "Display Reruns in detailed EPG View" -msgstr "Wiederholungen in der detailierten EPG Ansicht anzeigen" +msgid "Adjust Font Size - Detail View Text" +msgstr "Schriftgröße anpassen - Text EPG Detailanzeige" -msgid "Number of reruns to display" -msgstr "Anzahl der dargestellten Wiederholungen" +msgid "Adjust Font Size - Detail View Header" +msgstr "Schriftgröße anpassen - Header EPG Detailanzeige" -msgid "Use Subtitle for reruns" -msgstr "Untertitel für Wiederholungssuche nutzen" +msgid "Adjust Font Size - Detail View Header Large" +msgstr "Schriftgröße anpassen - Header Groß EPG Detailanzeige" -msgid "Display additional EPG Pictures in detailed EPG View" -msgstr "Weitere EPG Bilder in der detaillierten EPG Ansicht anzeigen" +msgid "Use narrow main menu" +msgstr "Schmales Hauptmenü verwenden" -msgid "Number of EPG pictures to display" -msgstr "Anzahl der zusätzlichen EPG Bilder" +msgid "Width (Percent of OSD Width)" +msgstr "Breite (Prozent der OSD Breite)" -msgid "Display additional EPG Pictures in detailed recording View" -msgstr "Weitere EPG Bilder in der detaillierten Aufnahmeansicht anzeigen" +msgid "Use narrow setup menu" +msgstr "Schmales Setup Menü verwenden" -msgid "Width of Main and Setup Menu (Percent of OSD Width)" -msgstr "Breite des Haupt und Setup Menüs (Proz. der OSD Breite)" +msgid "Use menu icons" +msgstr "Menü Icons benutzen" -msgid "Width of Schedules Menu (Percent of OSD Width)" -msgstr "Breite des Programm Menüs (Proz. der OSD Breite)" +msgid "Icon Size (Square)" +msgstr "Icon Größe (quadratisch)" -msgid "Width of Channels Menu (Percent of OSD Width)" -msgstr "Breite des Kanalmenüs (Proz. der OSD Breite)" +msgid "Display Disk Usage" +msgstr "Festplattenstatus anzeigen" -msgid "Width of Timers Menu (Percent of OSD Width)" -msgstr "Breite des Timermenüs (Proz. der OSD Breite)" +msgid "Size (square, Percent of OSD Width)" +msgstr "Größe (quadr., Proz. der OSD Breite)" -msgid "Width of Recordings Menu (Percent of OSD Width)" -msgstr "Breite des Aufzeichnugsmenüs (Proz. der OSD Breite)" +msgid "Adjust Font Size - free" +msgstr "Schriftgröße anpassen - frei" -msgid "Radius of rounded corners" -msgstr "Radius der abgerundeten Ecken" +msgid "Adjust Font Size - percent" +msgstr "Schriftgröße anpassen - Prozent" -msgid "Size of Disc Usage (square, Percent of OSD Width)" -msgstr "Größe des Festplattenstatus (quadratisch, Proz. der OSD Breite)" +msgid "Display Timers" +msgstr "Timer anzeigen" -msgid "Width of Timers Display (Percent of OSD Width)" -msgstr "Breite der Timeranzeige (Proz. der OSD Breite)" +msgid "Width of Timers (Percent of OSD Width)" +msgstr "Breite der Timer (Proz. der OSD Breite)" -msgid "Height of EPG Info Window (Percent of OSD Height)" -msgstr "Höhe des EPG Info Fensters (Proz. der OSD Höhe)" +msgid "Channel Logo Width" +msgstr "Breite der Kanallogos" -msgid "Header Height (Percent of OSD Height)" -msgstr "Header Höhe (in Prozent der OSD Höhe)" +msgid "Channel Logo Height" +msgstr "Höhe der Kanallogos" -msgid "Footer Height (Percent of OSD Height)" -msgstr "Footer Höhe (in Prozent der OSD Höhe)" +msgid "Adjust Font Size - Title" +msgstr "Schriftgröße anpassen - Titel" -msgid "Icon Size (Square Main Menu Icons)" -msgstr "Größe der quadratischen Hauptmenü Icons" +msgid "Show Timer Conflicts" +msgstr "Timer Konflikte anzeigen" -msgid "Header Icon Size (Square Header Menu Icons)" -msgstr "Größe der quadratischen Headericons" +msgid "Header Logo Width" +msgstr "Header Logo Breite" + +msgid "Header Logo Height" +msgstr "Header Logo Höhe" -msgid "Channel Logo Width (on the Menu Buttons)" -msgstr "Breite der Kanallogos auf den Menübuttons" +msgid "Adjust Font Size - Menu Items" +msgstr "Schriftgröße anpassen - Menüelemente" + +msgid "never" +msgstr "nie" + +msgid "if exists" +msgstr "falls vorhanden" -msgid "Channel Logo Height (on the Menu Buttons)" -msgstr "Höhe der Kanallogos auf den Menübuttons" +msgid "always" +msgstr "immer" -msgid "Channel Logo Width (on timers in main menu)" -msgstr "Breite der Kanallogos auf den Timern im Hauptmenü" +msgid "Use narrow menu" +msgstr "Schmales Menü verwenden" -msgid "Channel Logo Height (on timers in main menu)" -msgstr "Höhe der Kanallogos auf den Timern im Hauptmenü" +msgid "EPG Window Fade-In Time in ms (Zero for switching off fading)" +msgstr "Fade-In Zeit des EPG Fensters in ms (Null zum Abschalten)" -msgid "Main Menu Header Logo Width" -msgstr "Höhe des Logos im Hauptmenü" +msgid "EPG Window Display Delay in s" +msgstr "Anzeigeverzögerung des EPG Fensters in s" -msgid "Main Menu Header Logo Height" -msgstr "Breite des Logos im Hauptmenü" +msgid "EPG Window Scroll Delay in s" +msgstr "Scroll Verzögerung des EPG Fensters in s" -msgid "Recordings Menu Folder Icon Size" -msgstr "Ordner Icon Größe im Aufnahmeverzeichnis" +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)" + +msgid "Display Reruns in detailed EPG View" +msgstr "Wiederholungen in der detailierten EPG Ansicht anzeigen" + +msgid "Number of reruns to display" +msgstr "Anzahl der dargestellten Wiederholungen" + +msgid "Use Subtitle for reruns" +msgstr "Untertitel für Wiederholungssuche nutzen" + +msgid "Display additional EPG Pictures in detailed EPG View" +msgstr "Weitere EPG Bilder in der detaillierten EPG Ansicht anzeigen" + +msgid "Number of EPG pictures to display" +msgstr "Anzahl der zusätzlichen EPG Bilder" msgid "Detail EPG View Logo Width" msgstr "Breite der Kanallogos in der EPG Detailanzeige" @@ -269,72 +281,21 @@ msgstr "Breite der zusätzlichen EPG Bilder" msgid "Detail EPG View additional EPG Image Height" msgstr "Höhe der zusätzlichen EPG Bilder" -msgid "Adjust Font Size - Header" -msgstr "Schriftgröße anpassen - Header" +msgid "Adjust Font Size - Menu Item" +msgstr "Schriftgröße anpassen - Menüelement" -msgid "Adjust Font Size - Date" -msgstr "Schriftgröße anpassen - Datum und Uhrzeit" - -msgid "Adjust Font Size - Large Menu Item" -msgstr "Schriftgröße anpassen - Große Menübuttons" - -msgid "Adjust Font Size - Schedule Menu Item" -msgstr "Schriftgröße anpassen - Programmübersicht Menübuttons" - -msgid "Adjust Font Size - Schedule Menu Item Small" -msgstr "Schriftgröße anpassen - Programmübersicht Menübuttons klein" - -msgid "Adjust Font Size - Channels Menu Item" -msgstr "Schriftgröße anpassen - Kanäle Menübuttons" - -msgid "Adjust Font Size - Channels Menu Item Small" -msgstr "Schriftgröße anpassen - Kanäle Menübuttons klein" - -msgid "Adjust Font Size - Recordings Menu Item" -msgstr "Schriftgröße anpassen - Aufzeichnungen Menübuttons" - -msgid "Adjust Font Size - Recordings Menu Item Small" -msgstr "Schriftgröße anpassen - Aufzeichnungen Menübuttons klein" - -msgid "Adjust Font Size - Timers Menu Item" -msgstr "Schriftgröße anpassen - Timer Menübuttons" - -msgid "Adjust Font Size - Timers Menu Item Small" -msgstr "Schriftgröße anpassen - Timer Menübuttons klein" - -msgid "Adjust Font Size - Default Menu Item" -msgstr "Schriftgröße anpassen - Default Menübuttons" - -msgid "Adjust Font Size - Disc Usage (free)" -msgstr "Schriftgröße anpassen - Festplatte frei" - -msgid "Adjust Font Size - Disc Usage (percent)" -msgstr "Schriftgröße anpassen - Festplatte Prozent" - -msgid "Adjust Font Size - Timers Header" -msgstr "Schriftgröße anpassen - Timer Header" - -msgid "Adjust Font Size - Timers Title" -msgstr "Schriftgröße anpassen - Timer Name" - -msgid "Adjust Font Size - Color Buttons" -msgstr "Schriftgröße anpassen - Farbbuttons" - -msgid "Adjust Font Size - Messages" -msgstr "Schriftgröße anpassen - Nachrichten" - -msgid "Adjust Font Size - Detail View Text" -msgstr "Schriftgröße anpassen - Text EPG Detailanzeige" - -msgid "Adjust Font Size - Detail View Header" -msgstr "Schriftgröße anpassen - Header EPG Detailanzeige" - -msgid "Adjust Font Size - Detail View Header Large" -msgstr "Schriftgröße anpassen - Header Groß EPG Detailanzeige" +msgid "Adjust Font Size - Menu Item Small" +msgstr "Schriftgröße anpassen - Menüelement klein" msgid "Adjust Font Size - EPG Info Window" msgstr "Schriftgröße anpassen - EPG Infofenster" +msgid "Display additional EPG Pictures in detailed recording View" +msgstr "Weitere EPG Bilder in der detaillierten Aufnahmeansicht anzeigen" + +msgid "Folder Icon Size" +msgstr "Order Icon Größe" + msgid "Hight of Channel Display (Percent of OSD Height)" msgstr "Höhe der Kanalwechsel Anzeige (Proz. der OSD Höhe)" @@ -344,12 +305,6 @@ msgstr "Breite des linken und rechten Rands" msgid "Bottom Border Height" msgstr "Höhe des unteren Rands" -msgid "Channel Logo Width" -msgstr "Breite der Kanallogos" - -msgid "Channel Logo Height" -msgstr "Höhe der Kanallogos" - msgid "Channel Logo Border" msgstr "Rand um die Kanallogos" @@ -414,4 +369,4 @@ msgid "conflict" msgstr "Konflikt" msgid "conflicts" -msgstr "Konflikte" +msgstr "Konflikte"
\ No newline at end of file @@ -16,8 +16,11 @@ void cNopacitySetup::Setup(void) { Clear(); Add(new cMenuEditStraItem(tr("Font"), &tmpNopacityConfig.fontIndex, fontNames.Size(), &fontNames[0])); Add(new cOsdItem(tr("VDR Menu: Common Settings"))); - Add(new cOsdItem(tr("VDR Menu: Dimensions Settings"))); - Add(new cOsdItem(tr("VDR Menu: Font Sizes"))); + Add(new cOsdItem(tr("VDR Menu: Main and Setup Menu"))); + Add(new cOsdItem(tr("VDR Menu: Schedules Menu"))); + Add(new cOsdItem(tr("VDR Menu: Channels Menu"))); + Add(new cOsdItem(tr("VDR Menu: Timers Menu"))); + Add(new cOsdItem(tr("VDR Menu: Recordings Menu"))); Add(new cOsdItem(tr("Channel Switching"))); Add(new cOsdItem(tr("Replay"))); Add(new cOsdItem(tr("Audio Tracks"))); @@ -38,10 +41,16 @@ eOSState cNopacitySetup::ProcessKey(eKeys Key) { const char* ItemText = Get(Current())->Text(); if (strcmp(ItemText, tr("VDR Menu: Common Settings")) == 0) state = AddSubMenu(new cNopacitySetupMenuDisplay(&tmpNopacityConfig)); - if (strcmp(ItemText, tr("VDR Menu: Dimensions Settings")) == 0) - state = AddSubMenu(new cNopacitySetupMenuDisplayGeometry(&tmpNopacityConfig)); - if (strcmp(ItemText, tr("VDR Menu: Font Sizes")) == 0) - state = AddSubMenu(new cNopacitySetupMenuDisplayFonts(&tmpNopacityConfig)); + if (strcmp(ItemText, tr("VDR Menu: Main and Setup Menu")) == 0) + state = AddSubMenu(new cNopacitySetupMenuDisplayMain(&tmpNopacityConfig)); + if (strcmp(ItemText, tr("VDR Menu: Schedules Menu")) == 0) + state = AddSubMenu(new cNopacitySetupMenuDisplaySchedules(&tmpNopacityConfig)); + if (strcmp(ItemText, tr("VDR Menu: Channels Menu")) == 0) + state = AddSubMenu(new cNopacitySetupMenuDisplayChannels(&tmpNopacityConfig)); + if (strcmp(ItemText, tr("VDR Menu: Timers Menu")) == 0) + state = AddSubMenu(new cNopacitySetupMenuDisplayTimers(&tmpNopacityConfig)); + if (strcmp(ItemText, tr("VDR Menu: Recordings Menu")) == 0) + state = AddSubMenu(new cNopacitySetupMenuDisplayRecordings(&tmpNopacityConfig)); if (strcmp(ItemText, tr("Channel Switching")) == 0) state = AddSubMenu(new cNopacitySetupChannelDisplay(&tmpNopacityConfig)); if (strcmp(ItemText, tr("Replay")) == 0) @@ -124,6 +133,7 @@ void cNopacitySetup::Store(void) { SetupStore("menuWidthChannels", config.menuWidthChannels); SetupStore("menuWidthTimers", config.menuWidthTimers); SetupStore("menuWidthRecordings", config.menuWidthRecordings); + SetupStore("menuWidthSetup", config.menuWidthSetup); SetupStore("menuWidthRightItems", config.menuWidthRightItems); SetupStore("menuSizeDiskUsage", config.menuSizeDiskUsage); SetupStore("menuHeightInfoWindow", config.menuHeightInfoWindow); @@ -180,6 +190,7 @@ void cNopacitySetup::Store(void) { cMenuSetupSubMenu::cMenuSetupSubMenu(const char* Title, cNopacityConfig* data) : cOsdMenu(Title, 30) { tmpNopacityConfig = data; + spacer = " "; } cOsdItem *cMenuSetupSubMenu::InfoItem(const char *label, const char *value) { @@ -199,6 +210,8 @@ eOSState cMenuSetupSubMenu::ProcessKey(eKeys Key) { break; } } + if ((Key == kLeft)||(Key == kRight)) + Set(); return state; } @@ -207,9 +220,6 @@ eOSState cMenuSetupSubMenu::ProcessKey(eKeys Key) { cNopacitySetupMenuDisplay::cNopacitySetupMenuDisplay(cNopacityConfig* data) : cMenuSetupSubMenu(tr("VDR Menu: Common Settings"), data) { adjustLeft[0] = tr("right"); adjustLeft[1] = tr("left"); - useSubtitleRerunTexts[0] = tr("never"); - useSubtitleRerunTexts[1] = tr("if exists"); - useSubtitleRerunTexts[2] = tr("always"); scrollSpeed[0] = tr("off"); scrollSpeed[1] = tr("slow"); scrollSpeed[2] = tr("medium"); @@ -221,108 +231,181 @@ void cNopacitySetupMenuDisplay::Set(void) { int currentItem = Current(); Clear(); Add(new cMenuEditIntItem(tr("Number of Default Menu Entries per Page"), &tmpNopacityConfig->numDefaultMenuItems, 10, 40)); + Add(new cMenuEditIntItem(tr("Adjust Font Size - Default Menu Item"), &tmpNopacityConfig->fontMenuitemDefault, -20, 20)); Add(new cMenuEditStraItem(tr("Adjustment of narrow menus"), &tmpNopacityConfig->menuAdjustLeft, 2, adjustLeft)); - Add(new cMenuEditBoolItem(tr("Use narrow main menu"), &tmpNopacityConfig->narrowMainMenu)); - Add(new cMenuEditBoolItem(tr("Use narrow schedules menu"), &tmpNopacityConfig->narrowScheduleMenu)); - Add(new cMenuEditBoolItem(tr("Use narrow channel menu"), &tmpNopacityConfig->narrowChannelMenu)); - Add(new cMenuEditBoolItem(tr("Use narrow timer menu"), &tmpNopacityConfig->narrowTimerMenu)); - Add(new cMenuEditBoolItem(tr("Use narrow recording menu"), &tmpNopacityConfig->narrowRecordingMenu)); - Add(new cMenuEditBoolItem(tr("Use narrow setup menu"), &tmpNopacityConfig->narrowSetupMenu)); Add(new cMenuEditBoolItem(tr("Scale Video size to fit into menu window"), &tmpNopacityConfig->scalePicture)); + Add(new cMenuEditIntItem(tr("Header Height (Percent of OSD Height)"), &tmpNopacityConfig->headerHeight, 0, 30)); + Add(new cMenuEditIntItem(tr("Header Icon Size (Square Header Menu Icons)"), &tmpNopacityConfig->headerIconHeight, 30, 200)); + Add(new cMenuEditIntItem(tr("Footer Height (Percent of OSD Height)"), &tmpNopacityConfig->footerHeight, 0, 30)); Add(new cMenuEditBoolItem(tr("Rounded Corners for menu items and buttons"), &tmpNopacityConfig->roundedCorners)); + if (tmpNopacityConfig->roundedCorners) + Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Radius of rounded corners")), &tmpNopacityConfig->cornerRadius, 5, 30)); Add(new cMenuEditIntItem(tr("Fade-In Time in ms (Zero for switching off fading)"), &tmpNopacityConfig->menuFadeTime, 0, 1000)); - Add(new cMenuEditBoolItem(tr("Use menu icons in main and setup menu"), &tmpNopacityConfig->useMenuIcons)); - Add(new cMenuEditBoolItem(tr("Display Disk Usage in main menu"), &tmpNopacityConfig->showDiscUsage)); - Add(new cMenuEditBoolItem(tr("Display Timers in main menu"), &tmpNopacityConfig->showTimers)); - Add(new cMenuEditBoolItem(tr("Show Timer Conflicts in main menu"), &tmpNopacityConfig->checkTimerConflict)); Add(new cMenuEditStraItem(tr("Menu Items Scrolling Speed"), &tmpNopacityConfig->menuScrollSpeed, 4, scrollSpeed)); Add(new cMenuEditIntItem(tr("Menu Items Scrolling Delay in s"), &tmpNopacityConfig->menuScrollDelay, 0, 3)); - Add(new cMenuEditIntItem(tr("EPG Window Fade-In Time in ms (Zero for switching off fading)"), &tmpNopacityConfig->menuEPGWindowFadeTime, 0, 1000)); - Add(new cMenuEditIntItem(tr("EPG Window Display Delay in s"), &tmpNopacityConfig->menuInfoTextDelay, 0, 10)); - Add(new cMenuEditIntItem(tr("EPG Window Scroll Delay in s"), &tmpNopacityConfig->menuInfoScrollDelay, 0, 10)); - Add(new cMenuEditStraItem(tr("EPG Window Text Scrolling Speed"), &tmpNopacityConfig->menuInfoScrollSpeed, 4, scrollSpeed)); - Add(new cMenuEditBoolItem(tr("Display Reruns in detailed EPG View"), &tmpNopacityConfig->displayRerunsDetailEPGView)); - Add(new cMenuEditIntItem(tr("Number of reruns to display"), &tmpNopacityConfig->numReruns, 1, 10)); - Add(new cMenuEditStraItem(tr("Use Subtitle for reruns"), &tmpNopacityConfig->useSubtitleRerun, 3, useSubtitleRerunTexts)); - Add(new cMenuEditBoolItem(tr("Display additional EPG Pictures in detailed EPG View"), &tmpNopacityConfig->displayAdditionalEPGPictures)); - Add(new cMenuEditIntItem(tr("Number of EPG pictures to display"), &tmpNopacityConfig->numAdditionalEPGPictures, 1, 9)); - Add(new cMenuEditBoolItem(tr("Display additional EPG Pictures in detailed recording View"), &tmpNopacityConfig->displayAdditionalRecEPGPictures)); - Add(new cMenuEditIntItem(tr("Number of EPG pictures to display"), &tmpNopacityConfig->numAdditionalRecEPGPictures, 1, 9)); + Add(new cMenuEditIntItem(tr("Adjust Font Size - Header"), &tmpNopacityConfig->fontHeader, -20, 20)); + Add(new cMenuEditIntItem(tr("Adjust Font Size - Date"), &tmpNopacityConfig->fontDate, -20, 20)); + Add(new cMenuEditIntItem(tr("Adjust Font Size - Color Buttons"), &tmpNopacityConfig->fontButtons, -20, 20)); + Add(new cMenuEditIntItem(tr("Adjust Font Size - Messages"), &tmpNopacityConfig->fontMessageMenu, -20, 20)); + Add(new cMenuEditIntItem(tr("Adjust Font Size - Detail View Text"), &tmpNopacityConfig->fontDetailView, -20, 20)); + Add(new cMenuEditIntItem(tr("Adjust Font Size - Detail View Header"), &tmpNopacityConfig->fontDetailViewHeader, -20, 20)); + Add(new cMenuEditIntItem(tr("Adjust Font Size - Detail View Header Large"), &tmpNopacityConfig->fontDetailViewHeaderLarge, -20, 20)); + + SetCurrent(Get(currentItem)); + Display(); +} + +//-----MenuDisplay Main and Setup Menu ------------------------------------------------------------------------------------------------------------- + +cNopacitySetupMenuDisplayMain::cNopacitySetupMenuDisplayMain(cNopacityConfig* data) : cMenuSetupSubMenu(tr("VDR Menu: Main and Setup Menu"), data) { + Set(); +} + +void cNopacitySetupMenuDisplayMain::Set(void) { + int currentItem = Current(); + Clear(); + Add(new cMenuEditBoolItem(tr("Use narrow main menu"), &tmpNopacityConfig->narrowMainMenu)); + if (tmpNopacityConfig->narrowMainMenu) + Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width (Percent of OSD Width)")), &tmpNopacityConfig->menuWidthMain, 10, 100)); + Add(new cMenuEditBoolItem(tr("Use narrow setup menu"), &tmpNopacityConfig->narrowSetupMenu)); + if (tmpNopacityConfig->narrowSetupMenu) + Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width (Percent of OSD Width)")), &tmpNopacityConfig->menuWidthSetup, 10, 100)); + + Add(new cMenuEditBoolItem(tr("Use menu icons"), &tmpNopacityConfig->useMenuIcons)); + if (tmpNopacityConfig->useMenuIcons) + Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Icon Size (Square)")), &tmpNopacityConfig->iconHeight, 30, 200)); + Add(new cMenuEditBoolItem(tr("Display Disk Usage"), &tmpNopacityConfig->showDiscUsage)); + if (tmpNopacityConfig->showDiscUsage) { + Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Size (square, Percent of OSD Width)")), &tmpNopacityConfig->menuSizeDiskUsage, 2, 100)); + Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Adjust Font Size - free")), &tmpNopacityConfig->fontDiskUsage, -20, 20)); + Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Adjust Font Size - percent")), &tmpNopacityConfig->fontDiskUsagePercent, -20, 20)); + } + Add(new cMenuEditBoolItem(tr("Display Timers"), &tmpNopacityConfig->showTimers)); + if (tmpNopacityConfig->showTimers) { + Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width of Timers (Percent of OSD Width)")), &tmpNopacityConfig->menuWidthRightItems, 5, 100)); + Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Channel Logo Width")), &tmpNopacityConfig->timersLogoWidth, 30, 300)); + Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Channel Logo Height")), &tmpNopacityConfig->timersLogoHeight, 30, 300)); + Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Adjust Font Size - Header")), &tmpNopacityConfig->fontTimersHead, -20, 20)); + Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Adjust Font Size - Title")), &tmpNopacityConfig->fontTimers, -20, 20)); + } + Add(new cMenuEditBoolItem(tr("Show Timer Conflicts"), &tmpNopacityConfig->checkTimerConflict)); + Add(new cMenuEditIntItem(tr("Header Logo Width"), &tmpNopacityConfig->menuHeaderLogoWidth, 30, 500)); + Add(new cMenuEditIntItem(tr("Header Logo Height"), &tmpNopacityConfig->menuHeaderLogoHeight, 30, 500)); + Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Items"), &tmpNopacityConfig->fontMenuitemLarge, -20, 20)); SetCurrent(Get(currentItem)); Display(); } -//-----MenuDisplay Size Settings ------------------------------------------------------------------------------------------------------------- +//-----MenuDisplay Schedules Menu ------------------------------------------------------------------------------------------------------------- -cNopacitySetupMenuDisplayGeometry::cNopacitySetupMenuDisplayGeometry(cNopacityConfig* data) : cMenuSetupSubMenu(tr("VDR Menu: Dimensions Settings"), data) { +cNopacitySetupMenuDisplaySchedules::cNopacitySetupMenuDisplaySchedules(cNopacityConfig* data) : cMenuSetupSubMenu(tr("VDR Menu: Schedules Menu"), data) { + useSubtitleRerunTexts[0] = tr("never"); + useSubtitleRerunTexts[1] = tr("if exists"); + useSubtitleRerunTexts[2] = tr("always"); + scrollSpeed[0] = tr("off"); + scrollSpeed[1] = tr("slow"); + scrollSpeed[2] = tr("medium"); + scrollSpeed[3] = tr("fast"); Set(); } -void cNopacitySetupMenuDisplayGeometry::Set(void) { +void cNopacitySetupMenuDisplaySchedules::Set(void) { int currentItem = Current(); Clear(); - Add(new cMenuEditIntItem(tr("Width of Main and Setup Menu (Percent of OSD Width)"), &tmpNopacityConfig->menuWidthMain, 10, 100)); - Add(new cMenuEditIntItem(tr("Width of Schedules Menu (Percent of OSD Width)"), &tmpNopacityConfig->menuWidthSchedules, 10, 100)); - Add(new cMenuEditIntItem(tr("Width of Channels Menu (Percent of OSD Width)"), &tmpNopacityConfig->menuWidthChannels, 10, 100)); - Add(new cMenuEditIntItem(tr("Width of Timers Menu (Percent of OSD Width)"), &tmpNopacityConfig->menuWidthTimers, 10, 100)); - Add(new cMenuEditIntItem(tr("Width of Recordings Menu (Percent of OSD Width)"), &tmpNopacityConfig->menuWidthRecordings, 10, 100)); - Add(new cMenuEditIntItem(tr("Radius of rounded corners"), &tmpNopacityConfig->cornerRadius, 5, 30)); - Add(new cMenuEditIntItem(tr("Size of Disc Usage (square, Percent of OSD Width)"), &tmpNopacityConfig->menuSizeDiskUsage, 2, 100)); - Add(new cMenuEditIntItem(tr("Width of Timers Display (Percent of OSD Width)"), &tmpNopacityConfig->menuWidthRightItems, 5, 100)); + + Add(new cMenuEditBoolItem(tr("Use narrow menu"), &tmpNopacityConfig->narrowScheduleMenu)); + if (tmpNopacityConfig->narrowScheduleMenu) + Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width (Percent of OSD Width)")), &tmpNopacityConfig->menuWidthSchedules, 10, 100)); + Add(new cMenuEditIntItem(tr("Channel Logo Width"), &tmpNopacityConfig->menuItemLogoWidth, 30, 200)); + Add(new cMenuEditIntItem(tr("Channel Logo Height"), &tmpNopacityConfig->menuItemLogoHeight, 30, 200)); + Add(new cMenuEditIntItem(tr("EPG Window Fade-In Time in ms (Zero for switching off fading)"), &tmpNopacityConfig->menuEPGWindowFadeTime, 0, 1000)); + Add(new cMenuEditIntItem(tr("EPG Window Display Delay in s"), &tmpNopacityConfig->menuInfoTextDelay, 0, 10)); + Add(new cMenuEditIntItem(tr("EPG Window Scroll Delay in s"), &tmpNopacityConfig->menuInfoScrollDelay, 0, 10)); + Add(new cMenuEditStraItem(tr("EPG Window Text Scrolling Speed"), &tmpNopacityConfig->menuInfoScrollSpeed, 4, scrollSpeed)); Add(new cMenuEditIntItem(tr("Height of EPG Info Window (Percent of OSD Height)"), &tmpNopacityConfig->menuHeightInfoWindow, 10, 100)); - Add(new cMenuEditIntItem(tr("Header Height (Percent of OSD Height)"), &tmpNopacityConfig->headerHeight, 0, 30)); - Add(new cMenuEditIntItem(tr("Footer Height (Percent of OSD Height)"), &tmpNopacityConfig->footerHeight, 0, 30)); - Add(new cMenuEditIntItem(tr("Icon Size (Square Main Menu Icons)"), &tmpNopacityConfig->iconHeight, 30, 200)); - Add(new cMenuEditIntItem(tr("Header Icon Size (Square Header Menu Icons)"), &tmpNopacityConfig->headerIconHeight, 30, 200)); - Add(new cMenuEditIntItem(tr("Channel Logo Width (on the Menu Buttons)"), &tmpNopacityConfig->menuItemLogoWidth, 30, 200)); - Add(new cMenuEditIntItem(tr("Channel Logo Height (on the Menu Buttons)"), &tmpNopacityConfig->menuItemLogoHeight, 30, 200)); - Add(new cMenuEditIntItem(tr("Channel Logo Width (on timers in main menu)"), &tmpNopacityConfig->timersLogoWidth, 30, 300)); - Add(new cMenuEditIntItem(tr("Channel Logo Height (on timers in main menu)"), &tmpNopacityConfig->timersLogoHeight, 30, 300)); - Add(new cMenuEditIntItem(tr("Main Menu Header Logo Width"), &tmpNopacityConfig->menuHeaderLogoWidth, 30, 500)); - Add(new cMenuEditIntItem(tr("Main Menu Header Logo Height"), &tmpNopacityConfig->menuHeaderLogoHeight, 30, 500)); - Add(new cMenuEditIntItem(tr("Recordings Menu Folder Icon Size"), &tmpNopacityConfig->menuRecFolderSize, 30, 300)); + Add(new cMenuEditBoolItem(tr("Display Reruns in detailed EPG View"), &tmpNopacityConfig->displayRerunsDetailEPGView)); + if (tmpNopacityConfig->displayRerunsDetailEPGView) { + Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Number of reruns to display")), &tmpNopacityConfig->numReruns, 1, 10)); + Add(new cMenuEditStraItem(cString::sprintf("%s%s", *spacer, tr("Use Subtitle for reruns")), &tmpNopacityConfig->useSubtitleRerun, 3, useSubtitleRerunTexts)); + } + Add(new cMenuEditBoolItem(tr("Display additional EPG Pictures in detailed EPG View"), &tmpNopacityConfig->displayAdditionalEPGPictures)); + if (tmpNopacityConfig->displayAdditionalEPGPictures) + Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Number of EPG pictures to display")), &tmpNopacityConfig->numAdditionalEPGPictures, 1, 9)); Add(new cMenuEditIntItem(tr("Detail EPG View Logo Width"), &tmpNopacityConfig->detailViewLogoWidth, 30, 500)); Add(new cMenuEditIntItem(tr("Detail EPG View Logo Height"), &tmpNopacityConfig->detailViewLogoHeight, 30, 500)); Add(new cMenuEditIntItem(tr("Detail EPG View EPG Image Width"), &tmpNopacityConfig->epgImageWidth, 30, 500)); Add(new cMenuEditIntItem(tr("Detail EPG View EPG Image Height"), &tmpNopacityConfig->epgImageHeight, 30, 500)); Add(new cMenuEditIntItem(tr("Detail EPG View additional EPG Image Width"), &tmpNopacityConfig->epgImageWidthLarge, 100, 800)); Add(new cMenuEditIntItem(tr("Detail EPG View additional EPG Image Height"), &tmpNopacityConfig->epgImageHeightLarge, 100, 800)); + Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item"), &tmpNopacityConfig->fontMenuitemSchedule, -20, 20)); + Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item Small"), &tmpNopacityConfig->fontMenuitemScheduleSmall, -20, 20)); + Add(new cMenuEditIntItem(tr("Adjust Font Size - EPG Info Window"), &tmpNopacityConfig->fontEPGInfoWindow, -20, 20)); + SetCurrent(Get(currentItem)); Display(); } -//-----MenuDisplay Font Sizes ------------------------------------------------------------------------------------------------------------- +//-----MenuDisplay Channels Menu ------------------------------------------------------------------------------------------------------------- -cNopacitySetupMenuDisplayFonts::cNopacitySetupMenuDisplayFonts(cNopacityConfig* data) : cMenuSetupSubMenu(tr("VDR Menu: Font Sizes"), data) { +cNopacitySetupMenuDisplayChannels::cNopacitySetupMenuDisplayChannels(cNopacityConfig* data) : cMenuSetupSubMenu(tr("VDR Menu: Channels Menu"), data) { Set(); } -void cNopacitySetupMenuDisplayFonts::Set(void) { +void cNopacitySetupMenuDisplayChannels::Set(void) { int currentItem = Current(); Clear(); - Add(new cMenuEditIntItem(tr("Adjust Font Size - Header"), &tmpNopacityConfig->fontHeader, -20, 20)); - Add(new cMenuEditIntItem(tr("Adjust Font Size - Date"), &tmpNopacityConfig->fontDate, -20, 20)); - Add(new cMenuEditIntItem(tr("Adjust Font Size - Large Menu Item"), &tmpNopacityConfig->fontMenuitemLarge, -20, 20)); - Add(new cMenuEditIntItem(tr("Adjust Font Size - Schedule Menu Item"), &tmpNopacityConfig->fontMenuitemSchedule, -20, 20)); - Add(new cMenuEditIntItem(tr("Adjust Font Size - Schedule Menu Item Small"), &tmpNopacityConfig->fontMenuitemScheduleSmall, -20, 20)); - Add(new cMenuEditIntItem(tr("Adjust Font Size - Channels Menu Item"), &tmpNopacityConfig->fontMenuitemChannel, -20, 20)); - Add(new cMenuEditIntItem(tr("Adjust Font Size - Channels Menu Item Small"), &tmpNopacityConfig->fontMenuitemChannelSmall, -20, 20)); - Add(new cMenuEditIntItem(tr("Adjust Font Size - Recordings Menu Item"), &tmpNopacityConfig->fontMenuitemRecordings, -20, 20)); - Add(new cMenuEditIntItem(tr("Adjust Font Size - Recordings Menu Item Small"), &tmpNopacityConfig->fontMenuitemRecordingsSmall, -20, 20)); - Add(new cMenuEditIntItem(tr("Adjust Font Size - Timers Menu Item"), &tmpNopacityConfig->fontMenuitemTimers, -20, 20)); - Add(new cMenuEditIntItem(tr("Adjust Font Size - Timers Menu Item Small"), &tmpNopacityConfig->fontMenuitemTimersSmall, -20, 20)); - Add(new cMenuEditIntItem(tr("Adjust Font Size - Default Menu Item"), &tmpNopacityConfig->fontMenuitemDefault, -20, 20)); - Add(new cMenuEditIntItem(tr("Adjust Font Size - Disc Usage (free)"), &tmpNopacityConfig->fontDiskUsage, -20, 20)); - Add(new cMenuEditIntItem(tr("Adjust Font Size - Disc Usage (percent)"), &tmpNopacityConfig->fontDiskUsagePercent, -20, 20)); - Add(new cMenuEditIntItem(tr("Adjust Font Size - Timers Header"), &tmpNopacityConfig->fontTimersHead, -20, 20)); - Add(new cMenuEditIntItem(tr("Adjust Font Size - Timers Title"), &tmpNopacityConfig->fontTimers, -20, 20)); - Add(new cMenuEditIntItem(tr("Adjust Font Size - Color Buttons"), &tmpNopacityConfig->fontButtons, -20, 20)); - Add(new cMenuEditIntItem(tr("Adjust Font Size - Messages"), &tmpNopacityConfig->fontMessageMenu, -20, 20)); - Add(new cMenuEditIntItem(tr("Adjust Font Size - Detail View Text"), &tmpNopacityConfig->fontDetailView, -20, 20)); - Add(new cMenuEditIntItem(tr("Adjust Font Size - Detail View Header"), &tmpNopacityConfig->fontDetailViewHeader, -20, 20)); - Add(new cMenuEditIntItem(tr("Adjust Font Size - Detail View Header Large"), &tmpNopacityConfig->fontDetailViewHeaderLarge, -20, 20)); - Add(new cMenuEditIntItem(tr("Adjust Font Size - EPG Info Window"), &tmpNopacityConfig->fontEPGInfoWindow, -20, 20)); + + Add(new cMenuEditBoolItem(tr("Use narrow menu"), &tmpNopacityConfig->narrowChannelMenu)); + if (tmpNopacityConfig->narrowChannelMenu) + Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width (Percent of OSD Width)")), &tmpNopacityConfig->menuWidthChannels, 10, 100)); + Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item"), &tmpNopacityConfig->fontMenuitemChannel, -20, 20)); + Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item Small"), &tmpNopacityConfig->fontMenuitemChannelSmall, -20, 20)); + + SetCurrent(Get(currentItem)); + Display(); +} + +//-----MenuDisplay Timers Menu ------------------------------------------------------------------------------------------------------------- + +cNopacitySetupMenuDisplayTimers::cNopacitySetupMenuDisplayTimers(cNopacityConfig* data) : cMenuSetupSubMenu(tr("VDR Menu: Timers Menu"), data) { + Set(); +} + +void cNopacitySetupMenuDisplayTimers::Set(void) { + int currentItem = Current(); + Clear(); + + Add(new cMenuEditBoolItem(tr("Use narrow menu"), &tmpNopacityConfig->narrowTimerMenu)); + if (tmpNopacityConfig->narrowTimerMenu) + Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width (Percent of OSD Width)")), &tmpNopacityConfig->menuWidthTimers, 10, 100)); + Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item"), &tmpNopacityConfig->fontMenuitemTimers, -20, 20)); + Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item Small"), &tmpNopacityConfig->fontMenuitemTimersSmall, -20, 20)); + + SetCurrent(Get(currentItem)); + Display(); +} + +//-----MenuDisplay Recordings Menu ------------------------------------------------------------------------------------------------------------- + +cNopacitySetupMenuDisplayRecordings::cNopacitySetupMenuDisplayRecordings(cNopacityConfig* data) : cMenuSetupSubMenu(tr("VDR Menu: Recordings Menu"), data) { + Set(); +} + +void cNopacitySetupMenuDisplayRecordings::Set(void) { + int currentItem = Current(); + Clear(); + + Add(new cMenuEditBoolItem(tr("Use narrow menu"), &tmpNopacityConfig->narrowRecordingMenu)); + if (tmpNopacityConfig->narrowRecordingMenu) + Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width (Percent of OSD Width)")), &tmpNopacityConfig->menuWidthRecordings, 10, 100)); + Add(new cMenuEditBoolItem(tr("Display additional EPG Pictures in detailed recording View"), &tmpNopacityConfig->displayAdditionalRecEPGPictures)); + if (tmpNopacityConfig->displayAdditionalRecEPGPictures) + Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Number of EPG pictures to display")), &tmpNopacityConfig->numAdditionalRecEPGPictures, 1, 9)); + Add(new cMenuEditIntItem(tr("Folder Icon Size"), &tmpNopacityConfig->menuRecFolderSize, 30, 300)); + Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item"), &tmpNopacityConfig->fontMenuitemRecordings, -20, 20)); + Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item Small"), &tmpNopacityConfig->fontMenuitemRecordingsSmall, -20, 20)); + SetCurrent(Get(currentItem)); Display(); } @@ -19,6 +19,7 @@ class cNopacitySetup : public cMenuSetupPage { class cMenuSetupSubMenu : public cOsdMenu { protected: cNopacityConfig *tmpNopacityConfig; + cString spacer; virtual eOSState ProcessKey(eKeys Key); virtual void Set(void) = 0; cOsdItem *InfoItem(const char *label, const char *value); @@ -29,25 +30,47 @@ class cMenuSetupSubMenu : public cOsdMenu { class cNopacitySetupMenuDisplay : public cMenuSetupSubMenu { protected: const char *adjustLeft[2]; - const char *useSubtitleRerunTexts[3]; const char *scrollSpeed[4]; void Set(void); public: cNopacitySetupMenuDisplay(cNopacityConfig *data); }; -class cNopacitySetupMenuDisplayGeometry : public cMenuSetupSubMenu { +class cNopacitySetupMenuDisplayMain : public cMenuSetupSubMenu { + protected: + void Set(void); + public: + cNopacitySetupMenuDisplayMain(cNopacityConfig *data); +}; + +class cNopacitySetupMenuDisplaySchedules : public cMenuSetupSubMenu { + protected: + const char *useSubtitleRerunTexts[3]; + const char *scrollSpeed[4]; + void Set(void); + public: + cNopacitySetupMenuDisplaySchedules(cNopacityConfig *data); +}; + +class cNopacitySetupMenuDisplayChannels : public cMenuSetupSubMenu { + protected: + void Set(void); + public: + cNopacitySetupMenuDisplayChannels(cNopacityConfig *data); +}; + +class cNopacitySetupMenuDisplayTimers : public cMenuSetupSubMenu { protected: void Set(void); public: - cNopacitySetupMenuDisplayGeometry(cNopacityConfig *data); + cNopacitySetupMenuDisplayTimers(cNopacityConfig *data); }; -class cNopacitySetupMenuDisplayFonts : public cMenuSetupSubMenu { +class cNopacitySetupMenuDisplayRecordings : public cMenuSetupSubMenu { protected: void Set(void); public: - cNopacitySetupMenuDisplayFonts(cNopacityConfig *data); + cNopacitySetupMenuDisplayRecordings(cNopacityConfig *data); }; class cNopacitySetupChannelDisplay : public cMenuSetupSubMenu { |