From c59cc4e6103c38897ceba54b6a88e6934147f263 Mon Sep 17 00:00:00 2001
From: louis <louis.braun@gmx.de>
Date: Mon, 12 Jan 2015 12:34:19 +0100
Subject: first weather template

---
 displaymenu.c                                      |   5 +-
 skins/metrixhd/themes/default/icons/clear-day.png  | Bin 0 -> 4980 bytes
 .../metrixhd/themes/default/icons/clear-night.png  | Bin 0 -> 3115 bytes
 skins/metrixhd/themes/default/icons/cloudy.png     | Bin 0 -> 6433 bytes
 skins/metrixhd/themes/default/icons/fog.png        | Bin 0 -> 3652 bytes
 .../themes/default/icons/partly-cloudy-day.png     | Bin 0 -> 7028 bytes
 .../themes/default/icons/partly-cloudy-night.png   | Bin 0 -> 6409 bytes
 skins/metrixhd/themes/default/icons/rain.png       | Bin 0 -> 6000 bytes
 skins/metrixhd/themes/default/icons/sleet.png      | Bin 0 -> 6021 bytes
 skins/metrixhd/themes/default/icons/snow.png       | Bin 0 -> 7660 bytes
 skins/metrixhd/themes/default/icons/wind.png       | Bin 0 -> 2568 bytes
 .../plug-weatherforecast-weatherforecast.xml       |  99 +++++++++++++++++++++
 views/displaymenurootview.c                        |   2 +-
 13 files changed, 104 insertions(+), 2 deletions(-)
 create mode 100644 skins/metrixhd/themes/default/icons/clear-day.png
 create mode 100644 skins/metrixhd/themes/default/icons/clear-night.png
 create mode 100644 skins/metrixhd/themes/default/icons/cloudy.png
 create mode 100644 skins/metrixhd/themes/default/icons/fog.png
 create mode 100644 skins/metrixhd/themes/default/icons/partly-cloudy-day.png
 create mode 100644 skins/metrixhd/themes/default/icons/partly-cloudy-night.png
 create mode 100644 skins/metrixhd/themes/default/icons/rain.png
 create mode 100644 skins/metrixhd/themes/default/icons/sleet.png
 create mode 100644 skins/metrixhd/themes/default/icons/snow.png
 create mode 100644 skins/metrixhd/themes/default/icons/wind.png
 create mode 100644 skins/metrixhd/xmlfiles/plug-weatherforecast-weatherforecast.xml

diff --git a/displaymenu.c b/displaymenu.c
index 7759b61..2908880 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -203,7 +203,10 @@ void cSDDisplayMenu::SetItem(const char *Text, int Index, bool Current, bool Sel
         for (int i=0; i<MaxTabs; i++) {
             const char *s = GetTabbedText(Text, i);
             if (s) {
-                tabTexts[i] = s;
+                if (strlen(s) == 0)
+                    tabTexts[i] = " ";
+                else
+                    tabTexts[i] = s;
             } else {
                 tabTexts[i] = "";
             }
diff --git a/skins/metrixhd/themes/default/icons/clear-day.png b/skins/metrixhd/themes/default/icons/clear-day.png
new file mode 100644
index 0000000..2b06a14
Binary files /dev/null and b/skins/metrixhd/themes/default/icons/clear-day.png differ
diff --git a/skins/metrixhd/themes/default/icons/clear-night.png b/skins/metrixhd/themes/default/icons/clear-night.png
new file mode 100644
index 0000000..9bbe49f
Binary files /dev/null and b/skins/metrixhd/themes/default/icons/clear-night.png differ
diff --git a/skins/metrixhd/themes/default/icons/cloudy.png b/skins/metrixhd/themes/default/icons/cloudy.png
new file mode 100644
index 0000000..9870c7f
Binary files /dev/null and b/skins/metrixhd/themes/default/icons/cloudy.png differ
diff --git a/skins/metrixhd/themes/default/icons/fog.png b/skins/metrixhd/themes/default/icons/fog.png
new file mode 100644
index 0000000..9bc88d2
Binary files /dev/null and b/skins/metrixhd/themes/default/icons/fog.png differ
diff --git a/skins/metrixhd/themes/default/icons/partly-cloudy-day.png b/skins/metrixhd/themes/default/icons/partly-cloudy-day.png
new file mode 100644
index 0000000..b6df179
Binary files /dev/null and b/skins/metrixhd/themes/default/icons/partly-cloudy-day.png differ
diff --git a/skins/metrixhd/themes/default/icons/partly-cloudy-night.png b/skins/metrixhd/themes/default/icons/partly-cloudy-night.png
new file mode 100644
index 0000000..aa358fb
Binary files /dev/null and b/skins/metrixhd/themes/default/icons/partly-cloudy-night.png differ
diff --git a/skins/metrixhd/themes/default/icons/rain.png b/skins/metrixhd/themes/default/icons/rain.png
new file mode 100644
index 0000000..8275003
Binary files /dev/null and b/skins/metrixhd/themes/default/icons/rain.png differ
diff --git a/skins/metrixhd/themes/default/icons/sleet.png b/skins/metrixhd/themes/default/icons/sleet.png
new file mode 100644
index 0000000..1d99ae0
Binary files /dev/null and b/skins/metrixhd/themes/default/icons/sleet.png differ
diff --git a/skins/metrixhd/themes/default/icons/snow.png b/skins/metrixhd/themes/default/icons/snow.png
new file mode 100644
index 0000000..939e22f
Binary files /dev/null and b/skins/metrixhd/themes/default/icons/snow.png differ
diff --git a/skins/metrixhd/themes/default/icons/wind.png b/skins/metrixhd/themes/default/icons/wind.png
new file mode 100644
index 0000000..d92ec15
Binary files /dev/null and b/skins/metrixhd/themes/default/icons/wind.png differ
diff --git a/skins/metrixhd/xmlfiles/plug-weatherforecast-weatherforecast.xml b/skins/metrixhd/xmlfiles/plug-weatherforecast-weatherforecast.xml
new file mode 100644
index 0000000..f922522
--- /dev/null
+++ b/skins/metrixhd/xmlfiles/plug-weatherforecast-weatherforecast.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE menuplugin SYSTEM "../../../dtd/displaymenuplugin.dtd">
+
+<menuplugin x="0" y="0" width="100%" height="100%" fadetime="0">
+    <background>
+        <!-- background left Menu -->
+        <area x="0" y="0" width="50%" height="100%" layer="1">
+            <fill color="{clrTransBlack}" />
+        </area>
+        <!-- background right detail view -->
+        <area x="50%" y="3%" width="50%" height="94%" layer="1">
+            <fill color="{clrTransBlueLight}" />
+        </area>
+    </background>
+    <!-- Available Variables header:
+    {title}                         title of current menu
+    {vdrversion}                    running VDR Version
+    {hasicon}                       true if a menu icon is available
+    {icon}                          path of menu icon
+    -->
+    <header>
+        <area x="0" y="0" width="50%" height="10%" layer="2">
+            <drawtext condition="not{hasicon}" x="5" width="{areawidth}-10" valign="center" font="{light}" fontsize="80%" color="{clrWhite}" text="{title}" />
+            <drawimage condition="{hasicon}" name="menuicon" imagetype="menuicon" path="{icon}" x="5" valign="center" width="{areaheight}*8/10" height="80%"/>
+            <drawtext condition="{hasicon}" x="{areaheight}" valign="center" width="{areawidth}-{areaheight}-10" font="{light}" fontsize="80%" color="{clrWhite}" text="{title}" />
+        </area>
+    </header>
+
+    <datetime>
+        <area x="0" y="0" width="1" height="1" layer="1">
+            <fill color="{clrTransparent}" />
+        </area>
+    </datetime>
+
+    <colorbuttons>
+        <area x="0" y="0" width="1" height="1" layer="1">
+            <fill color="{clrTransparent}" />
+        </area>
+    </colorbuttons>
+
+    <menuitems x="0" y="10%" orientation="vertical" width="100%" height="82%" align="center" numlistelements="10">
+        <!-- Available Variables schedules menu listelement:
+        {current}
+        {separator}
+        {menuitemtext}
+        {iscurrent}
+        {ishourly}
+        {isdaily}
+        -->
+        <listelement debug="true">
+            <!-- Background -->
+            <area x="1%" width="46%" layer="2">
+                <fill condition="not{current}" color="{clrTransparent}" />
+                <fill condition="{current}" color="{clrTransBlueLight}" />
+            </area>
+            <area x="1%" width="46%" layer="3">
+                <drawtext x="10" valign="center" font="{light}" fontsize="95%" color="{clrWhite}" text="{menuitemtext}" />
+            </area>
+        </listelement>
+        <!-- additional element which is drawn for current element -->
+        <!-- All Tokens from listelement are available -->
+        <currentelement debug="true" delay="100" fadetime="0">
+            <area condition="{iscurrent}" x="51%" y="0" width="48%" height="100%" layer="3">
+                <drawimage name="weathericon" imagetype="icon" path="{icon}" x="2%" y="0" width="{areawidth}*0.3" height="{areawidth}*0.3"/>
+                <drawtext align="right" y="0" font="{light}" fontsize="8%" color="{clrWhite}" text="{timestamp}" />
+                <drawtext align="right" y="6%" font="{light}" fontsize="16%" color="{clrWhite}" text="{temperature}°C" />
+                <drawtext align="right" y="20%" font="{light}" fontsize="8%" color="{clrWhite}" text="{summary}" />
+                <drawtext x="0" y="34%" font="{light}" fontsize="6%" color="{clrWhite}" text="Gefühlte Temperatur: {apparenttemperature} °C" />
+                <drawtext x="0" y="40%" font="{light}" fontsize="6%" color="{clrWhite}" text="Regenwahrsch.: {precipitationprobability} %" />
+                <drawtext x="0" y="46%" font="{light}" fontsize="6%" color="{clrWhite}" text="Regenmenge: {precipitationintensity} l/qm" />
+                <drawtext x="0" y="52%" font="{light}" fontsize="6%" color="{clrWhite}" text="Luftfeuchtigkeit: {humidity} %" />
+                <drawtext x="0" y="58%" font="{light}" fontsize="6%" color="{clrWhite}" text="Windgeschwindigkeit: {windspeed} km/h" />
+                <drawtext x="0" y="64%" font="{light}" fontsize="6%" color="{clrWhite}" text="Windrichtung: {windbearingstring}  ({windbearing} °)" />
+                <drawtext x="0" y="70%" font="{light}" fontsize="6%" color="{clrWhite}" text="Bewölkung: {cloudcover} %" />
+                <drawtext x="0" y="76%" font="{light}" fontsize="6%" color="{clrWhite}" text="Luftdruck: {pressure} HPa" />
+                <drawtext x="0" y="82%" font="{light}" fontsize="6%" color="{clrWhite}" text="Ozon: {ozone} DU" />
+                <drawtext x="0" y="88%" font="{light}" fontsize="6%" color="{clrWhite}" text="Sicht: {visibility} km" />
+            </area>
+            <area condition="{ishourly}" x="51%" y="0" width="48%" height="100%" layer="3">
+                <loop name="hourly" x="0" y="0" orientation="vertical" columnwidth="{areawidth}" rowheight="{areaheight}/12" overflow="cut">
+                    <drawtext x="0" font="{semibold}" fontsize="7%" valign="center" color="{clrWhite}" text="{hourly[timestamp]}" />
+                    <drawimage imagetype="icon" path="{hourly[icon]}" x="18%" valign="center" width="{rowheight}*0.8" height="{rowheight}*0.8"/>
+                    <drawtext x="30%" font="{light}" fontsize="7%" valign="center" color="{clrWhite}" text="{hourly[temperature]}°C" />
+                    <drawtext x="48%" font="{light}" fontsize="5%" valign="center" width="52%" color="{clrWhite}" text="{hourly[summary]}" />
+                    <drawrectangle x="0" y="{rowheight} - 1" width="{columnwidth}" height="1" color="{clrWhite}" />
+                </loop>
+            </area>
+            <area condition="{isdaily}" x="51%" y="0" width="48%" height="100%" layer="3">
+                <loop name="daily" x="0" y="0" orientation="vertical" columnwidth="{areawidth}" rowheight="{areaheight}/7" overflow="cut">
+                    <drawtext x="0" font="{semibold}" fontsize="{rowheight}/2" y="5" color="{clrWhite}" text="{daily[dayname]} {daily[day]}" />
+                    <drawtext x="35%" font="{light}" fontsize="{rowheight}/2" y="5" color="{clrWhite}" text="{daily[temperaturemin]}°C - {daily[temperaturemax]}°C" />
+                    <drawtext x="0" font="{light}" fontsize="{rowheight}*0.3" width="{columnwidth} - {rowheight}*0.7" y="{rowheight}*0.6" color="{clrWhite}" text="{daily[summary]}" />
+                    <drawimage imagetype="icon" path="{daily[icon]}" x="{columnwidth} - {rowheight}*0.7" valign="center" width="{rowheight}*0.7" height="{rowheight}*0.7"/>
+                    <drawrectangle x="0" y="{rowheight} - 1" width="{columnwidth}" height="1" color="{clrWhite}" />
+                </loop>
+            </area>
+        </currentelement>
+    </menuitems>
+</menuplugin>
\ No newline at end of file
diff --git a/views/displaymenurootview.c b/views/displaymenurootview.c
index 2f3f11d..142949f 100644
--- a/views/displaymenurootview.c
+++ b/views/displaymenurootview.c
@@ -205,7 +205,7 @@ void cDisplayMenuRootView::SetMenu(eMenuCategory menuCat, bool menuInit) {
 }
 
 void cDisplayMenuRootView::CorrectDefaultMenu(void) {
-    if (viewType > svMenuDefault) {
+    if (viewType > svMenuDefault && viewType != svMenuPlugin) {
         SetMenu(mcUnknown, true);
     }
 }
-- 
cgit v1.2.3