summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--HISTORY5
-rw-r--r--conf/theme-freestyle.conf1
-rw-r--r--conf/theme-light.conf6
-rw-r--r--config.c7
-rw-r--r--displaymenu.c12
-rw-r--r--displaymenuview.c31
-rw-r--r--displaymenuview.h1
-rw-r--r--geometrymanager.c14
-rw-r--r--geometrymanager.h3
-rw-r--r--imagecache.c10
-rw-r--r--menuitem.c51
-rw-r--r--po/ca_ES.po17
-rw-r--r--po/de_DE.po17
-rw-r--r--po/it_IT.po17
-rw-r--r--po/sk_SK.po17
-rw-r--r--setup.c9
16 files changed, 108 insertions, 110 deletions
diff --git a/HISTORY b/HISTORY
index a3b3f19..d69e693 100644
--- a/HISTORY
+++ b/HISTORY
@@ -337,3 +337,8 @@ Version 0.1.4
- Improved Display of Poster or Banner in displaychannel
- implemented cDisplayChannel::SetMessage()
- display not selectable menu elements with dedicated font color
+- changed way of calculating number of menu items in narrow menus. This
+ value is not calculated by icon sizes anymore, these values are now
+ configurable via plugin setup menu. The number of menu items in
+ schedules menu also sets the number of menu items in channels and
+ timers menu.
diff --git a/conf/theme-freestyle.conf b/conf/theme-freestyle.conf
index 55b49aa..49fd6f7 100644
--- a/conf/theme-freestyle.conf
+++ b/conf/theme-freestyle.conf
@@ -1,5 +1,4 @@
displayType = 2
channelBackgroundTransparency = 20
mainMenuTitleStyle = 1
-menuRecFolderSize = 100
menuWidthRecordings = 40
diff --git a/conf/theme-light.conf b/conf/theme-light.conf
index 061feef..93835d0 100644
--- a/conf/theme-light.conf
+++ b/conf/theme-light.conf
@@ -13,14 +13,11 @@ fontEPGSmallSize = 3
fontHeader = 10
fontMenuitemDefault = -14
fontMenuitemLarge = 5
-fontMenuitemRecordings = -18
-fontMenuitemRecordingsSmall = -6
fontTimers = -4
fontTimersHead = -6
footerHeight = 6
headerHeight = 6
headerIconHeight = 100
-iconHeight = 80
mainMenuTitleStyle = 0
menuSizeDiskUsage = 13
menuWidthChannels = 37
@@ -31,6 +28,9 @@ menuWidthSchedules = 37
menuWidthSetup = 26
menuWidthTimers = 37
numDefaultMenuItems = 12
+numMainMenuItems = 12
+numSchedulesMenuItems = 12
+numRecordingsMenuItems = 12
roundedCorners = 0
scalePicture = 0
showDiscUsage = 0
diff --git a/config.c b/config.c
index f6b3228..816102c 100644
--- a/config.c
+++ b/config.c
@@ -94,12 +94,12 @@ void cNopacityConfig::LoadDefaults(void) {
conf.insert(std::pair<std::string, int>("headerHeight", 7));
conf.insert(std::pair<std::string, int>("footerHeight", 7));
conf.insert(std::pair<std::string, int>("numDefaultMenuItems", 16));
- conf.insert(std::pair<std::string, int>("iconHeight", 100));
+ conf.insert(std::pair<std::string, int>("numMainMenuItems", 10));
+ conf.insert(std::pair<std::string, int>("numSchedulesMenuItems", 10));
+ conf.insert(std::pair<std::string, int>("numRecordingsMenuItems", 10));
conf.insert(std::pair<std::string, int>("headerIconHeight", 80));
conf.insert(std::pair<std::string, int>("menuHeaderLogoWidth", 160));
conf.insert(std::pair<std::string, int>("menuHeaderLogoHeight", 70));
- conf.insert(std::pair<std::string, int>("menuItemLogoWidth", 130));
- conf.insert(std::pair<std::string, int>("menuItemLogoHeight", 100));
conf.insert(std::pair<std::string, int>("timersLogoWidth", 90));
conf.insert(std::pair<std::string, int>("timersLogoHeight", 70));
conf.insert(std::pair<std::string, int>("epgImageWidth", 210));
@@ -108,7 +108,6 @@ void cNopacityConfig::LoadDefaults(void) {
conf.insert(std::pair<std::string, int>("epgImageHeightLarge", 400));
conf.insert(std::pair<std::string, int>("posterWidth", 500));
conf.insert(std::pair<std::string, int>("posterHeight", 750));
- conf.insert(std::pair<std::string, int>("menuRecFolderSize", 128));
conf.insert(std::pair<std::string, int>("useFolderPoster", 1));
conf.insert(std::pair<std::string, int>("borderDetailedEPG", 30));
conf.insert(std::pair<std::string, int>("borderDetailedRecordings", 30));
diff --git a/displaymenu.c b/displaymenu.c
index 29630a5..ba4b5c8 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -164,13 +164,13 @@ int cNopacityDisplayMenu::MaxItems(void) {
switch (MenuCategory()) {
case mcMain:
if (config.GetValue("narrowMainMenu"))
- maxItems = menuView->GetMaxItems(MenuCategory());
+ maxItems = config.GetValue("numMainMenuItems");
else
maxItems = config.GetValue("numDefaultMenuItems");
break;
case mcSetup:
if (config.GetValue("narrowSetupMenu"))
- maxItems = menuView->GetMaxItems(MenuCategory());
+ maxItems = config.GetValue("numMainMenuItems");
else
maxItems = config.GetValue("numDefaultMenuItems");
break;
@@ -178,25 +178,25 @@ int cNopacityDisplayMenu::MaxItems(void) {
case mcScheduleNow:
case mcScheduleNext:
if (config.GetValue("narrowScheduleMenu"))
- maxItems = menuView->GetMaxItems(MenuCategory());
+ maxItems = config.GetValue("numSchedulesMenuItems");
else
maxItems = config.GetValue("numDefaultMenuItems");
break;
case mcChannel:
if (config.GetValue("narrowChannelMenu"))
- maxItems = menuView->GetMaxItems(MenuCategory());
+ maxItems = config.GetValue("numSchedulesMenuItems");
else
maxItems = config.GetValue("numDefaultMenuItems");
break;
case mcTimer:
if (config.GetValue("narrowTimerMenu"))
- maxItems = menuView->GetMaxItems(MenuCategory());
+ maxItems = config.GetValue("numSchedulesMenuItems");
else
maxItems = config.GetValue("numDefaultMenuItems");
break;
case mcRecording:
if (config.GetValue("narrowRecordingMenu"))
- maxItems = menuView->GetMaxItems(MenuCategory());
+ maxItems = config.GetValue("numRecordingsMenuItems");
else
maxItems = config.GetValue("numDefaultMenuItems");
break;
diff --git a/displaymenuview.c b/displaymenuview.c
index 8651ec6..4189ce2 100644
--- a/displaymenuview.c
+++ b/displaymenuview.c
@@ -240,29 +240,6 @@ void cNopacityDisplayMenuView::GetMenuItemSize(eMenuCategory menuCat, cPoint *it
itemSize->Set(itemWidth, itemHeight);
}
-int cNopacityDisplayMenuView::GetMaxItems(eMenuCategory menuCat) {
- int maxItems = 0;
- switch (menuCat) {
- case mcMain:
- case mcSetup:
- maxItems = geoManager->menuContentHeight / (geoManager->menuItemHeightMain + geoManager->menuSpace);
- break;
- case mcSchedule:
- case mcScheduleNow:
- case mcScheduleNext:
- case mcChannel:
- case mcTimer:
- maxItems = geoManager->menuContentHeight / (geoManager->menuItemHeightSchedule + geoManager->menuSpace);
- break;
- case mcRecording:
- maxItems = geoManager->menuContentHeight / (geoManager->menuItemHeightRecordings + geoManager->menuSpace);
- break;
- default:
- maxItems = config.GetValue("numDefaultMenuItems");
- }
- return maxItems;
-}
-
int cNopacityDisplayMenuView::GetMenuTop(int numItems, int itemHeight) {
return geoManager->menuHeaderHeight + (geoManager->menuContentHeight - numItems*(itemHeight + geoManager->menuSpace))/2;
}
@@ -473,8 +450,8 @@ int cNopacityDisplayMenuView::DrawHeaderIcon(eMenuCategory menuCat) {
int cNopacityDisplayMenuView::ShowHeaderIconChannelLogo(const char *Title) {
int left = 0;
- int iconX = (config.GetValue("menuAdjustLeft")) ? 0 : (geoManager->osdWidth - config.GetValue("menuItemLogoWidth"));
- pixmapHeaderIcon = osd->CreatePixmap(2, cRect(iconX, 0, config.GetValue("menuItemLogoWidth"), config.GetValue("menuItemLogoHeight")));
+ int iconX = (config.GetValue("menuAdjustLeft")) ? 0 : (geoManager->osdWidth - geoManager->menuLogoWidth);
+ pixmapHeaderIcon = osd->CreatePixmap(2, cRect(iconX, 0, geoManager->menuLogoWidth, geoManager->menuLogoHeight));
pixmapHeaderIcon->Fill(clrTransparent);
std::string channel = Title;
if (channel.length() == 0)
@@ -485,9 +462,9 @@ int cNopacityDisplayMenuView::ShowHeaderIconChannelLogo(const char *Title) {
channel.erase(0, remove.length());
} catch (...) {}
cImageLoader imgLoader;
- if (imgLoader.LoadLogo(channel.c_str(), config.GetValue("menuItemLogoWidth"), config.GetValue("menuItemLogoHeight"))) {
+ if (imgLoader.LoadLogo(channel.c_str(), geoManager->menuLogoWidth, geoManager->menuLogoHeight)) {
pixmapHeaderIcon->DrawImage(cPoint(0, 0), imgLoader.GetImage());
- left = config.GetValue("menuItemLogoWidth") + geoManager->menuSpace;
+ left = geoManager->menuLogoWidth + geoManager->menuSpace;
}
return left;
}
diff --git a/displaymenuview.h b/displaymenuview.h
index e2c1b5c..e2f64fc 100644
--- a/displaymenuview.h
+++ b/displaymenuview.h
@@ -39,7 +39,6 @@ class cNopacityDisplayMenuView {
void CreatePixmaps(void);
void SetPixmapAlpha(int Alpha);
void GetMenuItemSize(eMenuCategory menuCat, cPoint *itemSize);
- int GetMaxItems(eMenuCategory menuCat);
int GetMenuTop(int numItems, int itemHeight);
int GetMenuItemLeft(int itemWidth);
void SetAvrgFontWidth(void);
diff --git a/geometrymanager.c b/geometrymanager.c
index 17e55f1..20009b7 100644
--- a/geometrymanager.c
+++ b/geometrymanager.c
@@ -69,12 +69,20 @@ void cGeometryManager::SetDisplayMenuSizes() {
menuItemWidthRecording = menuContentWidthRecordings - 4 * config.GetValue("spaceMenu");
menuItemWidthSetup = menuContentWidthSetup - 4 * config.GetValue("spaceMenu");
menuItemWidthTracks = osdWidth * config.GetValue("tracksWidth") / 100 - 4;
- menuItemHeightMain = config.GetValue("iconHeight") + 2;
- menuItemHeightSchedule = config.GetValue("menuItemLogoHeight") + 2;
+ menuItemHeightMain = menuContentHeight / config.GetValue("numMainMenuItems") - config.GetValue("spaceMenu");
+ menuItemHeightSchedule = menuContentHeight / config.GetValue("numSchedulesMenuItems") - config.GetValue("spaceMenu");;
menuItemHeightDefault = menuContentHeight / config.GetValue("numDefaultMenuItems") - config.GetValue("spaceMenu");
- menuItemHeightRecordings = config.GetValue("menuRecFolderSize") + 2;
+ menuItemHeightRecordings = menuContentHeight / config.GetValue("numRecordingsMenuItems") - config.GetValue("spaceMenu");
menuItemHeightTracks = config.GetValue("tracksItemHeight");
+ menuMainMenuIconSize = menuItemHeightMain - 2 * menuSpace;
+ cSize logoSize = ScaleToFit(1000,
+ menuItemHeightSchedule - 2,
+ config.GetValue("logoWidthOriginal"),
+ config.GetValue("logoHeightOriginal"));
+ menuLogoWidth = logoSize.Width();
+ menuLogoHeight = logoSize.Height();
+
menuButtonsBorder = menuFooterHeight / 6;
menuButtonWidth = (osdWidth / 4) - 2 * menuButtonsBorder;
menuButtonHeight = menuFooterHeight - 3 * menuButtonsBorder;
diff --git a/geometrymanager.h b/geometrymanager.h
index cb94eef..fb23a00 100644
--- a/geometrymanager.h
+++ b/geometrymanager.h
@@ -50,6 +50,9 @@ class cGeometryManager {
int menuItemHeightDefault;
int menuItemHeightRecordings;
int menuItemHeightTracks;
+ int menuMainMenuIconSize;
+ int menuLogoWidth;
+ int menuLogoHeight;
int menuButtonsBorder;
int menuButtonWidth;
int menuButtonHeight;
diff --git a/imagecache.c b/imagecache.c
index 9b598bd..111cf20 100644
--- a/imagecache.c
+++ b/imagecache.c
@@ -86,8 +86,8 @@ cImage *cImageCache::GetMenuIcon(std::string name) {
if (hit != menuIconCache.end()) {
return (cImage*)hit->second;
} else {
- int iconWidth = config.GetValue("iconHeight");
- int iconHeight = config.GetValue("iconHeight");
+ int iconWidth = geoManager->menuMainMenuIconSize;
+ int iconHeight = geoManager->menuMainMenuIconSize;
bool success = LoadIcon(ctMenuIcon, name);
if (success) {
InsertIntoIconCache(ctMenuIcon, name, iconWidth, iconHeight);
@@ -239,7 +239,7 @@ std::vector<std::pair<std::string, cPoint> > cImageCache::GetMenuIcons(void) {
mainMenuIcons.push_back("menuIcons/Miscellaneous");
mainMenuIcons.push_back("menuIcons/Plugins");
mainMenuIcons.push_back("menuIcons/Restart");
- int mainMenuIconSize = config.GetValue("iconHeight") - 10;
+ int mainMenuIconSize = geoManager->menuMainMenuIconSize;
for (int i=0; i<mainMenuIcons.size(); i++) {
menuIcons.push_back(std::pair<std::string, cPoint>(mainMenuIcons[i], cPoint(mainMenuIconSize, mainMenuIconSize)));
}
@@ -394,8 +394,8 @@ cPoint cImageCache::LogoSize(eCacheType type) {
height = geoManager->channelLogoHeight;
break;
case ctLogoMenuItem:
- width = config.GetValue("menuItemLogoWidth");
- height = config.GetValue("menuItemLogoHeight");
+ width = geoManager->menuLogoWidth;
+ height = geoManager->menuLogoHeight;
break;
case ctLogoTimer:
width = config.GetValue("timersLogoWidth");
diff --git a/menuitem.c b/menuitem.c
index b588d54..e271fd8 100644
--- a/menuitem.c
+++ b/menuitem.c
@@ -109,13 +109,13 @@ void cNopacityMenuItem::DrawDelimiter(const char *del, const char *icon, eSkinEl
DrawRoundedCorners(Theme.Color(clrSeparatorBorder));
}
if (!drawn) {
- cImage *imgIcon = imgCache->GetSkinIcon(icon, config.GetValue("iconHeight"), config.GetValue("iconHeight"));
+ cImage *imgIcon = imgCache->GetSkinIcon(icon, height-2*geoManager->menuSpace, height-2*geoManager->menuSpace);
if (imgIcon) {
if (pixmapStatic == NULL) {
- pixmapStatic = osd->CreatePixmap(5, cRect(left, top + index * (height + spaceMenu), config.GetValue("menuItemLogoWidth"), config.GetValue("menuItemLogoWidth")));
+ pixmapStatic = osd->CreatePixmap(5, cRect(left, top + index * (height + spaceMenu), width, height));
pixmapStatic->Fill(clrTransparent);
}
- pixmapStatic->DrawImage(cPoint(1, (height - config.GetValue("iconHeight")) / 2), *imgIcon);
+ pixmapStatic->DrawImage(cPoint(geoManager->menuSpace, geoManager->menuSpace), *imgIcon);
}
drawn = true;
}
@@ -126,7 +126,7 @@ void cNopacityMenuItem::DrawDelimiter(const char *del, const char *icon, eSkinEl
if (delimiter.find_last_not_of("-") != std::string::npos)
delimiter.erase(delimiter.find_last_not_of("-")+1);
} catch (...) {}
- int x = config.GetValue("iconHeight") + 3;
+ int x = height + 3;
int y = (height - font->Height()) / 2;
pixmapStatic->DrawText(cPoint(x, y), delimiter.c_str(), Theme.Color(clrMenuFontMenuItemSep), clrTransparent, font);
}
@@ -212,8 +212,8 @@ void cNopacityMenuItem::DrawRoundedCorners(tColor borderColor) {
}
void cNopacityMenuItem::DrawChannelLogoBackground(void) {
- int logoWidth = config.GetValue("menuItemLogoWidth");
- pixmapBackground->DrawRectangle(cRect(5,7,logoWidth-5, height-14), Theme.Color(clrMenuChannelLogoBack));
+ int logoWidth = geoManager->menuLogoWidth;
+ pixmapBackground->DrawRectangle(cRect(4,6,logoWidth-4, height-12), Theme.Color(clrMenuChannelLogoBack));
}
// cNopacityMainMenuItem -------------
@@ -314,10 +314,10 @@ cString cNopacityMainMenuItem::GetIconName() {
void cNopacityMainMenuItem::CreatePixmapTextScroller(int totalWidth) {
int pixmapLeft = left + 10;
if (config.GetValue("useMenuIcons"))
- pixmapLeft += config.GetValue("iconHeight");
+ pixmapLeft += geoManager->menuMainMenuIconSize;
int pixmapWidth = width - 10;
if (config.GetValue("useMenuIcons"))
- pixmapWidth -= config.GetValue("iconHeight");
+ pixmapWidth -= geoManager->menuMainMenuIconSize;
int drawPortWidth = totalWidth + 10;
pixmapTextScroller = osd->CreatePixmap(4, cRect(pixmapLeft, top + index * (height + spaceMenu), pixmapWidth, height), cRect(0, 0, drawPortWidth, height));
pixmapTextScroller->Fill(clrTransparent);
@@ -362,7 +362,7 @@ void cNopacityMainMenuItem::CreateText() {
int cNopacityMainMenuItem::CheckScrollable(bool hasIcon) {
int spaceLeft = spaceMenu;
if (hasIcon)
- spaceLeft += config.GetValue("iconHeight");
+ spaceLeft += geoManager->menuMainMenuIconSize;
int totalTextWidth = width - spaceLeft;
int numberWidth = font->Width("xxx");
int textWidth = font->Width(*menuEntry);
@@ -405,8 +405,7 @@ void cNopacityMainMenuItem::Render() {
if (!drawn) {
cImage *imgIcon = imgCache->GetMenuIcon(*cIcon);
if (imgIcon)
- //TODO
- pixmapStatic->DrawImage(cPoint(5,5), *imgIcon);
+ pixmapStatic->DrawImage(cPoint(geoManager->menuSpace, geoManager->menuSpace), *imgIcon);
drawn = true;
}
}
@@ -450,8 +449,8 @@ void cNopacityScheduleMenuItem::CreatePixmapTextScroller(int totalWidth) {
int pixmapLeft = left;
int pixmapWidth = width;
if (Channel) {
- pixmapLeft += config.GetValue("menuItemLogoWidth") + 5;
- pixmapWidth = pixmapWidth - config.GetValue("menuItemLogoWidth") - 5;
+ pixmapLeft += geoManager->menuLogoWidth + geoManager->menuSpace;
+ pixmapWidth = pixmapWidth - geoManager->menuLogoWidth - geoManager->menuSpace;
}
pixmapTextScroller = osd->CreatePixmap(4, cRect(pixmapLeft, top + index * (height + spaceMenu), pixmapWidth, height), cRect(0, 0, drawPortWidth, height));
pixmapTextScroller->Fill(clrTransparent);
@@ -478,7 +477,7 @@ void cNopacityScheduleMenuItem::CreateText() {
int cNopacityScheduleMenuItem::CheckScrollable(bool hasIcon) {
int spaceLeft = spaceMenu;
if (hasIcon)
- spaceLeft += config.GetValue("menuItemLogoWidth");
+ spaceLeft += geoManager->menuLogoWidth;
int totalTextWidth = width - spaceLeft;
if (font->Width(strTitle.c_str()) > (width - spaceLeft)) {
scrollable = true;
@@ -517,8 +516,8 @@ void cNopacityScheduleMenuItem::SetTextShort(void) {
}
void cNopacityScheduleMenuItem::Render() {
- int logoWidth = config.GetValue("menuItemLogoWidth");
- int logoHeight = config.GetValue("menuItemLogoHeight");
+ int logoWidth = geoManager->menuLogoWidth;
+ int logoHeight = geoManager->menuLogoHeight;
textLeft = 5;
if (Channel && Channel->Name())
textLeft = logoWidth + 10;
@@ -680,8 +679,8 @@ cNopacityChannelMenuItem::~cNopacityChannelMenuItem(void) {
}
void cNopacityChannelMenuItem::CreatePixmapTextScroller(int totalWidth) {
- int pixmapLeft = left + config.GetValue("menuItemLogoWidth") + 10;
- int pixmapWidth = width - config.GetValue("menuItemLogoWidth") - 10;
+ int pixmapLeft = left + geoManager->menuLogoWidth + geoManager->menuSpace;
+ int pixmapWidth = width - geoManager->menuLogoWidth - geoManager->menuSpace;
int drawPortWidth = totalWidth + 10;
pixmapTextScroller = osd->CreatePixmap(4, cRect(pixmapLeft, top + index * (height + spaceMenu), pixmapWidth, height), cRect(0, 0, drawPortWidth, height));
pixmapTextScroller->Fill(clrTransparent);
@@ -704,7 +703,7 @@ void cNopacityChannelMenuItem::CreateText() {
int cNopacityChannelMenuItem::CheckScrollable(bool hasIcon) {
int spaceLeft = spaceMenu;
if (hasIcon)
- spaceLeft += config.GetValue("menuItemLogoWidth");
+ spaceLeft += geoManager->menuLogoWidth;
int totalTextWidth = width - spaceLeft;
if (font->Width(strEntry.c_str()) > (width - spaceLeft)) {
scrollable = true;
@@ -809,7 +808,7 @@ void cNopacityChannelMenuItem::DrawBackground(void) {
if (config.GetValue("menuChannelDisplayMode") == 0) {
int encryptedSize = height/4-2;
- int sourceX = config.GetValue("menuItemLogoWidth") + 15;
+ int sourceX = geoManager->menuLogoWidth + 15;
tColor clrFont = (current)?Theme.Color(clrMenuFontMenuItemHigh):Theme.Color(clrMenuFontMenuItem);
pixmapStatic->DrawText(cPoint(sourceX, 3*height/4 + (height/4 - fontSmall->Height())/2), *strChannelInfo, clrFont, clrTransparent, fontSmall);
if (Channel->Ca()) {
@@ -922,8 +921,8 @@ cNopacityTimerMenuItem::~cNopacityTimerMenuItem(void) {
}
void cNopacityTimerMenuItem::CreatePixmapTextScroller(int totalWidth) {
- int pixmapLeft = left + config.GetValue("menuItemLogoWidth") + 10;
- int pixmapWidth = width - config.GetValue("menuItemLogoWidth") - 10;
+ int pixmapLeft = left + geoManager->menuLogoWidth + geoManager->menuSpace;
+ int pixmapWidth = width - geoManager->menuLogoWidth - geoManager->menuSpace;
int drawPortWidth = totalWidth + 10;
pixmapTextScroller = osd->CreatePixmap(4, cRect(pixmapLeft, top + index * (height + spaceMenu), pixmapWidth, height), cRect(0, 0, drawPortWidth, height));
pixmapTextScroller->Fill(clrTransparent);
@@ -965,7 +964,7 @@ std::string cNopacityTimerMenuItem::CreateDate(void) {
int cNopacityTimerMenuItem::CheckScrollable(bool hasIcon) {
int spaceLeft = spaceMenu;
if (hasIcon)
- spaceLeft += config.GetValue("menuItemLogoWidth");
+ spaceLeft += geoManager->menuLogoWidth;
int totalTextWidth = width - spaceLeft;
if (font->Width(strEntry.c_str()) > (width - spaceLeft)) {
scrollable = true;
@@ -1044,12 +1043,12 @@ void cNopacityTimerMenuItem::DrawBackground(int textLeft) {
}
void cNopacityTimerMenuItem::Render() {
- textLeft = config.GetValue("menuItemLogoWidth") + 10;
+ textLeft = geoManager->menuLogoWidth + geoManager->menuSpace;
if (selectable) {
DrawBackground(textLeft);
DrawChannelLogoBackground();
- int logoWidth = config.GetValue("menuItemLogoWidth");
- int logoHeight = config.GetValue("menuItemLogoHeight");
+ int logoWidth = geoManager->menuLogoWidth;
+ int logoHeight = geoManager->menuLogoHeight;
if (!drawn) {
DrawLogo(logoWidth, logoHeight);
drawn = true;
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 88a78df..d1e9867 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.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-11-02 15:27+0100\n"
+"POT-Creation-Date: 2013-11-02 17:41+0100\n"
"PO-Revision-Date: 2013-03-19 22:56+0100\n"
"Last-Translator: Gabychan <gbonich@gmail.com>\n"
"Language-Team: \n"
@@ -233,12 +233,12 @@ msgstr "Amplada (% amplada OSD)"
msgid "Use narrow setup menu"
msgstr "Utilitza configuració limitada"
+msgid "Number of entires per page"
+msgstr ""
+
msgid "Use menu icons"
msgstr "Utilitza menú d'icones"
-msgid "Icon Size (Square)"
-msgstr "Mida icones (Quadrat)"
-
msgid "Main menu title style"
msgstr "Estil de títol al menú principal"
@@ -395,9 +395,6 @@ msgstr ""
msgid "Display additional EPG Pictures in detailed recording View"
msgstr "Mostra imatges EPG addicionals a vista detallada gravacions"
-msgid "Folder Icon Size"
-msgstr "Mida Carpeta Icones"
-
msgid "Use folder poster if available"
msgstr ""
@@ -559,3 +556,9 @@ msgstr "conflicte"
msgid "conflicts"
msgstr "conflictes"
+
+#~ msgid "Folder Icon Size"
+#~ msgstr "Mida Carpeta Icones"
+
+#~ msgid "Icon Size (Square)"
+#~ msgstr "Mida icones (Quadrat)"
diff --git a/po/de_DE.po b/po/de_DE.po
index cdd03b8..6cbaea9 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-11-02 15:27+0100\n"
+"POT-Creation-Date: 2013-11-02 17:41+0100\n"
"PO-Revision-Date: 2012-11-11 17:49+0200\n"
"Last-Translator: louis\n"
"Language-Team: \n"
@@ -230,12 +230,12 @@ msgstr "Breite (% der OSD Breite)"
msgid "Use narrow setup menu"
msgstr "Schmales Setup Menü verwenden"
+msgid "Number of entires per page"
+msgstr "Menüelemente pro Seite"
+
msgid "Use menu icons"
msgstr "Menü Icons benutzen"
-msgid "Icon Size (Square)"
-msgstr "Icon Größe (quadratisch)"
-
msgid "Main menu title style"
msgstr "Titel Stil im Hauptmenü"
@@ -392,9 +392,6 @@ msgstr "Rahmen um detailierte Aufnahmeansicht"
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 "Use folder poster if available"
msgstr "Zeige Poster für Ordner falls verfügbar"
@@ -556,3 +553,9 @@ msgstr "Konflikt"
msgid "conflicts"
msgstr "Konflikte"
+
+#~ msgid "Folder Icon Size"
+#~ msgstr "Order Icon Größe"
+
+#~ msgid "Icon Size (Square)"
+#~ msgstr "Icon Größe (quadratisch)"
diff --git a/po/it_IT.po b/po/it_IT.po
index 0cc6e43..afd1feb 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-11-02 15:27+0100\n"
+"POT-Creation-Date: 2013-11-02 17:41+0100\n"
"PO-Revision-Date: 2013-03-19 22:56+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: \n"
@@ -233,12 +233,12 @@ msgstr "Larghezza (% larghezza OSD)"
msgid "Use narrow setup menu"
msgstr "Usa menu opzioni ridotto"
+msgid "Number of entires per page"
+msgstr ""
+
msgid "Use menu icons"
msgstr "Usa icone menu"
-msgid "Icon Size (Square)"
-msgstr "Dim. icona (quadrato)"
-
msgid "Main menu title style"
msgstr ""
@@ -395,9 +395,6 @@ msgstr ""
msgid "Display additional EPG Pictures in detailed recording View"
msgstr "Mostra immagini EPG aggiuntivo nella vista dettagli registrazione"
-msgid "Folder Icon Size"
-msgstr "Dim. icona cartella"
-
msgid "Use folder poster if available"
msgstr ""
@@ -559,3 +556,9 @@ msgstr "conflitto"
msgid "conflicts"
msgstr "conflitti"
+
+#~ msgid "Folder Icon Size"
+#~ msgstr "Dim. icona cartella"
+
+#~ msgid "Icon Size (Square)"
+#~ msgstr "Dim. icona (quadrato)"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index c0680b4..a9f6601 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr-skinnopacity\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-11-02 15:27+0100\n"
+"POT-Creation-Date: 2013-11-02 17:41+0100\n"
"PO-Revision-Date: 2013-09-16 19:34+0100\n"
"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
"Language-Team: \n"
@@ -230,12 +230,12 @@ msgstr "©írka (Percent z OSD ¹írky)"
msgid "Use narrow setup menu"
msgstr "Úzke menu nastavenia"
+msgid "Number of entires per page"
+msgstr ""
+
msgid "Use menu icons"
msgstr "Pou¾i» ikony ponuky"
-msgid "Icon Size (Square)"
-msgstr "Veµkos» ikony (do ¹tvorca)"
-
msgid "Main menu title style"
msgstr "©týl názvu hlavného menu"
@@ -392,9 +392,6 @@ msgstr "Okraj okolo podrobného zobrazenia nahrávky"
msgid "Display additional EPG Pictures in detailed recording View"
msgstr "Zobrazi» ïal¹ie EPG obrázky v podrobnom zobrazení nahrávky"
-msgid "Folder Icon Size"
-msgstr "Veµkos» ikony prieèinku"
-
msgid "Use folder poster if available"
msgstr ""
@@ -556,3 +553,9 @@ msgstr "konflikt"
msgid "conflicts"
msgstr "konflikty"
+
+#~ msgid "Folder Icon Size"
+#~ msgstr "Veµkos» ikony prieèinku"
+
+#~ msgid "Icon Size (Square)"
+#~ msgstr "Veµkos» ikony (do ¹tvorca)"
diff --git a/setup.c b/setup.c
index 58b725c..0173492 100644
--- a/setup.c
+++ b/setup.c
@@ -192,10 +192,8 @@ void cNopacitySetupMenuDisplayMain::Set(void) {
Add(new cMenuEditBoolItem(tr("Use narrow setup menu"), tmpConf->GetValueRef("narrowSetupMenu")));
if (tmpConf->GetValue("narrowSetupMenu"))
Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width (Percent of OSD Width)")), tmpConf->GetValueRef("menuWidthSetup"), 10, 97));
-
+ Add(new cMenuEditIntItem(tr("Number of entires per page"), tmpConf->GetValueRef("numMainMenuItems"), 3, 20));
Add(new cMenuEditBoolItem(tr("Use menu icons"), tmpConf->GetValueRef("useMenuIcons")));
- if (tmpConf->GetValue("useMenuIcons"))
- Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Icon Size (Square)")), tmpConf->GetValueRef("iconHeight"), 30, 200));
Add(new cMenuEditStraItem(tr("Main menu title style"), tmpConf->GetValueRef("mainMenuTitleStyle"), 3, titleStyle));
Add(new cMenuEditBoolItem(tr("Display Disk Usage"), tmpConf->GetValueRef("showDiscUsage")));
if (tmpConf->GetValue("showDiscUsage")) {
@@ -247,8 +245,7 @@ void cNopacitySetupMenuDisplaySchedules::Set(void) {
Add(new cMenuEditBoolItem(tr("Use narrow menu"), tmpConf->GetValueRef("narrowScheduleMenu")));
if (tmpConf->GetValue("narrowScheduleMenu"))
Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width (Percent of OSD Width)")), tmpConf->GetValueRef("menuWidthSchedules"), 10, 97));
- Add(new cMenuEditIntItem(tr("Channel Logo Width"), tmpConf->GetValueRef("menuItemLogoWidth"), 30, 200));
- Add(new cMenuEditIntItem(tr("Channel Logo Height"), tmpConf->GetValueRef("menuItemLogoHeight"), 30, 200));
+ Add(new cMenuEditIntItem(tr("Number of entires per page"), tmpConf->GetValueRef("numSchedulesMenuItems"), 3, 20));
Add(new cMenuEditStraItem(tr("Mode of EPG Window"), tmpConf->GetValueRef("menuSchedulesWindowMode"), 2, windowMode));
Add(new cMenuEditIntItem(tr("EPG Window Fade-In Time in ms (Zero for switching off fading)"), tmpConf->GetValueRef("menuEPGWindowFadeTime"), 0, 1000));
Add(new cMenuEditIntItem(tr("EPG Window Display Delay in s"), tmpConf->GetValueRef("menuInfoTextDelay"), 0, 10));
@@ -343,12 +340,12 @@ void cNopacitySetupMenuDisplayRecordings::Set(void) {
Add(new cMenuEditBoolItem(tr("Use narrow menu"), tmpConf->GetValueRef("narrowRecordingMenu")));
if (tmpConf->GetValue("narrowRecordingMenu"))
Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width (Percent of OSD Width)")), tmpConf->GetValueRef("menuWidthRecordings"), 10, 97));
+ Add(new cMenuEditIntItem(tr("Number of entires per page"), tmpConf->GetValueRef("numRecordingsMenuItems"), 3, 20));
Add(new cMenuEditStraItem(tr("Mode of recording Window"), tmpConf->GetValueRef("menuRecordingsWindowMode"), 2, windowMode));
Add(new cMenuEditIntItem(tr("Border around detailed recording view"), tmpConf->GetValueRef("borderDetailedRecordings"), 1, 300));
Add(new cMenuEditStraItem(tr("Display additional EPG Pictures in detailed recording View"), tmpConf->GetValueRef("displayAdditionalRecEPGPictures"), 3, displayEPGPictures));
if (tmpConf->GetValue("displayAdditionalRecEPGPictures"))
Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Number of EPG pictures to display")), tmpConf->GetValueRef("numAdditionalRecEPGPictures"), 1, 9));
- Add(new cMenuEditIntItem(tr("Folder Icon Size"), tmpConf->GetValueRef("menuRecFolderSize"), 30, 300));
Add(new cMenuEditBoolItem(tr("Use folder poster if available"), tmpConf->GetValueRef("useFolderPoster")));
Add(new cMenuEditIntItem(tr("Width of manually set recording poster"), tmpConf->GetValueRef("posterWidth"), 100, 1000));
Add(new cMenuEditIntItem(tr("Height of manually set recording poster"), tmpConf->GetValueRef("posterHeight"), 100, 1000));
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-13 01:05:40 +0000