diff options
| author | louis <louis.braun@gmx.de> | 2015-01-24 10:47:47 +0100 |
|---|---|---|
| committer | louis <louis.braun@gmx.de> | 2015-01-24 10:47:47 +0100 |
| commit | a74cb93163146e547abc641638874697904672e5 (patch) | |
| tree | 5ade879d4ad7808cfb8eca6ad2bd40636a4fa22b /libtemplate/templateviewlist.c | |
| parent | 5733a499407a11b095887e06df09c4e5d6debeda (diff) | |
| download | vdr-plugin-skindesigner-a74cb93163146e547abc641638874697904672e5.tar.gz vdr-plugin-skindesigner-a74cb93163146e547abc641638874697904672e5.tar.bz2 | |
introduced globals.xml in skinpath, theme.xml in theme path
Diffstat (limited to 'libtemplate/templateviewlist.c')
| -rw-r--r-- | libtemplate/templateviewlist.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/libtemplate/templateviewlist.c b/libtemplate/templateviewlist.c index e75c528..0a6cabc 100644 --- a/libtemplate/templateviewlist.c +++ b/libtemplate/templateviewlist.c @@ -1,5 +1,6 @@ #include "templateviewlist.h"
#include "../config.h"
+#include "../libcore/helpers.h"
cTemplateViewList::cTemplateViewList(void) : cTemplateViewElement() {
listElement = NULL;
@@ -87,16 +88,11 @@ int cTemplateViewList::GetAverageFontWidth(void) { string paramFontSize = fontFunc->GetParameter(ptFontSize);
string fontName = "";
- if ((fontNameToken.find("{") == 0) && (fontNameToken.find("}") == (fontNameToken.size()-1))) {
- fontNameToken = fontNameToken.substr(1, fontNameToken.size()-2);
- map<string,string>::iterator hit = globals->fonts.find(fontNameToken);
- if (hit != globals->fonts.end()) {
- fontName = hit->second;
- } else {
- map<string,string>::iterator def = globals->fonts.find("vdrOsd");
- if (def == globals->fonts.end())
+ if (IsToken(fontNameToken)) {
+ if (!globals->GetFont(fontNameToken, fontName)) {
+ if (!globals->GetFont("{vdrOsd}", fontName)) {
return defaultAverageFontWidth;
- fontName = def->second;
+ }
}
} else {
//if no token, directly use input
@@ -135,16 +131,11 @@ cFont *cTemplateViewList::GetTextAreaFont(void) { string paramFontSize = fontFunc->GetParameter(ptFontSize);
string fontName = "";
- if ((fontNameToken.find("{") == 0) && (fontNameToken.find("}") == (fontNameToken.size()-1))) {
- fontNameToken = fontNameToken.substr(1, fontNameToken.size()-2);
- map<string,string>::iterator hit = globals->fonts.find(fontNameToken);
- if (hit != globals->fonts.end()) {
- fontName = hit->second;
- } else {
- map<string,string>::iterator def = globals->fonts.find("vdrOsd");
- if (def == globals->fonts.end())
+ if (IsToken(fontNameToken)) {
+ if (!globals->GetFont(fontNameToken, fontName)) {
+ if (!globals->GetFont("{vdrOsd}", fontName)) {
return NULL;
- fontName = def->second;
+ }
}
} else {
//if no token, directly use input
|