Index: ipk/source/infos_foreca/CONTROL/control =================================================================== --- ipk/source/infos_foreca/CONTROL/control (revision 7322) +++ ipk/source/infos_foreca/CONTROL/control (revision 7338) @@ -1,4 +1,4 @@ Package: enigma2-plugin-infos-foreca -Version: 1.3 +Version: 1.4 Architecture: sh4 OE: Weatherinfos for your AAF Duckbox Index: ipk/source/infos_foreca/CONTROL/preinst =================================================================== --- ipk/source/infos_foreca/CONTROL/preinst (revision 7322) +++ ipk/source/infos_foreca/CONTROL/preinst (revision 7338) @@ -21,5 +21,5 @@ SPACE=`df | grep /dev/mtdblock | grep var | sed 's/ \+/ /g' | cut -d ' ' -f4 | tail -n1` FREE=`expr $SPACE - 100` - SIZE=680 + SIZE=770 echo "checking freespace" echo packege size $SIZE kb Index: ipk/source/infos_foreca/usr/lib/enigma2/python/Plugins/Extensions/Foreca/plugin.py =================================================================== --- ipk/source/infos_foreca/usr/lib/enigma2/python/Plugins/Extensions/Foreca/plugin.py (revision 7322) +++ ipk/source/infos_foreca/usr/lib/enigma2/python/Plugins/Extensions/Foreca/plugin.py (revision 7338) @@ -77,4 +77,8 @@ deviceName = HardwareInfo().get_device_name() + +# Make Path for Slideshow +if os.path.exists("/usr/lib/enigma2/python/Plugins/Extensions/Foreca/bilder") is False: + os.system("mkdir -p /usr/lib/enigma2/python/Plugins/Extensions/Foreca/bilder") @@ -331,5 +335,5 @@ ##print "Desktop ", size, width if width == 1024: - self.skin = """""" + self.skin = """""" self.skin += """ @@ -348,5 +352,5 @@ """ else: - self.skin = """""" + self.skin = """""" self.skin += """ @@ -884,9 +888,14 @@ # ------------------------------------------------------------------- class SatPanelList(MenuList): - def __init__(self, list, font0 = 28, font1 = 16, itemHeight = 142, enableWrapAround = True): - MenuList.__init__(self, [], False, eListboxPythonMultiContent) - self.l.setFont(0, gFont("Regular", font0)) - self.l.setFont(1, gFont("Regular", font1)) - self.l.setItemHeight(itemHeight) + if (getDesktop(0).size().width() == 1280): + ItemSkin = 142 + else: + ItemSkin = 122 + + def __init__(self, list, font0 = 28, font1 = 16, itemHeight = ItemSkin, enableWrapAround = True): + MenuList.__init__(self, [], False, eListboxPythonMultiContent) + self.l.setFont(0, gFont("Regular", font0)) + self.l.setFont(1, gFont("Regular", font1)) + self.l.setItemHeight(itemHeight) # ------------------------------------------------------------------- @@ -895,28 +904,38 @@ self.session = session self.ort = ort - self.skin = """ + + if (getDesktop(0).size().width() == 1280): + self.skin = """ - - """ + else: + self.skin = """ + + + + + + """ + Screen.__init__(self, session) self.Mlist = [] - self.Mlist.append(self.SatEntryItem((self.SatEntryComponent('satellit'), _("Satelliten Bild"), 'satellit'))) - self.Mlist.append(self.SatEntryItem((self.SatEntryComponent('niederschlag'), _("Niederschlags Karte"), 'niederschlag'))) - self.Mlist.append(self.SatEntryItem((self.SatEntryComponent('bewoelkung'), _("Bewölkung Bild"), 'bewoelkung'))) - #self.Mlist.append(self.SatEntryItem((self.SatEntryComponent('luftdruck'), _("Luftdruck Karte"), 'luftdruck'))) + self.Mlist.append(self.SatEntryItem((self.SatEntryComponent('satellit'), _("Wetterkarte Video"), 'satellit'))) + self.Mlist.append(self.SatEntryItem((self.SatEntryComponent('niederschlag'), _("Niederschlags - Video"), 'niederschlag'))) + self.Mlist.append(self.SatEntryItem((self.SatEntryComponent('bewoelkung'), _("Bewoelkungs - Video"), 'bewoelkung'))) + self.Mlist.append(self.SatEntryItem((self.SatEntryComponent('eumetsat'), _("Eumetsat - Bild"), 'eumetsat'))) + self.Mlist.append(self.SatEntryItem((self.SatEntryComponent('metoffice'), _("Druckanalyse - Bild"), 'metoffice'))) + self.Mlist.append(self.SatEntryItem((self.SatEntryComponent('infrarotmetoffice'), _("Infrarot - Bild"), 'infrarotmetoffice'))) + self.Mlist.append(self.SatEntryItem((self.SatEntryComponent('wetterkontor'), _("Deutschland - Bild"), 'wetterkontor'))) + #self.Mlist.append(self.SatEntryItem((self.SatEntryComponent('luftdruck'), _("Luftdruck Video"), 'luftdruck'))) self.onChangedEntry = [] - if (getDesktop(0).size().width() == 1280): - self["Mlist"] = SatPanelList([]) - else: - self["Mlist"] = SatPanelList([], font0=24, font1=15, itemHeight=60) + self["Mlist"] = SatPanelList([]) self["Mlist"].l.setList(self.Mlist) self["Mlist"].selectionEnabled(1) @@ -993,5 +1012,4 @@ #------------------------------------------------------------------------------------------ - if menu == "luftdruck": devicepath = "/tmp/sat.html" @@ -1000,35 +1018,87 @@ #------------------------------------------------------------------------------------------ - - # Lade Kategorie Seite und suche BildLink - h = urllib.urlretrieve(url, devicepath) - fd=open(devicepath) - html=fd.read() - fd.close() - - fulltext = re.compile(r'http://cache-(.+?) ', re.DOTALL) - PressureLink = fulltext.findall(html) - PicLink = PressureLink[0] - PicLink = "http://cache-" + PicLink - - # Lade Bilder fuer Slideshow - devicepath = "/usr/lib/enigma2/python/Plugins/Extensions/Foreca/bilder/sat" - max = int(len(PressureLink))-2 - print "max= ", str(max) - zehner = "1" - x = 0 - while x < max: - url = "http://cache-" + PressureLink[x] - print str(x), url - h = urllib.urlretrieve(url, devicepath + zehner + str(x) + ".jpg") - x = x + 1 - if x > 9: - zehner = "2" - - self.session.open(View_Slideshow, 0, True) +#------------------------------------------------------------------------------------------ + + if menu == "satellit" or menu == "niederschlag" or menu == "bewoelkung": + # Lade Kategorie Seite und suche BildLink + h = urllib.urlretrieve(url, devicepath) + fd=open(devicepath) + html=fd.read() + fd.close() + + fulltext = re.compile(r'http://cache-(.+?) ', re.DOTALL) + PressureLink = fulltext.findall(html) + PicLink = PressureLink[0] + PicLink = "http://cache-" + PicLink + + # Lade Bilder fuer Slideshow + devicepath = "/usr/lib/enigma2/python/Plugins/Extensions/Foreca/bilder/sat" + max = int(len(PressureLink))-2 + print "max= ", str(max) + zehner = "1" + x = 0 + while x < max: + url = "http://cache-" + PressureLink[x] + print str(x), url + h = urllib.urlretrieve(url, devicepath + zehner + str(x) + ".jpg") + x = x + 1 + if x > 9: + zehner = "2" + + self.session.open(View_Slideshow, 0, True) + + else: + if menu == "eumetsat": + devicepath = "/tmp/meteogram.png" + path = "/tmp" + h = urllib.urlretrieve("http://www.sat24.com/images.php?country=eu&type=zoom&format=640x480001001&rnd=118538", devicepath) + filelist = devicepath + self.session.open(PicView, filelist, 0, path, False) + + if menu == "wetterkontor": + devicepath = "/tmp/meteogram.png" + path = "/tmp" + h = urllib.urlretrieve("http://www.wetterkontor.de/maps/deutschland0.jpg", devicepath) + filelist = devicepath + self.session.open(PicView, filelist, 0, path, False) + + if menu == "metoffice": + devicepath = "/tmp/meteogram.png" + path = "/tmp" + h = urllib.urlretrieve("http://www.metoffice.gov.uk/weather/charts/FSXX00T_00.jpg", devicepath) + filelist = devicepath + self.session.open(PicView, filelist, 0, path, False) + + if menu == "infrarotmetoffice": + # http://www.metoffice.gov.uk/satpics/latest_IR.html + devicepath = "/tmp/sat.html" + url = "http://www.metoffice.gov.uk/satpics/latest_IR.html" + path = "/tmp" + h = urllib.urlretrieve(url, devicepath) + fd=open(devicepath) + html=fd.read() + fd.close() + + #http://www.metoffice.gov.uk/weather/images/eurir_sat_201104251500.jpg + # \ \ - \ - \ + \ + \ " Screen.__init__(self, session) @@ -1217,5 +1286,5 @@ def slidePic(self): - print "[Picasa] slide to next Picture index=" + str(self.lastindex) + print "[Foreca] slide to next Picture index=" + str(self.lastindex) if config.plugins.foreca.loop.value==False and self.lastindex == self.maxentry: self.PlayPause() Index: ipk/source/swapinfos_foreca/CONTROL/control =================================================================== --- ipk/source/swapinfos_foreca/CONTROL/control (revision 7322) +++ ipk/source/swapinfos_foreca/CONTROL/control (revision 7338) @@ -1,4 +1,4 @@ Package: enigma2-plugin-swapinfos-foreca -Version: 1.3 +Version: 1.4 Description: Weatherinfo Plugin for Swapstick Section: infos Index: ipk/source/swapinfos_foreca/var/swap/extensions/Foreca/plugin.py =================================================================== --- ipk/source/swapinfos_foreca/var/swap/extensions/Foreca/plugin.py (revision 7322) +++ ipk/source/swapinfos_foreca/var/swap/extensions/Foreca/plugin.py (revision 7338) @@ -77,4 +77,8 @@ deviceName = HardwareInfo().get_device_name() + +# Make Path for Slideshow +if os.path.exists("/usr/lib/enigma2/python/Plugins/Extensions/Foreca/bilder") is False: + os.system("mkdir -p /usr/lib/enigma2/python/Plugins/Extensions/Foreca/bilder") @@ -331,5 +335,5 @@ ##print "Desktop ", size, width if width == 1024: - self.skin = """""" + self.skin = """""" self.skin += """ @@ -348,5 +352,5 @@ """ else: - self.skin = """""" + self.skin = """""" self.skin += """ @@ -884,9 +888,14 @@ # ------------------------------------------------------------------- class SatPanelList(MenuList): - def __init__(self, list, font0 = 28, font1 = 16, itemHeight = 142, enableWrapAround = True): - MenuList.__init__(self, [], False, eListboxPythonMultiContent) - self.l.setFont(0, gFont("Regular", font0)) - self.l.setFont(1, gFont("Regular", font1)) - self.l.setItemHeight(itemHeight) + if (getDesktop(0).size().width() == 1280): + ItemSkin = 142 + else: + ItemSkin = 122 + + def __init__(self, list, font0 = 28, font1 = 16, itemHeight = ItemSkin, enableWrapAround = True): + MenuList.__init__(self, [], False, eListboxPythonMultiContent) + self.l.setFont(0, gFont("Regular", font0)) + self.l.setFont(1, gFont("Regular", font1)) + self.l.setItemHeight(itemHeight) # ------------------------------------------------------------------- @@ -895,28 +904,38 @@ self.session = session self.ort = ort - self.skin = """ + + if (getDesktop(0).size().width() == 1280): + self.skin = """ - - """ + else: + self.skin = """ + + + + + + """ + Screen.__init__(self, session) self.Mlist = [] - self.Mlist.append(self.SatEntryItem((self.SatEntryComponent('satellit'), _("Satelliten Bild"), 'satellit'))) - self.Mlist.append(self.SatEntryItem((self.SatEntryComponent('niederschlag'), _("Niederschlags Karte"), 'niederschlag'))) - self.Mlist.append(self.SatEntryItem((self.SatEntryComponent('bewoelkung'), _("Bewölkung Bild"), 'bewoelkung'))) - #self.Mlist.append(self.SatEntryItem((self.SatEntryComponent('luftdruck'), _("Luftdruck Karte"), 'luftdruck'))) + self.Mlist.append(self.SatEntryItem((self.SatEntryComponent('satellit'), _("Wetterkarte Video"), 'satellit'))) + self.Mlist.append(self.SatEntryItem((self.SatEntryComponent('niederschlag'), _("Niederschlags - Video"), 'niederschlag'))) + self.Mlist.append(self.SatEntryItem((self.SatEntryComponent('bewoelkung'), _("Bewoelkungs - Video"), 'bewoelkung'))) + self.Mlist.append(self.SatEntryItem((self.SatEntryComponent('eumetsat'), _("Eumetsat - Bild"), 'eumetsat'))) + self.Mlist.append(self.SatEntryItem((self.SatEntryComponent('metoffice'), _("Druckanalyse - Bild"), 'metoffice'))) + self.Mlist.append(self.SatEntryItem((self.SatEntryComponent('infrarotmetoffice'), _("Infrarot - Bild"), 'infrarotmetoffice'))) + self.Mlist.append(self.SatEntryItem((self.SatEntryComponent('wetterkontor'), _("Deutschland - Bild"), 'wetterkontor'))) + #self.Mlist.append(self.SatEntryItem((self.SatEntryComponent('luftdruck'), _("Luftdruck Video"), 'luftdruck'))) self.onChangedEntry = [] - if (getDesktop(0).size().width() == 1280): - self["Mlist"] = SatPanelList([]) - else: - self["Mlist"] = SatPanelList([], font0=24, font1=15, itemHeight=60) + self["Mlist"] = SatPanelList([]) self["Mlist"].l.setList(self.Mlist) self["Mlist"].selectionEnabled(1) @@ -993,5 +1012,4 @@ #------------------------------------------------------------------------------------------ - if menu == "luftdruck": devicepath = "/tmp/sat.html" @@ -1000,35 +1018,87 @@ #------------------------------------------------------------------------------------------ - - # Lade Kategorie Seite und suche BildLink - h = urllib.urlretrieve(url, devicepath) - fd=open(devicepath) - html=fd.read() - fd.close() - - fulltext = re.compile(r'http://cache-(.+?) ', re.DOTALL) - PressureLink = fulltext.findall(html) - PicLink = PressureLink[0] - PicLink = "http://cache-" + PicLink - - # Lade Bilder fuer Slideshow - devicepath = "/usr/lib/enigma2/python/Plugins/Extensions/Foreca/bilder/sat" - max = int(len(PressureLink))-2 - print "max= ", str(max) - zehner = "1" - x = 0 - while x < max: - url = "http://cache-" + PressureLink[x] - print str(x), url - h = urllib.urlretrieve(url, devicepath + zehner + str(x) + ".jpg") - x = x + 1 - if x > 9: - zehner = "2" - - self.session.open(View_Slideshow, 0, True) +#------------------------------------------------------------------------------------------ + + if menu == "satellit" or menu == "niederschlag" or menu == "bewoelkung": + # Lade Kategorie Seite und suche BildLink + h = urllib.urlretrieve(url, devicepath) + fd=open(devicepath) + html=fd.read() + fd.close() + + fulltext = re.compile(r'http://cache-(.+?) ', re.DOTALL) + PressureLink = fulltext.findall(html) + PicLink = PressureLink[0] + PicLink = "http://cache-" + PicLink + + # Lade Bilder fuer Slideshow + devicepath = "/usr/lib/enigma2/python/Plugins/Extensions/Foreca/bilder/sat" + max = int(len(PressureLink))-2 + print "max= ", str(max) + zehner = "1" + x = 0 + while x < max: + url = "http://cache-" + PressureLink[x] + print str(x), url + h = urllib.urlretrieve(url, devicepath + zehner + str(x) + ".jpg") + x = x + 1 + if x > 9: + zehner = "2" + + self.session.open(View_Slideshow, 0, True) + + else: + if menu == "eumetsat": + devicepath = "/tmp/meteogram.png" + path = "/tmp" + h = urllib.urlretrieve("http://www.sat24.com/images.php?country=eu&type=zoom&format=640x480001001&rnd=118538", devicepath) + filelist = devicepath + self.session.open(PicView, filelist, 0, path, False) + + if menu == "wetterkontor": + devicepath = "/tmp/meteogram.png" + path = "/tmp" + h = urllib.urlretrieve("http://www.wetterkontor.de/maps/deutschland0.jpg", devicepath) + filelist = devicepath + self.session.open(PicView, filelist, 0, path, False) + + if menu == "metoffice": + devicepath = "/tmp/meteogram.png" + path = "/tmp" + h = urllib.urlretrieve("http://www.metoffice.gov.uk/weather/charts/FSXX00T_00.jpg", devicepath) + filelist = devicepath + self.session.open(PicView, filelist, 0, path, False) + + if menu == "infrarotmetoffice": + # http://www.metoffice.gov.uk/satpics/latest_IR.html + devicepath = "/tmp/sat.html" + url = "http://www.metoffice.gov.uk/satpics/latest_IR.html" + path = "/tmp" + h = urllib.urlretrieve(url, devicepath) + fd=open(devicepath) + html=fd.read() + fd.close() + + #http://www.metoffice.gov.uk/weather/images/eurir_sat_201104251500.jpg + # \ \ - \ - \ + \ + \ " Screen.__init__(self, session) @@ -1217,5 +1286,5 @@ def slidePic(self): - print "[Picasa] slide to next Picture index=" + str(self.lastindex) + print "[Foreca] slide to next Picture index=" + str(self.lastindex) if config.plugins.foreca.loop.value==False and self.lastindex == self.maxentry: self.PlayPause()