diff options
-rw-r--r-- | HISTORY | 1 | ||||
-rw-r--r-- | config.c | 2 | ||||
-rw-r--r-- | displaymenu.c | 17 | ||||
-rw-r--r-- | icons/default/chart1.png | bin | 4124 -> 1446 bytes | |||
-rw-r--r-- | icons/default/chart2.png | bin | 4000 -> 1322 bytes | |||
-rw-r--r-- | icons/default/chart3.png | bin | 3993 -> 1315 bytes | |||
-rw-r--r-- | icons/default/chart4.png | bin | 3842 -> 1164 bytes | |||
-rw-r--r-- | icons/default/chart5.png | bin | 3943 -> 1265 bytes | |||
-rw-r--r-- | icons/default/chart6.png | bin | 3734 -> 1056 bytes | |||
-rw-r--r-- | icons/default/chart7.png | bin | 3753 -> 1075 bytes | |||
-rw-r--r-- | imageloader.c | 6 |
11 files changed, 21 insertions, 5 deletions
@@ -8,6 +8,7 @@ VDR Plugin 'skinflatplus' Revision History - [fix] no scrollbar in some situations - [add] add support for menu SetItemChannel - [update] add Patch from MegaV0lt, support for simple aspect & format, new icons +- [update] only log not loaded images 2013-11-24: Version 0.1.0 - MegaV0lt Version Special thanks to MegaV0lt@VDR-Portal for @@ -416,7 +416,7 @@ void cFlatConfig::Init(void) { DecorCheckAndInit(); } -bool stringCompare( const std::string &left, const std::string &right ){ +bool stringCompare( const std::string &left, const std::string &right ) { for( std::string::const_iterator lit = left.begin(), rit = right.begin(); lit != left.end() && rit != right.end(); ++lit, ++rit ) if( tolower( *lit ) < tolower( *rit ) ) return true; diff --git a/displaymenu.c b/displaymenu.c index 29ae35cb..b3b72f73 100644 --- a/displaymenu.c +++ b/displaymenu.c @@ -246,8 +246,21 @@ void cFlatDisplayMenu::SetItem(const char *Text, int Index, bool Current, bool S int y = Index * itemHeight; menuItemWidth = menuWidth - Config.decorBorderMenuItemSize*2; - //if( menuCategory == mcMain ) - // menuItemWidth *= 0.5; + switch( menuCategory ) { + case mcMain: + case mcSchedule: + case mcScheduleNow: + case mcScheduleNext: + case mcChannel: + case mcTimer: + case mcRecording: + case mcCommand: + case mcEvent: + menuItemWidth *= Config.MainMenuItemScale; + break; + default: + break; + } int AvailableTextWidth = menuItemWidth - scrollBarWidth; if( isScrolling ) diff --git a/icons/default/chart1.png b/icons/default/chart1.png Binary files differindex b8041baa..48d5d311 100644 --- a/icons/default/chart1.png +++ b/icons/default/chart1.png diff --git a/icons/default/chart2.png b/icons/default/chart2.png Binary files differindex c5a8c549..b5182b0f 100644 --- a/icons/default/chart2.png +++ b/icons/default/chart2.png diff --git a/icons/default/chart3.png b/icons/default/chart3.png Binary files differindex 4d3f375b..9f31d644 100644 --- a/icons/default/chart3.png +++ b/icons/default/chart3.png diff --git a/icons/default/chart4.png b/icons/default/chart4.png Binary files differindex 8e3bb5c6..93dd1302 100644 --- a/icons/default/chart4.png +++ b/icons/default/chart4.png diff --git a/icons/default/chart5.png b/icons/default/chart5.png Binary files differindex abc26ea6..3c6cce8d 100644 --- a/icons/default/chart5.png +++ b/icons/default/chart5.png diff --git a/icons/default/chart6.png b/icons/default/chart6.png Binary files differindex 49699d76..b0407778 100644 --- a/icons/default/chart6.png +++ b/icons/default/chart6.png diff --git a/icons/default/chart7.png b/icons/default/chart7.png Binary files differindex ed7dc422..d1882dc8 100644 --- a/icons/default/chart7.png +++ b/icons/default/chart7.png diff --git a/imageloader.c b/imageloader.c index f83d9675..27aae363 100644 --- a/imageloader.c +++ b/imageloader.c @@ -121,12 +121,14 @@ void cImageLoader::toLowerCase(std::string &str) { } bool cImageLoader::LoadImage(cString FileName, cString Path, cString Extension) { + cString File = ""; try { - cString File = cString::sprintf("%s%s.%s", *Path, *FileName, *Extension); + File = cString::sprintf("%s%s.%s", *Path, *FileName, *Extension); //dsyslog("imageloader: trying to load: %s", *File); buffer.read(*File); //dsyslog("imageloader: %s sucessfully loaded", *File); - } catch (...) { + } catch (...) { + dsyslog("imageloader: %s could not be loaded", *File); return false; } return true; |