import enigma2-plugin-extensions-mediaportal 2020071201 v2020071201
authorChristian Weiske <cweiske@cweiske.de>
Sun, 12 Jul 2020 23:15:23 +0000 (01:15 +0200)
committerChristian Weiske <cweiske@cweiske.de>
Sun, 12 Jul 2020 23:15:23 +0000 (01:15 +0200)
102 files changed:
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/additions/fun/liveleak.py
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/additions/mediatheken/ard.py
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/additions/mediatheken/kindertube.py
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/additions/mediatheken/netzkino.py
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/additions/mediatheken/servustv.py
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/additions/mediatheken/srg.py
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/additions/mediatheken/tvnow.py
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/additions/mediatheken/youtube.py
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/additions/mediatheken/zdf.py
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/additions/porn/beeg.py
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/additions/porn/dirtyship.py
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/additions/porn/homemoviestube.py
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/additions/porn/pornrabbit.py
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/additions/porn/porntrex.py
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/additions/porn/sexu.py
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/additions/porn/spankbang.py
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/additions/porn/tnaflix.py
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/additions/porn/xhamster.py
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/additions/porn/youporn.py
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/directory.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/directory.svg [new file with mode: 0644]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/live.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/live.svg [new file with mode: 0644]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/page.svg [new file with mode: 0644]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/page_select.svg [new file with mode: 0644]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/pic_frame_mode0.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/pic_frame_mode1.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/playlist.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/playlist.svg [new file with mode: 0644]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/select.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/select.svg [new file with mode: 0644]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/star.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/star.svg [new file with mode: 0644]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/watched.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/watched.svg [new file with mode: 0644]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/plugin.py
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/resources/imagesize.py [new file with mode: 0644]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/resources/mpscreen.py
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/resources/simpleplayer.py
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/resources/twagenthelper.py
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/MP_Grid.xml
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/MP_List.xml
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/MP_Playlist.xml
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/MP_Plugin.xml
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/MP_Setup.xml
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/MP_Sort.xml
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/MP_TMDb.xml
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/MP_Update.xml
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/MP_skin.xml
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/MP_widget_youtube.xml
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/directory.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/gridselect.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/gridselect.svg [new file with mode: 0644]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/line.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/musiccd.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/musicfolder.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/page.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/page_select.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/playlist.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/pointer.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/scrollbar.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/scrollbar.svg [new file with mode: 0644]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/select.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/slider.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/slider.svg [new file with mode: 0644]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/watched.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/SimplePlayer.xml
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/SimplePlayerMenu.xml
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/pointer.svg [new file with mode: 0644]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/seekbutton.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/seekbutton.svg [new file with mode: 0644]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/MP_Grid.xml
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/MP_List.xml
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/MP_Playlist.xml
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/MP_Plugin.xml
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/MP_Setup.xml
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/MP_Sort.xml
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/MP_TMDb.xml
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/MP_Update.xml
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/MP_skin.xml
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/MP_widget_youtube.xml
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/directory.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/gridselect.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/gridselect.svg [new file with mode: 0644]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/line.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/musiccd.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/musicfolder.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/page.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/page_select.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/playlist.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/pointer.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/scrollbar.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/scrollbar.svg [new file with mode: 0644]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/select.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/slider.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/slider.svg [new file with mode: 0644]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/watched.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/simpleplayer/SimplePlayer.xml
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/simpleplayer/SimplePlayerMenu.xml
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/simpleplayer/pointer.svg [new file with mode: 0644]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/simpleplayer/seekbutton.png [deleted file]
usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/simpleplayer/seekbutton.svg [new file with mode: 0644]

index cc13d71..ba734f9 100644 (file)
@@ -65,9 +65,15 @@ class LiveLeakScreen(MPScreen):
 
        def layoutFinished(self):
                self._items.append(("--- Search ---", ""))
-               self._items.append(("Recent Items", "list?page="))
-               self._items.append(("Must See", "list?channel=must+see&page="))
-               self._items.append(("News", "list?channel=news&page="))
+               self._items.append(("Featured", "browse?featured=1&page="))
+               self._items.append(("Recent Items", "browse?page="))
+               self._items.append(("Must See", "browse?in_bookmark_folder_id=2&container_id=module_container_1&hs=1&page="))
+               self._items.append(("German", "browse?q=german&hs=1&page="))
+               self._items.append(("News & Politics", "browse?tag_string=news%2C+politics%2C+trump&container_id=module_container_1&hs=1&page="))
+               self._items.append(("Law Enforcement", "browse?tag_string=police%2C+law+enforcement%2C+cops%2C+bodycam&container_id=module_container_1&hs=1&page="))
+               self._items.append(("Weather", "browse?tag_string=weather%2Cstorm%2Cthunder%2Cwind%2Churricane%2Ctornado%2Crainbow%2Chail%2Csnow%2Cice&container_id=module_container_1&hs=1&page="))
+               self._items.append(("Entertainment", "browse?tag_string=entertainment&container_id=module_container_1&hs=1&page="))
+               self._items.append(("WTF", "browse?tag_string=wtf&container_id=module_container_1&hs=1&page="))
                self.ml.setList(list(map(self._defaultlistcenter, self._items)))
 
        def SuchenCallback(self, callback = None):
index d4276c6..3bd4a30 100644 (file)
@@ -46,7 +46,6 @@ from Plugins.Extensions.MediaPortal.resources.choiceboxext import ChoiceBoxExt
 BASE_URL = "https://classic.ardmediathek.de"
 agent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36'
 default_cover = "file://%s/ard.png" % (config_mp.mediaportal.iconcachepath.value + "logos")
-isWeg = "Nicht (oder nicht mehr) auf den ARD-Servern vorhanden!"
 
 class ARDGenreScreen(MPScreen):
 
@@ -142,36 +141,33 @@ class ARDPreSelect(MPScreen):
                elif self.gF == "4" or self.gF == "8":
                        self._items = []
                        if self.gF == "4": # Extra-Kategorien, Radio & TV
-                               self._items.append(("TOP von Seite 1 - TV", "1"))
+                               self._items.append(("TOP von Seite 1", "1"))
                                self._items.append(("Neueste Videos", "2"))
-                               self._items.append(("Am besten bewertete Videos", "3"))
-                               self._items.append(("Meistabgerufene Videos", "4"))
-                               self._items.append(("Ausgewählte Filme", "5"))
-                               self._items.append(("Ausgewählte Dokus", "6"))
+                               self._items.append(("Meistabgerufene Videos", "3"))
                                self._items.append((400 * "—", "99"))
+                               self._items.append(("Alle Filme", "18"))
+                               self._items.append(("Alle Dokus & Reportagen", "19"))
                                self._items.append(("Kinder & Familie", "7"))
-                               self._items.append(('"Must see" - was die Redaktion schaut', "8"))
-                               self._items.append(("Kurzes für Zwischendurch", "9"))
-                               self._items.append(("Unterhaltung & Comedy", "10"))
-                               self._items.append(("Wissen", "11"))
-                               self._items.append(("Politik", "12"))
                                self._items.append(("Kultur", "13"))
+                               self._items.append(("Musik", "6"))
+                               self._items.append(("Politik", "12"))
                                self._items.append(("Ratgeber", "14"))
+                               self._items.append(("Reise", "17"))
                                self._items.append(("Sport", "15"))
                                self._items.append(("Sportreportagen", "16"))
-                               self._items.append(("Reise", "17"))
-                               self._items.append(("Alle Filme", "18"))
-                               self._items.append(("Alle Dokus & Reportagen", "19"))
+                               self._items.append(("Tiere", "5"))
+                               self._items.append(("Unterhaltung & Comedy", "10"))
+                               self._items.append(("Wissen", "11"))
                        if self.gF == "8": # Extra-Kategorien, nur Radio
                                self._items.append(("Neueste Clips", "1"))
                                self._items.append(("Meistabgerufene Clips", "2"))
                                self._items.append((400 * "—", "99"))
                                self._items.append(("Tipps der Redaktion", "3"))
+                               self._items.append(("Feature & Hintergrund", "6"))
+                               self._items.append(("Gespräch", "8"))
                                self._items.append(("Hörspiel", "4"))
                                self._items.append(("Kabarett & Comedy", "5"))
-                               self._items.append(("Feature & Hintergrund", "6"))
                                self._items.append(("Wissen", "7"))
-                               self._items.append(("Gespräch", "8"))
                elif self.gF == "3":    # Sendung verpasst?
                        for q in range (0, 7):
                                s2 = (datetime.date.today()+datetime.timedelta(days=-q)).strftime("%A %d. %B %Y")
@@ -199,72 +195,70 @@ class ARDPreSelect(MPScreen):
                        self.session.open(ARDPreSelectSender, auswahl, self.gF, extra)
                elif self.gF == "4":    # Kategorien TV
                        if extra == '1': # TOP von Seite 1 - TV
-                               streamLink = "%s/tv" % BASE_URL
+                               Link = "%s/tv" % BASE_URL
                        elif extra == '2': # Neueste Videos
-                               streamLink = "%s/tv/Neueste-Videos/mehr?documentId=21282466" % BASE_URL
-                       elif extra == '3': # Am besten bewertete Videos
-                               streamLink = "%s/tv/Am-besten-bewertet/mehr?documentId=21282468" % BASE_URL
-                       elif extra == '4': # Meistabgerufene Videos
-                               streamLink = "%s/tv/Meistabgerufene-Videos/mehr?documentId=23644244" % BASE_URL
-                       elif extra == '5': # Ausgewählte Filme
-                               streamLink = "%s/tv/Ausgewählte-Filme/mehr?documentId=33649088" % BASE_URL
-                       elif extra == '6': # Ausgewählte Dokus
-                               streamLink = "%s/tv/Ausgewählte-Dokus/mehr?documentId=33649086" % BASE_URL
+                               Link = "%s/tv/Neueste-Videos/mehr?documentId=21282466" % BASE_URL
+                       elif extra == '3': # Meistabgerufene Videos
+                               Link = "%s/tv/Meistabgerufene-Videos/mehr?documentId=23644244" % BASE_URL
+                       elif extra == '5': # Tiere
+                               Link = "%s/tv/tiere" % BASE_URL
+                       elif extra == '6': # Musik
+                               Link = "%s/tv/musik" % BASE_URL
                        elif extra == '7': # Kinder & Familie
-                               streamLink = "%s/tv/Kinder-Familie/mehr?documentId=21282542" % BASE_URL
+                               Link = "%s/tv/Kinder-Familie/mehr?documentId=21282542" % BASE_URL
                        elif extra == '8': # "Must see" - was die Redaktion schaut
-                               streamLink = "%s/tv/mustsee" % BASE_URL
+                               Link = "%s/tv/mustsee" % BASE_URL
                        elif extra == '9': # Kurzes für Zwischendurch
-                               streamLink = "%s/tv/Kurzes-für-Zwischendurch/mehr?documentId=45458112" % BASE_URL
+                               Link = "%s/tv/Kurzes-für-Zwischendurch/mehr?documentId=45458112" % BASE_URL
                        elif extra == '10': # Unterhaltung & Comedy
-                               streamLink = "%s/tv/unterhaltung" % BASE_URL
+                               Link = "%s/tv/unterhaltung" % BASE_URL
                        elif extra == '11': # Wissen
-                               streamLink = "%s/tv/wissen" % BASE_URL
+                               Link = "%s/tv/wissen" % BASE_URL
                        elif extra == '12': # Politik
-                               streamLink = "%s/tv/politik" % BASE_URL
+                               Link = "%s/tv/politik" % BASE_URL
                        elif extra == '13': # Kultur
-                               streamLink = "%s/tv/kultur" % BASE_URL
+                               Link = "%s/tv/kultur" % BASE_URL
                        elif extra == '14': # Ratgeber
-                               streamLink = "%s/tv/ratgeber" % BASE_URL
+                               Link = "%s/tv/ratgeber" % BASE_URL
                        elif extra == '15': # Sport
-                               streamLink = "%s/tv/sport" % BASE_URL
+                               Link = "%s/tv/sport" % BASE_URL
                        elif extra == '16': # Sportreportagen
-                               streamLink = "%s/tv/Sportreportagen-dokus/Tipps?documentId=30366344" % BASE_URL
+                               Link = "%s/tv/Sportreportagen-dokus/Tipps?documentId=30366344" % BASE_URL
                        elif extra == '17': # Reise
-                               streamLink = "%s/tv/reise" % BASE_URL
+                               Link = "%s/tv/reise" % BASE_URL
                        elif extra == '18': # Alle Filme
-                               streamLink = "%s/tv/Alle-Filme/mehr?documentId=31610076" % BASE_URL
+                               Link = "%s/tv/Alle-Filme/mehr?documentId=31610076" % BASE_URL
                        elif extra == '19': # Alle Dokus & Reportagen
-                               streamLink = "%s/tv/Alle-Dokus-und-Reportagen/mehr?documentId=29897594" % BASE_URL
-                       self.session.open(ARDStreamScreen, streamLink, auswahl, self.gF)
+                               Link = "%s/tv/Alle-Dokus-und-Reportagen/mehr?documentId=29897594" % BASE_URL
+                       self.session.open(ARDStreamScreen, Link, auswahl, self.gF)
                elif self.gF == "8": # Kategorien Radio
                        if extra == '1': # Neueste Clips
-                               streamLink = "%s/radio/Neueste-Audios/mehr?documentId=21282450" % BASE_URL
+                               Link = "%s/radio/Neueste-Audios/mehr?documentId=21282450" % BASE_URL
                        elif extra == '2': # Meistabgerufene Clips
-                               streamLink = "%s/radio/Meistabgerufene-Audios/mehr?documentId=21282452" % BASE_URL
+                               Link = "%s/radio/Meistabgerufene-Audios/mehr?documentId=21282452" % BASE_URL
                        elif extra == '3': # Tipps der Redaktion
-                               streamLink = "%s/radio/Tipps-der-Redaktion/mehr?documentId=21301892" % BASE_URL
+                               Link = "%s/radio/Tipps-der-Redaktion/mehr?documentId=21301892" % BASE_URL
                        elif extra == '4': # Hörspiel
-                               streamLink = "%s/radio/Hörspiele/mehr?documentId=21301890" % BASE_URL
+                               Link = "%s/radio/Hörspiele/mehr?documentId=21301890" % BASE_URL
                        elif extra == '5': # Kabarett&Comedy
-                               streamLink = "%s/radio/Kabarett-Comedy/mehr?documentId=37915182" % BASE_URL
+                               Link = "%s/radio/Kabarett-Comedy/mehr?documentId=37915182" % BASE_URL
                        elif extra == '6': # Feature&Hintergrund
-                               streamLink = "%s/radio/Feature-und-Hintergrund/mehr?documentId=34835938" % BASE_URL
+                               Link = "%s/radio/Feature-und-Hintergrund/mehr?documentId=34835938" % BASE_URL
                        elif extra == '7': # Wissen
-                               streamLink = "%s/radio/Wissen/mehr?documentId=34836128" % BASE_URL
+                               Link = "%s/radio/Wissen/mehr?documentId=34836128" % BASE_URL
                        elif extra == '8': # Gespräch
-                               streamLink = "%s/radio/Gespräch/mehr?documentId=35293220" % BASE_URL
-                       self.session.open(ARDStreamScreen, streamLink, auswahl, self.gF)
+                               Link = "%s/radio/Gespräch/mehr?documentId=35293220" % BASE_URL
+                       self.session.open(ARDStreamScreen, Link, auswahl, self.gF)
                elif self.gF == "11": # Tagesschau
                        if extra == '1': # Tagesschau
-                               streamLink = "%s/tv/Tagesschau/Sendung?documentId=4326&bcastId=4326" % BASE_URL
+                               Link = "%s/tv/Tagesschau/Sendung?documentId=4326&bcastId=4326" % BASE_URL
                        elif extra == '2': # Tagesschau mit Gebärdensprache
-                               streamLink = BASE_URL+"/tv/Tagesschau-mit-Geb%C3%A4rdensprache/Sendung?documentId=12722002&bcastId=12722002"
+                               Link = BASE_URL+"/tv/Tagesschau-mit-Geb%C3%A4rdensprache/Sendung?documentId=12722002&bcastId=12722002"
                        elif extra == '3': # Tagesthemen
-                               streamLink = "%s/tv/Tagesthemen/Sendung?documentId=3914&bcastId=3914" % BASE_URL
+                               Link = "%s/tv/Tagesthemen/Sendung?documentId=3914&bcastId=3914" % BASE_URL
                        elif extra == '4': # Tagesschau24
-                               streamLink = "%s/tv/tagesschau24/Sendung?documentId=6753968&bcastId=6753968" % BASE_URL
-                       self.session.open(ARDStreamScreen, streamLink, auswahl, self.gF)
+                               Link = "%s/tv/tagesschau24/Sendung?documentId=6753968&bcastId=6753968" % BASE_URL
+                       self.session.open(ARDStreamScreen, Link, auswahl, self.gF)
                else:
                        if self.gF == "2" or self.gF == "7": # ABC (TV oder Radio)
                                self.gN = auswahl
@@ -321,6 +315,7 @@ class ARDPreSelectSender(MPScreen):
                self._items.append(("ARD alpha", "5868"))
                self._items.append(("ONE", "673348"))
                self._items.append(("KiKA", "5886"))
+               self._items.append(("phoenix", "5888"))
                self.ml.setList(list(map(self._defaultlistcenter, self._items)))
                self.showInfos()
 
@@ -367,25 +362,27 @@ class ARDPostSelect(MPScreen):
 
        def loadPageData(self, data):
                self._items = []
-               self.sendungen = re.findall('<div class="box" .*?textWrapper.*?<a\shref="(.*?)".*?headline">(.*?)<', data, re.S)
+               self.sendungen = re.findall('<div class="box" .*?data-ctrl-image=.*?(https://img.*?)&#039;.*?textWrapper.*?<a\shref="(.*?)".*?headline">(.*?)<', data, re.S)
                if self.sendungen:
-                       for (url, title) in self.sendungen:
+                       for (image, url, title) in self.sendungen:
                                url = BASE_URL+url.replace("&amp;", "&")
                                if "|" in title:
                                        title = title.replace("|", "-")
-                               self._items.append((decodeHtml(title), url))
+                               self._items.append((decodeHtml(title), url, image.replace('##width##', '800')))
                        self.keyLocked = False
-               else:
-                       self._items.append((isWeg, None))
+               if len(self._items) < 1:
+                       self._items.append((_('No videos found!'), None, None))
                self._setList('_defaultlistleft', True)
-               if self['liste'].getCurrent()[0][0] != isWeg:
+               if self['liste'].getCurrent()[0][1]:
                        self.showInfos()
 
        def showInfos(self):
                if self.keyLocked:
                        return
-               streamName = self['liste'].getCurrent()[0][0]
-               self['name'].setText(streamName)
+               Name = self['liste'].getCurrent()[0][0]
+               streamPic = self['liste'].getCurrent()[0][2]
+               self['name'].setText(Name)
+               CoverHelper(self['coverArt']).getCover(streamPic)
                if self.gF != "10":
                        url = self['liste'].getCurrent()[0][1]
                        if url:
@@ -416,23 +413,18 @@ class ARDPostSelect(MPScreen):
                                handlung = "Media: %s\nSender: %s\nClips: %s" % (media, sender, ausgaben)
                streamHandlung = handlung+"\n\n"+itxt
                self['handlung'].setText(streamHandlung)
-               if streamPic:
-                       CoverHelper(self['coverArt']).getCover(streamPic)
 
        def keyOK(self):
                if self.keyLocked:
                        return
-               if self['liste'].getCurrent()[0][0] == isWeg:
-                       self.close()
-               streamLink = self['liste'].getCurrent()[0][1]
-               if streamLink == None:
-                       return
-               self.session.open(ARDStreamScreen, streamLink, self.gN, self.gF)
+               Link = self['liste'].getCurrent()[0][1]
+               if Link:
+                       self.session.open(ARDStreamScreen, Link, self.gN, self.gF)
 
 class ARDStreamScreen(MPScreen):
 
-       def __init__(self, session, streamLink, genreName, genreFlag):
-               self.streamLink = streamLink
+       def __init__(self, session, Link, genreName, genreFlag):
+               self.Link = Link
                self.gN = genreName
                self.gF = genreFlag
                MPScreen.__init__(self, session, skin='MP_Plugin', default_cover=default_cover)
@@ -446,7 +438,6 @@ class ARDStreamScreen(MPScreen):
                        "right" : self.keyRight,
                        "left" : self.keyLeft,
                        "yellow" : self.keySort,
-                       "blue" : self.keyBlue,
                        "nextBouquet" : self.keyPageUp,
                        "prevBouquet" : self.keyPageDown
                        }, -1)
@@ -457,17 +448,10 @@ class ARDStreamScreen(MPScreen):
                self['name'] = Label(_("Please wait..."))
                if self.gF == "1" or self.gF == "6":
                        self['F3'] = Label(_("Sort"))
-               else:
-                       self['F4'] = Label("Mehr...")
 
-               self.future = 0
                self.page = 1
                self.lastpage = 1
                self.suchTrigger = "score"
-               self.blueTrigger = 0
-               self.blueURL = ""
-               self.blueMemory = [0, 0, 0]
-               self.blueIdx = 0
                self.folgen = ""
                self._items = []
                self.sendung = ""
@@ -476,122 +460,106 @@ class ARDStreamScreen(MPScreen):
                self.onLayoutFinish.append(self.loadPage)
 
        def loadPage(self):
-               if self.blueTrigger == 0:
-                       if self.gF == "1" or self.gF =="6":     # Suche
-                               url = self.streamLink+self.suchTrigger+"&mresults=page."+str(self.page) # Kein "%s" hier verwenden!! Gewandelte Umlaute aus searchCallBack enthalten "%"!
-                       elif self.gF == "4" or self.gF == "8":  # Kategorien
-                               url = "%s&mcontent=page.%s" % (self.streamLink, self.page)
-                       elif self.gF == "3":
-                               url = self.streamLink
-                       else:
-                               url = "%s&mcontents=page.%s" % (self.streamLink, self.page)
-
-                       if self.gN == "TOP von Seite 1 - TV":
-                               url = self.streamLink
-                       elif self.gN == '"Must see" - was die Redaktion schaut':
-                               url = "%s?m37862988=page.%s" % (self.streamLink, self.page)
-                       elif self.gN == 'Unterhaltung & Comedy':
-                               url = "%s?m39803570=page.%s" % (self.streamLink, self.page)
-                       elif self.gN == 'Wissen' and "/tv/" in self.streamLink:
-                               url = "%s?m39348662=page.%s" % (self.streamLink, self.page)
-                       elif self.gN == 'Politik':
-                               url = "%s?m39593042=page.%s" % (self.streamLink, self.page)
-                       elif self.gN == 'Kultur':
-                               url = "%s?m39594746=page.%s" % (self.streamLink, self.page)
-                       elif self.gN == 'Reise':
-                               url = "%s?m39618186=page.%s" % (self.streamLink, self.page)
-                       elif self.gN == 'Ratgeber':
-                               url = "%s?m39712440=page.%s" % (self.streamLink, self.page)
-                       elif self.gN == 'Sport':
-                               url = "%s?m30348620=page.%s" % (self.streamLink, self.page)
-                       elif self.gN == 'Sportreportagen':
-                               url = "%s&m27307124=page.%s" % (self.streamLink, self.page)
-               else:   # Zweiter Durchlauf, wenn "Mehr.." gedrückt wurde (StreamLink wird zur StreamLink-Liste)
-                       self['F4'].setText("Zurück")
-                       self.blueMemory[0] = self.page
-                       self.page = 1
-                       url = self.blueURL+"&mpage=page.moreclips"
+               if self.gF == "1" or self.gF =="6":     # Suche
+                       url = self.Link+self.suchTrigger+"&mresults=page."+str(self.page)       # Kein "%s" hier verwenden!! Gewandelte Umlaute aus searchCallBack enthalten "%"!
+               elif self.gF == "4" or self.gF == "8":  # Kategorien
+                       url = "%s&mcontent=page.%s" % (self.Link, self.page)
+               elif self.gF == "3":
+                       url = self.Link
+               else:
+                       url = "%s&mcontents=page.%s" % (self.Link, self.page)
+
+               if self.gN == "TOP von Seite 1":
+                       url = self.Link
+               elif self.gN == 'Unterhaltung & Comedy':
+                       url = "%s?m39803570=page.%s" % (self.Link, self.page)
+               elif self.gN == 'Wissen' and "/tv/" in self.Link:
+                       url = "%s?m39348662=page.%s" % (self.Link, self.page)
+               elif self.gN == 'Politik':
+                       url = "%s?m39593042=page.%s" % (self.Link, self.page)
+               elif self.gN == 'Kultur':
+                       url = "%s?m39594746=page.%s" % (self.Link, self.page)
+               elif self.gN == 'Reise':
+                       url = "%s?m39618186=page.%s" % (self.Link, self.page)
+               elif self.gN == 'Ratgeber':
+                       url = "%s?m39712440=page.%s" % (self.Link, self.page)
+               elif self.gN == 'Sport':
+                       url = "%s?m30348620=page.%s" % (self.Link, self.page)
+               elif self.gN == 'Sportreportagen':
+                       url = "%s&m27307124=page.%s" % (self.Link, self.page)
+               elif self.gN == 'Tiere':
+                       url = "%s?m47626546=page.%s" % (self.Link, self.page)
+               elif self.gN == 'Musik':
+                       url = "%s?m39087914=page.%s" % (self.Link, self.page)
                twAgentGetPage(url, agent=agent).addCallback(self.loadPageData).addErrback(self.dataError)
 
        def loadPageData(self, data):
                if self.gN == "Sport":
                        data = re.search('(.*?)Ausgewählte Dokus', data, re.S).group(1)
                self._items = []
-               if self.blueTrigger == 0:
-                       if self.page == 1:      # Gleich bei Seite 1 die maximale Seite merken. Danach nicht nochmal berechnen
-                               if "Loader-source" in data:
-                                       try:
-                                               max = re.findall('Loader-source.*?<a.*?>\s+(.*?)\s+</a>', data, re.S)[-2]       # Der vorletzte Treffer ist die letzte Seite
-                                       except IndexError:      #       Gab kein [-2]
-                                               max = "x"
-                                       max = [x for x in max if x.isdigit()]   #       Ziffer enthalten?
-                                       if not max:     # Keine Ziffer gefunden
-                                               self.lastpage = 1
-                                       else:
-                                               self.lastpage = int(max[-1])
-                               else: # Kein "Loader-source"; ergo: Gibt nur eine Seite
+               if self.page == 1:      # Gleich bei Seite 1 die maximale Seite merken. Danach nicht nochmal berechnen
+                       if "Loader-source" in data:
+                               try:
+                                       max = re.findall('Loader-source.*?<a.*?>\s+(.*?)\s+</a>', data, re.S)[-2]       # Der vorletzte Treffer ist die letzte Seite
+                               except IndexError:      #       Gab kein [-2]
+                                       max = "x"
+                               max = [x for x in max if x.isdigit()]   #       Ziffer enthalten?
+                               if not max:     # Keine Ziffer gefunden
                                        self.lastpage = 1
-               else:   #       "Mehr..."
-                       self.blueMemory[1] = self.lastpage
-                       self.lastpage = 1
+                               else:
+                                       self.lastpage = int(max[-1])
+                       else: # Kein "Loader-source"; ergo: Gibt nur eine Seite
+                               self.lastpage = 1
                if self.lastpage > 1:
                        self['Page'].setText(_("Page:"))
                        self['page'].setText(str(self.page) + ' / ' + str(self.lastpage))
 
-               if self.blueTrigger == 1:
-                       self.blueIdx = 0
-               else:
-                       self.blueIdx = self.blueMemory[2]
-                       self.blueMemory[2] = 0
-               if (self.gF == "4" and self.gN == "TOP von Seite 1 - TV"): # TOP von Seite 1
-                       if self.blueTrigger == 0:
-                               self.folgen = re.findall('ModStageMediaPanel.*?textWrapper.*?href="(.*?)" class="textLink">.*?headline">(.*?)</', data, re.S)
-                       else:   #       "Mehr..." im 2. Durchlauf
-                               self.folgen = re.findall('<div class="teaser" data-ctrl-.*?textWrapper.*?href="(.*?)" class="textLink">.*?headline">(.*?)</', data, re.S)
-               elif self.gF == "11":   #       Tagesschau/themen
-                       self.folgen = re.findall('data-ctrl-contentsoptionalLayouter-entry.*?textWrapper.*?href="(.*?)" class="textLink">.*?headline">(.*?)</', data, re.S)
+               if (self.gF == "4" and self.gN == "TOP von Seite 1"): # TOP von Seite 1
+                       self.folgen = re.findall('ModStageMediaPanel.*?data-ctrl-image=.*?(https://img.*?)&#039;.*?textWrapper.*?href="(.*?)" class="textLink">.*?headline">(.*?)</', data, re.S)
                else:
                        if 'class="controls sliding"' in data:
-                               data = re.search('.*class="controls sliding"(.*?)$', data, re.S).group(1)
-                       self.folgen = re.findall('<div class="teaser" data-ctrl-.*?textWrapper.*?href="(.*?)" class="textLink">.*?headline">(.*?)</', data, re.S)
+                               if self.gN == 'Musik':
+                                       data = re.search('class="controls sliding"(.*)class="section onlyWithJs', data, re.S).group(1)
+                               else:
+                                       data = re.search('.*?class="controls sliding"(.*?)$', data, re.S).group(1)
+                       self.folgen = re.findall('<div class="teaser"\s.*?data-ctrl-image=.*?(https://img.*?)&#039;.*?textWrapper.*?href="(.*?)" class="textLink">.*?headline">(.*?)</', data, re.S)
                if self.folgen:
-                       for (url, title) in self.folgen:
+                       for (image, url, title) in self.folgen:
                                if not "Livestream" in url and not "http:" in url and "bcastId" in url:
                                        url = BASE_URL+url.replace("&amp;", "&")
                                        sub = re.search('documentId=(.*?)($|&)', url, re.S)
                                        if sub:
                                                iD = sub.group(1)
-                                               self._items.append((decodeHtml(title), url, iD))
-                                               self._setList('_defaultlistleft', True)
-                                               self.ml.moveToIndex(self.blueIdx)
+                                               self._items.append((decodeHtml(title), url, image.replace('##width##', '800'), iD))
+                       self._setList('_defaultlistleft', True)
+                       self.ml.moveToIndex(0)
                        self.keyLocked = False
                else:
-                       self._items.append((isWeg, None, None, None))
+                       self._items.append((_('No videos found!'), None, None, None))
                        self._setList('_defaultlistleft', True)
-               if self['liste'].getCurrent()[0][0] != isWeg:
+               if self['liste'].getCurrent()[0][1]:
                        self.showInfos()
 
        def showInfos(self):
                if self.keyLocked:
                        return
-               self.blueURL = self['liste'].getCurrent()[0][1]
-               if self.blueURL:
-                       twAgentGetPage(self.blueURL, agent=agent).addCallback(self.handlePicAndTxt).addErrback(self.dataError)
+               Link = self['liste'].getCurrent()[0][1]
+               streamPic = self['liste'].getCurrent()[0][2]
+               CoverHelper(self['coverArt']).getCover(streamPic)
+               if Link:
+                       twAgentGetPage(Link, agent=agent).addCallback(self.handlePicAndTxt).addErrback(self.dataError)
 
        def handlePicAndTxt(self, data):
                if self.keyLocked:
                        return
                handlung = ''
                streamPic = default_cover
-               self.future = 0
                if not "dcterms.date" in data:
-                       self.future = 1
                        ergebnis = re.findall('<meta name="description" content="(.*?)"/>.*?author" content="(.*?)"/.*?<meta name="gsaimg512" content="(.*?)"/>.*?dcterms.title" content="(.*?)"/>.*?og:site_name" content="(.*?)"/>.*?<p class="subtitle">(.*?)</', data, re.S)
-               if "dcterms.isPartOf" in data and self.future == 0:
+               if "dcterms.isPartOf" in data:
                        ergebnis = re.findall('<meta name="description" content="(.*?)"/>.*?author" content="(.*?)"/.*?<meta name="gsaimg512" content="(.*?)"/>.*?dcterms.isPartOf" content="(.*?)"/>.*?dcterms.date" content="(.*?)"/>.*?<p class="subtitle">(.*?)</', data, re.S)
                else:
-                       if self.future == 0:
-                               ergebnis = re.findall('<meta name="description" content="(.*?)"/>.*?author" content="(.*?)"/.*?<meta name="gsaimg512" content="(.*?)"/>.*?dcterms.title" content="(.*?)"/>.*?dcterms.date" content="(.*?)"/>.*?<p class="subtitle">(.*?)</', data, re.S)
+                       ergebnis = re.findall('<meta name="description" content="(.*?)"/>.*?author" content="(.*?)"/.*?<meta name="gsaimg512" content="(.*?)"/>.*?dcterms.title" content="(.*?)"/>.*?dcterms.date" content="(.*?)"/>.*?<p class="subtitle">(.*?)</', data, re.S)
                if ergebnis:
                        itxt = ''
                        for (itxt, sender, streamPic, sendung, uhr, meta) in ergebnis:
@@ -617,8 +585,6 @@ class ARDStreamScreen(MPScreen):
                self['name'].setText(decodeHtml(self.sendung))
                streamHandlung = handlung+"\n\n"+itxt
                self['handlung'].setText(streamHandlung)
-               if streamPic:
-                       CoverHelper(self['coverArt']).getCover(streamPic)
 
        def keySort(self):
                if self.keyLocked:
@@ -633,31 +599,14 @@ class ARDStreamScreen(MPScreen):
                        self.suchTrigger = result[1]
                        self.loadPage()
 
-       def keyBlue(self):
-               if self.keyLocked:
-                       return
-               if self.blueTrigger == 0:
-                       self.blueMemory[2] = self['liste'].getSelectedIndex()
-                       self.blueTrigger = 1
-               elif self.blueTrigger == 1:
-                       self['F4'].setText("Mehr...")
-                       self.page = self.blueMemory[0]
-                       self.lastpage = self.blueMemory[1]
-                       self.blueTrigger = 0
-               self.loadPage()
-
        def keyOK(self):
                if self.keyLocked:
                        return
-               self.streamName = self['liste'].getCurrent()[0][0]
-               if self.streamName == isWeg:
-                       self.close()
+               Name = self['liste'].getCurrent()[0][0]
                self['name'].setText(_("Please wait..."))
                url = self['liste'].getCurrent()[0][1]
-               if url == None:
-                       streamName = self['liste'].getCurrent()[0][0]
-                       self['name'].setText(streamName)
-                       return
+               if not url:
+                       self['name'].setText(Name)
                else:
                        twAgentGetPage(url, agent=agent).addCallback(self.get_Link).addErrback(self.dataError)
 
@@ -665,11 +614,11 @@ class ARDStreamScreen(MPScreen):
                fsk = re.search('<div class="box fsk.*?"teasertext">\s+(.*?)\s+</p>', data, re.S)
                if fsk:
                        message = self.session.open(MessageBoxExt, _(fsk.group(1)), MessageBoxExt.TYPE_INFO, timeout=7)
-                       streamName = self['liste'].getCurrent()[0][0]
-                       self['name'].setText(streamName)
+                       Name = self['liste'].getCurrent()[0][0]
+                       self['name'].setText(Name)
                        return
                else:
-                       mediaid = self['liste'].getCurrent()[0][2]
+                       mediaid = self['liste'].getCurrent()[0][3]
                        url = BASE_URL+"/play/media/"+mediaid+"?devicetype=pc&features=flash"
                        twAgentGetPage(url, agent=agent).addCallback(self.getStreams).addErrback(self.dataError)
 
@@ -712,6 +661,6 @@ class ARDStreamScreen(MPScreen):
                if stream:
                        if stream.startswith('//'):
                                stream = 'http:' + stream
-                       streamName = self['liste'].getCurrent()[0][0]
-                       self['name'].setText(streamName)
-                       self.session.open(SimplePlayer, [(self.streamName, stream)], showPlaylist=False, ltype='ard')
\ No newline at end of file
+                       Name = self['liste'].getCurrent()[0][0]
+                       self['name'].setText(Name)
+                       self.session.open(SimplePlayer, [(Name, stream)], showPlaylist=False, ltype='ard')
\ No newline at end of file
index 4c26be6..bb66a16 100644 (file)
@@ -120,16 +120,13 @@ class kindertubeParsing(MPScreen):
                if pls:
                        for (url, image, title) in pls:
                                title = title.replace(' - alte kinderserien', '')
-                               image = BASE_URL+'/'+image
-                               self._items.append((decodeHtml(title), url, image))
-
+                               self._items.append((decodeHtml(title), url, default_cover))
                if len(self._items) == 0:
                        self._items.append((_('Parsing error!'), None, None))
                        self.keyLocked = True
                else:
                        self.keyLocked = False
-
-               self._setList('_defaultlistleft', True)
+               self._setList('_defaultlistleft', False, mode='list')
                self.ml.moveToIndex(0)
                self.showInfos()
 
@@ -186,7 +183,8 @@ class kindertubeEpisoden(MPScreen):
                if videos:
                        # ('xuF0AGaUhb8', 'yt', 'images/xuF0AGaUhb8.jpg', 'Der Kuckuck und der Esel - Kinderlieder zum Mitsingen | Sing Kinderlieder')
                        for (id, type, image, title) in videos:
-                               image = BASE_URL+'/'+image
+                               image = self.url.rsplit('/', 1)[0] + '/' + image
+                               print image
                                self._items.append((title, id, image, type))
                if len(self._items) == 0:
                        self._items.append((_('Parsing error!'), None, '', ''))
@@ -206,6 +204,5 @@ class kindertubeEpisoden(MPScreen):
                video_type = self['liste'].getCurrent()[0][3]
                if video_type == 'yt' and video_id:
                        self.session.open(YoutubePlayer, [(video_name, video_id, video_cover)], playAll = False, showPlaylist=False, showCover=False)
-
                else:
                        self.session.open(MessageBoxExt, _("Stream not found, try another Stream Hoster."), MessageBoxExt.TYPE_INFO, timeout=5)
\ No newline at end of file
index f3b2751..980b01c 100644 (file)
@@ -87,7 +87,7 @@ class netzKinoGenreScreen(MPScreen):
                self._items.append(('Liebesfilmkino', 'liebesfilmkino'))
                self._items.append(('Scifikino', 'scifikino'))
                self._items.append(('Arthousekino', 'arthousekino'))
-               self._items.append(('Queerkino', 'queerkino'))
+               #self._items.append(('Queerkino', 'queerkino'))
                self._items.append(('Spaßkino', 'spasskino'))
                self._items.append(('Asiakino', 'asiakino'))
                self._items.append(('Horrorkino', 'horrorkino'))
index 307b670..1189586 100644 (file)
@@ -154,7 +154,7 @@ class sTVids(MPScreen):
        def loadPageData(self, data):
                self.getLastPage(data, 'class="pagination">(.*?)</ul>')
                parse = re.search('class="grid-container"(.*?)class="site-footer"', data, re.S)
-               shows = re.findall('class="component__card media_asset.*?href="(https://www.servustv.com/videos/(.*?)/)".*?class="card__image-container">.*?img\ssrc="(.*?\.(?:jpg|png)).*?".*?card__label">(.*?)</div.*?heading--two">(.*?)</.*?card__date\s{0,1}">(.*?)</div', parse.group(1), re.S)
+               shows = re.findall('class="component__card media_asset.*?href="(https://www.servustv.com/videos/(.*?)/)".*?class="card__image-container">.*?img\ssrc="(.*?\.(?:jpg|jpeg|png)).*?".*?card__label">(.*?)</div.*?heading--two">(.*?)</.*?card__date\s{0,1}">(.*?)</div', parse.group(1), re.S)
                if shows:
                        for (url, id, image, title, subtitle, date) in shows:
                                id = id.upper()
index a0e0ed3..ab44469 100644 (file)
@@ -122,7 +122,7 @@ class SRGListScreen(MPScreen):
                                        image = node['Image']['ImageRepresentations']['ImageRepresentation'][0]['url'].encode('utf-8')
                                        image = image.replace('/16x9', '')
                                except:
-                                       image = None
+                                       image = default_cover
                                try:
                                        handlung = node["description"].encode('utf-8')
                                except:
@@ -215,15 +215,15 @@ class SRGFilmeListeScreen(MPScreen):
                                                        image = node["Assets"]["Video"][0]["Image"]["ImageRepresentations"]["ImageRepresentation"][0]["url"].encode("utf-8")
                                                        image = image.replace('/16x9', '')
                                                except:
-                                                       image = None
-                                               self._items.append((decodeHtml(serie), url, desc, image))
+                                                       image = default_cover
+                                               self._items.append((decodeHtml(serie), url, image, desc))
                                        except:
                                                pass
                except:
                        pass
                if len(self._items) == 0:
-                       self._items.append(('Keine Sendungen gefunden.', None, '', None))
-                       self._setList('_defaultlistleft', True)
+                       self._items.append(('Keine Sendungen gefunden.', None, None, ''))
+                       self._setList('_defaultlistleft', False, mode='list')
                        self['Page'].setText('')
                        self['page'].setText('')
                else:
@@ -234,9 +234,9 @@ class SRGFilmeListeScreen(MPScreen):
        def showInfos(self):
                streamName = self['liste'].getCurrent()[0][0]
                self['name'].setText(streamName)
-               streamHandlung = self['liste'].getCurrent()[0][2]
+               streamHandlung = self['liste'].getCurrent()[0][3]
                self['handlung'].setText(streamHandlung)
-               streamPic = self['liste'].getCurrent()[0][3]
+               streamPic = self['liste'].getCurrent()[0][2]
                CoverHelper(self['coverArt']).getCover(streamPic)
 
        def keyOK(self):
index 6d85f96..c4b8961 100644 (file)
@@ -47,7 +47,7 @@ name = "TVNOW"
 
 class tvnowFirstScreen(MPScreen):
 
-       def __init__(self, session, name=name):
+       def __init__(self, session, name=name, default_cover=default_cover):
                self.name = name
                MPScreen.__init__(self, session, skin='MP_Plugin', default_cover=default_cover)
 
@@ -101,7 +101,7 @@ class tvnowFirstScreen(MPScreen):
 
 class tvnowSubGenreScreen(MPScreen):
 
-       def __init__(self, session, Link, Name, Image, name=name):
+       def __init__(self, session, Link, Name, Image, name=name, default_cover=default_cover):
                self.Link = Link
                self.Name = Name
                self.Image = Image
@@ -172,7 +172,7 @@ class tvnowSubGenreScreen(MPScreen):
 
 class tvnowStaffelScreen(MPScreen):
 
-       def __init__(self, session, Link, Name, Image, name=name):
+       def __init__(self, session, Link, Name, Image, name=name, default_cover=default_cover):
                self.Link = Link
                self.Name = Name
                self.Image = Image
@@ -254,7 +254,7 @@ class tvnowStaffelScreen(MPScreen):
 
 class tvnowEpisodenScreen(MPScreen):
 
-       def __init__(self, session, Link, Name, Image, name=name):
+       def __init__(self, session, Link, Name, Image, name=name, default_cover=default_cover):
                self.Link = Link
                self.Name = Name
                self.Image = Image
index 20105fc..7cbd833 100644 (file)
@@ -45,7 +45,7 @@ param_ajax_hl = ('en', 'de', 'fr', 'it', 'es', 'pt', 'pl', 'da', 'no', 'sv', 'fi
 picker_lang = ''
 param_ajax_gl = ('us', 'gb', 'de', 'at', 'ch', 'fr', 'it', 'es', 'pt', 'pl', 'dk', 'no', 'se', 'fi')
 
-agent = getUserAgent()
+agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.116 Safari/537.36"
 std_headers = {
        'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
        'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
@@ -1105,6 +1105,11 @@ class YT_ListScreen(MPScreen):
                else:
                        self.mine = False
                #printl(url,self,'I')
+               if url.startswith('https://www.youtube.com/'):
+                       if "?" in url:
+                               url = url + "&advanced_settings=1&disable_polymer=1"
+                       else:
+                               url = url + "?advanced_settings=1&disable_polymer=1"
                twAgentGetPage(url, cookieJar=self.keckse, agent=agent, headers=self.headers).addCallback(self.genreData).addErrback(self.dataError)
 
        def getRelatedUserPL(self, url, token):
index fca0cdc..a31c016 100644 (file)
@@ -465,8 +465,8 @@ class ZDFStreamScreen(MPScreen):
                else:
                        articles = re.findall('(<article.*?</article>|class="content-box".*?<article)', data, re.S)
                        for article in articles:
-                               data = re.sub('<div class="img-container x-large-8 x-column">', '<source class="m-16-9" data-srcset="/static~Trash">', article, flags=re.S)
-                               data = re.sub('itemprop="image" content=""', '', data, flags=re.S)
+                               #data = re.sub('<div class="img-container x-large-8 x-column">', '<source class="m-16-9" data-srcset="/static~Trash">', article, flags=re.S)
+                               data = re.sub('itemprop="image" content=""', '', article, flags=re.S)
                                airtimedata = None
                                dur = ""
                                sender = ""
@@ -480,7 +480,7 @@ class ZDFStreamScreen(MPScreen):
                                if "Beiträge" in data:
                                        continue
                                elif '"search-foot">' in data:
-                                       airtimedata = re.search('time class="air-time" datetime=.*?>(.*?)<', data)
+                                       airtimedata = re.search('time class="air-time" datetime=.*?>(.*?)<', data, re.S)
                                if airtimedata:
                                        airtime = airtimedata.group(1)
                                else:
@@ -494,19 +494,19 @@ class ZDFStreamScreen(MPScreen):
                                else:
                                        continue
                                if "data-station" in data:
-                                       sender = re.search('data-station="(.*?)"', data).group(1)
+                                       sender = re.search('data-station="(.*?)"', data, re.S).group(1)
                                else:
                                        sender = "---"
                                if not "data-plusbar-id=" in data:
                                        continue
                                else:
-                                       assetId = re.search('data-plusbar-id="(.*?)"', data).group(1)
+                                       assetId = re.search('data-plusbar-id="(.*?)"', data, re.S).group(1)
                                if not "data-plusbar-url=" in data:
                                        continue
                                else:
-                                       assetPath = re.search('data-plusbar-url="(.*?)"', data).group(1)
+                                       assetPath = re.search('data-plusbar-url="(.*?)"', data, re.S).group(1)
                                if '<source class="m-16-9"' in data:
-                                       image = re.search('<source class=\"m-16-9\".*?data-srcset=\"(.*?)[,\"]', data)
+                                       image = re.search('<source class=\"m-16-9\".*?data-srcset=\"(.*?)[,\"\s]', data, re.S)
                                        if image:
                                                image = image.group(1)
                                                if "?layout" in image:
@@ -515,17 +515,29 @@ class ZDFStreamScreen(MPScreen):
                                                        image = image.split("~")[0]
                                        else:
                                                image = ""
+                               if 'data-zdfplayer-teaser-image-overwrite=' in data:
+                                       image = re.search('data-zdfplayer-teaser-image-overwrite=.*&quot;:&quot;(.*?)&quot;}\'', data, re.S)
+                                       if image:
+                                               if image:
+                                                       image = image.group(1)
+                                                       image = image.replace("\/", "/")
+                                                       if "?layout" in image:
+                                                               image = image.split("=")[0]+"="
+                                                       else:
+                                                               image = image.split("~")[0]
+                                       else:
+                                               image = ""
                                if image != "":
                                        if "/static" in image:
                                                try:
                                                        if "https:\/\/www.zdf.de\/assets\/" in data:
-                                                               image = re.search('https:\\\/\\\/www.zdf.de\\\/assets\\\/(.*?)~', data)
+                                                               image = re.search('https:\\\/\\\/www.zdf.de\\\/assets\\\/(.*?)~', data, re.S)
                                                        if image:
                                                                image = image.group(1)
                                                                image = "https://www.zdf.de/assets/"+image
                                                except:
                                                        try:
-                                                               image = re.search("data-zdfplayer-teaser-image-overwrite=\'\{(.*?)\&#", data)
+                                                               image = re.search("data-zdfplayer-teaser-image-overwrite=\'\{(.*?)\&#", data, re.S)
                                                                if image:
                                                                        image = image.group(1)+"="
                                                                        image = image.replace("\/", "/")
index 33c979a..a1ea4ff 100644 (file)
@@ -79,7 +79,7 @@ class beegGenreScreen(MPScreen):
                twAgentGetPage(url, agent=IPhone5Agent, headers=MyHeaders).addCallback(self.getApiKeys2).addErrback(self.dataError)
 
        def getApiKeys2(self, data):
-               js = re.findall('<script src=(?:https://beeg.com|)(/js/app\.[a-zA-Z0-9]+\.js)>', data, re.S)
+               js = re.findall('<script src=["|](?:https://beeg.com|)(/js/app\.[a-zA-Z0-9]+\.js)["|]>', data, re.S)
                url = "https://beeg.com" + js[0]
                twAgentGetPage(url, agent=IPhone5Agent, headers=MyHeaders).addCallback(self.getApiKeys3).addErrback(self.dataError)
 
index 324f0d8..0187fed 100644 (file)
@@ -186,7 +186,7 @@ class dirtyshipFilmScreen(MPScreen):
                rating = self['liste'].getCurrent()[0][4]
                added = self['liste'].getCurrent()[0][5]
                self['name'].setText(title)
-               self['handlung'].setText("Views: %s\Rating: %s\Added: %s" % (views, rating, added))
+               self['handlung'].setText("Views: %s\nRating: %s\nAdded: %s" % (views, rating, added))
                CoverHelper(self['coverArt']).getCover(pic, agent=agent)
 
        def keyOK(self):
index 73938f4..a01f018 100644 (file)
@@ -199,17 +199,18 @@ class homemoviestubeFilmScreen(MPScreen):
                        parse = re.search('<!-- featured-end --(.*?</html>', data, re.S)
                else:
                        parse = re.search('<head>(.*)</html>', data, re.S)
-               Liste = re.findall('class="film-item.*?-wrapper">(.*?)<a\shref="(.*?)"\stitle="(.*?)".*?class="film-thumb.*?img\ssrc="(.*?)".*?class="film-time">(.*?)</span.*?stat-added">(.*?)</span>.*?stat-views">(.*?)</span.*?stat-rated">(.*?)</span', parse.group(1), re.S)
+               Liste = re.findall('class="film-item.*?-wrapper">(.*?)<a\shref="(.*?)"\stitle="(.*?)".*?class="film-thumb.*?img.*?data-src="(.*?)".*?class="film-time">(.*?)</span.*?stat-views">(.*?)</span.*?stat-rated">(.*?)</span', parse.group(1), re.S)
                if Liste:
-                       for (Premium, Url, Name, Image, Runtime, Added, Views, Rated) in Liste:
+                       for (Premium, Url, Name, Image, Runtime, Views, Rated) in Liste:
                                if not "premium_star.png" in Premium:
                                        if Url.startswith('//'):
                                                Url = "http:" + Url
+                                       Image = Image.replace(' ', '%20')
                                        if Image.startswith('//'):
                                                Image = "http:" + Image
-                                       self._items.append((decodeHtml(Name), Image, Url, Runtime, Added, Views, Rated))
+                                       self._items.append((decodeHtml(Name), Url, Image, Runtime, Views, Rated))
                if len(self._items) == 0:
-                       self._items.append((_('No videos found!'), None, '', ''))
+                       self._items.append((_('No videos found!'), '', None, '', '', ''))
                self._setList('_defaultlistleft', True)
                self.ml.moveToIndex(0)
                self.keyLocked = False
@@ -217,22 +218,21 @@ class homemoviestubeFilmScreen(MPScreen):
 
        def showInfos(self):
                title = self['liste'].getCurrent()[0][0]
-               pic = self['liste'].getCurrent()[0][1].replace(' ', '%20')
+               pic = self['liste'].getCurrent()[0][2]
                runtime = self['liste'].getCurrent()[0][3]
-               added = self['liste'].getCurrent()[0][4]
-               views = self['liste'].getCurrent()[0][5]
-               rated = self['liste'].getCurrent()[0][6]
+               views = self['liste'].getCurrent()[0][4]
+               rated = self['liste'].getCurrent()[0][5]
                self['name'].setText(title)
                if re.match(".*?Search", self.Name):
-                       self['handlung'].setText("Runtime: %s\nViews: %s\nAdded: %s\nRating: %s" % (runtime, views, added, rated))
+                       self['handlung'].setText("Runtime: %s\nViews: %s\nRating: %s" % (runtime, views, rated))
                else:
-                       self['handlung'].setText("Runtime: %s\nViews: %s\nAdded: %s\nRating: %s\nSort: %s" % (runtime, views, added, rated, self.sort))
+                       self['handlung'].setText("Runtime: %s\nViews: %s\nRating: %s\nSort: %s" % (runtime, views, rated, self.sort))
                CoverHelper(self['coverArt']).getCover(pic)
 
        def keyOK(self):
                if self.keyLocked:
                        return
-               Link = self['liste'].getCurrent()[0][2]
+               Link = self['liste'].getCurrent()[0][1]
                self.keyLocked = True
                twAgentGetPage(Link, agent=hmtAgent).addCallback(self.getVideo).addErrback(self.dataError)
 
index 9415b54..c21ea54 100644 (file)
@@ -192,7 +192,7 @@ class pornrabbitFilmScreen(MPScreen):
                self.getLastPage(data, 'class="pagination"(.*?)</main>')
                parse = re.search('<main(.*?)</main', data, re.S)
                if parse:
-                       Movies = re.findall('class="thumb".*?href="(.*?)"\stitle="(.*?)".*?src="(.*?)".*?class="tools">.<span>(.*?)</span>', parse.group(1), re.S)
+                       Movies = re.findall('class="thumb".*?href="(.*?)"\stitle="(.*?)".*?src="(.*?)".*?class="tools">\s+<span>(.*?)</span>', parse.group(1), re.S)
                        if Movies:
                                for (Url, Title, Image, Runtime) in Movies:
                                        self._items.append((decodeHtml(Title), Url, Image, Runtime))
index 8c75294..95ae172 100644 (file)
@@ -304,7 +304,7 @@ class porntrexFilmScreen(MPScreen):
                        if Movies:
                                for (url, title, image, private, views, runtime, added) in Movies:
                                        if image.startswith('//'):
-                                               image = 'https:' + image
+                                               image = self.baseurl + image.replace('//cwbstatic.cdntrex.com', '')
                                        runtime = runtime.strip()
                                        views = views.replace(' ', '')
                                        if "private" in private:
index 5f9b28c..34efc7b 100644 (file)
@@ -40,7 +40,7 @@ from builtins import map
 from Plugins.Extensions.MediaPortal.plugin import _
 from Plugins.Extensions.MediaPortal.resources.imports import *
 
-agent='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36'
+agent='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.116 Safari/537.36'
 
 default_cover = "file://%s/sexu.png" % (config_mp.mediaportal.iconcachepath.value + "logos")
 sexu_cookies = CookieJar()
@@ -193,9 +193,10 @@ class sexuFilmScreen(MPScreen):
                stream_urls = re.findall('"downloadUrl":"(.*?)"', data)
                if stream_urls:
                        title = self['liste'].getCurrent()[0][0]
+                       url = self['liste'].getCurrent()[0][1]
                        ck = requests.utils.dict_from_cookiejar(sexu_cookies)
                        headers = '&Cookie=%s' % ','.join(['%s=%s' % (key, urllib.parse.quote_plus(ck[key])) for key in ck])
-                       headers = headers + '&Referer=https://sexu.com/'
+                       headers = headers + '&Referer=%s' % url
                        link = stream_urls[0]
                        if link.startswith('//'):
                                link = "https:" + link
index b47250e..9273712 100644 (file)
@@ -103,7 +103,6 @@ class spankbangGenreScreen(MPScreen):
                self._items.insert(0, ("Longest", "https://spankbang.com/longest_videos/", default_cover, False, True, False))
                self._items.insert(0, ("Trending", "https://spankbang.com/trending_videos/", default_cover, False, False, False))
                self._items.insert(0, ("Upcoming", "https://spankbang.com/upcoming/", default_cover, False, False, False))
-               self._items.insert(0, ("Interesting", "https://spankbang.com/interesting/", default_cover, False, True, False))
                self._items.insert(0, ("Top Rated", "https://spankbang.com/top_rated/", default_cover, False, True, False))
                self._items.insert(0, ("Most Popular", "https://spankbang.com/most_popular/", default_cover, False, True, False))
                self._items.insert(0, ("Newest", "https://spankbang.com/new_videos/", default_cover, False, False, False))
@@ -214,7 +213,7 @@ class spankbangFilmScreen(MPScreen):
        def genreData(self, data):
                self.getLastPage(data, 'class="pagination">(.*?)</ul>')
                parse = re.search('class="results(.*?)$', data, re.S)
-               Movies = re.findall('class="video-item".*?href="(.*?)".*?data-src="(.*?)"\salt="(.*?)".*?class="i-len">(.*?)</span>.*?class="stats">(.*?)(?:\s|&nbsp;).*?(.*?%).*?<span>(.*?)</span', parse.group(1), re.S)
+               Movies = re.findall('class="video-item.*?href="(.*?)".*?data-src="(.*?)"\salt="(.*?)".*?class="i-len">(.*?)</span>.*?class="stats">(?:<em>.*?</em>&nbsp;&nbsp;\s|)(.*?)(?:\s|&nbsp;).*?(.*?%).*?<span>(.*?)</span', parse.group(1), re.S)
                if Movies:
                        for (Url, Image, Title, Runtime, Views, Rating, Age) in Movies:
                                Url = "https://spankbang.com" + Url
index f91d11a..3b3ce7a 100644 (file)
@@ -91,13 +91,13 @@ class TnAflixGenreScreen(MPScreen):
                        Cats = re.findall('<li>\s*<a\shref="(.*?)".*?>(.*?)(?:</a>|\s<i>)', parse.group(1), re.S)
                        if Cats:
                                for (Url, Title) in Cats:
-                                       Url = self.baseurl + Url + "&page="
+                                       Url = self.baseurl + Url
                                        self._items.append((decodeHtml(Title), Url))
                                self._items.sort()
-                               self._items.insert(0, ("Featured", '%s/featured/?d=all&period=all&page=' % self.baseurl))
-                               self._items.insert(0, ("Top Rated", '%s/toprated/?d=all&period=all&page=' % self.baseurl))
-                               self._items.insert(0, ("Most Popular", '%s/popular/?d=all&period=all&page=' % self.baseurl))
-                               self._items.insert(0, ("Most Recent", '%s/new/?d=all&period=all&page=' % self.baseurl))
+                               self._items.insert(0, ("Featured", '%s/featured/$$PAGE$$?d=all&period=all' % self.baseurl))
+                               self._items.insert(0, ("Top Rated", '%s/toprated/$$PAGE$$?d=all&period=all' % self.baseurl))
+                               self._items.insert(0, ("Most Popular", '%s/popular/$$PAGE$$?d=all&period=all' % self.baseurl))
+                               self._items.insert(0, ("Most Recent", '%s/new/$$PAGE$$?d=all&period=all' % self.baseurl))
                                self._items.insert(0, ("--- Search ---", "callSuchen"))
                                self.ml.setList(list(map(self._defaultlistcenter, self._items)))
                                self.ml.moveToIndex(0)
@@ -170,8 +170,10 @@ class TnAflixFilmScreen(MPScreen):
                self._items = []
                if re.match(".*?Search", self.Name):
                        url = "%s/search.php?what=%s&page=%s" % (self.baseurl, self.Link, str(self.page))
+               elif "$$PAGE$$" in self.Link:
+                       url = self.Link.replace('$$PAGE$$', str(self.page))
                else:
-                       url = "%s%s" % (self.Link, str(self.page))
+                       url = "%s/%s" % (self.Link, str(self.page))
                twAgentGetPage(url).addCallback(self.loadData).addErrback(self.dataError)
 
        def loadData(self, data):
index 95b16eb..5ab5fc6 100644 (file)
@@ -262,7 +262,7 @@ class xhamsterSubscriptionsScreen(MPScreen):
                global subscriptions
                for m in subscriptions:
                        url = "https://xhamster.com/users/%s/videos" % m[0]
-                       self._items.append((m[1], None, url))
+                       self._items.append((m[1], url, None))
                if len(self._items) == 0:
                        self._items.append((_('No subscriptions found!'), None, None))
                self._setList('_defaultlistleft', True)
@@ -270,7 +270,7 @@ class xhamsterSubscriptionsScreen(MPScreen):
                self.showInfos()
 
        def showInfos(self):
-               Link = self['liste'].getCurrent()[0][2]
+               Link = self['liste'].getCurrent()[0][1]
                if Link:
                        twAgentGetPage(Link, agent=xhAgent, cookieJar=cookies).addCallback(self.showInfos2).addErrback(self.dataError)
 
@@ -282,7 +282,7 @@ class xhamsterSubscriptionsScreen(MPScreen):
                if data == "error":
                        CoverHelper(self['coverArt']).getCover(default_cover)
                        self['handlung'].setText("User not found")
-                       url = self['liste'].getCurrent()[0][2]
+                       url = self['liste'].getCurrent()[0][1]
                        self.username = ((url.split('/')[-2], ""),)
                        found = False
                        for t in subscriptions:
@@ -326,12 +326,12 @@ class xhamsterSubscriptionsScreen(MPScreen):
                if self.keyLocked:
                        return
                Name = self['liste'].getCurrent()[0][0]
-               Link = self['liste'].getCurrent()[0][2]
+               Link = self['liste'].getCurrent()[0][1]
                if Link:
                        self.session.open(xhamsterFilmScreen, Link, Name)
 
        def keySubscribe(self):
-               Link = self['liste'].getCurrent()[0][2]
+               Link = self['liste'].getCurrent()[0][1]
                if self.keyLocked:
                        return
                if not Link:
@@ -574,7 +574,7 @@ class xhamsterFilmScreen(MPScreen):
                                                Rating = stripAllTags(Rating).strip()
                                                self._items.append((decodeHtml(Name), Link, Image, Runtime, Views, Rating))
                        else:
-                               Liste = re.findall('"duration":(\d+),"title":"(.*?)","pageURL":"(.*?)".*?ratingModel","value":(\d+).*?videoModel","thumbURL":"(.*?)".*?views":(\d+),', data, re.S)
+                               Liste = re.findall('"duration":(\d+),"title":"(.*?)",.*?"pageURL":"(.*?)".*?ratingModel","value":(\d+).*?videoModel","thumbURL":"{0,1}(.*?)"{0,1},.*?views":(\d+),', data, re.S)
                                if Liste:
                                        for (Runtime, Name, Link, Rating, Image, Views) in Liste:
                                                Link = Link.replace('\/', '/')
@@ -582,7 +582,8 @@ class xhamsterFilmScreen(MPScreen):
                                                Rating = Rating + "%"
                                                m, s = divmod(int(Runtime), 60)
                                                Runtime = "%02d:%02d" % (m, s)
-                                               self._items.append((decodeHtml(Name), Link, Image, Runtime, Views, Rating))
+                                               if Image != "null":
+                                                       self._items.append((decodeHtml(Name), Link, Image, Runtime, Views, Rating))
                if len(self._items) == 0:
                        self._items.append((_('No videos found!'), None, None, '', '', ''))
                self._setList('_defaultlistleft', True)
index 2b738e6..c0d0166 100644 (file)
@@ -48,7 +48,7 @@ config_mp.mediaportal.youporn_password = ConfigPassword(default="youpornPassword
 
 cookies = CookieJar()
 ypLoggedIn = False
-ypAgent = getUserAgent()
+ypAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.120 Safari/537.36"
 
 headers = {
        'Accept-Language': 'de,en-US;q=0.7,en;q=0.3',
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/directory.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/directory.png
deleted file mode 100644 (file)
index dee24e6..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/directory.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/directory.svg b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/directory.svg
new file mode 100644 (file)
index 0000000..4e1db9b
--- /dev/null
@@ -0,0 +1 @@
+<svg height="48pt" viewBox="0 0 41.6 41.6" width="48pt" xmlns="http://www.w3.org/2000/svg"><path d="m40 12h-16l-2.828125-2.828125c-.75-.75-1.769531-1.171875-2.828125-1.171875h-10.34375c-2.199219 0-4 1.800781-4 4v24c0 2.199219 1.800781 4 4 4h32c2.199219 0 4-1.800781 4-4v-20c0-2.199219-1.800781-4-4-4zm0 24h-32v-20h32zm0 0" fill="#fff" transform="translate(-3.2 -3.2)"/></svg>
\ No newline at end of file
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/live.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/live.png
deleted file mode 100644 (file)
index 5eb52b3..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/live.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/live.svg b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/live.svg
new file mode 100644 (file)
index 0000000..054f8b0
--- /dev/null
@@ -0,0 +1 @@
+<svg height="48pt" viewBox="0 0 28.16 28.16" width="48pt" xmlns="http://www.w3.org/2000/svg"><path d="m4.2842556 4.8762385c-.3437964.0196456-.6802257.1792652-.9184281.4690368-1.9473614 2.3844743-3.11626952 5.4246177-3.11626952 8.7348867s1.16890812 6.350412 3.11626952 8.734887c.476404.581998 1.3481733.633567 1.8786021.103143.4518469-.451846.4960496-1.171364.090861-1.664957-1.6060209-1.954733-2.5711066-4.454625-2.5711066-7.173073s.9650857-5.2158838 2.5711068-7.1706123c.4051884-.4935935.3609857-1.2131117-.0908612-1.6649582-.2652138-.2652137-.6163775-.3879984-.960174-.368353zm19.5914874 0c-.343796-.019646-.694959.1031399-.960174.368353-.451846.4518465-.496049 1.1713647-.09085 1.6649582 1.606021 1.9547285 2.571108 4.4521643 2.571108 7.1706123s-.965087 5.215884-2.571108 7.170612c-.405188.493594-.360985 1.213112.09085 1.664958.53043.530429 1.404655.481315 1.878602-.100682 1.947361-2.382019 3.116271-5.424619 3.116271-8.734887 0-3.310269-1.16891-6.3504123-3.116271-8.7348866-.238202-.2897727-.574631-.4493923-.918428-.4690379zm-16.0282821 3.5754839c-.3487081.0196464-.687593.1817206-.9086053.4886819-1.0436677 1.4464017-1.6600459 3.2243197-1.6600459 5.1397577 0 1.915437.6163782 3.693357 1.6600459 5.139757.4444796.613923 1.3481732.653215 1.8835133.117874l.0049-.0049c.442035-.442034.473959-1.127172.112973-1.6355-.7219731-1.024022-1.1468071-2.271512-1.1468071-3.617229 0-1.345719.424834-2.593208 1.1468071-3.617231.358531-.5107836.329062-1.1934648-.112962-1.6354888l-.0049-.0049c-.2676729-.2676755-.6262038-.3904604-.9749115-.3708141zm12.4650781 0c-.348709-.019646-.707239.103143-.974909.3708085l-.0049.0049c-.442032.4420316-.473956 1.1271695-.11297 1.6354971.721973 1.024022 1.146807 2.271512 1.146807 3.61723s-.424834 2.593207-1.146807 3.61723c-.35853.510784-.329062 1.193465.112963 1.635489l.0049.0049c.53534.53534 1.441489.496049 1.883514-.117873 1.043675-1.446394 1.660053-3.224313 1.660053-5.139749 0-1.915439-.616378-3.693357-1.660046-5.1397587-.221013-.3069598-.559897-.4690351-.908605-.4886804zm-6.232541 1.8565006c-2.082423 0-3.771938 1.689514-3.771938 3.771939 0 2.082424 1.689515 3.771939 3.771938 3.771939 2.082426 0 3.771941-1.689515 3.771941-3.771939 0-2.082425-1.689515-3.771939-3.771941-3.771939zm0 0" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/page.svg b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/page.svg
new file mode 100644 (file)
index 0000000..b9bfa36
--- /dev/null
@@ -0,0 +1 @@
+<svg height="7" viewBox="0 0 5.8208333 1.8520833" width="22" xmlns="http://www.w3.org/2000/svg"><path d="m0 0h5.820833v1.852083h-5.820833z" fill="#4d4d4d" stroke-width=".025"/></svg>
\ No newline at end of file
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/page_select.svg b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/page_select.svg
new file mode 100644 (file)
index 0000000..24508db
--- /dev/null
@@ -0,0 +1 @@
+<svg height="7" viewBox="0 0 5.8208333 1.8520833" width="22" xmlns="http://www.w3.org/2000/svg"><path d="m0 0h5.820833v1.852083h-5.820833z" fill="#fff" stroke-width=".025"/></svg>
\ No newline at end of file
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/pic_frame_mode0.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/pic_frame_mode0.png
deleted file mode 100644 (file)
index f6988f3..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/pic_frame_mode0.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/pic_frame_mode1.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/pic_frame_mode1.png
deleted file mode 100644 (file)
index 3ea333c..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/pic_frame_mode1.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/playlist.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/playlist.png
deleted file mode 100644 (file)
index 4b31dfe..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/playlist.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/playlist.svg b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/playlist.svg
new file mode 100644 (file)
index 0000000..5ba8160
--- /dev/null
@@ -0,0 +1 @@
+<svg enable-background="new 0 0 512 512" height="48" viewBox="0 0 504 504" width="48" xmlns="http://www.w3.org/2000/svg"><g fill="#fff" stroke-width=".992126"><path d="m10.00905 429.5h150v45h-150z"/><path d="m10.00905 329.5h150v45h-150z"/><path d="m10.00905 229.5h270v45h-270z"/><path d="m10.00905 129.5h270v45h-270z"/><path d="m10.00905 29.5h270v45h-270z"/><path d="m249.81205 466.826c-20.471-5.189-39.48-20.199-44.87-41.26-5.641-20.109 1.74-41.701 14.399-57.58 23.49-29.4 63.79-44.471 100.78-37.52.3-98.411-.02-196.831.16-295.241 8.92 13.15 18.55 26.01 30.59 36.51 25.59 23.2 57.43 37.94 83.74 60.2 22.68 19.311 42.37 43.26 52.42 71.62 7.37 20.28 8.87 42.55 4.58 63.68-5.65 27.109-22.28 42.379-40.2 63.301 6.1-25.25 13.06-42.271 5.26-67.611-5.189-17.57-16.58-32.82-30.76-44.209-16.21-13.09-35.2-22.13-54.27-30.23-.25 65.02-.03 130.051-.11 195.081 1 22.449-10.45 43.93-26.85 58.68-25.119 22.72-61.829 33.069-94.869 24.579"/></g></svg>
\ No newline at end of file
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/select.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/select.png
deleted file mode 100644 (file)
index 6eea665..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/select.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/select.svg b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/select.svg
new file mode 100644 (file)
index 0000000..24ad605
--- /dev/null
@@ -0,0 +1 @@
+<svg height="50pt" viewBox="0 0 43.333332 43.333332" width="50pt" xmlns="http://www.w3.org/2000/svg"><path d="m41.9375 8.625c-.664062.023438-1.273438.375-1.625.9375l-18.8125 28.78125-12.1875-10.53125c-.523438-.542969-1.308594-.746094-2.03125-.519531-.71875.222656-1.253906.832031-1.378906 1.574219-.125.746093.175781 1.496093.785156 1.945312l13.9375 12.0625c.4375.371094 1.015625.535156 1.582031.453125.570313-.08594 1.074219-.410156 1.386719-.890625l20.09375-30.6875c.429688-.628906.464844-1.441406.09375-2.105469-.371094-.660156-1.085938-1.054687-1.84375-1.019531zm0 0" fill="#fff" transform="translate(-3.288859 -4.319158)"/></svg>
\ No newline at end of file
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/star.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/star.png
deleted file mode 100644 (file)
index b76924a..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/star.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/star.svg b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/star.svg
new file mode 100644 (file)
index 0000000..5faee77
--- /dev/null
@@ -0,0 +1 @@
+<svg height="48pt" viewBox="0 -10 515.2 515.2" width="48pt" xmlns="http://www.w3.org/2000/svg"><path d="m116.19984 492.92422c-5.60937 0-11.17969-1.75-15.93359-5.1875-8.85546-6.41796-12.99218-17.44921-10.58203-28.09375l32.9375-145.08984-111.703123-97.96094c-8.2109375-7.16796-11.34765553-18.51953-7.9765615-28.90625 3.371093-10.36718 12.5429685-17.70703 23.4023435-18.71093l147.796871-13.41797 58.43359-136.746103c4.30859-10.0468753 14.12109-16.5351563 25.02344-16.5351563 10.90234 0 20.71484 6.488281 25.02343 16.5117183l58.4336 136.769541 147.77344 13.41797c10.88281.98047 20.05468 8.34375 23.42578 18.71093 3.37109 10.36719.2539 21.73829-7.95703 28.90625l-111.70313 97.94141 32.9375 145.08594c2.41406 10.66797-1.72656 21.69922-10.57812 28.09765-8.83204 6.39844-20.60938 6.89063-29.91016 1.30078l-127.44531-76.16015-127.44532 76.20312c-4.30859 2.5586-9.10937 3.86328-13.95312 3.86328zm141.39844-112.875c4.84375 0 9.64062 1.30079 13.95312 3.85938l120.27735 71.9375-31.08594-136.94141c-2.21875-9.74609 1.08984-19.92187 8.62109-26.51562l105.47266-92.5-139.54297-12.67188c-10.04688-.91797-18.6875-7.23437-22.61328-16.49218l-55.08203-129.046887-55.14844 129.066417c-3.88281 9.19531-12.52344 15.51172-22.54688 16.42968l-139.562487 12.67188 105.468737 92.5c7.55469 6.61328 10.85938 16.76953 8.6211 26.53906l-31.0625 136.9375 120.27734-71.91406c4.3086-2.55859 9.10938-3.85938 13.95313-3.85938zm-84.58594-221.84765s0 .0234-.0234.043zm169.12891-.0625.0234.043c0-.0234 0-.0234-.0234-.043zm0 0" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/watched.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/watched.png
deleted file mode 100644 (file)
index 6f2e670..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/watched.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/watched.svg b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/watched.svg
new file mode 100644 (file)
index 0000000..b6837d4
--- /dev/null
@@ -0,0 +1 @@
+<svg enable-background="new 0 0 512 512" height="48" viewBox="0 0 516 516" width="48" xmlns="http://www.w3.org/2000/svg"><path d="m354 258-192 96v-192zm160-223.999998v447.999998h-512.000001v-447.999997zm-192 64.000001h64v-32h-64zm-96 0h64v-32h-64zm-96 0h64v-32h-64zm-96 0h64.000001v-32h-64.000001zm64.000001 319.999997h-64.000001v32h64.000001zm95.999999 0h-64v32h64zm96 0h-64v32h64zm96 0h-64v32h64zm96 0h-64v32h64zm0-288h-448v256h448zm0-63.999997h-64v32h64z" fill="#fff"/></svg>
\ No newline at end of file
index 17b1f83..06a8c11 100644 (file)
@@ -72,7 +72,7 @@ if desktopSize.width() == 1920:
        mp_globals.sizefactor = 3
        mp_globals.plugin_grid_pixmapwidth = 290
        mp_globals.plugin_grid_pixmapheight = 156
-       mp_globals.plugin_list_fontsize = 28    
+       mp_globals.plugin_list_fontsize = 28
 
 from Components.ScreenAnimations import *
 sa = ScreenAnimations()
@@ -113,7 +113,7 @@ config_mp.mediaportal = ConfigSubsection()
 config_mp.mediaportal.fake_entry = NoSave(ConfigNothing())
 
 # Allgemein
-config_mp.mediaportal.version = NoSave(ConfigText(default="2020062803"))
+config_mp.mediaportal.version = NoSave(ConfigText(default="2020071201"))
 config_mp.mediaportal.autoupdate = ConfigYesNo(default = True)
 
 config_mp.mediaportal.skinfail = ConfigYesNo(default = False)
@@ -163,7 +163,10 @@ config_mp.mediaportal.skin = NoSave(ConfigText(default=config_mp.mediaportal.ski
 config_mp.mediaportal.debugMode = ConfigSelectionExt(default="Silent", choices = ["High", "Normal", "Silent"])
 
 config_mp.mediaportal.viewmode = ConfigSelectionExt(default = "grid", choices = [("grid", _("Grid")), ("liste", _("List"))])
-config_mp.mediaportal.plugin_viewmode = ConfigYesNo(default = True)
+if mp_globals.model in ["one", "two", "dm900", "dm920"]:
+       config_mp.mediaportal.plugin_viewmode = ConfigYesNo(default = True)
+else:
+       config_mp.mediaportal.plugin_viewmode = ConfigYesNo(default = False)
 config_mp.mediaportal.storagepath = ConfigText(default="/tmp/mediaportal/tmp/", fixed_size=False)
 config_mp.mediaportal.iconcachepath = ConfigText(default="/media/hdd/mediaportal/", fixed_size=False)
 config_mp.mediaportal.autoplayThreshold = ConfigInteger(default = 50, limits = (1, 100))
@@ -479,8 +482,7 @@ class MPSetup(Screen, CheckPremiumize, ConfigListScreenExt):
                self.configlist.append(getConfigListEntry(_("Mainview Style:"), config_mp.mediaportal.viewmode, True))
                if config_mp.mediaportal.viewmode.value == "grid":
                        self.configlist.append(getConfigListEntry(_("Page Display Style:"), config_mp.mediaportal.pagestyle, False))
-               if mp_globals.model in ["one", "two", "dm900", "dm920"]:
-                       self.configlist.append(getConfigListEntry(_('Plugin Grid (switchable anytime with key "5"):'), config_mp.mediaportal.plugin_viewmode, False))
+               self.configlist.append(getConfigListEntry(_('Plugin Grid (switchable anytime with key "5"):'), config_mp.mediaportal.plugin_viewmode, False))
                self.configlist.append(getConfigListEntry(_("Skin:"), config_mp.mediaportal.skin2, False))
                self.configlist.append(getConfigListEntry(_("Disable Background-TV:"), config_mp.mediaportal.backgroundtv, True))
                if not config_mp.mediaportal.backgroundtv.value:
@@ -896,8 +898,8 @@ class MPGrid(Screen, HelpableScreen):
                        itemsperpage = mp_globals.grid_itemsperpage
                        totalPages = int(math.ceil(float(len(self.all))/float(itemsperpage)))
                        for x in range(1, totalPages+1):
-                               skincontent += "<widget name=\"page_empty" + str(x) + "\" position=\"" + str(start_pagebar) + "," + str(mp_globals.pagebar_posy) + "\" size=\"" + str(mp_globals.pagebar_iconwidth) + "," + str(mp_globals.pagebar_iconheight) + "\" zPosition=\"2\" transparent=\"1\" alphatest=\"blend\" scale=\"stretch\" />"
-                               skincontent += "<widget name=\"page_sel" + str(x) + "\" position=\"" + str(start_pagebar) + "," + str(mp_globals.pagebar_posy) + "\" size=\"" + str(mp_globals.pagebar_iconwidth) + "," + str(mp_globals.pagebar_iconheight) + "\" zPosition=\"2\" transparent=\"1\" alphatest=\"blend\" scale=\"stretch\" />"
+                               skincontent += "<widget name=\"page_empty" + str(x) + "\" position=\"" + str(start_pagebar) + "," + str(mp_globals.pagebar_posy) + "\" size=\"" + str(mp_globals.pagebar_iconwidth) + "," + str(mp_globals.pagebar_iconheight) + "\" zPosition=\"2\" transparent=\"1\" alphatest=\"on\" scale=\"stretch\" />"
+                               skincontent += "<widget name=\"page_sel" + str(x) + "\" position=\"" + str(start_pagebar) + "," + str(mp_globals.pagebar_posy) + "\" size=\"" + str(mp_globals.pagebar_iconwidth) + "," + str(mp_globals.pagebar_iconheight) + "\" zPosition=\"2\" transparent=\"1\" alphatest=\"on\" scale=\"stretch\" />"
                                start_pagebar += mp_globals.pagebar_iconwidth + mp_globals.pagebar_margin
                        self.skin += skincontent
                        self.skin += "</screen>"
@@ -1122,7 +1124,11 @@ class MPGrid(Screen, HelpableScreen):
                        itemsperpage = mp_globals.grid_itemsperpage
                        totalPages = int(math.ceil(float(len(self.all))/float(itemsperpage)))
                        for x in range(1, totalPages+1):
-                               poster_path = "%s/page_select.png" % (images_path)
+                               poster_path = "%s/page_select.svg" % (images_path)
+                               if not fileExists(poster_path):
+                                       poster_path = "%s/page_select.png" % (images_path)
+                                       if not fileExists(poster_path):
+                                               poster_path = "/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/page_select.svg"
                                self["page_sel"+str(x)].instance.setPixmap(gPixmapPtr())
                                self["page_sel"+str(x)].hide()
                                pic = LoadPixmap(cached=True, path=poster_path)
@@ -1131,7 +1137,11 @@ class MPGrid(Screen, HelpableScreen):
                                        if x == 1:
                                                self["page_sel"+str(x)].show()
                        for x in range(1, totalPages+1):
-                               poster_path = "%s/page.png" % (images_path)
+                               poster_path = "%s/page.svg" % (images_path)
+                               if not fileExists(poster_path):
+                                       poster_path = "%s/page.png" % (images_path)
+                                       if not fileExists(poster_path):
+                                               poster_path = "/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/page.svg"
                                self["page_empty"+str(x)].instance.setPixmap(gPixmapPtr())
                                self["page_empty"+str(x)].hide()
                                pic = LoadPixmap(cached=True, path=poster_path)
@@ -1372,8 +1382,6 @@ class MPGrid(Screen, HelpableScreen):
                self.par1 = ""
                self.par2 = ""
 
-               _thread.start_new_thread(self.hit_plugin, ("HitPlugin", auswahl, True))
-
                conf = xml.etree.cElementTree.parse(CONFIG)
                for x in conf.getroot():
                        if x.tag == "set" and x.get("name") == 'additions':
@@ -1460,6 +1468,8 @@ class MPGrid(Screen, HelpableScreen):
                                else:
                                        self.session.open(self.pornscreen, self.par1, self.par2)
 
+               _thread.start_new_thread(self.hit_plugin, ("HitPlugin", auswahl, True))
+
        def pincheckok(self, pincode):
                if pincode:
                        pincheck.pinEntered()
@@ -1475,38 +1485,7 @@ class MPGrid(Screen, HelpableScreen):
                        maxtotalPages = int(math.ceil(float(len(self.all))/float(itemsperpage)))
                        curtotalPages = int(math.ceil(float(len(self.currentlist))/float(itemsperpage)))
                        currentindex = self['liste'].instance.getCurrentIndex()
-                       if currentindex > 15*itemsperpage-1:
-                               currentPage = 16
-                       elif currentindex > 14*itemsperpage-1:
-                               currentPage = 15
-                       elif currentindex > 13*itemsperpage-1:
-                               currentPage = 14
-                       elif currentindex > 12*itemsperpage-1:
-                               currentPage = 13
-                       elif currentindex > 11*itemsperpage-1:
-                               currentPage = 12
-                       elif currentindex > 10*itemsperpage-1:
-                               currentPage = 11
-                       elif currentindex > 9*itemsperpage-1:
-                               currentPage = 10
-                       elif currentindex > 8*itemsperpage-1:
-                               currentPage = 9
-                       elif currentindex > 7*itemsperpage-1:
-                               currentPage = 8
-                       elif currentindex > 6*itemsperpage-1:
-                               currentPage = 7
-                       elif currentindex > 5*itemsperpage-1:
-                               currentPage = 6
-                       elif currentindex > 4*itemsperpage-1:
-                               currentPage = 5
-                       elif currentindex > 3*itemsperpage-1:
-                               currentPage = 4
-                       elif currentindex > 2*itemsperpage-1:
-                               currentPage = 3
-                       elif currentindex > itemsperpage-1:
-                               currentPage = 2
-                       else:
-                               currentPage = 1
+                       currentPage = int(currentindex) / int(itemsperpage) + 1
                        item = self["liste"].getCurrent()
                        (p_name, p_picname, p_mod, p_hits, p_sort, p_default) = item[0]
                        try:
@@ -2319,7 +2298,7 @@ class MPSummary(Screen):
                self["cover"] = Pixmap()
 
                self.skin = '''<screen name="MPSummary" backgroundColor="#00000000" position="''' + disp_pos + '''" size="''' + disp_size  + '''"''' + disp_id + '''>
-                               <widget name="cover" position="center,center" size="''' + disp_size + '''" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/none.png" transparent="1" alphatest="blend" />
+                               <widget name="cover" position="center,center" size="''' + disp_size + '''" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/none.png" transparent="1" alphatest="on" />
                                </screen>'''
 
                self.skinName = ''.join([random.choice(string.ascii_letters + string.digits) for n in range(32)])
@@ -2560,6 +2539,38 @@ def _stylemanager(mode):
                                                        mp_globals.plugin_list_fontsize = int(x.get("value"))
                                                elif x.tag == "plugin_list_itemheight":
                                                        mp_globals.plugin_list_itemheight = int(x.get("value"))
+                                               elif x.tag == "plugin_list_pixmapmargin_x":
+                                                       mp_globals.plugin_list_pixmapmargin_x = int(x.get("value"))
+                                               elif x.tag == "plugin_list_pixmapwatchedmargin_y":
+                                                       mp_globals.plugin_list_pixmapwatchedmargin_y = int(x.get("value"))
+                                               elif x.tag == "plugin_list_pixmapwatchedheight":
+                                                       mp_globals.plugin_list_pixmapwatchedheight = int(x.get("value"))
+                                               elif x.tag == "plugin_list_pixmapwatchedwidth":
+                                                       mp_globals.plugin_list_pixmapwatchedwidth = int(x.get("value"))
+                                               elif x.tag == "plugin_list_pixmaplivemargin_y":
+                                                       mp_globals.plugin_list_pixmaplivemargin_y = int(x.get("value"))
+                                               elif x.tag == "plugin_list_pixmapliveheight":
+                                                       mp_globals.plugin_list_pixmapliveheight = int(x.get("value"))
+                                               elif x.tag == "plugin_list_pixmaplivewidth":
+                                                       mp_globals.plugin_list_pixmaplivewidth = int(x.get("value"))
+                                               elif x.tag == "plugin_list_pixmapstarmargin_y":
+                                                       mp_globals.plugin_list_pixmapstarmargin_y = int(x.get("value"))
+                                               elif x.tag == "plugin_list_pixmapstarheight":
+                                                       mp_globals.plugin_list_pixmapstarheight = int(x.get("value"))
+                                               elif x.tag == "plugin_list_pixmapstarwidth":
+                                                       mp_globals.plugin_list_pixmapstarwidth = int(x.get("value"))
+                                               elif x.tag == "plugin_list_pixmapplaylistmargin_y":
+                                                       mp_globals.plugin_list_pixmapplaylistmargin_y = int(x.get("value"))
+                                               elif x.tag == "plugin_list_pixmapplaylistheight":
+                                                       mp_globals.plugin_list_pixmapplaylistheight = int(x.get("value"))
+                                               elif x.tag == "plugin_list_pixmapplaylistwidth":
+                                                       mp_globals.plugin_list_pixmapplaylistwidth = int(x.get("value"))
+                                               elif x.tag == "plugin_list_pixmapdirectorymargin_y":
+                                                       mp_globals.plugin_list_pixmapdirectorymargin_y = int(x.get("value"))
+                                               elif x.tag == "plugin_list_pixmapdirectoryheight":
+                                                       mp_globals.plugin_list_pixmapdirectoryheight = int(x.get("value"))
+                                               elif x.tag == "plugin_list_pixmapdirectorywidth":
+                                                       mp_globals.plugin_list_pixmapdirectorywidth = int(x.get("value"))
                                                elif x.tag == "plugin_grid_fontsize":
                                                        mp_globals.plugin_grid_fontsize = int(x.get("value"))
                                                elif x.tag == "plugin_grid_margin_x":
@@ -2610,6 +2621,14 @@ def _stylemanager(mode):
                                                        mp_globals.config_separation_width = int(x.get("value"))
                                                elif x.tag == "config_divider_height":
                                                        mp_globals.config_divider_height = int(x.get("value"))
+                                               elif x.tag == "sort_select_pixmapmargin_x":
+                                                       mp_globals.sort_select_pixmapmargin_x = int(x.get("value"))
+                                               elif x.tag == "sort_select_pixmapmargin_y":
+                                                       mp_globals.sort_select_pixmapmargin_y = int(x.get("value"))
+                                               elif x.tag == "sort_select_pixmapheight":
+                                                       mp_globals.sort_select_pixmapheight = int(x.get("value"))
+                                               elif x.tag == "sort_select_pixmapwidth":
+                                                       mp_globals.sort_select_pixmapwidth = int(x.get("value"))
                        stylemgr.setStyle(0, styleskinned)
                else:
                        pass
@@ -2781,4 +2800,4 @@ def Plugins(path, **kwargs):
                PluginDescriptor(name="MediaPortal", description="MediaPortal", where = [PluginDescriptor.WHERE_AUTOSTART, PluginDescriptor.WHERE_SESSIONSTART], fnc = autostart),
                PluginDescriptor(name="MediaPortal", description="MediaPortal", where = [PluginDescriptor.WHERE_PLUGINMENU, PluginDescriptor.WHERE_EXTENSIONSMENU], icon="plugin.png", fnc=MPmain)
        ]
-       return result
\ No newline at end of file
+       return result
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/resources/imagesize.py b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/resources/imagesize.py
new file mode 100644 (file)
index 0000000..1d7270c
--- /dev/null
@@ -0,0 +1,56 @@
+import struct
+
+def get(filepath):
+       height = -1
+       width = -1
+
+       with open(str(filepath), 'rb') as fhandle:
+               head = fhandle.read(24)
+               size = len(head)
+               # handle GIFs
+               if size >= 10 and head[:6] in (b'GIF87a', b'GIF89a'):
+                       # Check to see if content_type is correct
+                       try:
+                               width, height = struct.unpack("<hh", head[6:10])
+                       except struct.error:
+                               raise ValueError("Invalid GIF file")
+               # see png edition spec bytes are below chunk length then and finally the
+               elif size >= 24 and head.startswith(b'\211PNG\r\n\032\n') and head[12:16] == b'IHDR':
+                       try:
+                               width, height = struct.unpack(">LL", head[16:24])
+                       except struct.error:
+                               raise ValueError("Invalid PNG file")
+               # Maybe this is for an older PNG version.
+               elif size >= 16 and head.startswith(b'\211PNG\r\n\032\n'):
+                       # Check to see if we have the right content type
+                       try:
+                               width, height = struct.unpack(">LL", head[8:16])
+                       except struct.error:
+                               raise ValueError("Invalid PNG file")
+               # handle JPEGs
+               elif size >= 2 and head.startswith(b'\377\330'):
+                       try:
+                               fhandle.seek(0)  # Read 0xff next
+                               size = 2
+                               ftype = 0
+                               while not 0xc0 <= ftype <= 0xcf or ftype in [0xc4, 0xc8, 0xcc]:
+                                       fhandle.seek(size, 1)
+                                       byte = fhandle.read(1)
+                                       while ord(byte) == 0xff:
+                                               byte = fhandle.read(1)
+                                       ftype = ord(byte)
+                                       size = struct.unpack('>H', fhandle.read(2))[0] - 2
+                               # We are at a SOFn block
+                               fhandle.seek(1, 1)  # Skip `precision' byte.
+                               height, width = struct.unpack('>HH', fhandle.read(4))
+                       except struct.error:
+                               raise ValueError("Invalid JPEG file")
+               # handle JPEG2000s
+               elif size >= 12 and head.startswith(b'\x00\x00\x00\x0cjP  \r\n\x87\n'):
+                       fhandle.seek(48)
+                       try:
+                               height, width = struct.unpack('>LL', fhandle.read(8))
+                       except struct.error:
+                               raise ValueError("Invalid JPEG2000 file")
+
+       return width, height
\ No newline at end of file
index 9322a73..8cd0ba6 100644 (file)
@@ -15,6 +15,9 @@ import threading
 from .coverhelper import CoverHelper
 from .messageboxext import MessageBoxExt
 from .twagenthelper import twDownloadPage
+from twisted.web.client import HTTPConnectionPool
+from PIL import Image
+from . import imagesize
 
 screenList = []
 
@@ -226,16 +229,20 @@ class MPScreen(Screen, HelpableScreen):
 
                scale = AVSwitch().getFramebufferScale()
                self._picload = ePicLoad()
-               self._picload.setPara((mp_globals.plugin_grid_pixmapwidth, mp_globals.plugin_grid_pixmapheight, scale[0], scale[1], False, 0, '#FF000000'))
+               self._picload.setPara((mp_globals.plugin_grid_pixmapwidth, mp_globals.plugin_grid_pixmapheight, scale[0], scale[1], False, 1, '#FF000000'))
                self._picload_conn = self._picload.PictureData.connect(self._onDefaultPixmapReady)
 
+               self.pool = HTTPConnectionPool(reactor)
                self.deferreds = []
                if mp_globals.model in ["one", "two", "dm900", "dm920"]:
-                       tokens = 16
+                       tokens = 10
                else:
-                       tokens = 8
+                       tokens = 4
                self._cachingDeferred = defer.DeferredSemaphore(tokens=tokens)
                self._defaultPixmap = None
+               self._picloads = {}
+               self._picload_conns = {}
+               self._picload_result = {}
                self._loadDefaultPixmap()
                self._pixmapCache = {}
                self._currentEntry = 0
@@ -243,6 +250,8 @@ class MPScreen(Screen, HelpableScreen):
                self._items = []
                self.buildfunc = ''
                self.gridview = False
+               self.gridmode = 'list'
+               self.gridvalidate = False
                if mp_globals.model in ["one", "two", "dm900", "dm920", "dm7080", "dm820"]:
                        self.gridswitch = config_mp.mediaportal.plugin_viewmode.value
                else:
@@ -266,11 +275,13 @@ class MPScreen(Screen, HelpableScreen):
                        items.cancel()
 
        def _setList(self, buildfunc='_defaultlistleft', validateCache=False, mode='grid'):
+               self.buildfunc = buildfunc
+               self.gridvalidate = validateCache
+               self.gridmode = mode
                if mode == 'list':
                        self.gridswitch = False
-               self.buildfunc = buildfunc
                exec("self.ml.setList(list(map(self."+buildfunc+", self._items)))")
-               if validateCache and mp_globals.model in ["one", "two", "dm900", "dm920", "dm7080", "dm820"]:
+               if validateCache and self.gridswitch and mp_globals.model in ["one", "two", "dm900", "dm920", "dm7080", "dm820"]:
                        self.validateCache(True)
 
        def validateCache(self, clear=False):
@@ -281,7 +292,7 @@ class MPScreen(Screen, HelpableScreen):
                self._currentEntry = -1
                self._endEntry = len(self._items) - 1
                printl('currentEntry: '+str(self._currentEntry)+' _endEntry: '+str(self._endEntry), self, "H")
-               if self._endEntry < 300:
+               if self._endEntry < 400:
                        self._nextForCache()
 
        def _nextForCache(self):
@@ -297,43 +308,47 @@ class MPScreen(Screen, HelpableScreen):
                        else:
                                self._nextForCache()
 
-       def _onDownloadPageBody(self, data, index, url):
-               with open('/tmp/.gridIcon%s' % str(index), 'r') as f:
-                       body = f.read()
-                       f.close()
-               if len(body) > 500 and not body.startswith('<html>') and not body.startswith('<!DOCTYPE html>'):
-                       self._gotPixmapForCache(index, url)
-               else:
-                       self._decodedPixmapForCache(index, url, default=True)
-
        def _loadPixmapForCache(self, index, url):
-               d = self._cachingDeferred.run(twDownloadPage, url, '/tmp/.gridIcon%s' % str(index)).addCallback(self._onDownloadPageBody, index, url).addErrback(self._errorPixmapForCache, index)
+               d = self._cachingDeferred.run(twDownloadPage, url, '/tmp/.gridIcon%s' % str(index), pool=self.pool).addCallback(self._onDownloadPageBody, index, url).addErrback(self._errorPixmapForCache, index)
                self.deferreds.append(d)
                self._nextForCache()
 
+       def _onDownloadPageBody(self, data, index, url):
+               width, height = imagesize.get('/tmp/.gridIcon%s' % str(index))
+               if width > 1920:
+                       printl('Large picture! Resizing .gridIcon%s' % str(index), self, "W")
+                       im = Image.open('/tmp/.gridIcon%s' % str(index)).convert('RGB')
+                       im.thumbnail((mp_globals.plugin_grid_pixmapwidth, mp_globals.plugin_grid_pixmapheight), Image.NEAREST)
+                       im.save('/tmp/.gridIcon%s' % str(index), "JPEG")
+               reactor.callFromThread(boundFunction(self._gotPixmapForCache, index, url))
+
        def _gotPixmapForCache(self, index, url):
-               #printl('', self, "H")
                callback = boundFunction(self._decodedPixmapForCache, index, url)
                scale = AVSwitch().getFramebufferScale()
-               exec("self._picload" + str(index) + " = ePicLoad()")
-               exec("self._picload" + str(index) + ".setPara((mp_globals.plugin_grid_pixmapwidth, mp_globals.plugin_grid_pixmapheight, scale[0], scale[1], False, 0, '#FF000000'))")
-               exec("self._picload" + str(index) + "_conn = self._picload" + str(index) + ".PictureData.connect(callback)")
-               exec("self._picload" + str(index) + ".startDecode('/tmp/.gridIcon" + str(index) + "')")
-
-       def _decodedPixmapForCache(self, index, url, picInfo=None, default=False):
-               #printl('', self, "H")
-               if default:
+               self._picloads[index] = ePicLoad()
+               self._picloads[index].setPara((mp_globals.plugin_grid_pixmapwidth, mp_globals.plugin_grid_pixmapheight, scale[0], scale[1], False, 1, '#FF000000'))
+               self._picload_conns[index] = self._picloads[index].PictureData.connect(callback)
+               self._picload_result[index] = self._picloads[index].startDecode('/tmp/.gridIcon%s' % str(index))
+               if self._picload_result[index]:
+                       printl('Failed loading image .gridIcon%s!' % str(index), self, "W")
                        self._pixmapCache[url] = self._defaultPixmap
-               else:
                        try:
-                               exec("self._pixmapCache[url] = self._picload" + str(index) + ".getData()")
+                               exec("self._setList('"+self.buildfunc+"', False)")
                        except Exception as e:
                                printl(e, self, "E")
+                       del self._picloads[index]
+                       del self._picload_conns[index]
+
+       def _decodedPixmapForCache(self, index, url, picInfo=None):
+               ptr = self._picloads[index].getData()
+               if ptr != None:
+                       self._pixmapCache[url] = ptr
                try:
                        exec("self._setList('"+self.buildfunc+"', False)")
                except Exception as e:
                        printl(e, self, "E")
-               exec("self._picload" + str(index) + " = None")
+               del self._picloads[index]
+               del self._picload_conns[index]
                file = '/tmp/.gridIcon%s' % str(index)
                if fileExists(file):
                        BgFileEraser = eBackgroundFileEraser.getInstance()
@@ -341,11 +356,6 @@ class MPScreen(Screen, HelpableScreen):
 
        def _errorPixmapForCache(self, error, index):
                printl(error, self, "H")
-               exec("self._picload" + str(index) + " = None")
-               file = '/tmp/.gridIcon%s' % str(index)
-               if fileExists(file):
-                       BgFileEraser = eBackgroundFileEraser.getInstance()
-                       BgFileEraser.erase(file)
 
        def _loadDefaultPixmap(self):
                self._picload.startDecode(self.default_cover.replace('file://', ''))
@@ -362,7 +372,7 @@ class MPScreen(Screen, HelpableScreen):
                        self.gridswitch = False
                else:
                        self.gridswitch = True
-               exec("self._setList('"+self.buildfunc+"', False)")
+               self._setList(self.buildfunc, self.gridvalidate, self.gridmode)
 
        def skinMessage(self):
                if self.skinmsg != '':
@@ -699,7 +709,7 @@ class MPScreen(Screen, HelpableScreen):
                        self['liste'].instance.setMargin(ePoint(mp_globals.plugin_grid_margin_x,mp_globals.plugin_grid_margin_y))
                        pixmap = self._pixmapCache.get(entry[2], self._defaultPixmap)
                        res = [entry]
-                       res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, mp_globals.plugin_grid_pixmapmargin_x, mp_globals.plugin_grid_pixmapmargin_y, mp_globals.plugin_grid_pixmapwidth, mp_globals.plugin_grid_pixmapheight, pixmap))
+                       res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHABLEND, mp_globals.plugin_grid_pixmapmargin_x, mp_globals.plugin_grid_pixmapmargin_y, mp_globals.plugin_grid_pixmapwidth, mp_globals.plugin_grid_pixmapheight, pixmap))
                        res.append((eListboxPythonMultiContent.TYPE_TEXT, mp_globals.plugin_grid_textmargin_x, mp_globals.plugin_grid_textmargin_y, mp_globals.plugin_grid_textwidth, mp_globals.plugin_grid_textheight, 0, RT_HALIGN_CENTER | RT_VALIGN_CENTER | RT_WRAP, entry[0]))
                else:
                        self['liste'].instance.setMode(eListbox.layoutVertical)
@@ -737,51 +747,42 @@ class MPScreen(Screen, HelpableScreen):
 
                skin_path = mp_globals.pluginPath + mp_globals.skinsPath
 
-               path = "%s/%s/images/watched.png" % (skin_path, mp_globals.currentskin)
+               path = "%s/%s/images/watched.svg" % (skin_path, mp_globals.currentskin)
                if not fileExists(path):
-                       path = "%s/%s/images/watched.png" % (skin_path, mp_globals.skinFallback)
+                       path = "%s/%s/images/watched.png" % (skin_path, mp_globals.currentskin)
                        if not fileExists(path):
-                               path = "/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/watched.png"
+                               path = "/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/watched.svg"
                watched = LoadPixmap(path)
-               pwidth1 = watched.size().width()
-               pheight1 = watched.size().height()
-               vpos1 = round(float((height-pheight1) / 2))
 
-               path = "%s/%s/images/live.png" % (skin_path, mp_globals.currentskin)
+               path = "%s/%s/images/live.svg" % (skin_path, mp_globals.currentskin)
                if not fileExists(path):
-                       path = "%s/%s/images/live.png" % (skin_path, mp_globals.skinFallback)
+                       path = "%s/%s/images/live.png" % (skin_path, mp_globals.currentskin)
                        if not fileExists(path):
-                               path = "/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/live.png"
+                               path = "/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/live.svg"
                live = LoadPixmap(path)
-               pwidth2 = watched.size().width()
-               pheight2 = watched.size().height()
-               vpos2 = round(float((height-pheight2) / 2))
 
-               path = "%s/%s/images/star.png" % (skin_path, mp_globals.currentskin)
+               path = "%s/%s/images/star.svg" % (skin_path, mp_globals.currentskin)
                if not fileExists(path):
-                       path = "%s/%s/images/star.png" % (skin_path, mp_globals.skinFallback)
+                       path = "%s/%s/images/star.png" % (skin_path, mp_globals.currentskin)
                        if not fileExists(path):
-                               path = "/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/star.png"
+                               path = "/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/star.svg"
                star = LoadPixmap(path)
-               star_pwidth = star.size().width()
-               star_pheight = star.size().height()
-               star_vpos = round(float((height-star_pheight) / 2))
 
-               iconoffset = pwidth1 + 15
+               iconoffset = mp_globals.plugin_list_pixmapwatchedwidth + mp_globals.plugin_list_pixmapmargin_x
                if len(entry)>8:
                        if entry[2]:
-                               res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 15, vpos1, pwidth1, pheight1, watched))
-                       iconoffset = pwidth1 + 15
+                               res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHABLEND, mp_globals.plugin_list_pixmapmargin_x, mp_globals.plugin_list_pixmapwatchedmargin_y, mp_globals.plugin_list_pixmapwatchedwidth, mp_globals.plugin_list_pixmapwatchedheight, watched))
+                       iconoffset = mp_globals.plugin_list_pixmapwatchedwidth + mp_globals.plugin_list_pixmapmargin_x
                if len(entry)>9:
                        if entry[9]:
-                               res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, pwidth1+30, star_vpos, star_pwidth, star_pheight, star))
-                       iconoffset = pwidth1 + 30 + star_pwidth
+                               res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHABLEND, mp_globals.plugin_list_pixmapwatchedwidth+2*mp_globals.plugin_list_pixmapmargin_x, mp_globals.plugin_list_pixmapstarmargin_y, mp_globals.plugin_list_pixmapstarwidth, mp_globals.plugin_list_pixmapstarheight, star))
+                       iconoffset = mp_globals.plugin_list_pixmapwatchedwidth + 2*mp_globals.plugin_list_pixmapmargin_x + mp_globals.plugin_list_pixmapstarwidth
                elif len(entry)>7 and entry[7]:
                        if entry[7] == 'Live':
-                               res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 15, vpos2, pwidth2, pheight2, live))
-                       iconoffset = pwidth1 + 15
+                               res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHABLEND, mp_globals.plugin_list_pixmapmargin_x, mp_globals.plugin_list_pixmaplivemargin_y, mp_globals.plugin_list_pixmaplivewidth, mp_globals.plugin_list_pixmapliveheight, live))
+                       iconoffset = mp_globals.plugin_list_pixmapwatchedwidth + mp_globals.plugin_list_pixmapmargin_x
                elif entry[2]:
-                       res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 15, vpos1, pwidth1, pheight1, watched))
+                       res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHABLEND, mp_globals.plugin_list_pixmapmargin_x, mp_globals.plugin_list_pixmapwatchedmargin_y, mp_globals.plugin_list_pixmapwatchedwidth, mp_globals.plugin_list_pixmapwatchedheight, watched))
 
                try:
                        if entry[3]:
@@ -831,8 +832,8 @@ class MPScreen(Screen, HelpableScreen):
                                                lheight = mp_globals.plugin_list_fontsize
                                                lwidth = int(lheight * lratio)
                                        vpos = round(float((height-lheight) / 2))
-                                       res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, iconoffset+15, vpos, lwidth, lheight, llang))
-                                       self.langoffset = lwidth+15
+                                       res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHABLEND, iconoffset+mp_globals.plugin_list_pixmapmargin_x, vpos, lwidth, lheight, llang))
+                                       self.langoffset = lwidth+mp_globals.plugin_list_pixmapmargin_x
                                else:
                                        self.langoffset = 0
                except:
@@ -840,9 +841,9 @@ class MPScreen(Screen, HelpableScreen):
 
                if premium and ((config_mp.mediaportal.premiumize_use.value and re.search(mp_globals.premium_hosters_prz[0], entry[0], re.S|re.I)) or (config_mp.mediaportal.realdebrid_use.value and re.search(mp_globals.premium_hosters_rdb[0], entry[0], re.S|re.I))):
                        premiumFarbe = int(config_mp.mediaportal.premium_color.value, 0)
-                       res.append((eListboxPythonMultiContent.TYPE_TEXT, iconoffset+15+self.langoffset, 0, width, height, 0, RT_HALIGN_LEFT | RT_VALIGN_CENTER, entry[0], premiumFarbe))
+                       res.append((eListboxPythonMultiContent.TYPE_TEXT, iconoffset+mp_globals.plugin_list_pixmapmargin_x+self.langoffset, 0, width, height, 0, RT_HALIGN_LEFT | RT_VALIGN_CENTER, entry[0], premiumFarbe))
                else:
-                       res.append((eListboxPythonMultiContent.TYPE_TEXT, iconoffset+15+self.langoffset, 0, width, height, 0, RT_HALIGN_LEFT | RT_VALIGN_CENTER, entry[0]))
+                       res.append((eListboxPythonMultiContent.TYPE_TEXT, iconoffset+mp_globals.plugin_list_pixmapmargin_x+self.langoffset, 0, width, height, 0, RT_HALIGN_LEFT | RT_VALIGN_CENTER, entry[0]))
 
                return res
 
@@ -872,24 +873,18 @@ class MPScreen(Screen, HelpableScreen):
                height = self['liste'].l.getItemSize().height()
                self.ml.l.setFont(0, gFont(mp_globals.font, mp_globals.plugin_list_fontsize))
                res = [entry]
-
                skin_path = mp_globals.pluginPath + mp_globals.skinsPath
-
-               path = "%s/%s/images/select.png" % (skin_path, mp_globals.currentskin)
+               path = "%s/%s/images/select.svg" % (skin_path, mp_globals.currentskin)
                if not fileExists(path):
-                       path = "%s/%s/images/select.png" % (skin_path, mp_globals.skinFallback)
+                       path = "%s/%s/images/select.png" % (skin_path, mp_globals.currentskin)
                        if not fileExists(path):
-                               path = "/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/select.png"
-
+                               path = "/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/select.svg"
                select = LoadPixmap(path)
-               pwidth = select.size().width()
-               pheight = select.size().height()
-               vpos = round(float((height-pheight) / 2))
                if self.selected and entry[0] == self.old_plugin_name:
-                       res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 25, vpos, pwidth, pheight, select))
-               res.append((eListboxPythonMultiContent.TYPE_TEXT, pwidth+50+self.langoffset, 0, width, height, 0, RT_HALIGN_LEFT | RT_VALIGN_CENTER, entry[0]))
-
+                       res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHABLEND, mp_globals.sort_select_pixmapmargin_x, mp_globals.sort_select_pixmapmargin_y, mp_globals.sort_select_pixmapwidth, mp_globals.sort_select_pixmapheight, select))
+               res.append((eListboxPythonMultiContent.TYPE_TEXT, 2*mp_globals.sort_select_pixmapmargin_x+mp_globals.sort_select_pixmapwidth, 0, width, height, 0, RT_HALIGN_LEFT | RT_VALIGN_CENTER, entry[0]))
                return res
+
 ##################
 
 ####### simplelist
@@ -897,11 +892,11 @@ class MPScreen(Screen, HelpableScreen):
        def getIconPath(icon_name):
                skin_path = mp_globals.pluginPath + mp_globals.skinsPath
 
-               path = "%s/%s/images/%s" % (skin_path, mp_globals.currentskin, icon_name)
+               path = "%s/%s/images/%s.svg" % (skin_path, mp_globals.currentskin, icon_name)
                if not fileExists(path):
-                       path = "%s/%s/images/%s" % (skin_path, mp_globals.skinFallback, icon_name)
+                       path = "%s/%s/images/%s.png" % (skin_path, mp_globals.currentskin, icon_name)
                        if not fileExists(path):
-                               path = "/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/%s" % icon_name
+                               path = "/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/%s.svg" % icon_name
                return path
 
        def simplelistListEntry(self, entry):
@@ -910,19 +905,18 @@ class MPScreen(Screen, HelpableScreen):
                height = self['liste'].l.getItemSize().height()
                self.ml.l.setFont(0, gFont(mp_globals.font, mp_globals.plugin_list_fontsize))
                res = [entry]
-
                if entry[0] in ('1', '4', '5', '6', '7', '8', '9'):
-                       icon_name = "directory.png"
+                       icon_name = "directory"
                else:
-                       icon_name = "playlist.png"
-
+                       icon_name = "playlist"
                path = self.getIconPath(icon_name)
                icon = LoadPixmap(path)
-               pwidth = icon.size().width()
-               pheight = icon.size().height()
-               vpos = round(float((height-pheight) / 2))
-               res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 25, vpos, pwidth, pheight, icon))
-               res.append((eListboxPythonMultiContent.TYPE_TEXT, pwidth+50, 0, width, height, 0, RT_HALIGN_LEFT | RT_VALIGN_CENTER, entry[1]))
+               if icon_name == "directory":
+                       res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHABLEND, mp_globals.plugin_list_pixmapmargin_x, mp_globals.plugin_list_pixmapdirectorymargin_y, mp_globals.plugin_list_pixmapdirectorywidth, mp_globals.plugin_list_pixmapdirectoryheight, icon))
+                       res.append((eListboxPythonMultiContent.TYPE_TEXT, 2*mp_globals.plugin_list_pixmapmargin_x+mp_globals.plugin_list_pixmapdirectorywidth, 0, width, height, 0, RT_HALIGN_LEFT | RT_VALIGN_CENTER, entry[1]))
+               else:
+                       res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHABLEND, mp_globals.plugin_list_pixmapmargin_x, mp_globals.plugin_list_pixmapplaylistmargin_y, mp_globals.plugin_list_pixmapplaylistwidth, mp_globals.plugin_list_pixmapplaylistheight, icon))
+                       res.append((eListboxPythonMultiContent.TYPE_TEXT, 2*mp_globals.plugin_list_pixmapmargin_x+mp_globals.plugin_list_pixmapplaylistwidth, 0, width, height, 0, RT_HALIGN_LEFT | RT_VALIGN_CENTER, entry[1]))
                return res
 
        # simplelist - iptv
@@ -946,7 +940,7 @@ class MPScreen(Screen, HelpableScreen):
                                pwidth = icon.size().width()
                                pheight = icon.size().height()
                                vpos = round(float((height-pheight) / 2))
-                               res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 25, vpos, pwidth, pheight, icon))
+                               res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHABLEND, 25, vpos, pwidth, pheight, icon))
                                iconwidth = pwidth+50
 
                res.append((eListboxPythonMultiContent.TYPE_TEXT, iconwidth, 0, width2, height, 0, RT_HALIGN_LEFT | RT_VALIGN_CENTER, entry[0], color))
@@ -1098,7 +1092,7 @@ class MPScreenSummary(Screen):
                self["cover"] = Pixmap()
 
                self.skin = '''<screen name="MPScreenSummary" backgroundColor="#00000000" position="''' + disp_pos + '''" size="''' + disp_size  + '''"''' + disp_id + '''>
-                               <widget name="cover" position="center,center" size="''' + disp_size + '''" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/none.png" transparent="1" alphatest="blend" />
+                               <widget name="cover" position="center,center" size="''' + disp_size + '''" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/none.png" transparent="1" alphatest="on" />
                                </screen>'''
 
                self.skinName = ''.join([random.choice(string.ascii_letters + string.digits) for n in range(32)])
index c65906d..0886b03 100644 (file)
@@ -746,14 +746,14 @@ class RadioBackground(Screen):
                        self.skin = '''<screen backgroundColor="transparent" flags="wfNoBorder" name="RadioBackground" position="0,0" size="1920,1080" zPosition="-1">
                                        <widget name="screenSaverBg" position="0,0" size="1920,1080" transparent="0" backgroundColor="#00000000" zPosition="1" />
                                        <widget name="screenSaver" position="0,0" size="1920,1080" zPosition="2" />
-                                       <widget alphatest="blend" name="BgCover" position="648,10" size="800,800" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/none.png" zPosition="15" />
+                                       <widget alphatest="on" name="BgCover" position="648,10" size="800,800" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/none.png" zPosition="15" />
                                        <widget name="BgTitle" position="center,110" size="1600,50" halign="center" valign="center" font="mediaportal_clean;38" foregroundColor="#00ffffff" backgroundColor="#00000000" transparent="1" shadowColor="#00000000" shadowOffset="-2,-2" zPosition="11" />'''
 
                        if MerlinMusicPlayerPresent:
                                if config_mp.mediaportal.sp_radio_visualization.value == "3":
                                        self.skin += '''<widget name="coverGL" position="0,0" size="1920,1080" transparent="0" backgroundColor="#00000000" mode="%s" noCoverAvailablePic="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/none.png"/>''' % config_mp.mediaportal.sp_radio_visualization_gl_mode.value
                                else:
-                                       self.skin += '''<widget alphatest="blend" name="cover" position="735,270" size="450,450" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/none.png" zPosition="13" />
+                                       self.skin += '''<widget alphatest="on" name="cover" position="735,270" size="450,450" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/none.png" zPosition="13" />
                                        <widget name="rms0" channel="0" backgroundColor="#404040" zPosition="13" position="650,247" size="70,495" pixmap1="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/led_90x60_h9.png" transparent="1" mode="imagesOrientationUp" pixmapBackground1="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/colorgradient.png" drawBackground="0" pixmapBackgroundColor1="#080808" distance="15" maxValue="40" fadeOutTime="0" smoothing="0.5" />
                                        <widget name="rms1" channel="1" backgroundColor="#404040" zPosition="13" position="1200,247" size="70,495" pixmap1="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/led_90x60_h9.png" transparent="1" mode="imagesOrientationUp" pixmapBackground1="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/colorgradient.png" drawBackground="0" pixmapBackgroundColor1="#080808" distance="15" maxValue="40" fadeOutTime="0" smoothing="0.5" />'''
 
@@ -772,21 +772,21 @@ class RadioBackground(Screen):
                                        else:
                                                self.skin += '''<widget name="visu" position="0,960" size="1920,120" transparent="1" zPosition="11" pixmapBackground2="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/colorgradient.png" pixmap2="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/led_30x20_h8.png" distance1="18" distance2="8" mode="visImagesUp" maxValue="15" fadeOutTime="0" internalSize="1" pixmapBackgroundColor1="#080808" drawBackground="0" smoothing="0.6" />'''
                        else:
-                               self.skin += '''<widget alphatest="blend" name="cover" position="735,270" size="450,450" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/none.png" zPosition="13" />'''
+                               self.skin += '''<widget alphatest="on" name="cover" position="735,270" size="450,450" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/none.png" zPosition="13" />'''
 
                        self.skin += '''</screen>'''
                else:
                        self.skin = '''<screen backgroundColor="transparent" flags="wfNoBorder" name="RadioBackground" position="0,0" size="1280,720" zPosition="-1">
                                        <widget name="screenSaverBg" position="0,0" size="1280,720" transparent="0" backgroundColor="#00000000" zPosition="1" />
                                        <widget name="screenSaver" position="0,0" size="1280,720" zPosition="2" />
-                                       <widget alphatest="blend" name="BgCover" position="430,6" size="534,534" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/none.png" zPosition="15" />
+                                       <widget alphatest="on" name="BgCover" position="430,6" size="534,534" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/none.png" zPosition="15" />
                                        <widget name="BgTitle" position="center,75" size="1070,35" halign="center" valign="center" font="mediaportal_clean;24" foregroundColor="#00ffffff" backgroundColor="#00000000" transparent="1" shadowColor="#00000000" shadowOffset="-2,-2" zPosition="11" />'''
 
                        if MerlinMusicPlayerPresent:
                                if config_mp.mediaportal.sp_radio_visualization.value == "3":
                                        self.skin += '''<widget name="coverGL" position="0,0" size="1280,720" transparent="0" backgroundColor="#00000000" mode="%s" noCoverAvailablePic="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/none.png"/>''' % config_mp.mediaportal.sp_radio_visualization_gl_mode.value
                                else:
-                                       self.skin += '''<widget alphatest="blend" name="cover" position="490,180" size="300,300" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/none.png" zPosition="13" />
+                                       self.skin += '''<widget alphatest="on" name="cover" position="490,180" size="300,300" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/none.png" zPosition="13" />
                                        <widget name="rms0" channel="0" backgroundColor="#404040" zPosition="13" position="420,165" size="60,330" pixmap1="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/led_60x40_h6.png" transparent="1" mode="imagesOrientationUp" pixmapBackground1="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/colorgradient.png" drawBackground="0" pixmapBackgroundColor1="#080808" distance="10" maxValue="40" fadeOutTime="0" smoothing="0.5" />
                                        <widget name="rms1" channel="1" backgroundColor="#404040" zPosition="13" position="800,165" size="60,330" pixmap1="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/led_60x40_h6.png" transparent="1" mode="imagesOrientationUp" pixmapBackground1="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/colorgradient.png" drawBackground="0" pixmapBackgroundColor1="#080808" distance="10" maxValue="40" fadeOutTime="0" smoothing="0.5" />'''
 
@@ -805,7 +805,7 @@ class RadioBackground(Screen):
                                        else:
                                                self.skin += '''<widget name="visu" position="0,645" size="1280,75" transparent="1" zPosition="11" pixmapBackground2="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/colorgradient.png" pixmap2="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/led_20x13_h5.png" distance1="12" distance2="5" mode="visImagesUp" maxValue="15" fadeOutTime="0" internalSize="1" pixmapBackgroundColor1="#080808" drawBackground="0" smoothing="0.6" />'''
                        else:
-                               self.skin += '''<widget alphatest="blend" name="cover" position="490,180" size="300,300" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/none.png" zPosition="13" />'''
+                               self.skin += '''<widget alphatest="on" name="cover" position="490,180" size="300,300" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/none.png" zPosition="13" />'''
 
                        self.skin += '''</screen>'''
 
@@ -2424,7 +2424,7 @@ class SimplePlayerLCDScreen(Screen):
                                <widget position="10,0" render="Label" size="390,60" source="session.CurrentService" halign="center" valign="center" font="mediaportal_clean;22" foregroundColor="#fcc000" transparent="1">
                                        <convert type="MPServiceName">NameLCD</convert>
                                </widget>
-                               <widget name="cover" position="142,63" size="126,126" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/none.png" transparent="1" alphatest="blend" />
+                               <widget name="cover" position="142,63" size="126,126" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/none.png" transparent="1" alphatest="on" />
                                <widget source="session.CurrentService" render="Label" position="10,192" size="390,30" font="mediaportal_clean;22" halign="center" valign="center" foregroundColor="#f0f0f0" transparent="1" >
                                <convert type="MPServicePosition">Position,ShowHours</convert>
                                </widget>
index 25d673f..c69c5df 100644 (file)
@@ -363,11 +363,13 @@ class TwAgent(object):
 
                def _cancel(_):
                        d_print('_cancel()')
-                       #txresponse._transport._producer.loseConnection()
-                       if __TW_VER__ >= [11, 1, 0]:
-                               txresponse._transport._producer.abortConnection()
-                       else:
-                               txresponse._transport._producer.loseConnection()
+                       try:
+                               if __TW_VER__ >= [11, 1, 0]:
+                                       txresponse._transport._producer.abortConnection()
+                               else:
+                                       txresponse._transport._producer.loseConnection()
+                       except Exception as e:
+                               d_print(e)
 
                d = Deferred(_cancel)
                txresponse.deliverBody(_ResponseReader(d, txresponse, request))
@@ -485,8 +487,8 @@ def twAgentGetPage(url, method='GET', postdata=None, agent=default_agent, addloc
        return twAgent.agent.download_request(request)
 
 class TwDownloader(object):
-       def __init__(self, url, outputfile, method='GET', postdata=None, agent=default_agent, use_pipe=False, supportPartial=False, **kwargs):
-               self.twAgent = TwAgentHelper(**kwargs)
+       def __init__(self, url, outputfile, method='GET', postdata=None, agent=default_agent, use_pipe=False, supportPartial=False, pool=None, **kwargs):
+               self.twAgent = TwAgentHelper(pool=pool, **kwargs)
                if agent:
                        self.twAgent.headers['User-Agent'] = agent
                self.request = Request(url, method=method, body=postdata, headers=self.twAgent.headers)
@@ -525,11 +527,11 @@ class TwDownloader(object):
                failure.trap(twisted.internet.defer.CancelledError)
                return 'cancelled'
 
-def twDownloadPage(url, outputfile, method='GET', postdata=None, agent=default_agent, **kwargs):
+def twDownloadPage(url, outputfile, method='GET', postdata=None, agent=default_agent, pool=None, **kwargs):
        url = urllib.parse.quote_plus(url, ':/?&=+-%~()')
        url = bytes(six.ensure_text(url))
        #print(type(url))
-       return TwDownloader(url, outputfile, method=method, postdata=postdata, agent=agent, **kwargs).start()
+       return TwDownloader(url, outputfile, method=method, postdata=postdata, agent=agent, pool=pool, **kwargs).start()
 
 class TwDownloadWithProgress(TwDownloader):
        def __init__(self, url, outputfile, method='GET', postdata=None, agent=default_agent, use_pipe=False, supportPartial=False, **kwargs):
index bd04af0..625a7f6 100644 (file)
@@ -1,26 +1,26 @@
-<screen name="MediaPortal" position="0,0" size="1920,1080" title="MediaPortal" flags="wfNoBorder" backgroundColor="#80ffffff">
-       <widget backgroundColor="#20000000" font="mediaportal_clean;60" halign="right" position="1440,10" render="Label" size="200,90" source="global.CurrentTime" transparent="1" valign="center">
+<screen name="MediaPortal" position="0,0" size="1920,1080" title="MediaPortal" flags="wfNoBorder" backgroundColor="#75bbbbbb">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;60" halign="right" position="1440,10" render="Label" size="200,90" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Default</convert>
        </widget>
-       <widget backgroundColor="#20000000" font="mediaportal_clean;31" position="1670,10" render="Label" size="230,90" source="global.CurrentTime" transparent="1" valign="center">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;31" position="1670,10" render="Label" size="230,90" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Format:%A                   %d. %B</convert>
        </widget>
-       <eLabel backgroundColor="#20000000" text="MediaPortal" font="mediaportal_clean;50" halign="left" valign="center" position="50,10" shadowColor="#00000000" shadowOffset="4,4" size="280,90" transparent="1"/>
-       <widget name="version" backgroundColor="#20000000" font="mediaportal_clean;20" halign="left" valign="bottom" position="330,53" shadowColor="#00000000" shadowOffset="4,4" size="150,25" transparent="1"/>
-       <widget backgroundColor="#20000000" font="mediaportal_clean;50" valign="center" halign="center" name="name" position="0,120" size="1920,90" transparent="1"/>
-       <widget backgroundColor="#20000000" font="mediaportal;28" valign="center" halign="left" name="page" position="43,985" size="200,34" transparent="1"/>
-       <widget backgroundColor="#20000000" font="mediaportal;25" name="F1" position="15,1030" size="365,40" valign="center" halign="center" transparent="1"/>
-       <widget backgroundColor="#20000000" font="mediaportal;25" name="F2" position="385,1030" size="365,40" valign="center" halign="center" transparent="1"/>
-       <widget backgroundColor="#20000000" font="mediaportal;25" name="F3" position="755,1030" size="365,40" valign="center" halign="center" transparent="1"/>
-       <widget backgroundColor="#20000000" font="mediaportal;25" name="F4" position="1125,1030" size="365,40" valign="center" halign="center" transparent="1"/>
+       <eLabel backgroundColor="#08000000" text="MediaPortal" font="mediaportal_clean;50" halign="left" valign="center" position="50,10" shadowColor="#00000000" shadowOffset="4,4" size="280,90" transparent="1"/>
+       <widget name="version" backgroundColor="#08000000" font="mediaportal_clean;20" halign="left" valign="bottom" position="330,53" shadowColor="#00000000" shadowOffset="4,4" size="150,25" transparent="1"/>
+       <widget backgroundColor="#08000000" font="mediaportal_clean;50" valign="center" halign="center" name="name" position="0,120" size="1920,90" transparent="1"/>
+       <widget backgroundColor="#08000000" font="mediaportal;28" valign="center" halign="left" name="page" position="43,985" size="200,34" transparent="1"/>
+       <widget name="F1" position="20,1030" size="355,40" transparent="1" font="mediaportal; 25" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F2" position="390,1030" size="355,40" transparent="1" font="mediaportal; 25" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F3" position="760,1030" size="355,40" transparent="1" font="mediaportal; 25" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F4" position="1130,1030" size="355,40" transparent="1" font="mediaportal; 25" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>>
        <widget backgroundColor="#ff000000" foregroundColorSelected="#ff000000" name="liste" position="0,210" scrollbarMode="showNever" size="1930,820" transparent="1" itemWidth="230" itemHeight="125" selectionZoom="1.20" margin="43,20" backgroundPixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/none.png" selectionPixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/none.png"/>
-       <eLabel name="bg_up" position="10,10" size="1900,90" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_wall" position="10,110" size="1900,910" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_down" position="10,1030" size="1900,40" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="button red" position="15,1068" size="365,2" backgroundColor="#00f23d21" zPosition="1"/>
-       <eLabel name="button green" position="385,1068" size="365,2" backgroundColor="#0031a500" zPosition="1"/>
-       <eLabel name="button yellow" position="755,1068" size="365,2" backgroundColor="#00e5b243" zPosition="1"/>
-       <eLabel name="button blue" position="1125,1068" size="365,2" backgroundColor="#000064c7" zPosition="1"/>
+       <eLabel name="bg_up" position="10,10" size="1900,90" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_wall" position="10,110" size="1900,910" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_down" position="10,1030" size="1900,40" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="button red" position="20,1067" size="355,3" backgroundColor="#00f23d21" zPosition="1"/>
+       <eLabel name="button green" position="390,1067" size="355,3" backgroundColor="#0031a500" zPosition="1"/>
+       <eLabel name="button yellow" position="760,1067" size="355,3" backgroundColor="#00e5b243" zPosition="1"/>
+       <eLabel name="button blue" position="1130,1067" size="355,3" backgroundColor="#000064c7" zPosition="1"/>
        <eLabel name="button bouquet" position="1580,1035" size="60,30" backgroundColor="#00000000" text="BOUQ" font="mediaportal; 15" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button info" position="1660,1035" size="60,30" backgroundColor="#00000000" text="INFO" font="mediaportal; 15" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button help" position="1740,1035" size="60,30" backgroundColor="#00000000" text="HELP" font="mediaportal; 15" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
index b9e8370..825bea2 100644 (file)
@@ -1,26 +1,26 @@
-<screen name="MediaPortal" position="0,0" size="1920,1080" title="MediaPortal" flags="wfNoBorder" backgroundColor="#80ffffff">
-       <widget backgroundColor="#20000000" font="mediaportal_clean;60" halign="right" position="1440,10" render="Label" size="200,90" source="global.CurrentTime" transparent="1" valign="center">
+<screen name="MediaPortal" position="0,0" size="1920,1080" title="MediaPortal" flags="wfNoBorder" backgroundColor="#75bbbbbb">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;60" halign="right" position="1440,10" render="Label" size="200,90" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Default</convert>
        </widget>
-       <widget backgroundColor="#20000000" font="mediaportal_clean;31" position="1670,10" render="Label" size="230,90" source="global.CurrentTime" transparent="1" valign="center">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;31" position="1670,10" render="Label" size="230,90" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Format:%A                   %d. %B</convert>
        </widget>
-       <eLabel backgroundColor="#20000000" text="MediaPortal" font="mediaportal_clean;50" halign="left" valign="center" position="50,10" shadowColor="#00000000" shadowOffset="4,4" size="1200,90" transparent="1"/>
-       <widget name="version" backgroundColor="#20000000" font="mediaportal_clean;20" halign="left" valign="bottom" position="330,53" shadowColor="#00000000" shadowOffset="4,4" size="150,25" transparent="1"/>
-       <widget backgroundColor="#20000000" font="mediaportal_clean;50" halign="center" valign="center" name="name" position="20,120" size="920,70" transparent="1"/>
-       <widget backgroundColor="#20000000" font="mediaportal;25" name="F1" position="15,1030" size="365,40" valign="center" halign="center" transparent="1"/>
-       <widget backgroundColor="#20000000" font="mediaportal;25" name="F2" position="385,1030" size="365,40" valign="center" halign="center" transparent="1"/>
-       <widget backgroundColor="#20000000" font="mediaportal;25" name="F3" position="755,1030" size="365,40" valign="center" halign="center" transparent="1"/>
-       <widget backgroundColor="#20000000" font="mediaportal;25" name="F4" position="1125,1030" size="365,40" valign="center" halign="center" transparent="1"/>
-       <widget backgroundColor="#20000000" foregroundColorSelected="#ffffff" name="liste" position="30,230" scrollbarMode="showOnDemand" size="900,768" transparent="1" itemHeight="96"/>
-       <eLabel name="bg_up" position="10,10" size="1900,90" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_name" position="10,110" size="940,90" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_list" position="10,210" size="940,810" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_down" position="10,1030" size="1900,40" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="button red" position="15,1068" size="365,2" backgroundColor="#00f23d21" zPosition="1"/>
-       <eLabel name="button green" position="385,1068" size="365,2" backgroundColor="#0031a500" zPosition="1"/>
-       <eLabel name="button yellow" position="755,1068" size="365,2" backgroundColor="#00e5b243" zPosition="1"/>
-       <eLabel name="button blue" position="1125,1068" size="365,2" backgroundColor="#000064c7" zPosition="1"/>
+       <eLabel backgroundColor="#08000000" text="MediaPortal" font="mediaportal_clean;50" halign="left" valign="center" position="50,10" shadowColor="#00000000" shadowOffset="4,4" size="1200,90" transparent="1"/>
+       <widget name="version" backgroundColor="#08000000" font="mediaportal_clean;20" halign="left" valign="bottom" position="330,53" shadowColor="#00000000" shadowOffset="4,4" size="150,25" transparent="1"/>
+       <widget backgroundColor="#08000000" font="mediaportal_clean;50" halign="center" valign="center" name="name" position="20,120" size="920,70" transparent="1"/>
+       <widget name="F1" position="20,1030" size="355,40" transparent="1" font="mediaportal; 25" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F2" position="390,1030" size="355,40" transparent="1" font="mediaportal; 25" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F3" position="760,1030" size="355,40" transparent="1" font="mediaportal; 25" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F4" position="1130,1030" size="355,40" transparent="1" font="mediaportal; 25" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget backgroundColor="#08000000" name="liste" position="30,230" scrollbarMode="showOnDemand" size="900,768" transparent="1" itemHeight="96"/>
+       <eLabel name="bg_up" position="10,10" size="1900,90" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_name" position="10,110" size="940,90" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_list" position="10,210" size="940,810" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_down" position="10,1030" size="1900,40" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="button red" position="20,1067" size="355,3" backgroundColor="#00f23d21" zPosition="1"/>
+       <eLabel name="button green" position="390,1067" size="355,3" backgroundColor="#0031a500" zPosition="1"/>
+       <eLabel name="button yellow" position="760,1067" size="355,3" backgroundColor="#00e5b243" zPosition="1"/>
+       <eLabel name="button blue" position="1130,1067" size="355,3" backgroundColor="#000064c7" zPosition="1"/>
        <eLabel name="button bouquet" position="1580,1035" size="60,30" backgroundColor="#00000000" text="BOUQ" font="mediaportal; 15" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button info" position="1660,1035" size="60,30" backgroundColor="#00000000" text="INFO" font="mediaportal; 15" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button help" position="1740,1035" size="60,30" backgroundColor="#00000000" text="HELP" font="mediaportal; 15" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
index d991707..685e1de 100644 (file)
@@ -1,48 +1,48 @@
-<screen name="defaultPlaylist" position="center,center" size="1920,1080" flags="wfNoBorder" backgroundColor="#80ffffff">
-       <widget backgroundColor="#20000000" font="mediaportal_clean;60" halign="right" position="1440,10" render="Label" size="200,90" source="global.CurrentTime" transparent="1" valign="center">
+<screen name="defaultPlaylist" position="center,center" size="1920,1080" flags="wfNoBorder" backgroundColor="#75bbbbbb">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;60" halign="right" position="1440,10" render="Label" size="200,90" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Default</convert>
        </widget>
-       <widget backgroundColor="#20000000" font="mediaportal_clean;31" position="1670,10" render="Label" size="230,90" source="global.CurrentTime" transparent="1" valign="center">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;31" position="1670,10" render="Label" size="230,90" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Format:%A                   %d. %B</convert>
        </widget>
-       <eLabel backgroundColor="#20000000" text="MediaPortal" font="mediaportal_clean;50" halign="left" valign="center" position="50,10" shadowColor="#00000000" shadowOffset="4,4" size="1200,90" transparent="1"/>
-       <eLabel name="bg_up" position="10,10" size="1900,90" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_titel" position="10,110" size="1260,110" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_list" position="10,230" size="1260,790" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_cover" position="1280,110" size="630,420" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_player" position="1280,540" size="630,340" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_mode" position="1280,890" size="630,130" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_down" position="10,1030" size="1900,40" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="button red" position="15,1068" size="365,2" backgroundColor="#00f23d21" zPosition="1"/>
-       <eLabel name="button green" position="385,1068" size="365,2" backgroundColor="#0031a500" zPosition="1"/>
-       <eLabel name="button yellow" position="755,1068" size="365,2" backgroundColor="#00e5b243" zPosition="1"/>
-       <eLabel name="button blue" position="1125,1068" size="365,2" backgroundColor="#000064c7" zPosition="1"/>
+       <eLabel backgroundColor="#08000000" text="MediaPortal" font="mediaportal_clean;50" halign="left" valign="center" position="50,10" shadowColor="#00000000" shadowOffset="4,4" size="1200,90" transparent="1"/>
+       <eLabel name="bg_up" position="10,10" size="1900,90" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_titel" position="10,110" size="1260,110" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_list" position="10,230" size="1260,790" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_cover" position="1280,110" size="630,420" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_player" position="1280,540" size="630,340" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_mode" position="1280,890" size="630,130" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_down" position="10,1030" size="1900,40" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="button red" position="20,1067" size="355,3" backgroundColor="#00f23d21" zPosition="1"/>
+       <eLabel name="button green" position="390,1067" size="355,3" backgroundColor="#0031a500" zPosition="1"/>
+       <eLabel name="button yellow" position="760,1067" size="355,3" backgroundColor="#00e5b243" zPosition="1"/>
+       <eLabel name="button blue" position="1130,1067" size="355,3" backgroundColor="#000064c7" zPosition="1"/>
        <widget alphatest="on" name="coverArt" position="1290,120" size="610,400"/>
-       <widget backgroundColor="#20000000" font="mediaportal;30" name="artist" position="1290,550" size="610,90" transparent="1" valign="center" halign="center"/>
-       <widget backgroundColor="#20000000" font="mediaportal;30" name="songtitle" position="1290,650" size="610,120" transparent="1" valign="top" halign="center"/>
+       <widget backgroundColor="#08000000" font="mediaportal;30" name="artist" position="1290,550" size="610,90" transparent="1" valign="center" halign="center"/>
+       <widget backgroundColor="#08000000" font="mediaportal;30" name="songtitle" position="1290,650" size="610,120" transparent="1" valign="top" halign="center"/>
        <eLabel backgroundColor="#00616161" position="1290,789" size="610,2" foregroundColor="grey"/>
        <widget position="1290,780" progress_pointer="~/clean_fhd/images/pointer.png:18,4" render="PositionGauge" size="610,20" source="session.CurrentService" transparent="1" zPosition="1">
                <convert type="MPServicePosition">Gauge</convert>
        </widget>
-       <widget backgroundColor="#20000000" font="mediaportal;25" halign="left" position="1290,810" render="Label" size="120,35" source="session.CurrentService" transparent="1">
+       <widget backgroundColor="#08000000" font="mediaportal;25" halign="left" position="1290,810" render="Label" size="120,35" source="session.CurrentService" transparent="1">
                <convert type="MPServicePosition">Position</convert>
        </widget>
-       <widget backgroundColor="#20000000" font="mediaportal;25" position="1780,810" render="Label" size="120,35" source="session.CurrentService" transparent="1" halign="right">
+       <widget backgroundColor="#08000000" font="mediaportal;25" position="1780,810" render="Label" size="120,35" source="session.CurrentService" transparent="1" halign="right">
                <convert type="MPServicePosition">Remaining,Negate</convert>
        </widget>
-       <widget backgroundColor="#20000000" font="mediaportal;25" halign="center" position="1535,810" render="Label" size="120,35" source="session.CurrentService" transparent="1">
+       <widget backgroundColor="#08000000" font="mediaportal;25" halign="center" position="1535,810" render="Label" size="120,35" source="session.CurrentService" transparent="1">
                <convert type="MPServicePosition">Length</convert>
        </widget>
-       <eLabel backgroundColor="#20000000" font="mediaportal;30" position="1292,960" size="180,35" text="Playmode" transparent="1" valign="top"/>
-       <widget backgroundColor="#20000000" font="mediaportal;30" name="playmode" position="1490,960" size="410,35" transparent="1" valign="top"/>
-       <eLabel backgroundColor="#20000000" font="mediaportal;30" position="1290,915" size="180,35" text="Album" transparent="1" valign="top"/>
-       <widget backgroundColor="#20000000" font="mediaportal;30" position="1490,915" size="410,35" transparent="1" valign="top" name="album"/>
-       <widget name="liste" position="20,240" size="1240,735" backgroundColor="#20000000" scrollbarMode="showOnDemand" transparent="1" foregroundColorSelected="foreground" foregroundColor="foreground" zPosition="0" itemHeight="35"/>
-       <widget name="title" position="20,120" size="1240,90" backgroundColor="#20000000" transparent="1" font="mediaportal_clean;34" valign="center" halign="center"/>
-       <widget name="F1" position="15,1030" size="365,40" transparent="1" font="mediaportal;25" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
-       <widget name="F2" position="385,1030" size="365,40" transparent="1" font="mediaportal;25" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
-       <widget name="F3" position="755,1030" size="365,40" transparent="1" font="mediaportal;25" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
-       <widget name="F4" position="1125,1030" size="365,40" transparent="1" font="mediaportal;25" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
+       <eLabel backgroundColor="#08000000" font="mediaportal;30" position="1292,960" size="180,35" text="Playmode" transparent="1" valign="top"/>
+       <widget backgroundColor="#08000000" font="mediaportal;30" name="playmode" position="1490,960" size="410,35" transparent="1" valign="top"/>
+       <eLabel backgroundColor="#08000000" font="mediaportal;30" position="1290,915" size="180,35" text="Album" transparent="1" valign="top"/>
+       <widget backgroundColor="#08000000" font="mediaportal;30" position="1490,915" size="410,35" transparent="1" valign="top" name="album"/>
+       <widget name="liste" position="20,240" size="1240,735" backgroundColor="#08000000" scrollbarMode="showOnDemand" transparent="1" zPosition="0" itemHeight="35"/>
+       <widget name="title" position="20,120" size="1240,90" backgroundColor="#08000000" transparent="1" font="mediaportal_clean;34" valign="center" halign="center"/>
+       <widget name="F1" position="20,1030" size="355,40" transparent="1" font="mediaportal; 25" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F2" position="390,1030" size="355,40" transparent="1" font="mediaportal; 25" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F3" position="760,1030" size="355,40" transparent="1" font="mediaportal; 25" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F4" position="1130,1030" size="355,40" transparent="1" font="mediaportal; 25" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
        <eLabel name="button ok" position="1740,1035" size="60,30" backgroundColor="#00000000" text="OK" font="mediaportal;15" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button exit" position="1820,1035" size="60,30" backgroundColor="#00000000" text="EXIT" font="mediaportal;15" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button ok bg" position="1739,1034" size="62,32" backgroundColor="#00616161" zPosition="0"/>
index 996eecd..dcacfad 100644 (file)
@@ -1,33 +1,33 @@
-<screen name="defaultListWide" position="center,center" size="1920,1080" flags="wfNoBorder" backgroundColor="#80ffffff">
-       <widget backgroundColor="#20000000" font="mediaportal_clean;60" halign="right" position="1440,10" render="Label" size="200,90" source="global.CurrentTime" transparent="1" valign="center">
+<screen name="defaultListWide" position="center,center" size="1920,1080" flags="wfNoBorder" backgroundColor="#75bbbbbb">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;60" halign="right" position="1440,10" render="Label" size="200,90" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Default</convert>
        </widget>
-       <widget backgroundColor="#20000000" font="mediaportal_clean;31" position="1670,10" render="Label" size="230,90" source="global.CurrentTime" transparent="1" valign="center">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;31" position="1670,10" render="Label" size="230,90" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Format:%A                   %d. %B</convert>
        </widget>
-       <eLabel name="bg_up" position="10,10" size="1900,90" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_titel" position="10,110" size="1260,110" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_list" position="10,230" size="1260,790" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_name_handlung" position="1280,540" size="630,480" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_cover" position="1280,110" size="630,420" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_down" position="10,1030" size="1900,40" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="button red" position="15,1068" size="365,2" backgroundColor="#00f23d21" zPosition="1"/>
-       <eLabel name="button green" position="385,1068" size="365,2" backgroundColor="#0031a500" zPosition="1"/>
-       <eLabel name="button yellow" position="755,1068" size="365,2" backgroundColor="#00e5b243" zPosition="1"/>
-       <eLabel name="button blue" position="1125,1068" size="365,2" backgroundColor="#000064c7" zPosition="1"/>
-       <widget name="handlung" position="1290,664" size="610,346" backgroundColor="#20000000" font="mediaportal;27" transparent="1"/>
-       <widget name="coverArt" position="1290,120" size="610,400" transparent="1" alphatest="blend"/>
-       <widget name="ContentTitle" position="20,120" size="1240,90" backgroundColor="#20000000" zPosition="5" font="mediaportal_clean;30" valign="center" halign="center" transparent="1"/>
-       <widget name="name" position="1290,550" size="610,104" backgroundColor="#20000000" transparent="1" zPosition="1" font="mediaportal;30" valign="center" halign="center"/>
-       <widget name="liste" position="20,240" size="1240,735" backgroundColor="#20000000" scrollbarMode="showOnDemand" transparent="1" foregroundColorSelected="#ffffff"/>
-       <widget name="title" position="50,10" size="1200,90" backgroundColor="#20000000" transparent="1" font="mediaportal_clean;50" valign="center" halign="left"/>
-       <widget name="extrainfo" position="20,980" size="870,31" backgroundColor="#20000000" transparent="1" font="mediaportal;28" valign="center" zPosition="1"/>
-       <widget name="Page" position="970,980" size="150,31" backgroundColor="#20000000" transparent="1" font="mediaportal;28" valign="center" zPosition="1"/>
-       <widget name="page" position="1060,980" size="200,31" backgroundColor="#20000000" transparent="1" font="mediaportal;28" valign="center" zPosition="1"/>
-       <widget name="F1" position="15,1030" size="365,40" transparent="1" font="mediaportal; 25" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
-       <widget name="F2" position="385,1030" size="365,40" transparent="1" font="mediaportal; 25" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
-       <widget name="F3" position="755,1030" size="365,40" transparent="1" font="mediaportal; 25" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
-       <widget name="F4" position="1125,1030" size="365,40" transparent="1" font="mediaportal; 25" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
+       <eLabel name="bg_up" position="10,10" size="1900,90" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_titel" position="10,110" size="1260,60" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_list" position="10,180" size="1260,840" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_name_handlung" position="1280,540" size="630,480" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_cover" position="1280,110" size="630,420" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_down" position="10,1030" size="1900,40" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="button red" position="20,1067" size="355,3" backgroundColor="#00f23d21" zPosition="1"/>
+       <eLabel name="button green" position="390,1067" size="355,3" backgroundColor="#0031a500" zPosition="1"/>
+       <eLabel name="button yellow" position="760,1067" size="355,3" backgroundColor="#00e5b243" zPosition="1"/>
+       <eLabel name="button blue" position="1130,1067" size="355,3" backgroundColor="#000064c7" zPosition="1"/>
+       <widget name="handlung" position="1290,664" size="610,346" backgroundColor="#08000000" font="mediaportal;27" transparent="1"/>
+       <widget name="coverArt" position="1290,120" size="610,400" transparent="1" alphatest="on"/>
+       <widget name="ContentTitle" position="20,120" size="1240,40" backgroundColor="#08000000" zPosition="5" font="mediaportal_clean;30" valign="center" halign="center" transparent="1"/>
+       <widget name="name" position="1290,550" size="610,104" backgroundColor="#08000000" transparent="1" zPosition="1" font="mediaportal;30" valign="center" halign="center"/>
+       <widget name="liste" position="20,190" size="1240,770" backgroundColor="#08000000" scrollbarMode="showOnDemand" transparent="1"/>
+       <widget name="title" position="50,10" size="1200,90" backgroundColor="#08000000" transparent="1" font="mediaportal_clean;50" valign="center" halign="left"/>
+       <widget name="extrainfo" position="20,975" size="870,31" backgroundColor="#08000000" transparent="1" font="mediaportal;28" valign="center" zPosition="1"/>
+       <widget name="Page" position="970,975" size="150,31" backgroundColor="#08000000" transparent="1" font="mediaportal;28" valign="center" zPosition="1"/>
+       <widget name="page" position="1060,975" size="200,31" backgroundColor="#08000000" transparent="1" font="mediaportal;28" valign="center" zPosition="1"/>
+       <widget name="F1" position="20,1030" size="355,40" transparent="1" font="mediaportal; 25" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F2" position="390,1030" size="355,40" transparent="1" font="mediaportal; 25" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F3" position="760,1030" size="355,40" transparent="1" font="mediaportal; 25" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F4" position="1130,1030" size="355,40" transparent="1" font="mediaportal; 25" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
        <eLabel name="button ok" position="1740,1035" size="60,30" backgroundColor="#00000000" text="OK" font="mediaportal; 15" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button exit" position="1820,1035" size="60,30" backgroundColor="#00000000" text="EXIT" font="mediaportal; 15" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button ok bg" position="1739,1034" size="62,32" backgroundColor="#00616161" zPosition="0"/>
index 9004956..c60c387 100644 (file)
@@ -1,26 +1,26 @@
-<screen name="hauptScreenSetup" position="center,center" size="1920,1080" flags="wfNoBorder" backgroundColor="#80ffffff">
-       <widget backgroundColor="#20000000" font="mediaportal_clean;60" halign="right" position="1440,10" render="Label" size="200,90" source="global.CurrentTime" transparent="1" valign="center">
+<screen name="hauptScreenSetup" position="center,center" size="1920,1080" flags="wfNoBorder" backgroundColor="#75bbbbbb">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;60" halign="right" position="1440,10" render="Label" size="200,90" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Default</convert>
        </widget>
-       <widget backgroundColor="#20000000" font="mediaportal_clean;31" position="1670,10" render="Label" size="230,90" source="global.CurrentTime" transparent="1" valign="center">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;31" position="1670,10" render="Label" size="230,90" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Format:%A                   %d. %B</convert>
        </widget>
-       <eLabel backgroundColor="#20000000" text="MediaPortal" font="mediaportal_clean;50" halign="left" valign="center" position="50,10" shadowColor="#00000000" shadowOffset="4,4" size="1200,90" transparent="1"/>
-       <eLabel name="bg_up" position="10,10" size="1900,90" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_titel" position="10,110" size="1260,110" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_list" position="10,230" size="1260,790" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_cover" position="1280,110" size="630,910" zPosition="0" backgroundColor="#20000000"/>
-       <eLabel name="bg_down" position="10,1030" size="1900,40" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="button red" position="15,1068" size="365,2" backgroundColor="#00f23d21" zPosition="1"/>
-       <eLabel name="button green" position="385,1068" size="365,2" backgroundColor="#0031a500" zPosition="1"/>
-       <eLabel name="button yellow" position="755,1068" size="365,2" backgroundColor="#00e5b243" zPosition="1"/>
-       <eLabel name="button blue" position="1125,1068" size="365,2" backgroundColor="#000064c7" zPosition="1"/>
-       <widget backgroundColor="#20000000" name="config" position="20,240" size="1240,760" scrollbarMode="showOnDemand" transparent="1" itemHeight="40"/>
-       <widget name="title" position="20,120" size="1240,90" backgroundColor="#20000000" transparent="1" font="mediaportal_clean;50" valign="center" halign="center"/>
-       <widget name="F1" position="15,1030" size="365,40" transparent="1" font="mediaportal; 25" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
-       <widget name="F2" position="385,1030" size="365,40" transparent="1" font="mediaportal; 25" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
-       <widget name="F3" position="755,1030" size="365,40" transparent="1" font="mediaportal; 25" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
-       <widget name="F4" position="1125,1030" size="365,40" transparent="1" font="mediaportal; 25" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
+       <eLabel backgroundColor="#08000000" text="MediaPortal" font="mediaportal_clean;50" halign="left" valign="center" position="50,10" shadowColor="#00000000" shadowOffset="4,4" size="1200,90" transparent="1"/>
+       <eLabel name="bg_up" position="10,10" size="1900,90" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_titel" position="10,110" size="1260,110" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_list" position="10,230" size="1260,790" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_cover" position="1280,110" size="630,910" zPosition="0" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_down" position="10,1030" size="1900,40" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="button red" position="20,1067" size="355,3" backgroundColor="#00f23d21" zPosition="1"/>
+       <eLabel name="button green" position="390,1067" size="355,3" backgroundColor="#0031a500" zPosition="1"/>
+       <eLabel name="button yellow" position="760,1067" size="355,3" backgroundColor="#00e5b243" zPosition="1"/>
+       <eLabel name="button blue" position="1130,1067" size="355,3" backgroundColor="#000064c7" zPosition="1"/>
+       <widget backgroundColor="#08000000" name="config" position="20,240" size="1240,760" scrollbarMode="showOnDemand" transparent="1" itemHeight="40"/>
+       <widget name="title" position="20,120" size="1240,90" backgroundColor="#08000000" transparent="1" font="mediaportal_clean;50" valign="center" halign="center"/>
+       <widget name="F1" position="20,1030" size="355,40" transparent="1" font="mediaportal; 25" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F2" position="390,1030" size="355,40" transparent="1" font="mediaportal; 25" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F3" position="760,1030" size="355,40" transparent="1" font="mediaportal; 25" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F4" position="1130,1030" size="355,40" transparent="1" font="mediaportal; 25" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
        <eLabel name="button ok" position="1740,1035" size="60,30" backgroundColor="#00000000" text="OK" font="mediaportal; 15" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button exit" position="1820,1035" size="60,30" backgroundColor="#00000000" text="EXIT" font="mediaportal; 15" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button bouq" position="1660,1035" size="60,30" backgroundColor="#00000000" text="BOUQ" font="mediaportal; 15" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
index 50b4958..1df60bf 100644 (file)
@@ -1,21 +1,21 @@
-<screen name="pluginSort" position="center,center" size="1920,1080" flags="wfNoBorder" backgroundColor="#80ffffff">
-       <widget backgroundColor="#20000000" font="mediaportal_clean;60" halign="right" position="1440,10" render="Label" size="200,90" source="global.CurrentTime" transparent="1" valign="center">
+<screen name="pluginSort" position="center,center" size="1920,1080" flags="wfNoBorder" backgroundColor="#75bbbbbb">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;60" halign="right" position="1440,10" render="Label" size="200,90" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Default</convert>
        </widget>
-       <widget backgroundColor="#20000000" font="mediaportal_clean;31" position="1670,10" render="Label" size="230,90" source="global.CurrentTime" transparent="1" valign="center">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;31" position="1670,10" render="Label" size="230,90" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Format:%A                   %d. %B</convert>
        </widget>
-       <eLabel backgroundColor="#20000000" text="MediaPortal" font="mediaportal_clean;50" halign="left" valign="center" position="50,10" shadowColor="#00000000" shadowOffset="4,4" size="1200,90" transparent="1"/>
-       <eLabel name="bg_up" position="10,10" size="1900,90" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_titel" position="10,110" size="1900,110" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_list" position="10,230" size="1900,790" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_down" position="10,1030" size="1900,40" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="button red" position="15,1068" size="365,2" backgroundColor="#00f23d21" zPosition="1"/>
-       <eLabel name="button green" position="385,1068" size="365,2" backgroundColor="#0031a500" zPosition="1"/>
-       <eLabel name="button yellow" position="755,1068" size="365,2" backgroundColor="#00e5b243" zPosition="1"/>
-       <eLabel name="button blue" position="1125,1068" size="365,2" backgroundColor="#000064c7" zPosition="1"/>
-       <widget name="liste" position="20,240" size="1880,770" backgroundColor="#20000000" scrollbarMode="showOnDemand" transparent="1" foregroundColorSelected="#ffffff" itemHeight="35"/>
-       <widget name="title" position="20,120" size="1880,90" transparent="1" font="mediaportal_clean;50" backgroundColor="#20000000" valign="center" halign="center" zPosition="0"/>
+       <eLabel backgroundColor="#08000000" text="MediaPortal" font="mediaportal_clean;50" halign="left" valign="center" position="50,10" shadowColor="#00000000" shadowOffset="4,4" size="1200,90" transparent="1"/>
+       <eLabel name="bg_up" position="10,10" size="1900,90" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_titel" position="10,110" size="1900,110" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_list" position="10,230" size="1900,790" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_down" position="10,1030" size="1900,40" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="button red" position="20,1067" size="355,3" backgroundColor="#00f23d21" zPosition="1"/>
+       <eLabel name="button green" position="390,1067" size="355,3" backgroundColor="#0031a500" zPosition="1"/>
+       <eLabel name="button yellow" position="760,1067" size="355,3" backgroundColor="#00e5b243" zPosition="1"/>
+       <eLabel name="button blue" position="1130,1067" size="355,3" backgroundColor="#000064c7" zPosition="1"/>
+       <widget name="liste" position="20,240" size="1880,770" backgroundColor="#08000000" scrollbarMode="showOnDemand" transparent="1" itemHeight="35"/>
+       <widget name="title" position="20,120" size="1880,90" transparent="1" font="mediaportal_clean;50" backgroundColor="#08000000" valign="center" halign="center" zPosition="0"/>
        <eLabel name="button ok" position="1740,1035" size="60,30" backgroundColor="#00000000" text="OK" font="mediaportal; 15" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button exit" position="1820,1035" size="60,30" backgroundColor="#00000000" text="EXIT" font="mediaportal; 15" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button ok bg" position="1739,1034" size="62,32" backgroundColor="#00616161" zPosition="0"/>
index 175f4b6..5729f65 100644 (file)
@@ -1,51 +1,51 @@
-<screen title="TMDb - The Movie Database" name="TMDB" position="center,center" size="1920,1080" flags="wfNoBorder" backgroundColor="#80ffffff">
-       <widget backgroundColor="#20000000" font="mediaportal_clean;60" halign="right" position="1440,10" render="Label" size="200,90" source="global.CurrentTime" transparent="1" valign="center">
+<screen title="TMDb - The Movie Database" name="TMDB" position="center,center" size="1920,1080" flags="wfNoBorder" backgroundColor="#75bbbbbb">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;60" halign="right" position="1440,10" render="Label" size="200,90" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Default</convert>
        </widget>
-       <widget backgroundColor="#20000000" font="mediaportal_clean;31" position="1670,10" render="Label" size="230,90" source="global.CurrentTime" transparent="1" valign="center">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;31" position="1670,10" render="Label" size="230,90" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Format:%A                   %d. %B</convert>
        </widget>
-       <eLabel backgroundColor="#20000000" text="MediaPortal" font="mediaportal_clean;50" halign="left" valign="center" position="50,10" shadowColor="#00000000" shadowOffset="4,4" size="1200,90" transparent="1"/>
-       <eLabel name="bg_up" position="10,10" size="1900,90" zPosition="-1"/>
-       <eLabel name="bg_titel" position="10,110" size="1900,110" zPosition="-1"/>
-       <eLabel name="bg_station" position="10,228" size="1900,110" zPosition="-1"/>
-       <eLabel name="bg_list" position="10,350" size="945,670" zPosition="-1"/>
-       <eLabel name="bg_cover" position="1320,350" size="590,670" zPosition="-1"/>
-       <eLabel name="bg_cover" position="965,350" size="345,670" zPosition="-1"/>
-       <eLabel name="bg_down" position="10,1030" size="1900,40" zPosition="-1"/>
-       <eLabel name="button red" position="15,1068" size="365,2" backgroundColor="#00f23d21" zPosition="1"/>
-       <eLabel name="button green" position="385,1068" size="365,2" backgroundColor="#0031a500" zPosition="1"/>
-       <eLabel name="button yellow" position="755,1068" size="365,2" backgroundColor="#00e5b243" zPosition="1"/>
-       <eLabel name="button blue" position="1125,1068" size="365,2" backgroundColor="#000064c7" zPosition="1"/>
-       <widget name="title" backgroundColor="#20000000" font="mediaportal_clean;50" halign="center" position="20,120" size="1880,90" transparent="1"/>
-       <widget name="searchinfo" position="20,240" size="1880,45" zPosition="2" transparent="1" font="mediaportal_clean;35" halign="center" backgroundColor="#20000000"/>
-       <widget name="subtitle" position="20,285" size="1880,45" zPosition="2" transparent="1" font="mediaportal_clean;35" halign="center" backgroundColor="#20000000"/>
-       <widget name="fulldescription" position="20,360" size="925,650" font="mediaportal_clean;25"/>
-       <widget name="coverArt" position="975,555" size="325,455" alphatest="blend"/>
-       <widget name="rating10" position="967,440" size="340,35" pixmap="~/clean_fhd/images/stars-full10.png" zPosition="4" transparent="1" backgroundColor="#20000000"/>
-       <widget name="rating0" position="967,440" size="340,35" pixmap="~/clean_fhd/images/stars-empty10.png" zPosition="3" transparent="1" alphatest="blend" backgroundColor="#20000000"/>
-       <widget name="fsk_txt" position="1330,455" size="400,40" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#20000000"/>
-       <widget name="fsk" position="1455,455" size="450,40" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#20000000"/>
-       <widget name="year_txt" position="1330,505" size="400,40" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#20000000"/>
-       <widget name="year" position="1455,505" size="450,40" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#20000000"/>
-       <widget name="country_txt" position="1330,555" size="400,40" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#20000000"/>
-       <widget name="country" position="1455,560" size="450,40" zPosition="2" transparent="1" font="mediaportal;22" backgroundColor="#20000000"/>
-       <widget name="runtime_txt" position="1330,605" size="400,40" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#20000000"/>
-       <widget name="runtime" position="1455,605" size="450,40" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#20000000"/>
-       <widget name="votes_txt" position="1330,655" size="400,40" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#20000000"/>
-       <widget name="votes" position="1455,655" size="450,40" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#20000000"/>
-       <widget name="director_txt" position="1330,705" size="400,40" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#20000000"/>
-       <widget name="director" position="1455,705" size="450,70" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#20000000"/>
-       <widget name="author_txt" position="1330,785" size="400,40" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#20000000"/>
-       <widget name="author" position="1455,785" size="450,70" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#20000000"/>
-       <widget name="genre_txt" position="1330,865" size="100,40" font="mediaportal_clean; 25" backgroundColor="#20000000"/>
-       <widget name="genre" position="1455,865" size="450,70" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#20000000"/>
-       <widget name="studio_txt" position="1330,950" size="100,40" font="mediaportal_clean; 25" backgroundColor="#20000000"/>
-       <widget name="studio" position="1455,945" size="450,70" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#20000000"/>
-       <widget name="F1" position="15,1030" size="365,40" transparent="1" font="mediaportal_clean; 25" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
-       <widget name="F2" position="385,1030" size="365,40" transparent="1" font="mediaportal_clean; 25" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
-       <widget name="F3" position="755,1030" size="365,40" transparent="1" font="mediaportal_clean; 25" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
-       <widget name="F4" position="1125,1030" size="365,40" transparent="1" font="mediaportal_clean; 25" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
+       <eLabel backgroundColor="#08000000" text="MediaPortal" font="mediaportal_clean;50" halign="left" valign="center" position="50,10" shadowColor="#00000000" shadowOffset="4,4" size="1200,90" transparent="1"/>
+       <eLabel name="bg_up" position="10,10" size="1900,90" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_titel" position="10,110" size="1900,110" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_station" position="10,230" size="1900,110" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_list" position="10,350" size="945,670" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_cover" position="1320,350" size="590,670" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_cover" position="965,350" size="345,670" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="bg_down" position="10,1030" size="1900,40" zPosition="-1" backgroundColor="#08000000" cornerRadius="20"/>
+       <eLabel name="button red" position="20,1067" size="355,3" backgroundColor="#00f23d21" zPosition="1"/>
+       <eLabel name="button green" position="390,1067" size="355,3" backgroundColor="#0031a500" zPosition="1"/>
+       <eLabel name="button yellow" position="760,1067" size="355,3" backgroundColor="#00e5b243" zPosition="1"/>
+       <eLabel name="button blue" position="1130,1067" size="355,3" backgroundColor="#000064c7" zPosition="1"/>
+       <widget name="title" backgroundColor="#08000000" font="mediaportal_clean;50" halign="center" position="20,120" size="1880,90" transparent="1"/>
+       <widget name="searchinfo" position="20,240" size="1880,45" zPosition="2" transparent="1" font="mediaportal_clean;35" halign="center" backgroundColor="#08000000"/>
+       <widget name="subtitle" position="20,285" size="1880,45" zPosition="2" transparent="1" font="mediaportal_clean;35" halign="center" backgroundColor="#08000000"/>
+       <widget name="fulldescription" position="20,360" size="925,650" transparent="1" font="mediaportal_clean;25" backgroundColor="#08000000"/>
+       <widget name="coverArt" position="975,555" size="325,455" alphatest="on"/>
+       <widget name="rating10" position="967,440" size="340,35" pixmap="~/clean_fhd/images/stars-full10.png" zPosition="4" transparent="1" />
+       <widget name="rating0" position="967,440" size="340,35" pixmap="~/clean_fhd/images/stars-empty10.png" zPosition="3" transparent="1" />
+       <widget name="fsk_txt" position="1330,455" size="400,40" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#08000000"/>
+       <widget name="fsk" position="1455,455" size="450,40" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#08000000"/>
+       <widget name="year_txt" position="1330,505" size="400,40" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#08000000"/>
+       <widget name="year" position="1455,505" size="450,40" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#08000000"/>
+       <widget name="country_txt" position="1330,555" size="400,40" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#08000000"/>
+       <widget name="country" position="1455,560" size="450,40" zPosition="2" transparent="1" font="mediaportal;22" backgroundColor="#08000000"/>
+       <widget name="runtime_txt" position="1330,605" size="400,40" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#08000000"/>
+       <widget name="runtime" position="1455,605" size="450,40" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#08000000"/>
+       <widget name="votes_txt" position="1330,655" size="400,40" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#08000000"/>
+       <widget name="votes" position="1455,655" size="450,40" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#08000000"/>
+       <widget name="director_txt" position="1330,705" size="400,40" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#08000000"/>
+       <widget name="director" position="1455,705" size="450,70" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#08000000"/>
+       <widget name="author_txt" position="1330,785" size="400,40" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#08000000"/>
+       <widget name="author" position="1455,785" size="450,70" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#08000000"/>
+       <widget name="genre_txt" position="1330,865" size="100,40" transparent="1" font="mediaportal_clean; 25" backgroundColor="#08000000"/>
+       <widget name="genre" position="1455,865" size="450,70" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#08000000"/>
+       <widget name="studio_txt" position="1330,950" size="100,40" transparent="1" font="mediaportal_clean; 25" backgroundColor="#08000000"/>
+       <widget name="studio" position="1455,945" size="450,70" zPosition="2" transparent="1" font="mediaportal_clean;25" backgroundColor="#08000000"/>
+       <widget name="F1" position="20,1030" size="355,40" transparent="1" font="mediaportal; 25" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F2" position="390,1030" size="355,40" transparent="1" font="mediaportal; 25" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F3" position="760,1030" size="355,40" transparent="1" font="mediaportal; 25" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F4" position="1130,1030" size="355,40" transparent="1" font="mediaportal; 25" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
        <eLabel name="button exit" position="1820,1035" size="60,30" backgroundColor="#00000000" text="EXIT" font="mediaportal; 15" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button exit bg" position="1819,1034" size="62,32" backgroundColor="#00616161" zPosition="0"/>
 </screen>
\ No newline at end of file
index d3c4c86..9d21edc 100644 (file)
@@ -1,5 +1,5 @@
 <screen name="MPUpdateScreen" position="center,center" size="1404,746" title="" backgroundColor="#80ffffff" flags="wfNoBorder">
-       <widget name="mplog" position="10,75" size="1380,660" backgroundColor="#20000000" transparent="1" zPosition="1" foregroundColor="#00ffffff" itemHeight="35"/>
+       <widget name="mplog" position="10,75" size="1380,660" backgroundColor="#20000000" transparent="1" zPosition="1" itemHeight="35"/>
        <eLabel name="bg up" position="2,2" size="1400,60" backgroundColor="#20000000"/>
        <eLabel name="bg down" position="2,64" size="1400,680" backgroundColor="#20000000"/>
        <widget name="title" position="2,2" size="1400,60" font="mediaportal_clean;40" backgroundColor="#20000000" foregroundColor="#00ffffff" zPosition="1" halign="center" valign="center"/>
index 65e80e3..b90d7c8 100644 (file)
@@ -1,13 +1,13 @@
 <skin>
        <windowstyle id="0" type="skinned">
                <title font="mediaportal;32" offset="15,2"/>
-               <color color="#20000000" name="Background"/>
+               <color color="#08000000" name="Background"/>
                <color color="#ffffff" name="LabelForeground"/>
-               <color color="#20000000" name="ListboxBackground"/>
+               <color color="#08000000" name="ListboxBackground"/>
                <color color="#ffffff" name="ListboxForeground"/>
-               <color color="#000000" name="ListboxSelectedBackground"/>
+               <color color="#4d4d4d" name="ListboxSelectedBackground"/>
                <color color="#ffffff" name="ListboxSelectedForeground"/>
-               <color color="#20000000" name="ListboxMarkedBackground"/>
+               <color color="#08000000" name="ListboxMarkedBackground"/>
                <color color="#ffffff" name="ListboxMarkedForeground"/>
                <color color="#000000" name="ListboxMarkedAndSelectedBackground"/>
                <color color="#f23d21" name="ListboxMarkedAndSelectedForeground"/>
@@ -25,8 +25,8 @@
                        <pixmap filename="skins_1080/clean_fhd/images/b_br.png" pos="bpBottomRight"/>
                </borderset>
                <borderset name="bsListboxEntry">
-                       <pixmap filename="skins_1080/clean_fhd/images/line.png" pos="bpTop"/>
-                       <pixmap filename="skins_1080/clean_fhd/images/line.png" pos="bpBottom"/>
+                       <pixmap color="#08000000" pos="bpTop" size="2"/>
+                       <pixmap color="#08000000" pos="bpBottom" size="2"/>
                </borderset>
                <listfont type="Bigger" font="Regular" size="32"/>
                <listfont type="Big" font="Regular" size="30"/>
                <value name="BackgroundPixmapBottomHeight" value="0"/>
                <value name="ValuePixmapTopHeight" value="2"/>
                <value name="ValuePixmapBottomHeight" value="2"/>
-               <value name="ScrollbarWidth" value="7"/>
+               <value name="ScrollbarWidth" value="6"/>
                <value name="ScrollbarBorderWidth" value="0"/>
-               <pixmap filename="skins_1080/clean_fhd/images/scrollbar.png" name="BackgroundPixmap"/>
-               <pixmap filename="skins_1080/clean_fhd/images/slider.png" name="ValuePixmap"/>
+               <pixmap filename="skins_1080/clean_fhd/images/scrollbar.svg" name="BackgroundPixmap"/>
+               <pixmap filename="skins_1080/clean_fhd/images/slider.svg" name="ValuePixmap"/>
        </windowstylescrollbar>
        <listboxcontent>
                <offset name="left" value="5"/>
@@ -54,8 +54,7 @@
                <value name="config_item_height" value="40"/>
        </listboxcontent>
        <mediaportal>
-               <color color="#00ffffff" name="ThumbViewTextForeground"/>
-               <color color="#20000000" name="ThumbViewTextBackground"/>
+               <!--<color color="#00ffffff" name="notUsed"/>-->
                <grid_itemsperpage value="48"/>
                <pagebar_posx value="15"/>
                <pagebar_posy value="1010"/>
                <pagebar_iconwidth value="50"/>
                <pagebar_iconheight value="5"/>
                <pagebar_scaletowidth value="1"/>
-               <sp_seekbar_factor value="11.62"/>
+               <sp_seekbar_factor value="11.76"/>
                <config_separation_width value="780"/>
                <config_divider_height value="3"/>
                <plugin_list_fontsize value="28"/>
                <plugin_list_itemheight value="35"/>
+               <plugin_list_pixmapmargin_x value="15"/>
+               <plugin_list_pixmapwatchedmargin_y value="2"/> <!-- pornhub -->
+               <plugin_list_pixmapwatchedheight value="31"/>
+               <plugin_list_pixmapwatchedwidth value="31"/>
+               <plugin_list_pixmaplivemargin_y value="2"/> <!-- twitch -->
+               <plugin_list_pixmapliveheight value="31"/>
+               <plugin_list_pixmaplivewidth value="31"/>
+               <plugin_list_pixmapstarmargin_y value="3"/> <!-- pornhub premium -->
+               <plugin_list_pixmapstarheight value="29"/>
+               <plugin_list_pixmapstarwidth value="29"/>
+               <plugin_list_pixmapdirectorymargin_y value="3"/> <!-- simplelist -->
+               <plugin_list_pixmapdirectoryheight value="29"/>
+               <plugin_list_pixmapdirectorywidth value="29"/>
+               <plugin_list_pixmapplaylistmargin_y value="3"/> <!-- simplelist -->
+               <plugin_list_pixmapplaylistheight value="29"/>
+               <plugin_list_pixmapplaylistwidth value="29"/>
                <plugin_grid_margin_x value="15"/>
-               <plugin_grid_margin_y value="15"/>
-               <plugin_grid_fontsize value="18"/>
-               <plugin_grid_itemheight value="235"/>
+               <plugin_grid_margin_y value="10"/>
+               <plugin_grid_fontsize value="23"/>
+               <plugin_grid_itemheight value="250"/>
                <plugin_grid_itemwidth value="300"/>
                <plugin_grid_pixmapmargin_x value="5"/>
-               <plugin_grid_pixmapmargin_y value="7"/>
+               <plugin_grid_pixmapmargin_y value="6"/>
                <plugin_grid_pixmapheight value="156"/>
                <plugin_grid_pixmapwidth value="290"/>
                <plugin_grid_textmargin_x value="5"/>
-               <plugin_grid_textmargin_y value="166"/>
-               <plugin_grid_textheight value="62"/>
+               <plugin_grid_textmargin_y value="165"/>
+               <plugin_grid_textheight value="78"/>
                <plugin_grid_textwidth value="290"/>
                <plugin_grid_backgroundpicture filename="images/none.png"/>
-               <plugin_grid_selectionpicture filename="skins_1080/clean_fhd/images/gridselect.png"/>
+               <plugin_grid_selectionpicture filename="skins_1080/clean_fhd/images/gridselect.svg"/>
+               <sort_select_pixmapmargin_x value="10"/>
+               <sort_select_pixmapmargin_y value="4"/>
+               <sort_select_pixmapheight value="27"/>
+               <sort_select_pixmapwidth value="27"/>
                <!--<overridefont font="Regular" />-->
                <!--<overridefontsize value="30" />-->
                <!--<overridesizefactor value="3" />-->
index 4aac094..c7345f6 100644 (file)
@@ -1,20 +1,20 @@
-<widget name="Metalang" position="1290,660" size="240,35" backgroundColor="#20000000" transparent="1" font="mediaportal;28" halign="right"/>
-<widget name="metalang" position="1550,660" size="350,35" backgroundColor="#20000000" transparent="1" font="mediaportal;28"/>
-<widget name="Regionid" position="1290,695" size="240,35" backgroundColor="#20000000" transparent="1" font="mediaportal;28" halign="right"/>
-<widget name="regionid" position="1550,695" size="350,35" backgroundColor="#20000000" transparent="1" font="mediaportal;28" noWrap="1"/>
-<widget name="Query" position="1290,730" size="240,35" backgroundColor="#20000000" transparent="1" font="mediaportal;28" halign="right"/>
-<widget name="query" position="1550,730" size="350,35" backgroundColor="#20000000" transparent="1" font="mediaportal;28" noWrap="1"/>
-<widget name="Time" position="1290,765" size="240,35" backgroundColor="#20000000" transparent="1" font="mediaportal;28" halign="right"/>
-<widget name="time" position="1550,765" size="350,35" backgroundColor="#20000000" transparent="1" font="mediaportal;28"/>
-<widget name="Author" position="1290,800" size="240,35" backgroundColor="#20000000" transparent="1" font="mediaportal;28" halign="right"/>
-<widget name="author" position="1550,800" size="350,35" backgroundColor="#20000000" transparent="1" font="mediaportal;28"/>
-<widget name="3D" position="1290,835" size="240,35" backgroundColor="#20000000" transparent="1" font="mediaportal;28" halign="right"/>
-<widget name="3d" position="1550,835" size="350,35" backgroundColor="#20000000" transparent="1" font="mediaportal;28" noWrap="1"/>
-<widget name="Duration" position="1290,870" size="240,35" backgroundColor="#20000000" transparent="1" font="mediaportal;28" halign="right"/>
-<widget name="duration" position="1550,870" size="350,35" backgroundColor="#20000000" transparent="1" font="mediaportal;28"/>
-<widget name="Keywords" position="1290,905" size="240,35" backgroundColor="#20000000" transparent="1" font="mediaportal;28" halign="right"/>
-<widget name="keywords" position="1550,905" size="350,35" backgroundColor="#20000000" transparent="1" font="mediaportal;28" noWrap="1"/>
-<widget name="Reserve1" position="1290,940" size="240,35" backgroundColor="#20000000" transparent="1" font="mediaportal;28" halign="right"/>
-<widget name="reserve1" position="1550,940" size="350,35" backgroundColor="#20000000" transparent="1" font="mediaportal;28" noWrap="1"/>
-<widget name="Reserve2" position="1290,975" size="240,35" backgroundColor="#20000000" transparent="1" font="mediaportal;28" halign="right"/>
-<widget name="reserve2" position="1550,975" size="350,35" backgroundColor="#20000000" transparent="1" font="mediaportal;28" noWrap="1"/>
\ No newline at end of file
+<widget name="Metalang" position="1290,660" size="240,35" backgroundColor="#08000000" transparent="1" font="mediaportal;28" halign="right"/>
+<widget name="metalang" position="1550,660" size="350,35" backgroundColor="#08000000" transparent="1" font="mediaportal;28"/>
+<widget name="Regionid" position="1290,695" size="240,35" backgroundColor="#08000000" transparent="1" font="mediaportal;28" halign="right"/>
+<widget name="regionid" position="1550,695" size="350,35" backgroundColor="#08000000" transparent="1" font="mediaportal;28" noWrap="1"/>
+<widget name="Query" position="1290,730" size="240,35" backgroundColor="#08000000" transparent="1" font="mediaportal;28" halign="right"/>
+<widget name="query" position="1550,730" size="350,35" backgroundColor="#08000000" transparent="1" font="mediaportal;28" noWrap="1"/>
+<widget name="Time" position="1290,765" size="240,35" backgroundColor="#08000000" transparent="1" font="mediaportal;28" halign="right"/>
+<widget name="time" position="1550,765" size="350,35" backgroundColor="#08000000" transparent="1" font="mediaportal;28"/>
+<widget name="Author" position="1290,800" size="240,35" backgroundColor="#08000000" transparent="1" font="mediaportal;28" halign="right"/>
+<widget name="author" position="1550,800" size="350,35" backgroundColor="#08000000" transparent="1" font="mediaportal;28"/>
+<widget name="3D" position="1290,835" size="240,35" backgroundColor="#08000000" transparent="1" font="mediaportal;28" halign="right"/>
+<widget name="3d" position="1550,835" size="350,35" backgroundColor="#08000000" transparent="1" font="mediaportal;28" noWrap="1"/>
+<widget name="Duration" position="1290,870" size="240,35" backgroundColor="#08000000" transparent="1" font="mediaportal;28" halign="right"/>
+<widget name="duration" position="1550,870" size="350,35" backgroundColor="#08000000" transparent="1" font="mediaportal;28"/>
+<widget name="Keywords" position="1290,905" size="240,35" backgroundColor="#08000000" transparent="1" font="mediaportal;28" halign="right"/>
+<widget name="keywords" position="1550,905" size="350,35" backgroundColor="#08000000" transparent="1" font="mediaportal;28" noWrap="1"/>
+<widget name="Reserve1" position="1290,940" size="240,35" backgroundColor="#08000000" transparent="1" font="mediaportal;28" halign="right"/>
+<widget name="reserve1" position="1550,940" size="350,35" backgroundColor="#08000000" transparent="1" font="mediaportal;28" noWrap="1"/>
+<widget name="Reserve2" position="1290,975" size="240,35" backgroundColor="#08000000" transparent="1" font="mediaportal;28" halign="right"/>
+<widget name="reserve2" position="1550,975" size="350,35" backgroundColor="#08000000" transparent="1" font="mediaportal;28" noWrap="1"/>
\ No newline at end of file
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/directory.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/directory.png
deleted file mode 100644 (file)
index 4df9aaf..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/directory.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/gridselect.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/gridselect.png
deleted file mode 100644 (file)
index cec03c9..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/gridselect.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/gridselect.svg b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/gridselect.svg
new file mode 100644 (file)
index 0000000..dc54824
--- /dev/null
@@ -0,0 +1 @@
+<svg height="250" viewBox="0 0 300 250" width="300" xmlns="http://www.w3.org/2000/svg"><path d="m10 0h280a10 10 45 0 1 10 10v230a10 10 135 0 1 -10 10h-280a10 10 45 0 1 -10-10v-230a10 10 135 0 1 10-10z" fill="#4d4d4d" height="250" stroke-width="1.119" width="300"/></svg>
\ No newline at end of file
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/line.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/line.png
deleted file mode 100644 (file)
index 87400a7..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/line.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/musiccd.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/musiccd.png
deleted file mode 100644 (file)
index 4216d3a..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/musiccd.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/musicfolder.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/musicfolder.png
deleted file mode 100644 (file)
index af0a353..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/musicfolder.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/page.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/page.png
deleted file mode 100644 (file)
index 131da36..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/page.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/page_select.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/page_select.png
deleted file mode 100644 (file)
index 431df2f..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/page_select.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/playlist.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/playlist.png
deleted file mode 100644 (file)
index 13a8ebd..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/playlist.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/pointer.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/pointer.png
deleted file mode 100644 (file)
index 3697026..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/pointer.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/scrollbar.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/scrollbar.png
deleted file mode 100644 (file)
index 7866470..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/scrollbar.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/scrollbar.svg b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/scrollbar.svg
new file mode 100644 (file)
index 0000000..7de2d5f
--- /dev/null
@@ -0,0 +1 @@
+<svg height="6" viewBox="0 0 6 6" width="6" xmlns="http://www.w3.org/2000/svg"><path d="m.00599243.0040696h5.99999997v6h-5.99999997z" fill="#888" stroke-width=".866026"/></svg>
\ No newline at end of file
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/select.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/select.png
deleted file mode 100644 (file)
index cec03c9..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/select.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/slider.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/slider.png
deleted file mode 100644 (file)
index e6e263d..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/slider.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/slider.svg b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/slider.svg
new file mode 100644 (file)
index 0000000..84b9d6c
--- /dev/null
@@ -0,0 +1 @@
+<svg height="6" viewBox="0 0 6 6" width="6" xmlns="http://www.w3.org/2000/svg"><path d="m.00599243.0040696h5.99999997v6h-5.99999997z" fill="#dfdfdf" fill-rule="evenodd" stroke-width=".866026"/></svg>
\ No newline at end of file
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/watched.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/watched.png
deleted file mode 100644 (file)
index 02bc7f6..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/watched.png and /dev/null differ
index ee79129..9f33614 100644 (file)
@@ -7,8 +7,8 @@
                <convert type="MPServicePosition">Position,ShowHours</convert>
        </widget>
        <eLabel backgroundColor="#00ffffff" position="400,176" size="1180,2" foregroundColor="#00000000" />
-       <widget name="seekbarcursor" position="400,170" size="16,16" zPosition="4" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/seekbutton.png" alphatest="on" />
-       <widget position="400,169" progress_pointer="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/images/pointer.png:18,4" render="PositionGauge" size="1180,18" source="session.CurrentService" transparent="1" zPosition="1">
+       <widget name="seekbarcursor" position="400,168" size="4,18" zPosition="4" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/seekbutton.svg" alphatest="on" />
+       <widget position="400,168" progress_pointer="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/pointer.svg:4,4" render="PositionGauge" size="1182,18" source="session.CurrentService" transparent="1" zPosition="1">
                <convert type="MPServicePosition">Gauge</convert>
        </widget>
        <widget backgroundColor="#00616161" font="mediaportal_clean;35" foregroundColor="#00ffffff" halign="right" position="1420,190" render="Label" size="160,40" source="session.CurrentService" transparent="1" zPosition="1">
                <convert type="MPServiceName">Name</convert>
        </widget>
        <ePixmap pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/infobar_bg.png" position="0,0" size="1920,300" zPosition="-2" alphatest="on" />
-       <ePixmap pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/clock.png" position="10,250" size="40,40" zPosition="1" alphatest="blend" />
+       <ePixmap pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/clock.png" position="10,250" size="40,40" zPosition="1" alphatest="on" />
        <widget source="global.CurrentTime" render="Label" position="60,248" size="100,40" font="mediaportal_clean;35" transparent="1" backgroundColor="#00616161" halign="left" foregroundColor="#00ffffff" zPosition="1">
                <convert type="ClockToText">Default</convert>
        </widget>
-       <widget source="session.CurrentService" render="Pixmap" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/clockend.png" position="180,250" size="40,40" zPosition="1" alphatest="blend">
+       <widget source="session.CurrentService" render="Pixmap" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/clockend.png" position="180,250" size="40,40" zPosition="1" alphatest="on">
                <convert type="MPServicePosition">EndTime</convert>
                <convert type="ConditionalShowHide" />
        </widget>
        <widget source="session.CurrentService" render="Label" position="230,248" size="100,40" font="mediaportal_clean;35" halign="left" backgroundColor="#00616161" transparent="1" foregroundColor="#00ffffff" zPosition="1">
                <convert type="MPServicePosition">EndTime,ShowNoSeconds</convert>
        </widget>
-       <widget source="session.CurrentService" render="Pixmap" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/resicon.png" position="350,250" size="40,40" zPosition="1" alphatest="blend">
+       <widget source="session.CurrentService" render="Pixmap" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/resicon.png" position="350,250" size="40,40" zPosition="1" alphatest="on">
                <convert type="MPServiceInfo">VideoInfo</convert>
                <convert type="ConditionalShowHide" />
        </widget>
        <widget source="session.CurrentService" render="Label" position="400,248" size="480,40" backgroundColor="#00616161" transparent="1" font="mediaportal_clean;35" halign="left" foregroundColor="#00ffffff">
                <convert type="MPServiceInfo">VideoInfoCodec</convert>
        </widget>
-       <widget source="session.CurrentService" render="mp_AudioIcon" position="1410,254" zPosition="1" path="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer" size="80,35" alphatest="blend">
+       <widget source="session.CurrentService" render="mp_AudioIcon" position="1410,254" zPosition="1" path="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer" size="80,35" alphatest="on">
                <convert type="mp_audioinfo">AudioIcon</convert>
        </widget>
-       <widget name="premiumoff" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/premium_off.png" position="1500,254" size="80,35" zPosition="2" alphatest="blend" />
-       <widget name="premiumizemeon" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/premiumize_on.png" position="1500,254" size="80,35" zPosition="2" alphatest="blend" />
-       <widget name="realdebridon" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/realdebrid_on.png" position="1500,254" size="80,35" zPosition="2" alphatest="blend" />
+       <widget name="premiumoff" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/premium_off.png" position="1500,254" size="80,35" zPosition="2" alphatest="on" />
+       <widget name="premiumizemeon" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/premiumize_on.png" position="1500,254" size="80,35" zPosition="2" alphatest="on" />
+       <widget name="realdebridon" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/realdebrid_on.png" position="1500,254" size="80,35" zPosition="2" alphatest="on" />
 </screen>
\ No newline at end of file
index 71be820..835086c 100644 (file)
@@ -1,5 +1,5 @@
 <screen position="center,center" size="775,308" title="" backgroundColor="#80ffffff" flags="wfNoBorder" name="SimplePlayerMenu">
-    <widget name="menu" position="10,70" size="755,228" backgroundColor="#20000000" transparent="1" foregroundColorSelected="#ffffff" scrollbarMode="showOnDemand" zPosition="1" itemHeight="38" />
+    <widget name="menu" position="10,70" size="755,228" backgroundColor="#20000000" transparent="1" scrollbarMode="showOnDemand" zPosition="1" itemHeight="38" />
     <eLabel name="bg conf" position="2,64" size="771,242" backgroundColor="#20000000" />
     <eLabel name="bg title" position="2,2" size="771,60" backgroundColor="#20000000" />
     <widget name="title" position="2,2" size="771,60" font="mediaportal_clean;40" backgroundColor="#20000000" foregroundColor="#00ffffff" zPosition="1" halign="center" valign="center" />
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/pointer.svg b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/pointer.svg
new file mode 100644 (file)
index 0000000..5ae59b0
--- /dev/null
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docname="pointer.svg" inkscape:version="1.0 (4035a4fb49, 2020-05-01)" id="svg8" version="1.1" viewBox="0 0 370.41666 4.7625001" height="18" width="1400">
+  <defs id="defs2">
+    <linearGradient osb:paint="solid" id="linearGradient841">
+      <stop id="stop839" offset="0" style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <clipPath id="clipPath2794" clipPathUnits="userSpaceOnUse">
+      <g inkscape:label="Clip" id="use2796" style="fill:#111111;fill-opacity:1">
+        <path id="path2903" style="fill:#111111;fill-opacity:1;stroke-width:0.025" d="M -1.5237164,6.0547061 A 2.2489583,2.2489583 0 0 1 -3.7726748,8.3036644 2.2489583,2.2489583 0 0 1 -6.0216331,6.0547061 2.2489583,2.2489583 0 0 1 -3.7726748,3.8057477 2.2489583,2.2489583 0 0 1 -1.5237164,6.0547061" />
+      </g>
+    </clipPath>
+    <clipPath id="clipPath2805" clipPathUnits="userSpaceOnUse">
+      <g id="use2807" inkscape:label="Clip" style="fill:#111111;fill-opacity:1">
+        <g id="g2899" clip-path="url(#clipPath2794)" style="fill:#111111;fill-opacity:1">
+          <g inkscape:label="Clip" id="g2897" style="fill:#111111;fill-opacity:1">
+            <path id="path2895" style="fill:#111111;fill-opacity:1;stroke-width:0.025" d="M -1.5237164,6.0547061 A 2.2489583,2.2489583 0 0 1 -3.7726748,8.3036644 2.2489583,2.2489583 0 0 1 -6.0216331,6.0547061 2.2489583,2.2489583 0 0 1 -3.7726748,3.8057477 2.2489583,2.2489583 0 0 1 -1.5237164,6.0547061" />
+          </g>
+        </g>
+      </g>
+    </clipPath>
+    <clipPath id="clipPath2818" clipPathUnits="userSpaceOnUse">
+      <g inkscape:label="Clip" id="use2820" style="fill:#111111;fill-opacity:1">
+        <g clip-path="url(#clipPath2805)" id="g2891" style="fill:#111111;fill-opacity:1">
+          <g id="g2889" inkscape:label="Clip" style="fill:#111111;fill-opacity:1">
+            <g id="g2887" clip-path="url(#clipPath2794)" style="fill:#111111;fill-opacity:1">
+              <g inkscape:label="Clip" id="g2885" style="fill:#111111;fill-opacity:1">
+                <path id="path2883" style="fill:#111111;fill-opacity:1;stroke-width:0.025" d="M -1.5237164,6.0547061 A 2.2489583,2.2489583 0 0 1 -3.7726748,8.3036644 2.2489583,2.2489583 0 0 1 -6.0216331,6.0547061 2.2489583,2.2489583 0 0 1 -3.7726748,3.8057477 2.2489583,2.2489583 0 0 1 -1.5237164,6.0547061" />
+              </g>
+            </g>
+          </g>
+        </g>
+      </g>
+    </clipPath>
+  </defs>
+  <sodipodi:namedview units="px" inkscape:showpageshadow="false" inkscape:pagecheckerboard="true" showgrid="false" inkscape:document-rotation="0" inkscape:current-layer="layer1" inkscape:document-units="mm" inkscape:cy="-19.121186" inkscape:cx="1431.4078" inkscape:zoom="16" inkscape:pageshadow="2" inkscape:pageopacity="0.0" borderopacity="1.0" bordercolor="#666666" pagecolor="#ffffff" id="base" />
+  <metadata id="metadata5">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g id="layer1" inkscape:groupmode="layer" inkscape:label="Ebene 1">
+    <rect y="1.5875005" x="5.0862632e-06" height="1.5874991" width="370.41666" id="rect2909" style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill" />
+    <rect y="9.5367433e-08" x="369.35834" height="4.7624998" width="1.0583333" id="rect2911" style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill" />
+  </g>
+</svg>
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/seekbutton.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/seekbutton.png
deleted file mode 100644 (file)
index e62f56b..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/seekbutton.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/seekbutton.svg b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_1080/clean_fhd/simpleplayer/seekbutton.svg
new file mode 100644 (file)
index 0000000..690fb36
--- /dev/null
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" inkscape:version="1.0 (4035a4fb49, 2020-05-01)" id="svg8" version="1.1" viewBox="0 0 1.0583333 4.7625001" height="18" width="4">
+  <defs id="defs2" />
+  <sodipodi:namedview inkscape:showpageshadow="false" inkscape:pagecheckerboard="true" units="px" showgrid="false" inkscape:document-rotation="0" inkscape:current-layer="layer1" inkscape:document-units="mm" inkscape:cy="11.079951" inkscape:cx="2.3654337" inkscape:zoom="22.4" inkscape:pageshadow="2" inkscape:pageopacity="0.0" borderopacity="1.0" bordercolor="#666666" pagecolor="#ffffff" id="base" />
+  <metadata id="metadata5">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g id="layer1" inkscape:groupmode="layer" inkscape:label="Ebene 1">
+    <rect y="9.5367433e-08" x="2.7815501e-08" height="4.7624998" width="1.0583333" id="rect833" style="fill:#ffff00;stroke-width:0.025;fill-opacity:1" />
+  </g>
+</svg>
index 876e63f..9365d1b 100644 (file)
@@ -1,26 +1,26 @@
-<screen name="MediaPortal" position="0,0" size="1280,720" title="MediaPortal" flags="wfNoBorder" backgroundColor="#80ffffff">
-       <widget backgroundColor="#20000000" font="mediaportal_clean;40" halign="right" position="960,6" render="Label" size="133,60" source="global.CurrentTime" transparent="1" valign="center">
+<screen name="MediaPortal" position="0,0" size="1280,720" title="MediaPortal" flags="wfNoBorder" backgroundColor="#75bbbbbb">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;40" halign="right" position="960,6" render="Label" size="133,60" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Default</convert>
        </widget>
-       <widget backgroundColor="#20000000" font="mediaportal_clean;20" position="1113,6" render="Label" size="153,60" source="global.CurrentTime" transparent="1" valign="center">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;20" position="1113,6" render="Label" size="153,60" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Format:%A                   %d. %B</convert>
        </widget>
-       <eLabel backgroundColor="#20000000" text="MediaPortal" font="mediaportal_clean;33" halign="left" valign="center" position="33,6" shadowColor="#00000000" shadowOffset="2,2" size="186,60" transparent="1"/>
-       <widget name="version" backgroundColor="#20000000" font="mediaportal_clean;13" halign="left" valign="bottom" position="220,35" shadowColor="#00000000" shadowOffset="2,2" size="100,16" transparent="1"/>
-       <widget backgroundColor="#20000000" font="mediaportal_clean;33" valign="center" halign="center" name="name" position="0,80" size="1280,60" transparent="1"/>
-       <widget backgroundColor="#20000000" font="mediaportal;18" valign="center" halign="left" name="page" position="28,656" size="133,22" transparent="1"/>
-       <widget backgroundColor="#20000000" font="mediaportal;16" name="F1" position="10,686" size="243,26" valign="center" halign="center" transparent="1"/>
-       <widget backgroundColor="#20000000" font="mediaportal;16" name="F2" position="256,686" size="243,26" valign="center" halign="center" transparent="1"/>
-       <widget backgroundColor="#20000000" font="mediaportal;16" name="F3" position="503,686" size="243,26" valign="center" halign="center" transparent="1"/>
-       <widget backgroundColor="#20000000" font="mediaportal;16" name="F4" position="750,686" size="243,26" valign="center" halign="center" transparent="1"/>
+       <eLabel backgroundColor="#08000000" text="MediaPortal" font="mediaportal_clean;33" halign="left" valign="center" position="33,6" shadowColor="#00000000" shadowOffset="2,2" size="186,60" transparent="1"/>
+       <widget name="version" backgroundColor="#08000000" font="mediaportal_clean;13" halign="left" valign="bottom" position="220,35" shadowColor="#00000000" shadowOffset="2,2" size="100,16" transparent="1"/>
+       <widget backgroundColor="#08000000" font="mediaportal_clean;33" valign="center" halign="center" name="name" position="0,80" size="1280,60" transparent="1"/>
+       <widget backgroundColor="#08000000" font="mediaportal;18" valign="center" halign="left" name="page" position="28,656" size="133,22" transparent="1"/>
+       <widget name="F1" position="13,686" size="237,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F2" position="259,686" size="237,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F3" position="506,686" size="237,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F4" position="753,686" size="237,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
        <widget backgroundColor="#ff000000" foregroundColorSelected="#ff000000" name="liste" position="0,135" scrollbarMode="showNever" size="1290,547" transparent="1" itemWidth="155" itemHeight="85" selectionZoom="1.16" margin="21,8" backgroundPixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/none.png" selectionPixmap="/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/images/none.png"/>
-       <eLabel name="bg_up" position="6,6" size="1268,60" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_wall" position="6,73" size="1268,606" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_down" position="6,686" size="1268,26" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="button red" position="10,712" size="243,1" backgroundColor="#00f23d21" zPosition="1"/>
-       <eLabel name="button green" position="256,712" size="243,1" backgroundColor="#0031a500" zPosition="1"/>
-       <eLabel name="button yellow" position="503,712" size="243,1" backgroundColor="#00e5b243" zPosition="1"/>
-       <eLabel name="button blue" position="750,712" size="243,1" backgroundColor="#000064c7" zPosition="1"/>
+       <eLabel name="bg_up" position="6,6" size="1268,60" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_wall" position="6,73" size="1268,606" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_down" position="6,686" size="1268,26" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="button red" position="13,710" size="237,2" backgroundColor="#00f23d21" zPosition="1"/>
+       <eLabel name="button green" position="259,710" size="237,2" backgroundColor="#0031a500" zPosition="1"/>
+       <eLabel name="button yellow" position="506,710" size="237,2" backgroundColor="#00e5b243" zPosition="1"/>
+       <eLabel name="button blue" position="753,710" size="237,2" backgroundColor="#000064c7" zPosition="1"/>
        <eLabel name="button bouquet" position="1053,690" size="40,20" backgroundColor="#00000000" text="BOUQ" font="mediaportal; 10" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button info" position="1106,690" size="40,20" backgroundColor="#00000000" text="INFO" font="mediaportal; 10" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button help" position="1160,690" size="40,20" backgroundColor="#00000000" text="HELP" font="mediaportal; 10" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
index 2942e26..2456b04 100644 (file)
@@ -1,26 +1,26 @@
-<screen name="MediaPortal" position="0,0" size="1280,720" title="MediaPortal" flags="wfNoBorder" backgroundColor="#80ffffff">
-       <widget backgroundColor="#20000000" font="mediaportal_clean;40" halign="right" position="960,6" render="Label" size="133,60" source="global.CurrentTime" transparent="1" valign="center">
+<screen name="MediaPortal" position="0,0" size="1280,720" title="MediaPortal" flags="wfNoBorder" backgroundColor="#75bbbbbb">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;40" halign="right" position="960,6" render="Label" size="133,60" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Default</convert>
        </widget>
-       <widget backgroundColor="#20000000" font="mediaportal_clean;20" position="1113,6" render="Label" size="153,60" source="global.CurrentTime" transparent="1" valign="center">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;20" position="1113,6" render="Label" size="153,60" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Format:%A                   %d. %B</convert>
        </widget>
-       <eLabel backgroundColor="#20000000" text="MediaPortal" font="mediaportal_clean;33" halign="left" valign="center" position="33,6" shadowColor="#00000000" shadowOffset="2,2" size="800,60" transparent="1"/>
-       <widget name="version" backgroundColor="#20000000" font="mediaportal_clean;13" halign="left" valign="bottom" position="220,35" shadowColor="#00000000" shadowOffset="2,2" size="100,16" transparent="1"/>
-       <widget backgroundColor="#20000000" font="mediaportal_clean;33" halign="center" valign="center" name="name" position="13,80" size="613,46" transparent="1"/>
-       <widget backgroundColor="#20000000" font="mediaportal;16" name="F1" position="10,686" size="243,26" valign="center" halign="center" transparent="1"/>
-       <widget backgroundColor="#20000000" font="mediaportal;16" name="F2" position="256,686" size="243,26" valign="center" halign="center" transparent="1"/>
-       <widget backgroundColor="#20000000" font="mediaportal;16" name="F3" position="503,686" size="243,26" valign="center" halign="center" transparent="1"/>
-       <widget backgroundColor="#20000000" font="mediaportal;16" name="F4" position="750,686" size="243,26" valign="center" halign="center" transparent="1"/>
-       <widget backgroundColor="#20000000" foregroundColorSelected="#ffffff" name="liste" position="20,153" scrollbarMode="showOnDemand" size="600,512" transparent="1" itemHeight="64"/>
-       <eLabel name="bg_up" position="6,6" size="1268,60" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_name" position="6,73" size="626,60" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_list" position="6,140" size="626,539" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_down" position="6,686" size="1268,26" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="button red" position="10,711" size="243,1" backgroundColor="#00f23d21" zPosition="1"/>
-       <eLabel name="button green" position="256,711" size="243,1" backgroundColor="#0031a500" zPosition="1"/>
-       <eLabel name="button yellow" position="503,711" size="243,1" backgroundColor="#00e5b243" zPosition="1"/>
-       <eLabel name="button blue" position="750,711" size="243,1" backgroundColor="#000064c7" zPosition="1"/>
+       <eLabel backgroundColor="#08000000" text="MediaPortal" font="mediaportal_clean;33" halign="left" valign="center" position="33,6" shadowColor="#00000000" shadowOffset="2,2" size="800,60" transparent="1"/>
+       <widget name="version" backgroundColor="#08000000" font="mediaportal_clean;13" halign="left" valign="bottom" position="220,35" shadowColor="#00000000" shadowOffset="2,2" size="100,16" transparent="1"/>
+       <widget backgroundColor="#08000000" font="mediaportal_clean;33" halign="center" valign="center" name="name" position="13,80" size="613,46" transparent="1"/>
+       <widget name="F1" position="13,686" size="237,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F2" position="259,686" size="237,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F3" position="506,686" size="237,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F4" position="753,686" size="237,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget backgroundColor="#08000000" name="liste" position="20,153" scrollbarMode="showOnDemand" size="600,512" transparent="1" itemHeight="64"/>
+       <eLabel name="bg_up" position="6,6" size="1268,60" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_name" position="6,73" size="626,60" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_list" position="6,140" size="626,539" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_down" position="6,686" size="1268,26" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="button red" position="13,710" size="237,2" backgroundColor="#00f23d21" zPosition="1"/>
+       <eLabel name="button green" position="259,710" size="237,2" backgroundColor="#0031a500" zPosition="1"/>
+       <eLabel name="button yellow" position="506,710" size="237,2" backgroundColor="#00e5b243" zPosition="1"/>
+       <eLabel name="button blue" position="753,710" size="237,2" backgroundColor="#000064c7" zPosition="1"/>
        <eLabel name="button bouquet" position="1053,690" size="40,18" backgroundColor="#00000000" text="BOUQ" font="mediaportal; 10" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button info" position="1107,690" size="40,18" backgroundColor="#00000000" text="INFO" font="mediaportal; 10" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button help" position="1160,690" size="40,18" backgroundColor="#00000000" text="HELP" font="mediaportal; 10" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
index ebe5ef3..e13d0e4 100644 (file)
@@ -1,48 +1,48 @@
-<screen name="defaultPlaylist" position="center,center" size="1280,720" flags="wfNoBorder" backgroundColor="#80ffffff">
-       <widget backgroundColor="#20000000" font="mediaportal_clean;40" halign="right" position="960,6" render="Label" size="133,60" source="global.CurrentTime" transparent="1" valign="center">
+<screen name="defaultPlaylist" position="center,center" size="1280,720" flags="wfNoBorder" backgroundColor="#75bbbbbb">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;40" halign="right" position="960,6" render="Label" size="133,60" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Default</convert>
        </widget>
-       <widget backgroundColor="#20000000" font="mediaportal_clean;20" position="1113,6" render="Label" size="153,60" source="global.CurrentTime" transparent="1" valign="center">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;20" position="1113,6" render="Label" size="153,60" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Format:%A                   %d. %B</convert>
        </widget>
-       <eLabel backgroundColor="#20000000" text="MediaPortal" font="mediaportal_clean;33" halign="left" valign="center" position="33,6" shadowColor="#00000000" shadowOffset="2,2" size="800,60" transparent="1"/>
-       <eLabel name="bg_up" position="6,6" size="1268,60" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_titel" position="6,73" size="840,73" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_list" position="6,153" size="840,526" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_cover" position="853,73" size="421,280" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_player" position="853,360" size="421,226" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_mode" position="853,593" size="421,86" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_down" position="6,686" size="1268,26" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="button red" position="10,711" size="243,1" backgroundColor="#00f23d21" zPosition="1"/>
-       <eLabel name="button green" position="256,711" size="243,1" backgroundColor="#0031a500" zPosition="1"/>
-       <eLabel name="button yellow" position="503,711" size="243,1" backgroundColor="#00e5b243" zPosition="1"/>
-       <eLabel name="button blue" position="750,711" size="243,1" backgroundColor="#000064c7" zPosition="1"/>
+       <eLabel backgroundColor="#08000000" text="MediaPortal" font="mediaportal_clean;33" halign="left" valign="center" position="33,6" shadowColor="#00000000" shadowOffset="2,2" size="800,60" transparent="1"/>
+       <eLabel name="bg_up" position="6,6" size="1268,60" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_titel" position="6,73" size="840,73" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_list" position="6,153" size="840,526" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_cover" position="853,73" size="421,280" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_player" position="853,360" size="421,226" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_mode" position="853,593" size="421,86" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_down" position="6,686" size="1268,26" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="button red" position="13,710" size="237,2" backgroundColor="#00f23d21" zPosition="1"/>
+       <eLabel name="button green" position="259,710" size="237,2" backgroundColor="#0031a500" zPosition="1"/>
+       <eLabel name="button yellow" position="506,710" size="237,2" backgroundColor="#00e5b243" zPosition="1"/>
+       <eLabel name="button blue" position="753,710" size="237,2" backgroundColor="#000064c7" zPosition="1"/>
        <widget alphatest="on" name="coverArt" position="860,80" size="406,266"/>
-       <widget backgroundColor="#20000000" font="mediaportal;20" name="artist" position="860,366" size="406,60" transparent="1" valign="center" halign="center"/>
-       <widget backgroundColor="#20000000" font="mediaportal;20" name="songtitle" position="860,433" size="406,80" transparent="1" valign="top" halign="center"/>
+       <widget backgroundColor="#08000000" font="mediaportal;20" name="artist" position="860,366" size="406,60" transparent="1" valign="center" halign="center"/>
+       <widget backgroundColor="#08000000" font="mediaportal;20" name="songtitle" position="860,433" size="406,80" transparent="1" valign="top" halign="center"/>
        <eLabel backgroundColor="#00616161" position="860,526" size="406,1" foregroundColor="grey"/>
        <widget position="860,520" progress_pointer="~/clean_hd/images/pointer.png:18,1" render="PositionGauge" size="406,13" source="session.CurrentService" transparent="1" zPosition="1">
                <convert type="MPServicePosition">Gauge</convert>
        </widget>
-       <widget backgroundColor="#20000000" font="mediaportal;16" halign="left" position="860,540" render="Label" size="80,23" source="session.CurrentService" transparent="1">
+       <widget backgroundColor="#08000000" font="mediaportal;16" halign="left" position="860,540" render="Label" size="80,23" source="session.CurrentService" transparent="1">
                <convert type="MPServicePosition">Position</convert>
        </widget>
-       <widget backgroundColor="#20000000" font="mediaportal;16" position="1186,540" render="Label" size="80,23" source="session.CurrentService" transparent="1" halign="right">
+       <widget backgroundColor="#08000000" font="mediaportal;16" position="1186,540" render="Label" size="80,23" source="session.CurrentService" transparent="1" halign="right">
                <convert type="MPServicePosition">Remaining,Negate</convert>
        </widget>
-       <widget backgroundColor="#20000000" font="mediaportal;16" halign="center" position="1023,540" render="Label" size="80,23" source="session.CurrentService" transparent="1">
+       <widget backgroundColor="#08000000" font="mediaportal;16" halign="center" position="1023,540" render="Label" size="80,23" source="session.CurrentService" transparent="1">
                <convert type="MPServicePosition">Length</convert>
        </widget>
-       <eLabel backgroundColor="#20000000" font="mediaportal;20" position="861,640" size="120,23" text="Playmode" transparent="1" valign="top"/>
-       <widget backgroundColor="#20000000" font="mediaportal;20" name="playmode" position="993,640" size="273,23" transparent="1" valign="top"/>
-       <eLabel backgroundColor="#20000000" font="mediaportal;20" position="860,610" size="120,23" text="Album" transparent="1" valign="top"/>
-       <widget backgroundColor="#20000000" font="mediaportal;20" position="993,610" size="273,23" transparent="1" valign="top" name="album"/>
-       <widget name="liste" position="13,160" size="826,483" backgroundColor="#20000000" scrollbarMode="showOnDemand" transparent="1" foregroundColorSelected="foreground" foregroundColor="foreground" zPosition="0" itemHeight="23"/>
-       <widget name="title" position="13,80" size="826,60" backgroundColor="#20000000" transparent="1" font="mediaportal_clean;20" valign="center" halign="center"/>
-       <widget name="F1" position="10,686" size="243,26" transparent="1" font="mediaportal;16" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
-       <widget name="F2" position="256,686" size="243,26" transparent="1" font="mediaportal;16" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
-       <widget name="F3" position="503,686" size="243,26" transparent="1" font="mediaportal;16" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
-       <widget name="F4" position="750,686" size="243,26" transparent="1" font="mediaportal;16" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
+       <eLabel backgroundColor="#08000000" font="mediaportal;20" position="861,640" size="120,23" text="Playmode" transparent="1" valign="top"/>
+       <widget backgroundColor="#08000000" font="mediaportal;20" name="playmode" position="993,640" size="273,23" transparent="1" valign="top"/>
+       <eLabel backgroundColor="#08000000" font="mediaportal;20" position="860,610" size="120,23" text="Album" transparent="1" valign="top"/>
+       <widget backgroundColor="#08000000" font="mediaportal;20" position="993,610" size="273,23" transparent="1" valign="top" name="album"/>
+       <widget name="liste" position="13,160" size="826,483" backgroundColor="#08000000" scrollbarMode="showOnDemand" transparent="1" zPosition="0" itemHeight="23"/>
+       <widget name="title" position="13,80" size="826,60" backgroundColor="#08000000" transparent="1" font="mediaportal_clean;20" valign="center" halign="center"/>
+       <widget name="F1" position="13,686" size="237,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F2" position="259,686" size="237,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F3" position="506,686" size="237,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F4" position="753,686" size="237,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
        <eLabel name="button ok" position="1160,690" size="40,18" backgroundColor="#00000000" text="OK" font="mediaportal;10" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button exit" position="1213,690" size="40,18" backgroundColor="#00000000" text="EXIT" font="mediaportal;10" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button ok bg" position="1159,689" size="42,20" backgroundColor="#00616161" zPosition="0"/>
index 9453da7..67f0435 100644 (file)
@@ -1,33 +1,33 @@
-<screen name="defaultListWide" position="center,center" size="1280,720" flags="wfNoBorder" backgroundColor="#80ffffff">
-       <widget backgroundColor="#20000000" font="mediaportal_clean;40" halign="right" position="960,6" render="Label" size="133,60" source="global.CurrentTime" transparent="1" valign="center">
+<screen name="defaultListWide" position="center,center" size="1280,720" flags="wfNoBorder" backgroundColor="#75bbbbbb">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;40" halign="right" position="960,6" render="Label" size="133,60" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Default</convert>
        </widget>
-       <widget backgroundColor="#20000000" font="mediaportal_clean;20" position="1113,6" render="Label" size="153,60" source="global.CurrentTime" transparent="1" valign="center">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;20" position="1113,6" render="Label" size="153,60" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Format:%A                   %d. %B</convert>
        </widget>
-       <eLabel name="bg_up" position="6,6" size="1268,60" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_titel" position="6,73" size="840,73" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_list" position="6,153" size="840,526" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_name_handlung" position="853,360" size="421,319" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_cover" position="853,73" size="421,280" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_down" position="6,686" size="1268,26" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="button red" position="10,711" size="243,1" backgroundColor="#00f23d21" zPosition="1"/>
-       <eLabel name="button green" position="256,711" size="243,1" backgroundColor="#0031a500" zPosition="1"/>
-       <eLabel name="button yellow" position="503,711" size="243,1" backgroundColor="#00e5b243" zPosition="1"/>
-       <eLabel name="button blue" position="750,711" size="243,1" backgroundColor="#000064c7" zPosition="1"/>
-       <widget name="handlung" position="860,442" size="406,231" backgroundColor="#20000000" font="mediaportal;18" transparent="1"/>
-       <widget name="coverArt" position="860,80" size="406,266" transparent="1" alphatest="blend"/>
-       <widget name="ContentTitle" position="13,80" size="826,60" backgroundColor="#20000000" zPosition="5" font="mediaportal_clean;20" valign="center" halign="center" transparent="1"/>
-       <widget name="name" position="860,366" size="406,68" backgroundColor="#20000000" transparent="1" zPosition="1" font="mediaportal;20" valign="center" halign="center"/>
-       <widget name="liste" position="13,160" size="826,483" backgroundColor="#20000000" scrollbarMode="showOnDemand" transparent="1" foregroundColorSelected="#ffffff"/>
-       <widget name="title" position="33,6" size="800,60" backgroundColor="#20000000" transparent="1" font="mediaportal_clean;33" valign="center" halign="left"/>
-       <widget name="extrainfo" position="13,650" size="580,20" backgroundColor="#20000000" transparent="1" font="mediaportal;18" valign="center" zPosition="1"/>
-       <widget name="Page" position="646,650" size="100,20" backgroundColor="#20000000" transparent="1" font="mediaportal;18" valign="center" zPosition="1"/>
-       <widget name="page" position="706,650" size="133,20" backgroundColor="#20000000" transparent="1" font="mediaportal;18" valign="center" zPosition="1"/>
-       <widget name="F1" position="10,686" size="243,26" transparent="1" font="mediaportal; 16" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
-       <widget name="F2" position="256,686" size="243,26" transparent="1" font="mediaportal; 16" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
-       <widget name="F3" position="503,686" size="243,26" transparent="1" font="mediaportal; 16" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
-       <widget name="F4" position="750,686" size="243,26" transparent="1" font="mediaportal; 16" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
+       <eLabel name="bg_up" position="6,6" size="1268,60" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_titel" position="6,73" size="840,40" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_list" position="6,120" size="840,559" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_name_handlung" position="853,360" size="421,319" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_cover" position="853,73" size="421,280" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_down" position="6,686" size="1268,26" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="button red" position="13,710" size="237,2" backgroundColor="#00f23d21" zPosition="1"/>
+       <eLabel name="button green" position="259,710" size="237,2" backgroundColor="#0031a500" zPosition="1"/>
+       <eLabel name="button yellow" position="506,710" size="237,2" backgroundColor="#00e5b243" zPosition="1"/>
+       <eLabel name="button blue" position="753,710" size="237,2" backgroundColor="#000064c7" zPosition="1"/>
+       <widget name="handlung" position="860,443" size="406,229" backgroundColor="#08000000" font="mediaportal;17" transparent="1"/>
+       <widget name="coverArt" position="860,80" size="406,266" transparent="1" alphatest="on"/>
+       <widget name="ContentTitle" position="13,80" size="826,26" backgroundColor="#08000000" zPosition="5" font="mediaportal_clean;20" valign="center" halign="center" transparent="1"/>
+       <widget name="name" position="860,366" size="406,68" backgroundColor="#08000000" transparent="1" zPosition="1" font="mediaportal;20" valign="center" halign="center"/>
+       <widget name="liste" position="13,127" size="826,528" backgroundColor="#08000000" scrollbarMode="showOnDemand" transparent="1"/>
+       <widget name="title" position="33,6" size="800,60" backgroundColor="#08000000" transparent="1" font="mediaportal_clean;33" valign="center" halign="left"/>
+       <widget name="extrainfo" position="13,656" size="580,20" backgroundColor="#08000000" transparent="1" font="mediaportal;18" valign="center" zPosition="1"/>
+       <widget name="Page" position="646,656" size="100,20" backgroundColor="#08000000" transparent="1" font="mediaportal;18" valign="center" zPosition="1"/>
+       <widget name="page" position="706,656" size="133,20" backgroundColor="#08000000" transparent="1" font="mediaportal;18" valign="center" zPosition="1"/>
+       <widget name="F1" position="10,686" size="243,26" transparent="1" font="mediaportal; 16" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F2" position="256,686" size="243,26" transparent="1" font="mediaportal; 16" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F3" position="503,686" size="243,26" transparent="1" font="mediaportal; 16" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F4" position="750,686" size="243,26" transparent="1" font="mediaportal; 16" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
        <eLabel name="button ok" position="1160,690" size="40,18" backgroundColor="#00000000" text="OK" font="mediaportal; 10" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button exit" position="1213,690" size="40,18" backgroundColor="#00000000" text="EXIT" font="mediaportal; 10" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button ok bg" position="1159,689" size="42,20" backgroundColor="#00616161" zPosition="0"/>
index 91d7c67..afc99e1 100644 (file)
@@ -1,26 +1,26 @@
-<screen name="hauptScreenSetup" position="center,center" size="1280,720" flags="wfNoBorder" backgroundColor="#80ffffff">
-       <widget backgroundColor="#20000000" font="mediaportal_clean;40" halign="right" position="960,6" render="Label" size="133,60" source="global.CurrentTime" transparent="1" valign="center">
+<screen name="hauptScreenSetup" position="center,center" size="1280,720" flags="wfNoBorder" backgroundColor="#75bbbbbb">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;40" halign="right" position="960,6" render="Label" size="133,60" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Default</convert>
        </widget>
-       <widget backgroundColor="#20000000" font="mediaportal_clean;20" position="1113,6" render="Label" size="153,60" source="global.CurrentTime" transparent="1" valign="center">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;20" position="1113,6" render="Label" size="153,60" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Format:%A                   %d. %B</convert>
        </widget>
-       <eLabel backgroundColor="#20000000" text="MediaPortal" font="mediaportal_clean;33" halign="left" valign="center" position="33,6" shadowColor="#00000000" shadowOffset="2,2" size="800,60" transparent="1"/>
-       <eLabel name="bg_up" position="6,6" size="1268,60" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_titel" position="6,73" size="840,73" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_list" position="6,153" size="840,526" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_cover" position="853,73" size="421,606" zPosition="0" backgroundColor="#20000000"/>
-       <eLabel name="bg_down" position="6,686" size="1268,26" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="button red" position="10,711" size="243,1" backgroundColor="#00f23d21" zPosition="1"/>
-       <eLabel name="button green" position="256,711" size="243,1" backgroundColor="#0031a500" zPosition="1"/>
-       <eLabel name="button yellow" position="503,711" size="243,1" backgroundColor="#00e5b243" zPosition="1"/>
-       <eLabel name="button blue" position="750,711" size="243,1" backgroundColor="#000064c7" zPosition="1"/>
-       <widget backgroundColor="#20000000" name="config" position="13,160" size="826,494" scrollbarMode="showOnDemand" transparent="1" itemHeight="26"/>
-       <widget name="title" position="13,80" size="826,60" backgroundColor="#20000000" transparent="1" font="mediaportal_clean;33" valign="center" halign="center"/>
-       <widget name="F1" position="10,686" size="243,26" transparent="1" font="mediaportal; 16" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
-       <widget name="F2" position="256,686" size="243,26" transparent="1" font="mediaportal; 16" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
-       <widget name="F3" position="503,686" size="243,26" transparent="1" font="mediaportal; 16" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
-       <widget name="F4" position="750,686" size="243,26" transparent="1" font="mediaportal; 16" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
+       <eLabel backgroundColor="#08000000" text="MediaPortal" font="mediaportal_clean;33" halign="left" valign="center" position="33,6" shadowColor="#00000000" shadowOffset="2,2" size="800,60" transparent="1"/>
+       <eLabel name="bg_up" position="6,6" size="1268,60" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_titel" position="6,73" size="840,73" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_list" position="6,153" size="840,526" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_cover" position="853,73" size="421,606" zPosition="0" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_down" position="6,686" size="1268,26" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="button red" position="13,710" size="237,2" backgroundColor="#00f23d21" zPosition="1"/>
+       <eLabel name="button green" position="259,710" size="237,2" backgroundColor="#0031a500" zPosition="1"/>
+       <eLabel name="button yellow" position="506,710" size="237,2" backgroundColor="#00e5b243" zPosition="1"/>
+       <eLabel name="button blue" position="753,710" size="237,2" backgroundColor="#000064c7" zPosition="1"/>
+       <widget backgroundColor="#08000000" name="config" position="13,160" size="826,494" scrollbarMode="showOnDemand" transparent="1" itemHeight="26"/>
+       <widget name="title" position="13,80" size="826,60" backgroundColor="#08000000" transparent="1" font="mediaportal_clean;33" valign="center" halign="center"/>
+       <widget name="F1" position="13,686" size="237,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F2" position="259,686" size="237,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F3" position="506,686" size="237,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F4" position="753,686" size="237,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
        <eLabel name="button ok" position="1160,690" size="40,18" backgroundColor="#00000000" text="OK" font="mediaportal; 10" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button exit" position="1213,690" size="40,18" backgroundColor="#00000000" text="EXIT" font="mediaportal; 10" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button bouq" position="1107,690" size="40,18" backgroundColor="#00000000" text="BOUQ" font="mediaportal; 10" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
index 8c18f9f..0b801b9 100644 (file)
@@ -1,21 +1,21 @@
-<screen name="pluginSort" position="center,center" size="1280,720" flags="wfNoBorder" backgroundColor="#80ffffff">
-       <widget backgroundColor="#20000000" font="mediaportal_clean;40" halign="right" position="960,6" render="Label" size="133,60" source="global.CurrentTime" transparent="1" valign="center">
+<screen name="pluginSort" position="center,center" size="1280,720" flags="wfNoBorder" backgroundColor="#75bbbbbb">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;40" halign="right" position="960,6" render="Label" size="133,60" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Default</convert>
        </widget>
-       <widget backgroundColor="#20000000" font="mediaportal_clean;20" position="1113,6" render="Label" size="153,60" source="global.CurrentTime" transparent="1" valign="center">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;20" position="1113,6" render="Label" size="153,60" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Format:%A                   %d. %B</convert>
        </widget>
-       <eLabel backgroundColor="#20000000" text="MediaPortal" font="mediaportal_clean;33" halign="left" valign="center" position="33,6" shadowColor="#00000000" shadowOffset="2,2" size="800,60" transparent="1"/>
-       <eLabel name="bg_up" position="6,6" size="1268,60" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_titel" position="6,73" size="1268,73" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_list" position="6,153" size="1268,526" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="bg_down" position="6,686" size="1268,26" zPosition="-1" backgroundColor="#20000000"/>
-       <eLabel name="button red" position="10,711" size="243,1" backgroundColor="#00f23d21" zPosition="1"/>
-       <eLabel name="button green" position="256,711" size="243,1" backgroundColor="#0031a500" zPosition="1"/>
-       <eLabel name="button yellow" position="503,711" size="243,1" backgroundColor="#00e5b243" zPosition="1"/>
-       <eLabel name="button blue" position="750,711" size="243,1" backgroundColor="#000064c7" zPosition="1"/>
-       <widget name="liste" position="13,160" size="1253,506" backgroundColor="#20000000" scrollbarMode="showOnDemand" transparent="1" foregroundColorSelected="#ffffff" itemHeight="23"/>
-       <widget name="title" position="13,80" size="1253,60" transparent="1" font="mediaportal_clean;33" backgroundColor="#20000000" valign="center" halign="center" zPosition="0"/>
+       <eLabel backgroundColor="#08000000" text="MediaPortal" font="mediaportal_clean;33" halign="left" valign="center" position="33,6" shadowColor="#00000000" shadowOffset="2,2" size="800,60" transparent="1"/>
+       <eLabel name="bg_up" position="6,6" size="1268,60" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_titel" position="6,73" size="1268,73" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_list" position="6,153" size="1268,526" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_down" position="6,686" size="1268,26" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="button red" position="13,710" size="237,2" backgroundColor="#00f23d21" zPosition="1"/>
+       <eLabel name="button green" position="259,710" size="237,2" backgroundColor="#0031a500" zPosition="1"/>
+       <eLabel name="button yellow" position="506,710" size="237,2" backgroundColor="#00e5b243" zPosition="1"/>
+       <eLabel name="button blue" position="753,710" size="237,2" backgroundColor="#000064c7" zPosition="1"/>
+       <widget name="liste" position="13,160" size="1253,506" backgroundColor="#08000000" scrollbarMode="showOnDemand" transparent="1" itemHeight="23"/>
+       <widget name="title" position="13,80" size="1253,60" transparent="1" font="mediaportal_clean;33" backgroundColor="#08000000" valign="center" halign="center" zPosition="0"/>
        <eLabel name="button ok" position="1160,690" size="40,18" backgroundColor="#00000000" text="OK" font="mediaportal; 10" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button exit" position="1213,690" size="40,18" backgroundColor="#00000000" text="EXIT" font="mediaportal; 10" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button ok bg" position="1159,689" size="42,20" backgroundColor="#00616161" zPosition="0"/>
index cc84b24..ceb5c41 100644 (file)
@@ -1,51 +1,51 @@
-<screen title="TMDb - The Movie Database" name="TMDB" position="center,center" size="1280,720" flags="wfNoBorder" backgroundColor="#80ffffff">
-       <widget backgroundColor="#20000000" font="mediaportal_clean;40" halign="right" position="960,6" render="Label" size="133,60" source="global.CurrentTime" transparent="1" valign="center">
+<screen title="TMDb - The Movie Database" name="TMDB" position="center,center" size="1280,720" flags="wfNoBorder" backgroundColor="#75bbbbbb">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;40" halign="right" position="960,6" render="Label" size="133,60" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Default</convert>
        </widget>
-       <widget backgroundColor="#20000000" font="mediaportal_clean;20" position="1113,6" render="Label" size="153,60" source="global.CurrentTime" transparent="1" valign="center">
+       <widget backgroundColor="#08000000" font="mediaportal_clean;20" position="1113,6" render="Label" size="153,60" source="global.CurrentTime" transparent="1" valign="center">
                <convert type="ClockToText">Format:%A                   %d. %B</convert>
        </widget>
-       <eLabel backgroundColor="#20000000" text="MediaPortal" font="mediaportal_clean;33" halign="left" valign="center" position="33,6" shadowColor="#00000000" shadowOffset="2,2" size="800,60" transparent="1"/>
-       <eLabel name="bg_up" position="6,6" size="1268,60" zPosition="-1"/>
-       <eLabel name="bg_titel" position="6,73" size="1268,73" zPosition="-1"/>
-       <eLabel name="bg_station" position="6,153" size="1268,72" zPosition="-1"/>
-       <eLabel name="bg_list" position="6,233" size="630,446" zPosition="-1"/>
-       <eLabel name="bg_cover" position="880,233" size="392,446" zPosition="-1"/>
-       <eLabel name="bg_cover" position="643,233" size="230,446" zPosition="-1"/>
-       <eLabel name="bg_down" position="6,686" size="1268,26" zPosition="-1"/>
-       <eLabel name="button red" position="10,711" size="243,1" backgroundColor="#00f23d21" zPosition="1"/>
-       <eLabel name="button green" position="256,711" size="243,1" backgroundColor="#0031a500" zPosition="1"/>
-       <eLabel name="button yellow" position="503,711" size="243,1" backgroundColor="#00e5b243" zPosition="1"/>
-       <eLabel name="button blue" position="750,711" size="243,1" backgroundColor="#000064c7" zPosition="1"/>
-       <widget name="title" backgroundColor="#20000000" font="mediaportal_clean;33" halign="center" position="13,80" size="1253,60" transparent="1"/>
-       <widget name="searchinfo" position="13,160" size="1253,30" zPosition="2" transparent="1" font="mediaportal_clean;23" halign="center" backgroundColor="#20000000"/>
-       <widget name="subtitle" position="13,190" size="1253,30" zPosition="2" transparent="1" font="mediaportal_clean;23" halign="center" backgroundColor="#20000000"/>
-       <widget name="fulldescription" position="13,240" size="616,433" font="mediaportal_clean;16"/>
-       <widget name="coverArt" position="650,370" size="216,303" alphatest="blend"/>
-       <widget name="rating10" position="644,293" size="226,23" pixmap="~/clean_hd/images/stars-full10.png" zPosition="4" transparent="1" backgroundColor="#20000000"/>
-       <widget name="rating0" position="644,293" size="226,23" pixmap="~/clean_hd/images/stars-empty10.png" zPosition="3" transparent="1" alphatest="blend" backgroundColor="#20000000"/>
-       <widget name="fsk_txt" position="886,303" size="266,26" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#20000000"/>
-       <widget name="fsk" position="970,303" size="300,26" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#20000000"/>
-       <widget name="year_txt" position="886,336" size="266,26" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#20000000"/>
-       <widget name="year" position="970,336" size="300,26" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#20000000"/>
-       <widget name="country_txt" position="886,370" size="266,26" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#20000000"/>
-       <widget name="country" position="970,373" size="300,26" zPosition="2" transparent="1" font="mediaportal;14" backgroundColor="#20000000"/>
-       <widget name="runtime_txt" position="886,403" size="266,26" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#20000000"/>
-       <widget name="runtime" position="970,403" size="300,26" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#20000000"/>
-       <widget name="votes_txt" position="886,436" size="266,26" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#20000000"/>
-       <widget name="votes" position="970,436" size="300,26" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#20000000"/>
-       <widget name="director_txt" position="886,470" size="266,26" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#20000000"/>
-       <widget name="director" position="970,470" size="300,46" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#20000000"/>
-       <widget name="author_txt" position="886,523" size="266,26" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#20000000"/>
-       <widget name="author" position="970,523" size="300,46" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#20000000"/>
-       <widget name="genre_txt" position="886,576" size="66,26" font="mediaportal_clean; 16" backgroundColor="#20000000"/>
-       <widget name="genre" position="970,576" size="300,46" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#20000000"/>
-       <widget name="studio_txt" position="886,633" size="66,26" font="mediaportal_clean; 16" backgroundColor="#20000000"/>
-       <widget name="studio" position="970,630" size="300,46" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#20000000"/>
-       <widget name="F1" position="10,686" size="243,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
-       <widget name="F2" position="256,686" size="243,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
-       <widget name="F3" position="503,686" size="243,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
-       <widget name="F4" position="750,686" size="243,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#20000000" valign="center" halign="center" zPosition="1"/>
+       <eLabel backgroundColor="#08000000" text="MediaPortal" font="mediaportal_clean;33" halign="left" valign="center" position="33,6" shadowColor="#00000000" shadowOffset="2,2" size="800,60" transparent="1"/>
+       <eLabel name="bg_up" position="6,6" size="1268,60" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_titel" position="6,73" size="1268,73" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_station" position="6,153" size="1268,72" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_list" position="6,233" size="630,446" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_cover" position="880,233" size="392,446" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_cover" position="643,233" size="230,446" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="bg_down" position="6,686" size="1268,26" zPosition="-1" backgroundColor="#08000000" cornerRadius="12"/>
+       <eLabel name="button red" position="13,710" size="237,2" backgroundColor="#00f23d21" zPosition="1"/>
+       <eLabel name="button green" position="259,710" size="237,2" backgroundColor="#0031a500" zPosition="1"/>
+       <eLabel name="button yellow" position="506,710" size="237,2" backgroundColor="#00e5b243" zPosition="1"/>
+       <eLabel name="button blue" position="753,710" size="237,2" backgroundColor="#000064c7" zPosition="1"/>
+       <widget name="title" backgroundColor="#08000000" font="mediaportal_clean;33" halign="center" position="13,80" size="1253,60" transparent="1"/>
+       <widget name="searchinfo" position="13,160" size="1253,30" zPosition="2" transparent="1" font="mediaportal_clean;23" halign="center" backgroundColor="#08000000"/>
+       <widget name="subtitle" position="13,190" size="1253,30" zPosition="2" transparent="1" font="mediaportal_clean;23" halign="center" backgroundColor="#08000000"/>
+       <widget name="fulldescription" position="13,240" size="616,433" transparent="1" font="mediaportal_clean;16"  backgroundColor="#08000000"/>
+       <widget name="coverArt" position="650,370" size="216,303" alphatest="on"/>
+       <widget name="rating10" position="644,293" size="226,23" pixmap="~/clean_hd/images/stars-full10.png" zPosition="4" transparent="1" />
+       <widget name="rating0" position="644,293" size="226,23" pixmap="~/clean_hd/images/stars-empty10.png" zPosition="3" transparent="1" />
+       <widget name="fsk_txt" position="886,303" size="266,26" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#08000000"/>
+       <widget name="fsk" position="970,303" size="300,26" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#08000000"/>
+       <widget name="year_txt" position="886,336" size="266,26" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#08000000"/>
+       <widget name="year" position="970,336" size="300,26" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#08000000"/>
+       <widget name="country_txt" position="886,370" size="266,26" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#08000000"/>
+       <widget name="country" position="970,373" size="300,26" zPosition="2" transparent="1" font="mediaportal;14" backgroundColor="#08000000"/>
+       <widget name="runtime_txt" position="886,403" size="266,26" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#08000000"/>
+       <widget name="runtime" position="970,403" size="300,26" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#08000000"/>
+       <widget name="votes_txt" position="886,436" size="266,26" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#08000000"/>
+       <widget name="votes" position="970,436" size="300,26" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#08000000"/>
+       <widget name="director_txt" position="886,470" size="266,26" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#08000000"/>
+       <widget name="director" position="970,470" size="300,46" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#08000000"/>
+       <widget name="author_txt" position="886,523" size="266,26" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#08000000"/>
+       <widget name="author" position="970,523" size="300,46" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#08000000"/>
+       <widget name="genre_txt" position="886,576" size="66,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#08000000"/>
+       <widget name="genre" position="970,576" size="300,46" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#08000000"/>
+       <widget name="studio_txt" position="886,633" size="66,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#08000000"/>
+       <widget name="studio" position="970,630" size="300,46" zPosition="2" transparent="1" font="mediaportal_clean;16" backgroundColor="#08000000"/>
+       <widget name="F1" position="13,686" size="237,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F2" position="259,686" size="237,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F3" position="506,686" size="237,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
+       <widget name="F4" position="753,686" size="237,26" transparent="1" font="mediaportal_clean; 16" backgroundColor="#08000000" valign="center" halign="center" zPosition="1"/>
        <eLabel name="button exit" position="1213,690" size="40,18" backgroundColor="#00000000" text="EXIT" font="mediaportal; 10" foregroundColor="#00ffffff" halign="center" valign="center" shadowColor="#00000000" shadowOffset="-3,-3" zPosition="1"/>
        <eLabel name="button exit bg" position="1212,689" size="42,20" backgroundColor="#00616161" zPosition="0"/>
 </screen>
\ No newline at end of file
index 28a7426..b65bf6d 100644 (file)
@@ -1,5 +1,5 @@
 <screen name="MPUpdateScreen" position="center,center" size="936,497" title="" backgroundColor="#80ffffff" flags="wfNoBorder">
-       <widget name="mplog" position="6,50" size="920,440" backgroundColor="#20000000" transparent="1" zPosition="1" foregroundColor="#00ffffff" itemHeight="23"/>
+       <widget name="mplog" position="6,50" size="920,440" backgroundColor="#20000000" transparent="1" zPosition="1" itemHeight="23"/>
        <eLabel name="bg up" position="1,1" size="933,40" backgroundColor="#20000000"/>
        <eLabel name="bg down" position="1,42" size="933,453" backgroundColor="#20000000"/>
        <widget name="title" position="1,1" size="933,40" font="mediaportal_clean;26" backgroundColor="#20000000" foregroundColor="#00ffffff" zPosition="1" halign="center" valign="center"/>
index 126d6fd..ac2364a 100644 (file)
@@ -1,13 +1,13 @@
 <skin>
        <windowstyle id="0" type="skinned">
                <title font="mediaportal;21" offset="10,1"/>
-               <color color="#20000000" name="Background"/>
+               <color color="#08000000" name="Background"/>
                <color color="#ffffff" name="LabelForeground"/>
-               <color color="#20000000" name="ListboxBackground"/>
+               <color color="#08000000" name="ListboxBackground"/>
                <color color="#ffffff" name="ListboxForeground"/>
-               <color color="#000000" name="ListboxSelectedBackground"/>
+               <color color="#4d4d4d" name="ListboxSelectedBackground"/>
                <color color="#ffffff" name="ListboxSelectedForeground"/>
-               <color color="#20000000" name="ListboxMarkedBackground"/>
+               <color color="#08000000" name="ListboxMarkedBackground"/>
                <color color="#ffffff" name="ListboxMarkedForeground"/>
                <color color="#000000" name="ListboxMarkedAndSelectedBackground"/>
                <color color="#f23d21" name="ListboxMarkedAndSelectedForeground"/>
@@ -25,8 +25,8 @@
                        <pixmap filename="skins_720/clean_hd/images/b_br.png" pos="bpBottomRight"/>
                </borderset>
                <borderset name="bsListboxEntry">
-                       <pixmap filename="skins_720/clean_hd/images/line.png" pos="bpTop"/>
-                       <pixmap filename="skins_720/clean_hd/images/line.png" pos="bpBottom"/>
+                       <pixmap color="#08000000" pos="bpTop" size="1"/>
+                       <pixmap color="#08000000" pos="bpBottom" size="1"/>
                </borderset>
                <listfont type="Bigger" font="Regular" size="21"/>
                <listfont type="Big" font="Regular" size="20"/>
@@ -41,8 +41,8 @@
                <value name="ValuePixmapBottomHeight" value="1"/>
                <value name="ScrollbarWidth" value="4"/>
                <value name="ScrollbarBorderWidth" value="0"/>
-               <pixmap filename="skins_720/clean_hd/images/scrollbar.png" name="BackgroundPixmap"/>
-               <pixmap filename="skins_720/clean_hd/images/slider.png" name="ValuePixmap"/>
+               <pixmap filename="skins_720/clean_hd/images/scrollbar.svg" name="BackgroundPixmap"/>
+               <pixmap filename="skins_720/clean_hd/images/slider.svg" name="ValuePixmap"/>
        </windowstylescrollbar>
        <listboxcontent>
                <offset name="left" value="3"/>
@@ -54,8 +54,7 @@
                <value name="config_item_height" value="26"/>
        </listboxcontent>
        <mediaportal>
-               <color color="#00ffffff" name="ThumbViewTextForeground"/>
-               <color color="#20000000" name="ThumbViewTextBackground"/>
+               <!--<color color="#00ffffff" name="notUsed"/>-->
                <grid_itemsperpage value="48"/>
                <pagebar_posx value="10"/>
                <pagebar_posy value="673"/>
                <pagebar_iconwidth value="34"/>
                <pagebar_iconheight value="3"/>
                <pagebar_scaletowidth value="1"/>
-               <sp_seekbar_factor value="7.74"/>
+               <sp_seekbar_factor value="7.84"/>
                <config_separation_width value="520"/>
                <config_divider_height value="2"/>
                <plugin_list_fontsize value="19"/>
-               <plugin_list_itemheight value="23"/>
+               <plugin_list_itemheight value="24"/>
+               <plugin_list_pixmapmargin_x value="15"/>
+               <plugin_list_pixmapwatchedmargin_y value="1"/> <!-- pornhub -->
+               <plugin_list_pixmapwatchedheight value="22"/>
+               <plugin_list_pixmapwatchedwidth value="22"/>
+               <plugin_list_pixmaplivemargin_y value="1"/> <!-- twitch -->
+               <plugin_list_pixmapliveheight value="22"/>
+               <plugin_list_pixmaplivewidth value="22"/>
+               <plugin_list_pixmapstarmargin_y value="2"/> <!-- pornhub premium -->
+               <plugin_list_pixmapstarheight value="20"/>
+               <plugin_list_pixmapstarwidth value="20"/>
+               <plugin_list_pixmapdirectorymargin_y value="2"/> <!-- simplelist -->
+               <plugin_list_pixmapdirectoryheight value="20"/>
+               <plugin_list_pixmapdirectorywidth value="20"/>
+               <plugin_list_pixmapplaylistmargin_y value="2"/> <!-- simplelist -->
+               <plugin_list_pixmapplaylistheight value="20"/>
+               <plugin_list_pixmapplaylistwidth value="20"/>
                <plugin_grid_margin_x value="8"/>
                <plugin_grid_margin_y value="8"/>
-               <plugin_grid_fontsize value="12"/>
-               <plugin_grid_itemheight value="155"/>
+               <plugin_grid_fontsize value="15"/>
+               <plugin_grid_itemheight value="162"/>
                <plugin_grid_itemwidth value="200"/>
                <plugin_grid_pixmapmargin_x value="3"/>
-               <plugin_grid_pixmapmargin_y value="5"/>
+               <plugin_grid_pixmapmargin_y value="3"/>
                <plugin_grid_pixmapheight value="104"/>
                <plugin_grid_pixmapwidth value="194"/>
                <plugin_grid_textmargin_x value="3"/>
-               <plugin_grid_textmargin_y value="111"/>
-               <plugin_grid_textheight value="42"/>
+               <plugin_grid_textmargin_y value="108"/>
+               <plugin_grid_textheight value="52"/>
                <plugin_grid_textwidth value="194"/>
                <plugin_grid_backgroundpicture filename="images/none.png"/>
-               <plugin_grid_selectionpicture filename="skins_720/clean_hd/images/gridselect.png"/>
+               <plugin_grid_selectionpicture filename="skins_720/clean_hd/images/gridselect.svg"/>
+               <sort_select_pixmapmargin_x value="6"/>
+               <sort_select_pixmapmargin_y value="1"/>
+               <sort_select_pixmapheight value="19"/>
+               <sort_select_pixmapwidth value="19"/>
                <!--<overridefont font="Regular" />-->
                <!--<overridefontsize value="20" />-->
                <!--<overridesizefactor value="2" />-->
index 17fe6fd..a788feb 100644 (file)
@@ -1,20 +1,20 @@
-<widget name="Metalang" position="860,440" size="160,23" backgroundColor="#20000000" transparent="1" font="mediaportal;18" halign="right"/>
-<widget name="metalang" position="1033,440" size="233,23" backgroundColor="#20000000" transparent="1" font="mediaportal;18"/>
-<widget name="Regionid" position="860,463" size="160,23" backgroundColor="#20000000" transparent="1" font="mediaportal;18" halign="right"/>
-<widget name="regionid" position="1033,463" size="233,23" backgroundColor="#20000000" transparent="1" font="mediaportal;18" noWrap="1"/>
-<widget name="Query" position="860,486" size="160,23" backgroundColor="#20000000" transparent="1" font="mediaportal;18" halign="right"/>
-<widget name="query" position="1033,486" size="233,23" backgroundColor="#20000000" transparent="1" font="mediaportal;18" noWrap="1"/>
-<widget name="Time" position="860,510" size="160,23" backgroundColor="#20000000" transparent="1" font="mediaportal;18" halign="right"/>
-<widget name="time" position="1033,510" size="233,23" backgroundColor="#20000000" transparent="1" font="mediaportal;18"/>
-<widget name="Author" position="860,533" size="160,23" backgroundColor="#20000000" transparent="1" font="mediaportal;18" halign="right"/>
-<widget name="author" position="1033,533" size="233,23" backgroundColor="#20000000" transparent="1" font="mediaportal;18"/>
-<widget name="3D" position="860,556" size="160,23" backgroundColor="#20000000" transparent="1" font="mediaportal;18" halign="right"/>
-<widget name="3d" position="1033,556" size="233,23" backgroundColor="#20000000" transparent="1" font="mediaportal;18" noWrap="1"/>
-<widget name="Duration" position="860,580" size="160,23" backgroundColor="#20000000" transparent="1" font="mediaportal;18" halign="right"/>
-<widget name="duration" position="1033,580" size="233,23" backgroundColor="#20000000" transparent="1" font="mediaportal;18"/>
-<widget name="Keywords" position="860,603" size="160,23" backgroundColor="#20000000" transparent="1" font="mediaportal;18" halign="right"/>
-<widget name="keywords" position="1033,603" size="233,23" backgroundColor="#20000000" transparent="1" font="mediaportal;18" noWrap="1"/>
-<widget name="Reserve1" position="860,626" size="160,23" backgroundColor="#20000000" transparent="1" font="mediaportal;18" halign="right"/>
-<widget name="reserve1" position="1033,626" size="233,23" backgroundColor="#20000000" transparent="1" font="mediaportal;18" noWrap="1"/>
-<widget name="Reserve2" position="860,650" size="160,23" backgroundColor="#20000000" transparent="1" font="mediaportal;18" halign="right"/>
-<widget name="reserve2" position="1033,650" size="233,23" backgroundColor="#20000000" transparent="1" font="mediaportal;18" noWrap="1"/>
\ No newline at end of file
+<widget name="Metalang" position="860,440" size="160,23" backgroundColor="#08000000" transparent="1" font="mediaportal;18" halign="right"/>
+<widget name="metalang" position="1033,440" size="233,23" backgroundColor="#08000000" transparent="1" font="mediaportal;18"/>
+<widget name="Regionid" position="860,463" size="160,23" backgroundColor="#08000000" transparent="1" font="mediaportal;18" halign="right"/>
+<widget name="regionid" position="1033,463" size="233,23" backgroundColor="#08000000" transparent="1" font="mediaportal;18" noWrap="1"/>
+<widget name="Query" position="860,486" size="160,23" backgroundColor="#08000000" transparent="1" font="mediaportal;18" halign="right"/>
+<widget name="query" position="1033,486" size="233,23" backgroundColor="#08000000" transparent="1" font="mediaportal;18" noWrap="1"/>
+<widget name="Time" position="860,510" size="160,23" backgroundColor="#08000000" transparent="1" font="mediaportal;18" halign="right"/>
+<widget name="time" position="1033,510" size="233,23" backgroundColor="#08000000" transparent="1" font="mediaportal;18"/>
+<widget name="Author" position="860,533" size="160,23" backgroundColor="#08000000" transparent="1" font="mediaportal;18" halign="right"/>
+<widget name="author" position="1033,533" size="233,23" backgroundColor="#08000000" transparent="1" font="mediaportal;18"/>
+<widget name="3D" position="860,556" size="160,23" backgroundColor="#08000000" transparent="1" font="mediaportal;18" halign="right"/>
+<widget name="3d" position="1033,556" size="233,23" backgroundColor="#08000000" transparent="1" font="mediaportal;18" noWrap="1"/>
+<widget name="Duration" position="860,580" size="160,23" backgroundColor="#08000000" transparent="1" font="mediaportal;18" halign="right"/>
+<widget name="duration" position="1033,580" size="233,23" backgroundColor="#08000000" transparent="1" font="mediaportal;18"/>
+<widget name="Keywords" position="860,603" size="160,23" backgroundColor="#08000000" transparent="1" font="mediaportal;18" halign="right"/>
+<widget name="keywords" position="1033,603" size="233,23" backgroundColor="#08000000" transparent="1" font="mediaportal;18" noWrap="1"/>
+<widget name="Reserve1" position="860,626" size="160,23" backgroundColor="#08000000" transparent="1" font="mediaportal;18" halign="right"/>
+<widget name="reserve1" position="1033,626" size="233,23" backgroundColor="#08000000" transparent="1" font="mediaportal;18" noWrap="1"/>
+<widget name="Reserve2" position="860,650" size="160,23" backgroundColor="#08000000" transparent="1" font="mediaportal;18" halign="right"/>
+<widget name="reserve2" position="1033,650" size="233,23" backgroundColor="#08000000" transparent="1" font="mediaportal;18" noWrap="1"/>
\ No newline at end of file
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/directory.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/directory.png
deleted file mode 100644 (file)
index a220b3f..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/directory.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/gridselect.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/gridselect.png
deleted file mode 100644 (file)
index ba8ae0d..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/gridselect.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/gridselect.svg b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/gridselect.svg
new file mode 100644 (file)
index 0000000..b95b74f
--- /dev/null
@@ -0,0 +1 @@
+<svg height="162" viewBox="0 0 200 162" width="200" xmlns="http://www.w3.org/2000/svg"><path d="m6.9685184-.00000076h186.0000016a7 7 45 0 1 7 6.99999996v148.0000008a7 7 135 0 1 -7 7h-186.0000016a7 7 45 0 1 -6.99999995-7v-148.0000008a7 7 135 0 1 6.99999995-6.99999996z" fill="#4d4d4d" height="162" stroke-width="1.119" width="200" x="-.031482" y="-.000001"/></svg>
\ No newline at end of file
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/line.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/line.png
deleted file mode 100644 (file)
index 524e69f..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/line.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/musiccd.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/musiccd.png
deleted file mode 100644 (file)
index ba33cdb..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/musiccd.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/musicfolder.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/musicfolder.png
deleted file mode 100644 (file)
index ace57d2..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/musicfolder.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/page.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/page.png
deleted file mode 100644 (file)
index 0e37123..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/page.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/page_select.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/page_select.png
deleted file mode 100644 (file)
index f4592d5..0000000
Binary files a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/page_select.png and /dev/null differ
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/playlist.png b/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal/skins_720/clean_hd/images/playlist.png
deleted file mode 100644 (file)
index