Skip to content
Browse files

Add a new required 'copyrightlogo' widget to all weather screens

Some newer sources require more than a text copyright string.
  • Loading branch information...
1 parent 20d8ef6 commit a3aa6f52efb575ded2ea23f47558cf463979c36b @stuartm stuartm committed Jul 13, 2012
View
8 mythplugins/mythweather/mythweather/weather-screens.xml
@@ -15,6 +15,7 @@
<datum name="weather_icon" />
<datum name="observation_time" />
<datum name="copyright" />
+ <datum name="copyrightlogo" />
</screen>
<screen name="Three Day Forecast">
@@ -33,6 +34,7 @@
<datum name="high-2" />
<datum name="updatetime" />
<datum name="copyright" />
+ <datum name="copyrightlogo" />
</screen>
<screen name="Six Day Forecast">
@@ -63,33 +65,38 @@
<datum name="low-5" />
<datum name="updatetime" />
<datum name="copyright" />
+ <datum name="copyrightlogo" />
</screen>
<!-- <screen name="Today's Forecast">
<datum name="header" />
<datum name="updatetime" />
<datum name="today-desc" />
<datum name="copyright" />
+ <datum name="copyrightlogo" />
</screen> -->
<screen name="Static Map" hasunits="no">
<datum name="smdesc" />
<datum name="updatetime" />
<datum name="map" />
<datum name="copyright" />
+ <datum name="copyrightlogo" />
</screen>
<screen name="Animated Map" hasunits="no">
<datum name="amdesc" />
<datum name="updatetime" />
<datum name="animatedimage" />
<datum name="copyright" />
+ <datum name="copyrightlogo" />
</screen>
<screen name="Severe Weather Alerts" hasunits="no">
<datum name="swlocation" />
<datum name="alerts" />
<datum name="copyright" />
+ <datum name="copyrightlogo" />
</screen>
<screen name="18 Hour Forecast">
@@ -120,6 +127,7 @@
<datum name="pop-5" />
<datum name="updatetime" />
<datum name="copyright" />
+ <datum name="copyrightlogo" />
</screen>
<!-- <screen name="Tomorrow's Outlook">
View
7 mythplugins/mythweather/mythweather/weatherScreen.cpp
@@ -128,6 +128,13 @@ bool WeatherScreen::prepareScreen(bool checkOnly)
.arg(m_name));
return false;
}
+ else if (name == "copyrightlogo")
+ {
+ LOG(VB_GENERAL, LOG_WARNING,
+ QString("No copyrightlogo widget found, skipping screen %1.")
+ .arg(m_name));
+ return false;
+ }
}
if( !widget || checkOnly )
View
49 mythplugins/mythweather/theme/default-wide/weather-ui.xml
@@ -156,10 +156,15 @@
</textarea>
<textarea name="copyright" from="basetextarea">
- <area>70,640,1140,40</area>
+ <area>70,640,700,40</area>
<align>left,vcenter</align>
<font>basesmaller</font>
</textarea>
+
+ <imagetype name="copyrightlogo">
+ <area>900,617,240,60</area>
+ <preserveaspect>true</preserveaspect>
+ </imagetype>
</window>
<window name="Three Day Forecast">
@@ -265,10 +270,15 @@
</textarea>
<textarea name="copyright" from="basetextarea">
- <area>70,640,1140,40</area>
+ <area>70,640,700,40</area>
<align>left,vcenter</align>
<font>basesmaller</font>
</textarea>
+
+ <imagetype name="copyrightlogo">
+ <area>900,617,240,60</area>
+ <preserveaspect>true</preserveaspect>
+ </imagetype>
</window>
<window name="Six Day Forecast">
@@ -428,10 +438,15 @@
</textarea>
<textarea name="copyright" from="basetextarea">
- <area>70,640,1140,40</area>
+ <area>70,640,700,40</area>
<align>left,vcenter</align>
<font>basesmaller</font>
</textarea>
+
+ <imagetype name="copyrightlogo">
+ <area>900,617,240,60</area>
+ <preserveaspect>true</preserveaspect>
+ </imagetype>
</window>
<window name="Static Map">
@@ -447,10 +462,15 @@
</imagetype>
<textarea name="copyright" from="basetextarea">
- <area>70,640,1140,40</area>
+ <area>70,640,700,40</area>
<align>left,vcenter</align>
<font>basesmaller</font>
</textarea>
+
+ <imagetype name="copyrightlogo">
+ <area>900,617,240,60</area>
+ <preserveaspect>true</preserveaspect>
+ </imagetype>
</window>
<window name="Animated Map">
@@ -467,10 +487,15 @@
</imagetype>
<textarea name="copyright" from="basetextarea">
- <area>70,640,1140,40</area>
+ <area>70,640,700,40</area>
<align>left,vcenter</align>
<font>basesmaller</font>
</textarea>
+
+ <imagetype name="copyrightlogo">
+ <area>900,617,240,60</area>
+ <preserveaspect>true</preserveaspect>
+ </imagetype>
</window>
<window name="Severe Weather Alerts">
@@ -488,10 +513,15 @@
</textarea>
<textarea name="copyright" from="basetextarea">
- <area>70,640,1140,40</area>
+ <area>70,640,700,40</area>
<align>left,vcenter</align>
<font>basesmaller</font>
</textarea>
+
+ <imagetype name="copyrightlogo">
+ <area>900,617,240,60</area>
+ <preserveaspect>true</preserveaspect>
+ </imagetype>
</window>
<window name="18 Hour Forecast">
@@ -652,10 +682,15 @@
</textarea>
<textarea name="copyright" from="basetextarea">
- <area>70,640,1140,40</area>
+ <area>70,640,700,40</area>
<align>left,vcenter</align>
<font>basesmaller</font>
</textarea>
+
+ <imagetype name="copyrightlogo">
+ <area>900,617,240,60</area>
+ <preserveaspect>true</preserveaspect>
+ </imagetype>
</window>
<window name="global-setup">
View
54 mythplugins/mythweather/theme/default/weather-ui.xml
@@ -40,7 +40,7 @@
</textarea>
<textarea name="update_text" from="basetextarea">
- <area>30,531,740,33</area>
+ <area>30,531,520,33</area>
<align>vcenter</align>
</textarea>
</window>
@@ -147,16 +147,21 @@
</imagetype>
<textarea name="observation_time" from="basetextarea">
- <area>30,531,740,33</area>
+ <area>30,531,520,33</area>
<align>vcenter</align>
</textarea>
<textarea name="copyright" from="basetextarea">
- <area>30,558,740,33</area>
+ <area>30,558,520,33</area>
<align>left,vcenter</align>
<font>basesmaller</font>
</textarea>
+ <imagetype name="copyrightlogo">
+ <area>530,531,240,60</area>
+ <preserveaspect>true</preserveaspect>
+ </imagetype>
+
</window>
<window name="Three Day Forecast">
@@ -262,10 +267,15 @@
</textarea>
<textarea name="copyright" from="basetextarea">
- <area>30,558,740,33</area>
+ <area>30,558,520,33</area>
<align>left,vcenter</align>
<font>basesmaller</font>
</textarea>
+
+ <imagetype name="copyrightlogo">
+ <area>530,531,240,60</area>
+ <preserveaspect>true</preserveaspect>
+ </imagetype>
</window>
@@ -421,10 +431,15 @@
</textarea>
<textarea name="copyright" from="basetextarea">
- <area>30,558,740,33</area>
+ <area>30,558,520,33</area>
<align>left,vcenter</align>
<font>basesmaller</font>
</textarea>
+
+ <imagetype name="copyrightlogo">
+ <area>530,531,240,60</area>
+ <preserveaspect>true</preserveaspect>
+ </imagetype>
</window>
@@ -441,10 +456,15 @@
</imagetype>
<textarea name="copyright" from="basetextarea">
- <area>30,558,740,33</area>
+ <area>30,558,520,33</area>
<align>left,vcenter</align>
<font>basesmaller</font>
</textarea>
+
+ <imagetype name="copyrightlogo">
+ <area>530,531,240,60</area>
+ <preserveaspect>true</preserveaspect>
+ </imagetype>
</window>
@@ -462,11 +482,16 @@
</imagetype>
<textarea name="copyright" from="basetextarea">
- <area>30,558,740,33</area>
+ <area>30,558,520,33</area>
<align>left,vcenter</align>
<font>basesmaller</font>
</textarea>
+ <imagetype name="copyrightlogo">
+ <area>530,531,240,60</area>
+ <preserveaspect>true</preserveaspect>
+ </imagetype>
+
</window>
<window name="Severe Weather Alerts">
@@ -484,11 +509,16 @@
</textarea>
<textarea name="copyright" from="basetextarea">
- <area>30,558,740,33</area>
+ <area>30,558,520,33</area>
<align>left,vcenter</align>
<font>basesmaller</font>
</textarea>
+ <imagetype name="copyrightlogo">
+ <area>530,531,240,60</area>
+ <preserveaspect>true</preserveaspect>
+ </imagetype>
+
</window>
<window name="18 Hour Forecast">
@@ -642,13 +672,17 @@
<position>531,482</position>
</textarea>
-
<textarea name="copyright" from="basetextarea">
- <area>30,558,740,33</area>
+ <area>30,558,520,33</area>
<align>left,vcenter</align>
<font>basesmaller</font>
</textarea>
+ <imagetype name="copyrightlogo">
+ <area>530,531,240,60</area>
+ <preserveaspect>true</preserveaspect>
+ </imagetype>
+
</window>
<window name="global-setup">

0 comments on commit a3aa6f5

Please sign in to comment.
Something went wrong with that request. Please try again.