diff options
author | Martin Schirrmacher <vdr.skinflatplus@schirrmacher.eu> | 2013-11-23 16:31:04 +0100 |
---|---|---|
committer | Martin Schirrmacher <vdr.skinflatplus@schirrmacher.eu> | 2013-11-23 16:31:04 +0100 |
commit | 583bc1a9041687ad467e822a8c8f321e5446afcf (patch) | |
tree | e80bfc3505401df08ce7c676478a4ec22640d81b | |
parent | 21b80796e3f532f0bb9ef7573521f2f3913618bd (diff) | |
download | skin-flatplus-583bc1a9041687ad467e822a8c8f321e5446afcf.tar.gz skin-flatplus-583bc1a9041687ad467e822a8c8f321e5446afcf.tar.bz2 |
release version 0.1.0
-rw-r--r-- | HISTORY | 30 | ||||
-rw-r--r-- | baserender.c | 7 | ||||
-rw-r--r-- | config.c | 16 | ||||
-rw-r--r-- | imageloader.c | 2 | ||||
-rw-r--r-- | skinflatplus.c | 6 |
5 files changed, 37 insertions, 24 deletions
@@ -1,33 +1,43 @@ VDR Plugin 'skinflatplus' Revision History --------------------------------------- -2013-XX-XX: Version 0.1.0 +2013-11-24: Version 0.1.0 - MegaV0lt Version +Special thanks to MegaV0lt@VDR-Portal for +detailed bug reports, feature requests, testing and themes + icons + - [fix] many small fixes - [fix] marker position - [fix] borders displaced -- [fix] menu has full width if no scrollbar is needed - [fix] icon size in channel display -- [update] TopBar title align right +- [update] menu has full width if no scrollbar is needed +- [update] TopBar date align right - [update] channel display icons - [update] show recording in display channel for present and following -- [add] free minutes in disk usage -- [add] topbar font size option -- [add] message bottom offset option +- [update] do not DisplayChannel for the first time +- [update] remove decor settings from themes and add separately decor files. + You can select decor file from plugin settings. + WARNING: Please delete all old themes! +- [add] free minutes in disk usage TopBar +- [add] TopBar font size option (select individual font size for TopBar) +- [add] message bottom offset option (select the offset of bottom screen for messages) - [add] menu items symbols for rec, timer, etc. Lent code from skin elchi (thank you!) -- [add] option menu content full size background +- [add] option menu content full size background (draw menu background for full menu size + or only for content size) - [add] option to display resolution & aspect in display channel - [add] option do display format (hd/sd) in display channel - [add] option to display resolution & aspect in replay - [add] option do display format (hd/sd) in replay -- [add] default logo for channels without channel logo +- [add] default logo for channels without channel logo (logo for tv and radio) - [add] use icon from default theme if current theme does not have the icon - [add] option to show additional info in epg menu. Lent code from skin elchi (thank you!) - [add] option to show additional info in recording menu. Lent code from skin elchi (thank you!) - [add] option to show active recording in TopBar -- [add] menu icons +- [add] menu icons (lent some code from skin nopacity, thanks!) - [add] TopBar menu icons +- [add] many themes, icons, etc. - many thanks for MegaV0lt! + -2013-23-09: Version 0.0.1 +2013-09-23: Version 0.0.1 difference to skinflat - [add] configurable borders - any window have its own border with separate size and type diff --git a/baserender.c b/baserender.c index f3f62505..101bd4a2 100644 --- a/baserender.c +++ b/baserender.c @@ -66,7 +66,6 @@ cFlatBaseRender::~cFlatBaseRender(void) { } void cFlatBaseRender::CreateFullOsd(void) { - //printf("left: %d top: %d width: %d height: %d", cOsd::OsdLeft(), cOsd::OsdTop(), cOsd::OsdWidth(), cOsd::OsdHeight()); CreateOsd(cOsd::OsdLeft() + Config.marginOsdHor, cOsd::OsdTop() + Config.marginOsdVer, cOsd::OsdWidth() - Config.marginOsdHor*2, cOsd::OsdHeight() - Config.marginOsdVer*2); } @@ -80,9 +79,11 @@ void cFlatBaseRender::CreateOsd(int left, int top, int width, int height) { if (osd) { tArea Area = { 0, 0, width, height, 32 }; if (osd->SetAreas(&Area, 1) == oeOk) { + dsyslog("skinflatplus: create osd SUCESS left: %d top: %d width: %d height: %d", left, top, width, height); return; } } + dsyslog("skinflatplus: create osd FAILED left: %d top: %d width: %d height: %d", left, top, width, height); return; } @@ -174,8 +175,8 @@ void cFlatBaseRender::TopBarUpdate(void) { if( topBarMenuIconSet && Config.TopBarMenuIconShow ) { int IconLeft = marginItem; - if (imgLoader.LoadIcon(*topBarMenuIcon, 999, topBarHeight)) { - int iconTop = topBarHeight / 2 - imgLoader.Height()/2; + if (imgLoader.LoadIcon(*topBarMenuIcon, 999, topBarHeight - marginItem*2)) { + int iconTop = (topBarHeight / 2 - imgLoader.Height()/2); topBarIconPixmap->DrawImage(cPoint(IconLeft, iconTop), imgLoader.GetImage()); MenuIconWidth = imgLoader.Width()+marginItem*2; TitleWidthLeft -= MenuIconWidth + marginItem*3; @@ -173,8 +173,8 @@ bool cFlatConfig::SetupParse(const char *Name, const char *Value) { } void cFlatConfig::ThemeCheckAndInit(void) { - if( strcmp(Theme.Name(), *ThemeCurrent) != 0 ) - { + if( strcmp(Theme.Name(), *ThemeCurrent) != 0 ) { + dsyslog("skinflatplus: load theme: %s", *ThemeCurrent); ThemeCurrent = Theme.Name(); ThemeInit(); } @@ -390,12 +390,14 @@ void cFlatConfig::ThemeInit(void) { } void cFlatConfig::Init(void) { - if( !strcmp(logoPath, "") ) + if( !strcmp(logoPath, "") ) { logoPath = cString::sprintf("%s/logos/", PLUGINRESOURCEPATH); - //dsyslog("skinflat: logopath: %s", *logoPath); - if( !strcmp(iconPath, "") ) + dsyslog("skinflatplus: logoPath: %s", *logoPath); + } + if( !strcmp(iconPath, "") ) { iconPath = cString::sprintf("%s/icons/", PLUGINRESOURCEPATH); - //dsyslog("skinflat: iconPath: %s", *iconPath); + dsyslog("skinflatplus: iconPath: %s", *iconPath); + } ThemeInit(); DecorCheckAndInit(); @@ -461,6 +463,8 @@ void cFlatConfig::DecorLoadCurrent(void) { } void cFlatConfig::DecorLoadFile(cString File) { + dsyslog("skinflatplus: load decor file: %s", *File); + FILE *f = fopen(File, "r"); if( f ) { int line = 0; diff --git a/imageloader.c b/imageloader.c index 1b5c3772..7005f76c 100644 --- a/imageloader.c +++ b/imageloader.c @@ -124,10 +124,8 @@ bool cImageLoader::LoadImage(cString FileName, cString Path, cString Extension) try { cString File = cString::sprintf("%s%s.%s", *Path, *FileName, *Extension); dsyslog("imageloader: trying to load: %s", *File); - //printf("imageloader: trying to load: %s\n", *File); buffer.read(*File); dsyslog("imageloader: %s sucessfully loaded", *File); - //printf("imageloader: %s sucessfully loaded\n", *File); } catch (...) { return false; } diff --git a/skinflatplus.c b/skinflatplus.c index 609c8d9e..33c26262 100644 --- a/skinflatplus.c +++ b/skinflatplus.c @@ -15,7 +15,7 @@ #include "flat.h" #include "setup.h" -static const char *VERSION = "0.0.1"; +static const char *VERSION = "0.1.0"; static const char *DESCRIPTION = "skin flatplus"; class cPluginFlat : public cPlugin { @@ -82,10 +82,10 @@ bool cPluginFlat::Initialize(void) { bool cPluginFlat::Start(void) { if (!cOsdProvider::SupportsTrueColor()) { - esyslog("skinflat: No TrueColor OSD found! Aborting!"); + esyslog("skinflatplus: No TrueColor OSD found! Aborting!"); return false; } else - dsyslog("skinflat: TrueColor OSD found"); + dsyslog("skinflatplus: TrueColor OSD found"); flat = new cFlat; return flat; } |