From 7c9ad39e95205d2c3304499dc4d66548bea037fa Mon Sep 17 00:00:00 2001 From: louis Date: Wed, 1 Apr 2015 13:26:36 +0200 Subject: added parameter mode to viewelement --- libtemplate/templatefunction.c | 5 +++++ libtemplate/templatefunction.h | 1 + libtemplate/templateview.c | 9 +++++++++ libtemplate/templateview.h | 1 + libtemplate/templateviewelement.c | 6 ++++++ libtemplate/templateviewelement.h | 1 + 6 files changed, 23 insertions(+) (limited to 'libtemplate') diff --git a/libtemplate/templatefunction.c b/libtemplate/templatefunction.c index 9081d23..9cd1861 100644 --- a/libtemplate/templatefunction.c +++ b/libtemplate/templatefunction.c @@ -53,6 +53,8 @@ void cTemplateFunction::SetParameters(vector > params) { p.first = ptCond; } else if (!name.compare("name")) { p.first = ptName; + } else if (!name.compare("mode")) { + p.first = ptMode; } else if (!name.compare("x")) { p.first = ptX; } else if (!name.compare("y")) { @@ -1488,6 +1490,9 @@ string cTemplateFunction::GetParamName(eParamType pt) { case ptName: name = "Name"; break; + case ptMode: + name = "Mode"; + break; case ptX: name = "X"; break; diff --git a/libtemplate/templatefunction.h b/libtemplate/templatefunction.h index 3c7e515..fa2e86a 100644 --- a/libtemplate/templatefunction.h +++ b/libtemplate/templatefunction.h @@ -40,6 +40,7 @@ enum eFuncType { enum eParamType { ptCond, ptName, + ptMode, ptX, ptY, ptWidth, diff --git a/libtemplate/templateview.c b/libtemplate/templateview.c index b20796f..352b6c7 100644 --- a/libtemplate/templateview.c +++ b/libtemplate/templateview.c @@ -229,6 +229,14 @@ bool cTemplateView::DetachViewElement(eViewElement ve) { return viewElement->Detach(); } +string cTemplateView::GetViewElementMode(eViewElement ve) { + map < eViewElement, cTemplateViewElement* >::iterator hit = viewElements.find(ve); + if (hit == viewElements.end()) + return ""; + cTemplateViewElement *viewElement = hit->second; + return viewElement->GetMode(); +} + int cTemplateView::GetNumListViewMenuItems(void) { int numElements = 0; cTemplateViewList *menuList = GetViewList(vlMenuItem); @@ -626,6 +634,7 @@ void cTemplateView::SetFunctionDefinitions(void) { attributes.insert("fadetime"); attributes.insert("name"); attributes.insert("condition"); + attributes.insert("mode"); funcsAllowed.insert(pair< string, set >(name, attributes)); name = "area"; diff --git a/libtemplate/templateview.h b/libtemplate/templateview.h index 51bb4bf..b1fd17d 100644 --- a/libtemplate/templateview.h +++ b/libtemplate/templateview.h @@ -115,6 +115,7 @@ public: bool HideView(void); bool ExecuteView(eViewElement ve); bool DetachViewElement(eViewElement ve); + string GetViewElementMode(eViewElement ve); int GetNumListViewMenuItems(void); bool GetScalingWindow(cRect &scalingWindow); map GetCustomStringTokens(void) { return globals->GetCustomStringTokens(); }; diff --git a/libtemplate/templateviewelement.c b/libtemplate/templateviewelement.c index aae68a8..5b18de2 100644 --- a/libtemplate/templateviewelement.c +++ b/libtemplate/templateviewelement.c @@ -133,6 +133,12 @@ bool cTemplateViewElement::Detach(void) { return false; } +string cTemplateViewElement::GetMode(void) { + if (!parameters) + return ""; + return parameters->GetParameter(ptMode); +} + bool cTemplateViewElement::DebugTokens(void) { if (!parameters) return false; diff --git a/libtemplate/templateviewelement.h b/libtemplate/templateviewelement.h index 93ef28a..8293109 100644 --- a/libtemplate/templateviewelement.h +++ b/libtemplate/templateviewelement.h @@ -111,6 +111,7 @@ public: cTemplateFunction *GetFunction(string name); bool Execute(void); bool Detach(void); + string GetMode(void); bool DebugTokens(void); virtual void Debug(void); }; -- cgit v1.2.3