From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Wed, 28 Dec 2005 23:12:30 +0000 (+0000)
Subject: fix timerlist and movielist multicontent region sizes
X-Git-Tag: 2.6.0~4591
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/bb4448ebb7cb6a4f9fdcd52cd4db29e1ce9d35fa

fix timerlist and movielist multicontent region sizes

TODO: put multicontent entry layout in the skin
---

diff --git a/data/skin.xml b/data/skin.xml
index ab0be1c1..8b10af5a 100644
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -137,7 +137,7 @@
 			<widget name="config" position="10,30" size="420,220" />
 		</screen>
 		<screen name="TimerEditList" position="70,100" size="560,400" title="Timer Editor">
-			<widget name="timerlist" position="10,50" size="530,300" scrollbarMode="showOnDemand" />
+			<widget name="timerlist" position="0,50" size="560,300" scrollbarMode="showOnDemand" />
 			<widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Regular;21" />
 			<widget name="key_green" position="140,0" size="140,40" backgroundColor="green" font="Regular;21" />
 			<widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" font="Regular;21" />
@@ -226,21 +226,21 @@
 			<widget name="Dishpixmap" pixmap="/usr/share/enigma2/dish.png" position="0,0" size="100,107" />
 		</screen>
  		<screen name="ChannelSelection" position="90,98" size="560,417" title="Channel Selection">
-			<widget name="list" position="10,45" size="550,364" scrollbarMode="showOnDemand" />
+			<widget name="list" position="00,45" size="560,364" scrollbarMode="showOnDemand" />
 			<widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Regular;21" />
 			<widget name="key_green" position="140,0" size="140,40" backgroundColor="green" font="Regular;21" />
 			<widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" font="Regular;21" />
 			<widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" font="Regular;21" />
 		</screen>
 		<screen name="SimpleChannelSelection" position="90,98" size="560,417" title="Channel Selection">
-			<widget name="list" position="10,45" size="540,364" scrollbarMode="showOnDemand" />
+			<widget name="list" position="00,45" size="560,364" scrollbarMode="showOnDemand" />
 			<widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Regular;21" />
 			<widget name="key_green" position="140,0" size="140,40" backgroundColor="green" font="Regular;21" />
 			<widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" font="Regular;21" />
 			<widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" font="Regular;21" />
 		</screen>
 		<screen name="EPGSelection" position="90,100" size="560,415" title="EPG Selection">
-			<widget name="list" position="10,40" size="550,370" scrollbarMode="showOnDemand" />
+			<widget name="list" position="0,40" size="560,370" scrollbarMode="showOnDemand" />
 			<widget name="key_red" position="0,0" size="140,30" backgroundColor="red" font="Regular;21" />
 			<widget name="key_green" position="140,0" size="140,30" backgroundColor="green" font="Regular;21" />
 			<widget name="key_yellow" position="280,0" size="140,30" backgroundColor="yellow" font="Regular;21" />
diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py
index 0c0bba9b..0f3a3fd2 100644
--- a/lib/python/Components/MovieList.py
+++ b/lib/python/Components/MovieList.py
@@ -39,7 +39,7 @@ def MovieListEntry(serviceref, serviceHandler):
 	else:
 		len = "?:??"
 	
-	res.append((0, 0, 400, 30, 0, RT_HALIGN_LEFT, info.getName(serviceref)))
+	res.append((0, 0, 560, 30, 0, RT_HALIGN_LEFT, info.getName(serviceref)))
 	
 	description = info.getInfoString(serviceref, iServiceInformation.sDescription)
 	begin = info.getInfo(serviceref, iServiceInformation.sTimeCreate)
@@ -49,9 +49,9 @@ def MovieListEntry(serviceref, serviceHandler):
 		t = FuzzyTime(begin)
 		begin_string = t[0] + ", " + t[1]
 	
-	res.append((0, 30, 200, 20, 1, RT_HALIGN_LEFT, description))
-	res.append((0, 50, 200, 20, 1, RT_HALIGN_LEFT, begin_string))
-	res.append((200, 50, 200, 20, 1, RT_HALIGN_RIGHT, len))
+	res.append((0, 30, 560, 20, 1, RT_HALIGN_LEFT, description))
+	res.append((0, 50, 270, 20, 1, RT_HALIGN_LEFT, begin_string))
+	res.append((290, 50, 270, 20, 1, RT_HALIGN_RIGHT, len))
 	
 	return res
 
diff --git a/lib/python/Components/TimerList.py b/lib/python/Components/TimerList.py
index 8f8dc50c..da2ff949 100644
--- a/lib/python/Components/TimerList.py
+++ b/lib/python/Components/TimerList.py
@@ -26,7 +26,7 @@ RT_WRAP = 32
 def TimerEntryComponent(timer, processed):
 	res = [ timer ]
 	
-	res.append((0, 0, 400, 30, 0, RT_HALIGN_LEFT, timer.service_ref.getServiceName()))
+	res.append((0, 0, 220, 30, 0, RT_HALIGN_LEFT, timer.service_ref.getServiceName()))
 	repeatedtext = ""
 	days = [ "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" ]
 	if (timer.repeated != 0):
@@ -39,11 +39,11 @@ def TimerEntryComponent(timer, processed):
 					repeatedtext += days[x]
 					count += 1
 				flags = flags >> 1
-		res.append((0, 30, 200, 20, 1, RT_HALIGN_LEFT, repeatedtext + (" %s ... %s" % (FuzzyTime(timer.begin)[1], FuzzyTime(timer.end)[1]))))
+		res.append((0, 30, 300, 20, 1, RT_HALIGN_LEFT, repeatedtext + (" %s ... %s" % (FuzzyTime(timer.begin)[1], FuzzyTime(timer.end)[1]))))
 	else:
-		res.append((0, 30, 200, 20, 1, RT_HALIGN_LEFT, repeatedtext + ("%s, %s ... %s" % (FuzzyTime(timer.begin) + FuzzyTime(timer.end)[1:]))))
+		res.append((0, 30, 300, 20, 1, RT_HALIGN_LEFT, repeatedtext + ("%s, %s ... %s" % (FuzzyTime(timer.begin) + FuzzyTime(timer.end)[1:]))))
 
-	res.append((300, 0, 200, 20, 1, RT_HALIGN_RIGHT, timer.name))
+	res.append((240, 0, 320, 20, 1, RT_HALIGN_RIGHT, timer.name))
 	
 	if not processed:
 		if timer.state == TimerEntry.StateWait:
@@ -57,7 +57,7 @@ def TimerEntryComponent(timer, processed):
 	else:
 		state = "done!"
 	
-	res.append((300, 30, 200, 20, 1, RT_HALIGN_RIGHT, state))
+	res.append((320, 30, 240, 20, 1, RT_HALIGN_RIGHT, state))
 	
 	return res