summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--HISTORY3
-rw-r--r--config.c10
-rw-r--r--config.h5
-rw-r--r--displaymenu.c56
-rw-r--r--displaymenuview.c24
-rw-r--r--po/de_DE.po29
-rw-r--r--setup.c16
7 files changed, 116 insertions, 27 deletions
diff --git a/HISTORY b/HISTORY
index 8790ba8..a02c1dc 100644
--- a/HISTORY
+++ b/HISTORY
@@ -124,3 +124,6 @@ Version 0.0.7:
- Width of narrow menus (main, schedule, channel, recordings, settings)
individually configurable
- Display of free disk space in recordings menu header
+- Usage of narrow menus (main, schedule, channel, recordings, settings)
+ configurable via plugin setup. If option is set to "no", the "normal"
+ style for this menu will be used.
diff --git a/config.c b/config.c
index 5767ace..1854667 100644
--- a/config.c
+++ b/config.c
@@ -54,6 +54,11 @@ cNopacityConfig::cNopacityConfig() {
fontVolume = 0;
//DisplayMenu
scalePicture = 1;
+ narrowMainMenu = 1;
+ narrowScheduleMenu = 1;
+ narrowChannelMenu = 1;
+ narrowRecordingMenu = 1;
+ narrowSetupMenu = 1;
displayRerunsDetailEPGView = 1;
numReruns = 5;
useSubtitleRerun = 1;
@@ -226,6 +231,11 @@ bool cNopacityConfig::SetupParse(const char *Name, const char *Value) {
else if (strcmp(Name, "menuInfoScrollDelay") == 0) menuInfoScrollDelay = atoi(Value);
else if (strcmp(Name, "menuInfoScrollSpeed") == 0) menuInfoScrollSpeed = atoi(Value);
else if (strcmp(Name, "scalePicture") == 0) scalePicture = atoi(Value);
+ else if (strcmp(Name, "narrowMainMenu") == 0) narrowMainMenu = atoi(Value);
+ else if (strcmp(Name, "narrowScheduleMenu") == 0) narrowScheduleMenu = atoi(Value);
+ else if (strcmp(Name, "narrowChannelMenu") == 0) narrowChannelMenu = atoi(Value);
+ else if (strcmp(Name, "narrowRecordingMenu") == 0) narrowRecordingMenu = atoi(Value);
+ else if (strcmp(Name, "narrowSetupMenu") == 0) narrowSetupMenu = atoi(Value);
else if (strcmp(Name, "displayRerunsDetailEPGView") == 0) displayRerunsDetailEPGView = atoi(Value);
else if (strcmp(Name, "numReruns") == 0) numReruns = atoi(Value);
else if (strcmp(Name, "useSubtitleRerun") == 0) useSubtitleRerun = atoi(Value);
diff --git a/config.h b/config.h
index 7e5a719..fae90e3 100644
--- a/config.h
+++ b/config.h
@@ -76,6 +76,11 @@ class cNopacityConfig {
int fontVolume;
//DisplayMenu
int scalePicture;
+ int narrowMainMenu;
+ int narrowScheduleMenu;
+ int narrowChannelMenu;
+ int narrowRecordingMenu;
+ int narrowSetupMenu;
int displayRerunsDetailEPGView;
int numReruns;
int useSubtitleRerun;
diff --git a/displaymenu.c b/displaymenu.c
index b13e36c..2892fac 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -47,6 +47,8 @@ cNopacityDisplayMenu::~cNopacityDisplayMenu() {
}
void cNopacityDisplayMenu::DrawDisk(void) {
+ if (!config.narrowMainMenu)
+ return;
if (initial || ((menuCategoryLast!=mcMain)&&(MenuCategory()==mcMain)&&!diskUsageDrawn)) {
if (cVideoDiskUsage::HasChanged(lastDiskUsageState)) {
menuView->DrawDiskUsage();
@@ -81,6 +83,8 @@ int cNopacityDisplayMenu::CheckTimerConflict(bool timersChanged) {
}
void cNopacityDisplayMenu::DrawTimers(bool timersChanged, int numConflicts) {
+ if (!config.narrowMainMenu)
+ return;
int maxTimersHeight = menuView->GetTimersMaxHeight();
if (initial || ((menuCategoryLast!=mcMain)&&(MenuCategory()==mcMain)&&!timersDrawn)) {
if (timersChanged) {
@@ -134,13 +138,36 @@ int cNopacityDisplayMenu::MaxItems(void) {
int maxItems = 0;
switch (MenuCategory()) {
case mcMain:
+ if (config.narrowMainMenu)
+ maxItems = menuView->GetMaxItems(MenuCategory());
+ else
+ maxItems = config.numDefaultMenuItems;
+ break;
case mcSetup:
+ if (config.narrowSetupMenu)
+ maxItems = menuView->GetMaxItems(MenuCategory());
+ else
+ maxItems = config.numDefaultMenuItems;
+ break;
case mcSchedule:
case mcScheduleNow:
case mcScheduleNext:
+ if (config.narrowScheduleMenu)
+ maxItems = menuView->GetMaxItems(MenuCategory());
+ else
+ maxItems = config.numDefaultMenuItems;
+ break;
case mcChannel:
+ if (config.narrowChannelMenu)
+ maxItems = menuView->GetMaxItems(MenuCategory());
+ else
+ maxItems = config.numDefaultMenuItems;
+ break;
case mcRecording:
- maxItems = menuView->GetMaxItems(MenuCategory());
+ if (config.narrowRecordingMenu)
+ maxItems = menuView->GetMaxItems(MenuCategory());
+ else
+ maxItems = config.numDefaultMenuItems;
break;
default:
maxItems = config.numDefaultMenuItems;
@@ -297,6 +324,8 @@ void cNopacityDisplayMenu::SetMessage(eMessageType Type, const char *Text) {
bool cNopacityDisplayMenu::SetItemEvent(const cEvent *Event, int Index, bool Current,
bool Selectable, const cChannel *Channel, bool WithDate, eTimerMatch TimerMatch) {
+ if (!config.narrowScheduleMenu)
+ return false;
if ((initMenu)&&(Index > menuItemIndexLast)) {
cNopacityMenuItem *item = new cNopacityScheduleMenuItem(osd, Event, Channel, TimerMatch, Selectable, MenuCategory());
cPoint itemSize;
@@ -337,6 +366,8 @@ bool cNopacityDisplayMenu::SetItemTimer(const cTimer *Timer, int Index, bool Cur
}
bool cNopacityDisplayMenu::SetItemChannel(const cChannel *Channel, int Index, bool Current, bool Selectable, bool WithProvider) {
+ if (!config.narrowChannelMenu)
+ return false;
if ((initMenu)&&(Index > menuItemIndexLast)) {
cNopacityMenuItem *item = new cNopacityChannelMenuItem(osd, Channel, Selectable);
cPoint itemSize;
@@ -372,6 +403,8 @@ bool cNopacityDisplayMenu::SetItemChannel(const cChannel *Channel, int Index, bo
bool cNopacityDisplayMenu::SetItemRecording(const cRecording *Recording, int Index, bool Current, bool Selectable,
int Level, int Total, int New) {
+ if (!config.narrowRecordingMenu)
+ return false;
if ((initMenu)&&(Index > menuItemIndexLast)) {
bool isFolder = false;
if (Total > 0)
@@ -425,18 +458,15 @@ void cNopacityDisplayMenu::SetItem(const char *Text, int Index, bool Current, bo
if (Index > menuItemIndexLast) {
cNopacityMenuItem *item;
cPoint itemSize;
- switch (MenuCategory()) {
- case mcMain:
- case mcSetup:
- item = new cNopacityMainMenuItem(osd, Text, Selectable);
- menuView->GetMenuItemSize(mcMain, &itemSize);
- item->SetFont(menuView->GetMenuItemFont(mcMain));
- hasIcons = true;
- break;
- default:
- item = new cNopacityDefaultMenuItem(osd, Text, Selectable);
- menuView->GetMenuItemSize(mcUnknown, &itemSize);
- item->SetFont(menuView->GetMenuItemFont(mcUnknown));
+ if (((MenuCategory() == mcMain)&&(config.narrowMainMenu)) || ((MenuCategory() == mcSetup)&&(config.narrowSetupMenu))){
+ item = new cNopacityMainMenuItem(osd, Text, Selectable);
+ menuView->GetMenuItemSize(mcMain, &itemSize);
+ item->SetFont(menuView->GetMenuItemFont(mcMain));
+ hasIcons = true;
+ } else {
+ item = new cNopacityDefaultMenuItem(osd, Text, Selectable);
+ menuView->GetMenuItemSize(mcUnknown, &itemSize);
+ item->SetFont(menuView->GetMenuItemFont(mcUnknown));
}
int spaceTop = menuView->GetMenuTop(currentNumItems, itemSize.Y());
item->SetGeometry(Index, spaceTop, menuView->spaceMenu, itemSize.X(), itemSize.Y());
diff --git a/displaymenuview.c b/displaymenuview.c
index 405f0b1..deba02e 100644
--- a/displaymenuview.c
+++ b/displaymenuview.c
@@ -105,16 +105,32 @@ cRect *cNopacityDisplayMenuView::GetDescriptionTextWindowSize(eMenuCategory menu
int cNopacityDisplayMenuView::GetContentWidth(eMenuCategory menuCat) {
switch (menuCat) {
case mcMain:
+ if (config.narrowMainMenu)
+ return contentWidthMain;
+ else
+ return contentWidthFull;
case mcSetup:
- return contentWidthMain;
+ if (config.narrowSetupMenu)
+ return contentWidthMain;
+ else
+ return contentWidthFull;
case mcSchedule:
case mcScheduleNow:
case mcScheduleNext:
- return contentWidthSchedules;
+ if (config.narrowScheduleMenu)
+ return contentWidthSchedules;
+ else
+ return contentWidthFull;
case mcChannel:
- return contentWidthChannels;
+ if (config.narrowChannelMenu)
+ return contentWidthChannels;
+ else
+ return contentWidthFull;
case mcRecording:
- return contentWidthRecordings;
+ if (config.narrowRecordingMenu)
+ return contentWidthRecordings;
+ else
+ return contentWidthFull;
default:
return contentWidthFull;
}
diff --git a/po/de_DE.po b/po/de_DE.po
index 5e1fbbc..e8107c0 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-08 17:20+0100\n"
+"POT-Creation-Date: 2013-02-09 14:02+0100\n"
"PO-Revision-Date: 2012-11-11 17:49+0200\n"
"Last-Translator: louis\n"
"Language-Team: \n"
@@ -107,20 +107,35 @@ msgstr "schnell"
msgid "Number of Default Menu Entries per Page"
msgstr "Anzahl der Default-Menüelemente pro Seite"
+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 recording menu"
+msgstr "Schmales Aufzeichnungsmenü verwenden"
+
+msgid "Use narrow setup menu"
+msgstr "Schmales Setup Menü verwenden"
+
msgid "Scale Video size to fit into menu window"
msgstr "TV-Bildgröße in Menüfenster einpassen"
msgid "Fade-In Time in ms (Zero for switching off fading)"
msgstr "Fade-In Zeit in ms (Null zum Abschalten)"
-msgid "Display Disk Usage"
-msgstr "Festplattenstatus anzeigen"
+msgid "Display Disk Usage in main menu"
+msgstr "Festplattenstatus im Hauptmenü anzeigen"
-msgid "Display Timers"
-msgstr "Timer anzeigen"
+msgid "Display Timers in main menu"
+msgstr "Timer im Hauptmenü anzeigen"
-msgid "Show Timer Conflicts"
-msgstr "Timer Konflikte anzeigen"
+msgid "Show Timer Conflicts in main menu"
+msgstr "Timerkonflikte im Hauptmenü anzeigen"
msgid "Menu Items Scrolling Speed"
msgstr "Scroll Geschwindigkeit der Menüelemente"
diff --git a/setup.c b/setup.c
index d2d4791..fe42533 100644
--- a/setup.c
+++ b/setup.c
@@ -99,6 +99,11 @@ void cNopacitySetup::Store(void) {
SetupStore("volumeBorderBottom", config.volumeBorderBottom);
SetupStore("fontVolume", config.fontVolume);
SetupStore("scalePicture", config.scalePicture);
+ SetupStore("narrowMainMenu", config.narrowMainMenu);
+ SetupStore("narrowScheduleMenu", config.narrowScheduleMenu);
+ SetupStore("narrowChannelMenu", config.narrowChannelMenu);
+ SetupStore("narrowRecordingMenu", config.narrowRecordingMenu);
+ SetupStore("narrowSetupMenu", config.narrowSetupMenu);
SetupStore("displayRerunsDetailEPGView", config.displayRerunsDetailEPGView);
SetupStore("numReruns", config.numReruns);
SetupStore("useSubtitleRerun", config.useSubtitleRerun);
@@ -204,11 +209,16 @@ 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 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 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("Fade-In Time in ms (Zero for switching off fading)"), &tmpNopacityConfig->menuFadeTime, 0, 1000));
- Add(new cMenuEditBoolItem(tr("Display Disk Usage"), &tmpNopacityConfig->showDiscUsage));
- Add(new cMenuEditBoolItem(tr("Display Timers"), &tmpNopacityConfig->showTimers));
- Add(new cMenuEditBoolItem(tr("Show Timer Conflicts"), &tmpNopacityConfig->checkTimerConflict));
+ 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));
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-07 18:21:41 +0000