From 4d91408700a3920e19f193f3a6e8d7000f1b600f Mon Sep 17 00:00:00 2001
From: louis <louis.braun@gmx.de>
Date: Fri, 20 Mar 2015 17:00:00 +0100
Subject: added dedicated hor. and ver. viewelements for header, footer and
 time

---
 HISTORY                           |  3 ++-
 epggrid.c                         |  6 +++---
 templates/plug-tvguideng-root.xml | 12 +++++++++---
 tvguideng.c                       |  9 ++++++---
 tvguidengosd.h                    |  9 ++++++---
 5 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/HISTORY b/HISTORY
index af2b057..693ff58 100644
--- a/HISTORY
+++ b/HISTORY
@@ -13,5 +13,6 @@ Version 0.0.2
 - fixed bug that recmenu was not hide when displaying detailed view
   in some cases
 - fixed translations
-
+- added dedicated hor. and ver. viewelements for header, 
+  footer and time
 
diff --git a/epggrid.c b/epggrid.c
index f4dbcd7..7951eeb 100644
--- a/epggrid.c
+++ b/epggrid.c
@@ -17,9 +17,9 @@ cEpgGrid::cEpgGrid(cOsdView *rootView, cTimeManager *timeManager) {
     back = rootView->GetViewElement(config.displayMode == eHorizontal ? verBackgroundHor : verBackgroundVer);
     back->Display();
 
-    header = rootView->GetViewElement(verHeader);
-    footer = rootView->GetViewElement(verFooter);
-    watch = rootView->GetViewElement(verTime);
+    header = rootView->GetViewElement(config.displayMode == eHorizontal ? verHeaderHor : verHeaderVer);
+    footer = rootView->GetViewElement(config.displayMode == eHorizontal ? verFooterHor : verFooterVer);
+    watch = rootView->GetViewElement(config.displayMode == eHorizontal ? verTimeHor : verTimeVer);
 
     channelsGrid = rootView->GetViewGrid(config.displayMode == eHorizontal ? vgChannelsHor : vgChannelsVer);
     epgGrid = rootView->GetViewGrid(config.displayMode == eHorizontal ? vgSchedulesHor : vgSchedulesVer);
diff --git a/templates/plug-tvguideng-root.xml b/templates/plug-tvguideng-root.xml
index 9e2c329..d87176a 100644
--- a/templates/plug-tvguideng-root.xml
+++ b/templates/plug-tvguideng-root.xml
@@ -35,9 +35,11 @@
     {posterheight}            height of scraped poster
     {posterpath}              absolute path of scraped poster
     -->
-    <viewelement name="header">
+    <viewelement name="header_hor">
     </viewelement>
 
+    <viewelement name="header_ver">
+    </viewelement>
     <!-- Available Variables Footer:
     {red1}                    true if red button is button 1
     {red2}                    true if red button is button 2
@@ -60,9 +62,11 @@
     {yellow}                  label of yellow button
     {blue}                    label of blue button
     -->
-    <viewelement name="footer">
+    <viewelement name="footer_hor">
     </viewelement>
 
+    <viewelement name="footer_ver">
+    </viewelement>
     <!-- Available Variables time:
     {time}                   timestring in hh:mm
     {sec}                    current seconds
@@ -78,9 +82,11 @@
     {monthnameshort}         3 letter abbrivation of month name
     {year}                   year in yyyy
     -->
-    <viewelement name="time">
+    <viewelement name="time_hor">
     </viewelement>
 
+    <viewelement name="time_ver">
+    </viewelement>
     <!-- Tokens available in datetimeline
     {weekday}                weekday of current display
     {date}                   date of current display
diff --git a/tvguideng.c b/tvguideng.c
index 7a133f7..197dcaa 100644
--- a/tvguideng.c
+++ b/tvguideng.c
@@ -67,9 +67,12 @@ bool cPluginTvguideng::Start(void) {
     reg.SetView(viRootView, "root.xml");
     reg.SetViewElement(viRootView, verBackgroundHor, "background_hor");
     reg.SetViewElement(viRootView, verBackgroundVer, "background_ver");
-    reg.SetViewElement(viRootView, verHeader, "header");
-    reg.SetViewElement(viRootView, verTime, "time");
-    reg.SetViewElement(viRootView, verFooter, "footer");
+    reg.SetViewElement(viRootView, verHeaderHor, "header_hor");
+    reg.SetViewElement(viRootView, verHeaderVer, "header_ver");
+    reg.SetViewElement(viRootView, verTimeHor, "time_hor");
+    reg.SetViewElement(viRootView, verTimeVer, "time_ver");
+    reg.SetViewElement(viRootView, verFooterHor, "footer_hor");
+    reg.SetViewElement(viRootView, verFooterVer, "footer_ver");
     reg.SetViewElement(viRootView, verDateTimelineHor, "datetimeline_hor");
     reg.SetViewElement(viRootView, verDateTimelineVer, "datetimeline_ver");
     reg.SetViewElement(viRootView, verTimeIndicatorHor, "timeindicator_hor");
diff --git a/tvguidengosd.h b/tvguidengosd.h
index 9fc8a00..aaf6082 100644
--- a/tvguidengosd.h
+++ b/tvguidengosd.h
@@ -21,9 +21,12 @@ enum eViews {
 enum eViewElementsRoot {
     verBackgroundHor,
     verBackgroundVer,
-    verHeader,
-    verFooter,
-    verTime,
+    verHeaderHor,
+    verHeaderVer,
+    verFooterHor,
+    verFooterVer,
+    verTimeHor,
+    verTimeVer,
     verDateTimelineHor,
     verDateTimelineVer,
     verTimeIndicatorHor,
-- 
cgit v1.2.3