summaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorlouis <louis.braun@gmx.de>2015-05-30 16:43:59 +0200
committerlouis <louis.braun@gmx.de>2015-05-30 16:43:59 +0200
commit17871b8811baa9478b2b3247e340aa21bb64e06e (patch)
treec3c2139244bbb11d4f0cf3d32e02c1137e29a1c2 /views
parent0936766c7be02661f1cd678fdd1b6fb22b5d122c (diff)
downloadvdr-plugin-skindesigner-17871b8811baa9478b2b3247e340aa21bb64e06e.tar.gz
vdr-plugin-skindesigner-17871b8811baa9478b2b3247e340aa21bb64e06e.tar.bz2
implemented Skin Repositories
Diffstat (limited to 'views')
-rw-r--r--views/displaymenudetailview.c2
-rw-r--r--views/displaymenurootview.c3
-rw-r--r--views/displaypluginview.c2
-rw-r--r--views/view.c6
4 files changed, 7 insertions, 6 deletions
diff --git a/views/displaymenudetailview.c b/views/displaymenudetailview.c
index 1258861..a6e4c84 100644
--- a/views/displaymenudetailview.c
+++ b/views/displaymenudetailview.c
@@ -226,7 +226,7 @@ void cDisplayMenuDetailView::InitTabs(void) {
while(tmplTab = tmplView->GetNextViewTab()) {
tmplTab->ParseDynamicParameters(&stringTokens, &intTokens, true);
tmplTab->ClearDynamicFunctionParameters();
- tmplTab->ParseDynamicFunctionParameters(&stringTokens, &intTokens);
+ tmplTab->ParseDynamicFunctionParameters(&stringTokens, &intTokens, &loopTokens);
if (tmplTab->DoExecute()) {
activeTabs.push_back(tmplTab);
}
diff --git a/views/displaymenurootview.c b/views/displaymenurootview.c
index 6a19433..31007f0 100644
--- a/views/displaymenurootview.c
+++ b/views/displaymenurootview.c
@@ -322,8 +322,9 @@ bool cDisplayMenuRootView::SetDetailedViewPlugin(map<string,string> *stringToken
if (!detailView) {
SetMenu(mcPlugin, true);
}
- if (!subViewAvailable)
+ if (!subViewAvailable) {
return false;
+ }
detailView->SetPluginTokens(stringTokens, intTokens, loopTokens);
return true;
}
diff --git a/views/displaypluginview.c b/views/displaypluginview.c
index 67104af..95d9dc0 100644
--- a/views/displaypluginview.c
+++ b/views/displaypluginview.c
@@ -143,7 +143,7 @@ void cDisplayPluginView::SetTabs(void) {
while(tmplTab = tmplView->GetNextViewTab()) {
tmplTab->ParseDynamicParameters(&tabStringTokens, &tabIntTokens, true);
tmplTab->ClearDynamicFunctionParameters();
- tmplTab->ParseDynamicFunctionParameters(&tabStringTokens, &tabIntTokens);
+ tmplTab->ParseDynamicFunctionParameters(&tabStringTokens, &tabIntTokens, &tabLoopTokens);
if (tmplTab->DoExecute()) {
activeTabs.push_back(tmplTab);
}
diff --git a/views/view.c b/views/view.c
index ef13a67..31254bf 100644
--- a/views/view.c
+++ b/views/view.c
@@ -167,7 +167,7 @@ void cView::DrawViewElement(eViewElement ve, map <string,string> *stringTokens,
}
//parse dynamic tokens of pixmap functions
pix->ClearDynamicFunctionParameters();
- pix->ParseDynamicFunctionParameters(stringTokens, intTokens);
+ pix->ParseDynamicFunctionParameters(stringTokens, intTokens, loopTokens);
if (!PixmapExists(pixCurrent) && pix->Scrolling()) {
cSize drawportSize;
@@ -1215,7 +1215,7 @@ cRect cViewListItem::DrawListItem(map <string,string> *stringTokens, map <string
}
pix->ClearDynamicFunctionParameters();
- pix->ParseDynamicFunctionParameters(stringTokens, intTokens);
+ pix->ParseDynamicFunctionParameters(stringTokens, intTokens, NULL);
if (!PixmapExists(pixCurrent) && pix->Scrolling()) {
cSize drawportSize;
@@ -1386,7 +1386,7 @@ void cGrid::Draw(void) {
}
pix->ClearDynamicFunctionParameters();
- pix->ParseDynamicFunctionParameters(&stringTokens, &intTokens);
+ pix->ParseDynamicFunctionParameters(&stringTokens, &intTokens, NULL);
//pix->Debug();
DrawPixmap(pixCurrent, pix);
pixCurrent++;