- lcd4linux.conf: small formatting fixes

archive-imagefiles/lcd4linux/etc/lcd4linux.conf

@@ -359,24 +359,13 @@ Widget Pearl_BACKGROUND {
 	update		0
 }
 
-Widget Pearl_DOSCAM {
+Widget Pearl_XCAM {
 	class		'Image'
 	file		ICONS . 'background/' . file::readline('/tmp/lcd/layout', 1) . '.png'
 	update		0
 	reload		1
 }
 
-Widget RES320x240 {
-	class		'Truetype'
-	font		file::readline('/tmp/lcd/font', 1)
-	fcolor		'585858'
-	width		120
-	height		20
-	align		'R'
-	expression	file::readline('/usr/share/lcd/icons/spf.txt', 11)
-	update		0
-}
-
 # --- the clocks for standby-mode ------------------------------------------- #
 
 # --- the digital clock ----------------------------------------------------- #
@@ -865,7 +854,7 @@ Layout Pearl_xcam {
 		row25.col01	'XCAMLINE28'
 	}
 	layer 1 {
-		x001.y001	'Pearl_DOSCAM'
+		x001.y001	'Pearl_XCAM'
 	}
 }
 
@@ -1006,7 +995,6 @@ Display Samsung1024x600_xcam {
 	orientation	1
 }
 
-
 Display Samsung800x600_standby {
 	driver		'SamsungSPF'
 	model		'SPF-Auto'
@@ -1073,7 +1061,7 @@ Widget S800x600_STB1 {
 	reload		1
 }
 
-Widget S800x600_DOSCAM {
+Widget S800x600_XCAM {
 	class		'Image'
 	file		ICONS . 'background/800x600/' . file::readline('/tmp/lcd/layout', 1) . '.png'
 	update		0
@@ -1110,7 +1098,7 @@ Widget S800x480_STB1 {
 	reload		1
 }
 
-Widget S800x480_DOSCAM {
+Widget S800x480_XCAM {
 	class		'Image'
 	file		ICONS . 'background/800x480/' . file::readline('/tmp/lcd/layout', 1) . '.png'
 	update		0
@@ -1147,7 +1135,7 @@ Widget S1024x600_STB1 {
 	reload		1
 }
 
-Widget S1024x600_DOSCAM {
+Widget S1024x600_XCAM {
 	class		'Image'
 	file		ICONS . 'background/1024x600/' . file::readline('/tmp/lcd/layout', 1) . '.png'
 	update		0
@@ -1238,7 +1226,7 @@ Widget S_TTF-CHANNEL {
 
 Widget S_TTF-CHANNEL1 {
 	class		'Truetype'
-	expression	(file::readline('/tmp/lcd/mode_logo', 1) == 1 ? '' : file::readline('/tmp/lcd/service', 1))
+	expression	file::readline('/tmp/lcd/mode_logo', 1) == 1 ? '' : file::readline('/tmp/lcd/service', 1)
 	font		file::readline('/tmp/lcd/font', 1)
 	fcolor		'58585800'
 	update		3000
@@ -1398,6 +1386,17 @@ Widget HST_STB {
 	reload		1
 }
 
+Widget RES320x240 {
+	class		'Truetype'
+	font		file::readline('/tmp/lcd/font', 1)
+	fcolor		'585858'
+	width		120
+	height		20
+	align		'R'
+	expression	file::readline('/usr/share/lcd/icons/spf.txt', 11)
+	update		0
+}
+
 Widget RES800x480 {
 	class		'Truetype'
 	font		file::readline('/tmp/lcd/font', 1)
@@ -1528,7 +1527,7 @@ Widget TAGDATUM-TTF {
 
 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())
+	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'
 	align		'C'
@@ -1767,7 +1766,7 @@ Layout Samsung800x600_xcam {
 		X580.Y700	'RES800x600'
 	}
 	layer 2 {
-		x001.y001	'S800x600_DOSCAM'
+		x001.y001	'S800x600_XCAM'
 	}
 }
 
@@ -1805,7 +1804,7 @@ Layout Samsung800x480_xcam {
 		X460.Y700	'RES800x480'
 	}
 	layer 2 {
-		x001.y001	'S800x480_DOSCAM'
+		x001.y001	'S800x480_XCAM'
 	}
 }
 
@@ -1843,7 +1842,7 @@ Layout Samsung1024x600_xcam {
 		X580.Y924	'RES1024x600'
 	}
 	layer 2 {
-		x001.y001	'S1024x600_DOSCAM'
+		x001.y001	'S1024x600_XCAM'
 	}
 }