- lcd4linux: sync with horsti58

archive-imagefiles/lcd4linux/etc/lcd4linux.conf

@@ -435,6 +435,25 @@ Widget ICON_WEATHER {
 	reload		1
 }
 
+Widget ICON_WEATHER1 {
+	class		'Image'
+	file		file::exist(FWEATHER) == 0 ? ICONS . 'mode/weather_off.png' : ICONS . 'mode/weather_on.png'
+	update		10000
+	reload		1
+    scale       300
+}
+
+Widget WEATHER_CITY1 {
+	class		'Truetype'
+	font		file::readline('/tmp/lcd/font', 1)
+	fcolor		'EEEEEE'
+	width		300
+	height		50
+	align		'C'
+	expression	file::exist(FWEATHER) == 0 ? '' : file::readline('/tmp/lcd/weather_city', 1)
+	update		10000
+}
+
 Widget WEATHERICON_CURRENT {
 	class		'image'
 	file		file::exist(FWEATHER) == 0 ? ICONS . 'blank.png' : file::readline('/tmp/lcd/weather_icon', 1)
@@ -457,6 +476,17 @@ Widget TEMPERATURE_CURRENT {
 	update		10000
 }
 
+Widget TEMPERATURE_CURRENT1 {
+	class		'Truetype'
+	font		file::readline('/tmp/lcd/font', 1)
+	fcolor		'EEEEEE'
+	width		100
+	height		50
+	align		'L'
+	expression	file::exist(FWEATHER) == 0 ? '' : file::readline('/tmp/lcd/weather_temp', 1)
+	update		10000
+}
+
 Widget TEMPERATURE_LATER {
 	class		'Text'
 	expression	file::exist(FWEATHER) == 0 ? '' : (TEMP=file::readline('/tmp/lcd/weather_temp', strftime('%H', time()) < 16 ? 2 : 3); substr(TEMP, (strstr(TEMP, '|') + 1)))
@@ -465,6 +495,17 @@ Widget TEMPERATURE_LATER {
 	update		10000
 }
 
+Widget TEMPERATURE_LATER1 {
+	class		'Truetype'
+	font		file::readline('/tmp/lcd/font', 1)
+	fcolor		'EEEEEE'
+	width		100
+	height		50
+	align		'R'
+	expression	file::exist(FWEATHER) == 0 ? '' : (TEMP=file::readline('/tmp/lcd/weather_temp', strftime('%H', time()) < 16 ? 2 : 3); substr(TEMP, (strstr(TEMP, '|') + 1)))
+	update		10000
+}
+
 # --- OS/N/DOScam ----------------------------------------------------------- #
 
 Widget XCAMLINE01 {
@@ -1325,7 +1366,7 @@ Widget S_DURATION {
 	size		0
 	width		160
 	height		50
-	align		'L'
+	align		'R'
 }
 
 Widget S_DURATION1 {
@@ -1337,7 +1378,7 @@ Widget S_DURATION1 {
 	reload		1
 	width		160
 	height		40
-	align		'L'
+	align		'R'
 }
 
 Widget S_EPGBAR {
@@ -1437,7 +1478,7 @@ Widget S_HOUR1_ {
 	file		ICONS . 'clock/digital_weiss_129px/' . substr(strftime('%H', time()), 0, 1) . '.png'
 	update		10000
 	reload		1
-	scale		70
+	scale		50
 }
 
 Widget S_HOUR_1 {
@@ -1445,14 +1486,14 @@ Widget S_HOUR_1 {
 	file		ICONS . 'clock/digital_weiss_129px/' . substr(strftime('%H', time()), 1) . '.png'
 	update		10000
 	reload		1
-	scale		70
+	scale		50
 }
 
 Widget S_DP {
 	class		'Image'
 	file		ICONS . 'clock/digital_weiss_129px/dp.png'
 	update		0
-	scale		70
+	scale		50
 }
 
 Widget S_MIN1_ {
@@ -1460,7 +1501,7 @@ Widget S_MIN1_ {
 	file		ICONS . 'clock/digital_weiss_129px/' . substr(strftime('%M', time()), 0, 1) . '.png'
 	update		10000
 	reload		1
-	scale		70
+	scale		50
 }
 
 Widget S_MIN_1 {
@@ -1468,7 +1509,7 @@ Widget S_MIN_1 {
 	file		ICONS . 'clock/digital_weiss_129px/' . substr(strftime('%M', time()), 1) . '.png'
 	update		10000
 	reload		1
-	scale		70
+	scale		50
 }
 
 Widget S_STANDBY_HOUR1_ {
@@ -1516,7 +1557,7 @@ Widget TAGDATUM-TTF {
 	class		'truetype'
 	expression	(strftime('%u', time()) == 1 ? 'Montag' : (strftime('%u', time()) == 2 ? 'Dienstag' : (strftime('%u', time()) == 3 ? 'Mittwoch' : (strftime('%u', time()) == 4 ? 'Donnerstag' : (strftime('%u', time()) == 5 ? 'Freitag' : (strftime('%u', time()) == 6 ? 'Samstag' : 'Sonntag')))))) . ', ' . strftime('%d.%m.%Y', time())
 	font		file::readline('/tmp/lcd/font', 1)
-	fcolor		'58585800'
+	fcolor		'EEEEEE00'
 	align		'C'
 	width		800
 	height		75
@@ -1529,7 +1570,7 @@ Widget TAGDATUM-TTF1 {
 	class		'truetype'
 	expression	(strftime('%u', time()) == 1 ? 'Montag' : (strftime('%u', time()) == 2 ? 'Dienstag' : (strftime('%u', time()) == 3 ? 'Mittwoch' : (strftime('%u', time()) == 4 ? 'Donnerstag' : (strftime('%u', time()) == 5 ? 'Freitag' : (strftime('%u', time()) == 6 ? 'Samstag' : 'Sonntag')))))) . ', ' . strftime('%d.%m.%Y', time())
 	font		file::readline('/tmp/lcd/font', 1)
-	fcolor		'58585800'
+	fcolor		'EEEEEE00'
 	align		'C'
 	width		1000
 	height		75
@@ -1554,12 +1595,17 @@ Layout Samsung800x600_standard {
 		X260.Y165	'S_TTF-EPG-NOW'
 		X320.Y165	'S_TTF-EPG-NEXT'
 		X320.Y20	'S_END'
-		X480.Y125	'S_HOUR1_'
+		X480.Y315	'ICON_WEATHER1'
-		X480.Y190	'S_HOUR_1'
+		X500.Y230	'WEATHERICON_CURRENT'
-		X480.Y254	'S_DP'
+		X500.Y530	'WEATHERICON_LATER'
-		X480.Y286	'S_MIN1_'
+		X510.Y300	'TEMPERATURE_CURRENT1'
-		X480.Y351	'S_MIN_1'
+		X510.Y420	'TEMPERATURE_LATER1'
-		X520.Y610	'S_DURATION'
+		X500.Y20	'S_HOUR1_'
+		X500.Y65	'S_HOUR_1'
+		X500.Y108	'S_DP'
+		X500.Y125	'S_MIN1_'
+		X500.Y170	'S_MIN_1'
+		X510.Y610	'S_DURATION'
 		X580.Y5		'HST'
 		X580.Y700	'RES800x600'
 	}
@@ -1586,11 +1632,16 @@ Layout Samsung800x480_standard {
 		X205.Y165	'S_TTF-EPG-NOW'
 		X260.Y165	'S_TTF-EPG-NEXT'
 		X260.Y20	'S_END'
-		X380.Y125	'S_HOUR1_'
+		X380.Y315	'ICON_WEATHER1'
-		X380.Y190	'S_HOUR_1'
+		X400.Y230	'WEATHERICON_CURRENT'
-		X380.Y255	'S_DP'
+		X400.Y530	'WEATHERICON_LATER'
-		X380.Y288	'S_MIN1_'
+		X410.Y300	'TEMPERATURE_CURRENT1'
-		X380.Y353	'S_MIN_1'
+		X410.Y420	'TEMPERATURE_LATER1'
+		X400.Y20	'S_HOUR1_'
+		X400.Y65	'S_HOUR_1'
+		X400.Y108	'S_DP'
+		X400.Y125	'S_MIN1_'
+		X400.Y170	'S_MIN_1'
 		X410.Y630	'S_DURATION'
 		X460.Y5		'HST'
 		X460.Y700	'RES800x480'
@@ -1618,12 +1669,17 @@ Layout Samsung1024x600_standard {
 		X260.Y190	'S_TTF-EPG-NOW1'
 		X320.Y190	'S_TTF-EPG-NEXT1'
 		X320.Y20	'S_END'
-		X480.Y130	'S_HOUR1_'
+		X480.Y415	'ICON_WEATHER1'
-		X480.Y195	'S_HOUR_1'
+		X500.Y230	'WEATHERICON_CURRENT'
-		X480.Y260	'S_DP'
+		X500.Y730	'WEATHERICON_LATER'
-		X480.Y293	'S_MIN1_'
+		X510.Y300	'TEMPERATURE_CURRENT1'
-		X480.Y358	'S_MIN_1'
+		X510.Y620	'TEMPERATURE_LATER1'
-		X520.Y830	'S_DURATION'
+		X500.Y20	'S_HOUR1_'
+		X500.Y65	'S_HOUR_1'
+		X500.Y108	'S_DP'
+		X500.Y125	'S_MIN1_'
+		X500.Y170	'S_MIN_1'
+		X510.Y830	'S_DURATION'
 		X580.Y5		'HST'
 		X580.Y924	'RES1024x600'
 	}
@@ -1861,6 +1917,12 @@ Layout Samsung800x600_standby {
 		X160.Y365	 'S_STANDBY_DP'
 		X160.Y427	 'S_STANDBY_MIN1_'
 		X160.Y548	 'S_STANDBY_MIN_1'
+		X450.Y310	'ICON_WEATHER1'
+		X500.Y050	'WEATHERICON_CURRENT'
+		X500.Y700	'WEATHERICON_LATER'
+        X510.Y250	'WEATHER_CITY1'
+		X510.Y140	'TEMPERATURE_CURRENT1'
+		X510.Y590	'TEMPERATURE_LATER1'
 		X580.Y5		 'HST_STB'
 		X580.Y700	 'RES800x600'
 	}
@@ -1884,6 +1946,12 @@ Layout Samsung800x480_standby {
 		X160.Y365	'S_STANDBY_DP'
 		X160.Y427	'S_STANDBY_MIN1_'
 		X160.Y548	'S_STANDBY_MIN_1'
+		X380.Y310	'ICON_WEATHER1'
+		X400.Y050	'WEATHERICON_CURRENT'
+		X400.Y700	'WEATHERICON_LATER'
+        X410.Y250	'WEATHER_CITY1'
+		X410.Y140	'TEMPERATURE_CURRENT1'
+		X410.Y590	'TEMPERATURE_LATER1'
 		X460.Y5		'HST_STB'
 		X460.Y700	'RES800x480'
 	}
@@ -1907,6 +1975,12 @@ Layout Samsung1024x600_standby {
 		X160.Y475	'S_STANDBY_DP'
 		X160.Y538	'S_STANDBY_MIN1_'
 		X160.Y661	'S_STANDBY_MIN_1'
+		X450.Y410	'ICON_WEATHER1'
+		X500.Y050	'WEATHERICON_CURRENT'
+		X500.Y900	'WEATHERICON_LATER'
+        X510.Y350	'WEATHER_CITY1'
+		X510.Y140	'TEMPERATURE_CURRENT1'
+		X510.Y790	'TEMPERATURE_LATER1'
 		X580.Y5		'HST_STB'
 		X580.Y924	'RES1024x600'
 	}