1.1 --- a/mosaic/plugin.py Mon Jan 16 22:56:52 2012 +0100
1.2 +++ b/mosaic/plugin.py Mon Jan 16 22:58:01 2012 +0100
1.3 @@ -59,67 +59,73 @@
1.4
1.5 positions = []
1.6 x = 80
1.7 - y = 50
1.8 + y = 40
1.9 for i in range(1, 10):
1.10 positions.append([x, y])
1.11 x += windowWidth
1.12 x += ((width - 160) - (windowWidth * 3)) / 2
1.13 if (i == 3) or (i == 6):
1.14 - y = y + windowHeight + 20
1.15 + y = y + windowHeight + 40
1.16 x = 80
1.17
1.18 skin = ""
1.19 - skin += """<screen position="0,0" size="%d,%d" title="Mosaic" flags="wfNoBorder" backgroundColor="#ffffff" >""" % (width, height)
1.20 + skin += """<screen position="0,0" size="%d,%d" title="Mosaic" flags="wfNoBorder" backgroundColor="#000000" >""" % (width, height)
1.21 skin += """<widget name="playState" position="55,55" size="16,16" alphatest="on" />"""
1.22 - skin += """<eLabel position="%d,%d" size="%d,%d" />""" % (positions[0][0]-2, positions[0][1]-1, windowWidth, windowHeight)
1.23 - skin += """<eLabel position="%d,%d" size="%d,%d" />""" % (positions[1][0]-2, positions[1][1]-1, windowWidth, windowHeight)
1.24 - skin += """<eLabel position="%d,%d" size="%d,%d" />""" % (positions[2][0]-2, positions[2][1]-1, windowWidth, windowHeight)
1.25 - skin += """<eLabel position="%d,%d" size="%d,%d" />""" % (positions[3][0]-2, positions[3][1]-1, windowWidth, windowHeight)
1.26 - skin += """<eLabel position="%d,%d" size="%d,%d" />""" % (positions[4][0]-2, positions[4][1]-1, windowWidth, windowHeight)
1.27 - skin += """<eLabel position="%d,%d" size="%d,%d" />""" % (positions[5][0]-2, positions[5][1]-1, windowWidth, windowHeight)
1.28 - skin += """<eLabel position="%d,%d" size="%d,%d" />""" % (positions[6][0]-2, positions[6][1]-1, windowWidth, windowHeight)
1.29 - skin += """<eLabel position="%d,%d" size="%d,%d" />""" % (positions[7][0]-2, positions[7][1]-1, windowWidth, windowHeight)
1.30 - skin += """<eLabel position="%d,%d" size="%d,%d" />""" % (positions[8][0]-2, positions[8][1]-1, windowWidth, windowHeight)
1.31 - skin += """<widget name="channel1" position="%d,%d" size="%d,20" font="Regular;18" backgroundColor="#ffffff" foregroundColor="#000000" />""" % (positions[0][0], positions[0][1]-18, windowWidth-4)
1.32 - skin += """<widget name="channel2" position="%d,%d" size="%d,20" font="Regular;18" backgroundColor="#ffffff" foregroundColor="#000000" />""" % (positions[1][0], positions[1][1]-18, windowWidth-4)
1.33 - skin += """<widget name="channel3" position="%d,%d" size="%d,20" font="Regular;18" backgroundColor="#ffffff" foregroundColor="#000000" />""" % (positions[2][0], positions[2][1]-18, windowWidth-4)
1.34 - skin += """<widget name="channel4" position="%d,%d" size="%d,20" font="Regular;18" backgroundColor="#ffffff" foregroundColor="#000000" />""" % (positions[3][0], positions[3][1]-18, windowWidth-4)
1.35 - skin += """<widget name="channel5" position="%d,%d" size="%d,20" font="Regular;18" backgroundColor="#ffffff" foregroundColor="#000000" />""" % (positions[4][0], positions[4][1]-18, windowWidth-4)
1.36 - skin += """<widget name="channel6" position="%d,%d" size="%d,20" font="Regular;18" backgroundColor="#ffffff" foregroundColor="#000000" />""" % (positions[5][0], positions[5][1]-18, windowWidth-4)
1.37 - skin += """<widget name="channel7" position="%d,%d" size="%d,20" font="Regular;18" backgroundColor="#ffffff" foregroundColor="#000000" />""" % (positions[6][0], positions[6][1]-18, windowWidth-4)
1.38 - skin += """<widget name="channel8" position="%d,%d" size="%d,20" font="Regular;18" backgroundColor="#ffffff" foregroundColor="#000000" />""" % (positions[7][0], positions[7][1]-18, windowWidth-4)
1.39 - skin += """<widget name="channel9" position="%d,%d" size="%d,20" font="Regular;18" backgroundColor="#ffffff" foregroundColor="#000000" />""" % (positions[8][0], positions[8][1]-18, windowWidth-4)
1.40 - skin += """<widget name="window1" position="%d,%d" zPosition="1" size="%d,%d" />""" % (positions[0][0]-2, positions[0][1]-1, windowWidth, windowHeight)
1.41 - skin += """<widget name="window2" position="%d,%d" zPosition="1" size="%d,%d" />""" % (positions[1][0]-2, positions[1][1]-1, windowWidth, windowHeight)
1.42 - skin += """<widget name="window3" position="%d,%d" zPosition="1" size="%d,%d" />""" % (positions[2][0]-2, positions[2][1]-1, windowWidth, windowHeight)
1.43 - skin += """<widget name="window4" position="%d,%d" zPosition="1" size="%d,%d" />""" % (positions[3][0]-2, positions[3][1]-1, windowWidth, windowHeight)
1.44 - skin += """<widget name="window5" position="%d,%d" zPosition="1" size="%d,%d" />""" % (positions[4][0]-2, positions[4][1]-1, windowWidth, windowHeight)
1.45 - skin += """<widget name="window6" position="%d,%d" zPosition="1" size="%d,%d" />""" % (positions[5][0]-2, positions[5][1]-1, windowWidth, windowHeight)
1.46 - skin += """<widget name="window7" position="%d,%d" zPosition="1" size="%d,%d" />""" % (positions[6][0]-2, positions[6][1]-1, windowWidth, windowHeight)
1.47 - skin += """<widget name="window8" position="%d,%d" zPosition="1" size="%d,%d" />""" % (positions[7][0]-2, positions[7][1]-1, windowWidth, windowHeight)
1.48 - skin += """<widget name="window9" position="%d,%d" zPosition="1" size="%d,%d" />""" % (positions[8][0]-2, positions[8][1]-1, windowWidth, windowHeight)
1.49 - skin += """<widget name="video1" position="%d,%d" zPosition="2" size="%d,%d" backgroundColor="#ffffffff" />""" % (positions[0][0]-2, positions[0][1]-1, windowWidth, windowHeight)
1.50 - skin += """<widget name="video2" position="%d,%d" zPosition="2" size="%d,%d" backgroundColor="#ffffffff" />""" % (positions[1][0]-2, positions[1][1]-1, windowWidth, windowHeight)
1.51 - skin += """<widget name="video3" position="%d,%d" zPosition="2" size="%d,%d" backgroundColor="#ffffffff" />""" % (positions[2][0]-2, positions[2][1]-1, windowWidth, windowHeight)
1.52 - skin += """<widget name="video4" position="%d,%d" zPosition="2" size="%d,%d" backgroundColor="#ffffffff" />""" % (positions[3][0]-2, positions[3][1]-1, windowWidth, windowHeight)
1.53 - skin += """<widget name="video5" position="%d,%d" zPosition="2" size="%d,%d" backgroundColor="#ffffffff" />""" % (positions[4][0]-2, positions[4][1]-1, windowWidth, windowHeight)
1.54 - skin += """<widget name="video6" position="%d,%d" zPosition="2" size="%d,%d" backgroundColor="#ffffffff" />""" % (positions[5][0]-2, positions[5][1]-1, windowWidth, windowHeight)
1.55 - skin += """<widget name="video7" position="%d,%d" zPosition="2" size="%d,%d" backgroundColor="#ffffffff" />""" % (positions[6][0]-2, positions[6][1]-1, windowWidth, windowHeight)
1.56 - skin += """<widget name="video8" position="%d,%d" zPosition="2" size="%d,%d" backgroundColor="#ffffffff" />""" % (positions[7][0]-2, positions[7][1]-1, windowWidth, windowHeight)
1.57 - skin += """<widget name="video9" position="%d,%d" zPosition="2" size="%d,%d" backgroundColor="#ffffffff" />""" % (positions[8][0]-2, positions[8][1]-1, windowWidth, windowHeight)
1.58 - skin += """<widget name="event1" position="%d,%d" size="%d,20" zPosition="3" font="Regular;18" backgroundColor="#000000" foregroundColor="#ffffff" />""" % (positions[0][0]-2, positions[0][1]-1, windowWidth)
1.59 - skin += """<widget name="event2" position="%d,%d" size="%d,20" zPosition="3" font="Regular;18" backgroundColor="#000000" foregroundColor="#ffffff" />""" % (positions[1][0]-2, positions[1][1]-1, windowWidth)
1.60 - skin += """<widget name="event3" position="%d,%d" size="%d,20" zPosition="3" font="Regular;18" backgroundColor="#000000" foregroundColor="#ffffff" />""" % (positions[2][0]-2, positions[2][1]-1, windowWidth)
1.61 - skin += """<widget name="event4" position="%d,%d" size="%d,20" zPosition="3" font="Regular;18" backgroundColor="#000000" foregroundColor="#ffffff" />""" % (positions[3][0]-2, positions[3][1]-1, windowWidth)
1.62 - skin += """<widget name="event5" position="%d,%d" size="%d,20" zPosition="3" font="Regular;18" backgroundColor="#000000" foregroundColor="#ffffff" />""" % (positions[4][0]-2, positions[4][1]-1, windowWidth)
1.63 - skin += """<widget name="event6" position="%d,%d" size="%d,20" zPosition="3" font="Regular;18" backgroundColor="#000000" foregroundColor="#ffffff" />""" % (positions[5][0]-2, positions[5][1]-1, windowWidth)
1.64 - skin += """<widget name="event7" position="%d,%d" size="%d,20" zPosition="3" font="Regular;18" backgroundColor="#000000" foregroundColor="#ffffff" />""" % (positions[6][0]-2, positions[6][1]-1, windowWidth)
1.65 - skin += """<widget name="event8" position="%d,%d" size="%d,20" zPosition="3" font="Regular;18" backgroundColor="#000000" foregroundColor="#ffffff" />""" % (positions[7][0]-2, positions[7][1]-1, windowWidth)
1.66 - skin += """<widget name="event9" position="%d,%d" size="%d,20" zPosition="3" font="Regular;18" backgroundColor="#000000" foregroundColor="#ffffff" />""" % (positions[8][0]-2, positions[8][1]-1, windowWidth)
1.67 + skin += """<eLabel position="%d,%d" size="%d,%d" />""" % (positions[0][0]-2, positions[0][1]+1, windowWidth, windowHeight)
1.68 + skin += """<eLabel position="%d,%d" size="%d,%d" />""" % (positions[1][0]-2, positions[1][1]+1, windowWidth, windowHeight)
1.69 + skin += """<eLabel position="%d,%d" size="%d,%d" />""" % (positions[2][0]-2, positions[2][1]+1, windowWidth, windowHeight)
1.70 + skin += """<eLabel position="%d,%d" size="%d,%d" />""" % (positions[3][0]-2, positions[3][1]+1, windowWidth, windowHeight)
1.71 + skin += """<eLabel position="%d,%d" size="%d,%d" />""" % (positions[4][0]-2, positions[4][1]+1, windowWidth, windowHeight)
1.72 + skin += """<eLabel position="%d,%d" size="%d,%d" />""" % (positions[5][0]-2, positions[5][1]+1, windowWidth, windowHeight)
1.73 + skin += """<eLabel position="%d,%d" size="%d,%d" />""" % (positions[6][0]-2, positions[6][1]+1, windowWidth, windowHeight)
1.74 + skin += """<eLabel position="%d,%d" size="%d,%d" />""" % (positions[7][0]-2, positions[7][1]+1, windowWidth, windowHeight)
1.75 + skin += """<eLabel position="%d,%d" size="%d,%d" />""" % (positions[8][0]-2, positions[8][1]+1, windowWidth, windowHeight)
1.76
1.77 - skin += """<widget name="countdown" position="80,%d" size="%d,20" font="Regular;18" backgroundColor="#ffffff" foregroundColor="#000000" />""" % (height-50, windowWidth)
1.78 - skin += """<widget name="count" position="%d,%d" size="%d,20" font="Regular;18" backgroundColor="#ffffff" foregroundColor="#000000" halign="right" />
1.79 - </screen>""" % (positions[2][0] ,height-50, windowWidth)
1.80 + skin += """<widget name="channel1" position="%d,%d" size="%d,20" font="Regular;18" backgroundColor="#000000" foregroundColor="#88aacc" />""" % (positions[0][0]-2, positions[0][1]-18, windowWidth-4)
1.81 + skin += """<widget name="channel2" position="%d,%d" size="%d,20" font="Regular;18" backgroundColor="#000000" foregroundColor="#88aacc" />""" % (positions[1][0]-2, positions[1][1]-18, windowWidth-4)
1.82 + skin += """<widget name="channel3" position="%d,%d" size="%d,20" font="Regular;18" backgroundColor="#000000" foregroundColor="#88aacc" />""" % (positions[2][0]-2, positions[2][1]-18, windowWidth-4)
1.83 + skin += """<widget name="channel4" position="%d,%d" size="%d,20" font="Regular;18" backgroundColor="#000000" foregroundColor="#88aacc" />""" % (positions[3][0]-2, positions[3][1]-18, windowWidth-4)
1.84 + skin += """<widget name="channel5" position="%d,%d" size="%d,20" font="Regular;18" backgroundColor="#000000" foregroundColor="#88aacc" />""" % (positions[4][0]-2, positions[4][1]-18, windowWidth-4)
1.85 + skin += """<widget name="channel6" position="%d,%d" size="%d,20" font="Regular;18" backgroundColor="#000000" foregroundColor="#88aacc" />""" % (positions[5][0]-2, positions[5][1]-18, windowWidth-4)
1.86 + skin += """<widget name="channel7" position="%d,%d" size="%d,20" font="Regular;18" backgroundColor="#000000" foregroundColor="#88aacc" />""" % (positions[6][0]-2, positions[6][1]-18, windowWidth-4)
1.87 + skin += """<widget name="channel8" position="%d,%d" size="%d,20" font="Regular;18" backgroundColor="#000000" foregroundColor="#88aacc" />""" % (positions[7][0]-2, positions[7][1]-18, windowWidth-4)
1.88 + skin += """<widget name="channel9" position="%d,%d" size="%d,20" font="Regular;18" backgroundColor="#000000" foregroundColor="#88aacc" />""" % (positions[8][0]-2, positions[8][1]-18, windowWidth-4)
1.89 +
1.90 + skin += """<widget name="window1" position="%d,%d" zPosition="1" size="%d,%d" />""" % (positions[0][0]-2, positions[0][1]+1, windowWidth, windowHeight)
1.91 + skin += """<widget name="window2" position="%d,%d" zPosition="1" size="%d,%d" />""" % (positions[1][0]-2, positions[1][1]+1, windowWidth, windowHeight)
1.92 + skin += """<widget name="window3" position="%d,%d" zPosition="1" size="%d,%d" />""" % (positions[2][0]-2, positions[2][1]+1, windowWidth, windowHeight)
1.93 + skin += """<widget name="window4" position="%d,%d" zPosition="1" size="%d,%d" />""" % (positions[3][0]-2, positions[3][1]+1, windowWidth, windowHeight)
1.94 + skin += """<widget name="window5" position="%d,%d" zPosition="1" size="%d,%d" />""" % (positions[4][0]-2, positions[4][1]+1, windowWidth, windowHeight)
1.95 + skin += """<widget name="window6" position="%d,%d" zPosition="1" size="%d,%d" />""" % (positions[5][0]-2, positions[5][1]+1, windowWidth, windowHeight)
1.96 + skin += """<widget name="window7" position="%d,%d" zPosition="1" size="%d,%d" />""" % (positions[6][0]-2, positions[6][1]+1, windowWidth, windowHeight)
1.97 + skin += """<widget name="window8" position="%d,%d" zPosition="1" size="%d,%d" />""" % (positions[7][0]-2, positions[7][1]+1, windowWidth, windowHeight)
1.98 + skin += """<widget name="window9" position="%d,%d" zPosition="1" size="%d,%d" />""" % (positions[8][0]-2, positions[8][1]+1, windowWidth, windowHeight)
1.99 +
1.100 + # Playing video moving pictures
1.101 + skin += """<widget name="video1" position="%d,%d" zPosition="2" size="%d,%d" backgroundColor="#ffffffff" />""" % (positions[0][0]-2, positions[0][1]+1, windowWidth, windowHeight)
1.102 + skin += """<widget name="video2" position="%d,%d" zPosition="2" size="%d,%d" backgroundColor="#ffffffff" />""" % (positions[1][0]-2, positions[1][1]+1, windowWidth, windowHeight)
1.103 + skin += """<widget name="video3" position="%d,%d" zPosition="2" size="%d,%d" backgroundColor="#ffffffff" />""" % (positions[2][0]-2, positions[2][1]+1, windowWidth, windowHeight)
1.104 + skin += """<widget name="video4" position="%d,%d" zPosition="2" size="%d,%d" backgroundColor="#ffffffff" />""" % (positions[3][0]-2, positions[3][1]+1, windowWidth, windowHeight)
1.105 + skin += """<widget name="video5" position="%d,%d" zPosition="2" size="%d,%d" backgroundColor="#ffffffff" />""" % (positions[4][0]-2, positions[4][1]+1, windowWidth, windowHeight)
1.106 + skin += """<widget name="video6" position="%d,%d" zPosition="2" size="%d,%d" backgroundColor="#ffffffff" />""" % (positions[5][0]-2, positions[5][1]+1, windowWidth, windowHeight)
1.107 + skin += """<widget name="video7" position="%d,%d" zPosition="2" size="%d,%d" backgroundColor="#ffffffff" />""" % (positions[6][0]-2, positions[6][1]+1, windowWidth, windowHeight)
1.108 + skin += """<widget name="video8" position="%d,%d" zPosition="2" size="%d,%d" backgroundColor="#ffffffff" />""" % (positions[7][0]-2, positions[7][1]+1, windowWidth, windowHeight)
1.109 + skin += """<widget name="video9" position="%d,%d" zPosition="2" size="%d,%d" backgroundColor="#ffffffff" />""" % (positions[8][0]-2, positions[8][1]+1, windowWidth, windowHeight)
1.110 +
1.111 + # Zweite Zeile Sendung
1.112 + skin += """<widget name="event1" position="%d,%d" size="%d,20" zPosition="3" font="Regular;18" backgroundColor="#000000" foregroundColor="#446688" />""" % (positions[0][0]-2, positions[0][1]-1, windowWidth)
1.113 + skin += """<widget name="event2" position="%d,%d" size="%d,20" zPosition="3" font="Regular;18" backgroundColor="#000000" foregroundColor="#446688" />""" % (positions[1][0]-2, positions[1][1]-1, windowWidth)
1.114 + skin += """<widget name="event3" position="%d,%d" size="%d,20" zPosition="3" font="Regular;18" backgroundColor="#000000" foregroundColor="#446688" />""" % (positions[2][0]-2, positions[2][1]-1, windowWidth)
1.115 + skin += """<widget name="event4" position="%d,%d" size="%d,20" zPosition="3" font="Regular;18" backgroundColor="#000000" foregroundColor="#446688" />""" % (positions[3][0]-2, positions[3][1]-1, windowWidth)
1.116 + skin += """<widget name="event5" position="%d,%d" size="%d,20" zPosition="3" font="Regular;18" backgroundColor="#000000" foregroundColor="#446688" />""" % (positions[4][0]-2, positions[4][1]-1, windowWidth)
1.117 + skin += """<widget name="event6" position="%d,%d" size="%d,20" zPosition="3" font="Regular;18" backgroundColor="#000000" foregroundColor="#446688" />""" % (positions[5][0]-2, positions[5][1]-1, windowWidth)
1.118 + skin += """<widget name="event7" position="%d,%d" size="%d,20" zPosition="3" font="Regular;18" backgroundColor="#000000" foregroundColor="#446688" />""" % (positions[6][0]-2, positions[6][1]-1, windowWidth)
1.119 + skin += """<widget name="event8" position="%d,%d" size="%d,20" zPosition="3" font="Regular;18" backgroundColor="#000000" foregroundColor="#446688" />""" % (positions[7][0]-2, positions[7][1]-1, windowWidth)
1.120 + skin += """<widget name="event9" position="%d,%d" size="%d,20" zPosition="3" font="Regular;18" backgroundColor="#000000" foregroundColor="#446688" />""" % (positions[8][0]-2, positions[8][1]-1, windowWidth)
1.121 +
1.122 + skin += """<widget name="countdown" position="80,%d" size="%d,20" font="Regular;18" backgroundColor="#000000" foregroundColor="#448866" />""" % (height-40, windowWidth)
1.123 + skin += """<widget name="count" position="%d,%d" size="%d,20" font="Regular;18" backgroundColor="#000000" foregroundColor="#886644" halign="right" />
1.124 + </screen>""" % (positions[2][0] ,height-40, windowWidth)
1.125
1.126 def __init__(self, session, services):
1.127 Screen.__init__(self, session)
1.128 @@ -252,7 +258,7 @@
1.129 # Grab video
1.130 if not self.Console:
1.131 self.Console = Console()
1.132 - self.consoleCmd = "%s -v -r %d -l -j 100 %s" % (grab_binary, self.windowWidth, grab_picture)
1.133 + self.consoleCmd = "%s -v -r %d -j 100 %s" % (grab_binary, self.windowWidth, grab_picture)
1.134 self.Console.ePopen(self.consoleCmd, self.showNextScreenshot)
1.135
1.136 def showNextScreenshot(self, result, retval, extra_args):
