Skip to content

Commit

Permalink
Version ist jetzt 3.2, Bugfixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@MacDisein
MacDisein committed Oct 18, 2015
1 parent d0caf3c commit b704078
Show file tree
Hide file tree
Showing 20 changed files with 88 additions and 11 deletions.
21 changes: 12 additions & 9 deletions src/SerienRecorder.py
View file
Expand Up @@ -135,10 +135,10 @@ def SelectSkin():
writeErrorLog(" SelectSkin(): Error")
pass

elif config.plugins.serienRec.SkinType.value in ("", "Skin2", "AtileHD", "Black Box"):
elif config.plugins.serienRec.SkinType.value in ("", "Skin2", "AtileHD", "StyleFHD", "Black Box"):
skin = "%sskins/%s/SR_Skin.xml" % (serienRecMainPath, config.plugins.serienRec.SkinType.value)
skin = skin.replace("//", "/")
if config.plugins.serienRec.SkinType.value in ("Skin2", "Black Box"):
if config.plugins.serienRec.SkinType.value in ("Skin2", "StyleFHD", "Black Box"):
showAllButtons = True
if config.plugins.serienRec.SkinType.value in ("Skin2", "AtileHD", "Black Box"):
buttonText_na = ""
Expand All @@ -154,11 +154,11 @@ def ReadConfigFile():
config.plugins.serienRec.databasePath = ConfigText(default = serienRecMainPath, fixed_size=False, visible_width=80)
config.plugins.serienRec.coverPath = ConfigText(default = serienRecCoverPath, fixed_size=False, visible_width=80)

choices = [("Skinpart", _("Skinpart")), ("", _("SerienRecorder 1")), ("Skin2", _("SerienRecorder 2")), ("AtileHD", _("AtileHD")), ("Black Box", _("Black Box"))]
choices = [("Skinpart", _("Skinpart")), ("", _("SerienRecorder 1")), ("Skin2", _("SerienRecorder 2")), ("AtileHD", _("AtileHD")), ("StyleFHD", _("StyleFHD")), ("Black Box", _("Black Box"))]
try:
t = list(os.walk("%sskins" % serienRecMainPath))
for x in t[0][1]:
if x not in ("Skin2", "AtileHD", "Black Box"):
if x not in ("Skin2", "AtileHD", "StyleFHD", "Black Box"):
choices.append((x, x))
except:
writeErrorLog(" ReadConfigFile(): Error creating Skin-List")
Expand Down Expand Up @@ -282,7 +282,7 @@ def ReadConfigFile():

# interne
config.plugins.serienRec.version = NoSave(ConfigText(default="032"))
config.plugins.serienRec.showversion = NoSave(ConfigText(default="3.2-beta"))
config.plugins.serienRec.showversion = NoSave(ConfigText(default="3.2"))
config.plugins.serienRec.screenmode = ConfigInteger(0, (0,2))
config.plugins.serienRec.screenplaner = ConfigInteger(1, (1,5))
config.plugins.serienRec.recordListView = ConfigInteger(0, (0,1))
Expand Down Expand Up @@ -987,7 +987,7 @@ def getTags(serien_name):
data = cCursor.fetchone()
if data:
(tagString,) = data
if tagString is not None:
if tagString is not None and len(tagString) > 0:
tags = pickle.loads(tagString)
cCursor.close()
return tags
Expand Down Expand Up @@ -2601,6 +2601,7 @@ def startCheck(self, amanuell=False):
writeLog(_("[Serien Recorder] AutoCheck Clock-Timer gestartet."), True)
writeLog(_("[Serien Recorder] Verbleibende Zeit: %s Stunden") % TimeHelpers.td2HHMMstr(datetime.timedelta(minutes=deltatime+int(config.plugins.serienRec.maxDelayForAutocheck.value))), True)

global dbSerRec
if config.plugins.serienRec.AutoBackup.value:
BackupPath = "%s%s%s%s%s%s/" % (config.plugins.serienRec.BackupPath.value, lt.tm_year, str(lt.tm_mon).zfill(2), str(lt.tm_mday).zfill(2), str(lt.tm_hour).zfill(2), str(lt.tm_min).zfill(2))
if not os.path.exists(BackupPath):
Expand All @@ -2609,7 +2610,6 @@ def startCheck(self, amanuell=False):
except:
pass
if os.path.isdir(BackupPath):
global dbSerRec
if fileExists(serienRecDataBase):
f = dbSerRec.text_factory
dbSerRec.close()
Expand Down Expand Up @@ -5670,6 +5670,9 @@ def keyCancel(self):
self['popup_bg'].hide()
self.insertSenderMarker()
else:
#if not showMainScreen:
#self.hide()
#self.session.openWithCallback(self.readSerienMarker, ShowSplashScreen, config.plugins.serienRec.showversion.value)
if config.plugins.serienRec.refreshViews.value:
self.close(self.changesMade)
else:
Expand Down Expand Up @@ -8059,7 +8062,7 @@ def createConfigList(self):
self.list.append(getConfigListEntry(_("--------- GUI: ----------------------------------------------------------------------------------------------")))
self.list.append(getConfigListEntry(_("Skin:"), config.plugins.serienRec.SkinType))
global showAllButtons
if config.plugins.serienRec.SkinType.value not in ("", "Skin2", "AtileHD", "Black Box"):
if config.plugins.serienRec.SkinType.value not in ("", "Skin2", "AtileHD", "StyleFHD", "Black Box"):
self.list.append(getConfigListEntry(_(" werden bei diesem Skin immer ALLE Tasten angezeigt:"), config.plugins.serienRec.showAllButtons))
showAllButtons = config.plugins.serienRec.showAllButtons.value
elif config.plugins.serienRec.SkinType.value in ("", "AtileHD"):
Expand Down Expand Up @@ -12612,7 +12615,7 @@ def keyCancel(self):
singleTimer.start(10000, True)

#self.hide()
#self.showAbout()
#self.showSplashScreen()
self.close()
elif self.modus == "popup":
self['popup_list'].hide()
Expand Down
2 changes: 1 addition & 1 deletion src/SerienRecorderUpdateScreen.py
View file
Expand Up @@ -35,7 +35,7 @@ def __init__(self, session):
def checkForUpdate(self):
global UpdateAvailable
UpdateAvailable = False
conn = httplib.HTTPSConnection("api.github.com", timeout=WebTimeout, port=443)
conn = httplib.HTTPSConnection("api.github.com", timeout=10, port=443)
try:
conn.request(url="/repos/einfall/serienrecorder/tags", method="GET", headers={'User-Agent': 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US;rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)',})
data = conn.getresponse()
Expand Down
2 changes: 1 addition & 1 deletion src/skins/AtileHD/SR_Skin.xml
View file
Expand Up @@ -36,7 +36,7 @@
<widget name="config_information_text" position="920,100" size="310,320" zPosition="5" font="Regular;18" halign="left" foregroundColor="#00ffffff" backgroundColor="#20606060" transparent="0" />

<widget name="info" position="60,170" size="850,440" font="Regular;24" backgroundColor="#20606060" transparent="1" zPosition="1" />
<widget name="path" position="70,47" size="950,43" font="Regular;20" foregroundColor="#00ffffff" backgroundColor="#20606060" valign="center" halign="left" transparent="1" />
<widget name="path" position="70,110" size="950,43" font="Regular;20" foregroundColor="#00ffffff" backgroundColor="#20606060" valign="center" halign="left" transparent="1" />

<widget name="bt_ok" position="930,435" size="35,25" zPosition="1" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/serienrecorder/skins/AtileHD/images/key_ok.png" alphatest="on" />
<widget name="text_ok" position="965,435" size="260,25" zPosition="1" font="Regular;20" halign="left" foregroundColor="#00ffffff" backgroundColor="#20606060" transparent="1" />
Expand Down
74 changes: 74 additions & 0 deletions src/skins/StyleFHD/SR_Skin.xml
View file
@@ -0,0 +1,74 @@
<screen name="SerienRecorder" position="0,0" size="1980,1080" title="Serien Recorder" backgroundColor="#ffffffff">
<eLabel position="0,0" size="1830,1080" zPosition="-15" backgroundColor="#10ffffff" />
<eLabel position=" 55,100" size="1810,870" zPosition="-10" backgroundColor="#102e2e2e" />
<eLabel position="55,1025" size="290, 5" zPosition="-10" backgroundColor="#10b81c46" />
<eLabel position="350,1025" size="290, 5" zPosition="-10" backgroundColor="#10009f3c" />
<eLabel position="645,1025" size="290, 5" zPosition="-10" backgroundColor="#109ca81b" />
<eLabel position="940,1025" size="290, 5" zPosition="-10" backgroundColor="#102673ec" />
<widget name="text_red" position="70,970" size="260,50" zPosition="1" font="Regular;18" halign="left" valign="center" foregroundColor="#00666666" backgroundColor="#10ffffff" transparent="1" />
<widget name="text_green" position="365,970" size="260,50" zPosition="1" font="Regular;18" halign="left" valign="center" foregroundColor="#00666666" backgroundColor="#10ffffff" transparent="1" />
<widget name="text_yellow" position="660,970" size="260,50" zPosition="1" font="Regular;18" halign="left" valign="center" foregroundColor="#00666666" backgroundColor="#10ffffff" transparent="1" />
<widget name="text_blue" position="955,970" size="260,50" zPosition="1" font="Regular;18" halign="left" valign="center" foregroundColor="#00666666" backgroundColor="#10ffffff" transparent="1" />

<!-- Titel + Version -->
<widget name="version" position="70,50" size="870,43" font="Regular;28" foregroundColor="#00666666" backgroundColor="#10ffffff" transparent="1" />
<!-- Subtitel -->
<widget name="title" position="70,105" size="1200,35" font="Regular;21" foregroundColor="#0061b5f8" backgroundColor="#102e2e2e" transparent="1" zPosition="5" />
<!-- Serienherkunft -->
<widget name="headline" position="70,140" size="1200,35" font="Regular;21" foregroundColor="#0061b5f8" backgroundColor="#102e2e2e" valign="center" transparent="1" />

<widget name="cover" position="1300,105" size="250,250" backgroundColor="#102e2e2e" transparent="1" alphatest="blend" />
<widget name="info" position="70,145" size="1200,815" font="Regular;20" backgroundColor="#102e2e2e" transparent="1" />
<widget name="path" position="70,105" size="1200,65" font="Regular;20" foregroundColor="#0061b5f8" backgroundColor="#102e2e2e" valign="top" transparent="1" />

<!-- Serienliste -->
<widget name="config" position="70,190" size="1200,770" itemHeight="35" font="Regular;20" secondfont="Regular;19" scrollbarMode="showOnDemand" enableWrapAround="1" backgroundColor="#102e2e2e" transparent="1" />
<widget name="menu_list" position="70,190" size="1200,755" enableWrapAround="1" backgroundColor="#102e2e2e" transparent="1" />
<widget name="log" position="70,190" size="1200,755" enableWrapAround="1" backgroundColor="#102e2e2e" transparent="1" />

<!-- Anzeige-Modus -->
<widget name="popup_bg" position="70,175" size="1200,770" backgroundColor="#102e2e2e" transparent="0" zPosition="5" />
<widget name="popup_list" position="70,175" size="1200,770" itemHeight="35" backgroundColor="#102e2e2e" zPosition="10" scrollbarMode="showOnDemand" transparent="0" />

<!-- Channels -->
<widget name="Web_Channel" position="100,135" size="250,30" zPosition="10" font="Regular; 20" foregroundColor="#0061b5f8" backgroundColor="#102e2e2e" transparent="1" />
<widget name="STB_Channel" position="410,135" size="250,30" zPosition="10" font="Regular; 20" foregroundColor="#0061b5f8" backgroundColor="#102e2e2e" transparent="1" />
<widget name="alt_STB_Channel" position="720,135" size="250,30" zPosition="10" font="Regular; 20" foregroundColor="#0061b5f8" backgroundColor="#102e2e2e" transparent="1" />
<widget name="list" position="70,175" size="1200,770" itemHeight="35" backgroundColor="#102e2e2e" zPosition="5" scrollbarMode="showOnDemand" transparent="0" />
<widget name="popup_list2" position="70,175" size="1200,770" itemHeight="35" backgroundColor="#10111111" zPosition="11" scrollbarMode="showOnDemand" transparent="0" />

<!-- Config -->
<widget name="config_information" position="1300,115" size="560,250" zPosition="3" foregroundColor="#0061b5f8" backgroundColor="#ffffffff" />
<widget name="config_information_text" position="1300,115" size="560,250" zPosition="5" font="Regular;18" halign="left" foregroundColor="#0061b5f8" backgroundColor="#102e2e2e" transparent="0" />

<widget name="bt_menu" position="1300,370" size="35,35" zPosition="1" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/serienrecorder/skins/StyleFHD/images/key_menu.png" alphatest="on" />
<widget name="text_menu" position="1340,370" size="360,35" zPosition="1" font="Regular;20" halign="left" foregroundColor="#00ffffff" backgroundColor="#102e2e2e" transparent="1" />
<widget name="bt_ok" position="1300,410" size="35,35" zPosition="1" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/serienrecorder/skins/StyleFHD/images/key_ok.png" alphatest="on" />
<widget name="text_ok" position="1340,410" size="360,35" zPosition="1" font="Regular;20" halign="left" foregroundColor="#00ffffff" backgroundColor="#102e2e2e" transparent="1" />
<widget name="bt_0" position="1300,450" size="35,35" zPosition="3" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/serienrecorder/skins/StyleFHD/images/key_0.png" alphatest="on" />
<widget name="text_0" position="1340,450" size="360,35" zPosition="1" font="Regular;20" halign="left" foregroundColor="#00ffffff" backgroundColor="#102e2e2e" transparent="1" />
<widget name="bt_1" position="1300,490" size="35,35" zPosition="3" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/serienrecorder/skins/StyleFHD/images/key_1.png" alphatest="on" />
<widget name="text_1" position="1340,490" size="360,35" zPosition="1" font="Regular;20" halign="left" foregroundColor="#00ffffff" backgroundColor="#102e2e2e" transparent="1" />
<widget name="bt_2" position="1300,530" size="35,35" zPosition="3" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/serienrecorder/skins/StyleFHD/images/key_2.png" alphatest="on" />
<widget name="text_2" position="1340,530" size="360,35" zPosition="1" font="Regular;20" halign="left" foregroundColor="#00ffffff" backgroundColor="#102e2e2e" transparent="1" />
<widget name="bt_3" position="1300,570" size="35,35" zPosition="3" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/serienrecorder/skins/StyleFHD/images/key_3.png" alphatest="on" />
<widget name="text_3" position="1340,570" size="360,35" zPosition="1" font="Regular;20" halign="left" foregroundColor="#00ffffff" backgroundColor="#102e2e2e" transparent="1" />
<widget name="bt_4" position="1300,610" size="35,35" zPosition="3" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/serienrecorder/skins/StyleFHD/images/key_4.png" alphatest="on" />
<widget name="text_4" position="1340,610" size="360,35" zPosition="1" font="Regular;20" halign="left" foregroundColor="#00ffffff" backgroundColor="#102e2e2e" transparent="1" />
<widget name="bt_5" position="1300,650" size="35,35" zPosition="2" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/serienrecorder/skins/StyleFHD/images/key_5.png" alphatest="on" />
<widget name="text_5" position="1340,650" size="360,35" zPosition="1" font="Regular;20" halign="left" foregroundColor="#00ffffff" backgroundColor="#102e2e2e" transparent="1" />
<widget name="bt_6" position="1300,690" size="35,35" zPosition="2" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/serienrecorder/skins/StyleFHD/images/key_6.png" alphatest="on" />
<widget name="text_6" position="1340,690" size="360,35" zPosition="1" font="Regular;20" halign="left" foregroundColor="#00ffffff" backgroundColor="#102e2e2e" transparent="1" />
<widget name="bt_7" position="1300,730" size="35,35" zPosition="2" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/serienrecorder/skins/StyleFHD/images/key_7.png" alphatest="on" />
<widget name="text_7" position="1340,730" size="360,35" zPosition="1" font="Regular;20" halign="left" foregroundColor="#00ffffff" backgroundColor="#102e2e2e" transparent="1" />
<widget name="bt_8" position="1300,770" size="35,35" zPosition="2" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/serienrecorder/skins/StyleFHD/images/key_8.png" alphatest="on" />
<widget name="text_8" position="1340,770" size="360,35" zPosition="1" font="Regular;20" halign="left" foregroundColor="#00ffffff" backgroundColor="#102e2e2e" transparent="1" />
<widget name="bt_9" position="1300,810" size="35,35" zPosition="2" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/serienrecorder/skins/StyleFHD/images/key_9.png" alphatest="on" />
<widget name="text_9" position="1340,810" size="360,35" zPosition="1" font="Regular;20" halign="left" foregroundColor="#00ffffff" backgroundColor="#102e2e2e" transparent="1" />
<widget name="bt_text" position="1300,850" size="35,35" zPosition="1" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/serienrecorder/skins/StyleFHD/images/key_text.png" alphatest="on" />
<widget name="text_text" position="1340,850" size="360,35" zPosition="1" font="Regular;20" halign="left" foregroundColor="#00ffffff" backgroundColor="#102e2e2e" transparent="1" />
<widget name="bt_epg" position="1300,890" size="35,35" zPosition="1" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/serienrecorder/skins/StyleFHD/images/key_epg.png" alphatest="on" />
<widget name="text_epg" position="1340,890" size="360,35" zPosition="1" font="Regular;20" halign="left" foregroundColor="#00ffffff" backgroundColor="#102e2e2e" transparent="1" />
<widget name="bt_info" position="1300,930" size="35,35" zPosition="1" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/serienrecorder/skins/StyleFHD/images/key_help.png" alphatest="on" />
<widget name="text_info" position="1340,930" size="360,35" zPosition="1" font="Regular;20" halign="left" foregroundColor="#00ffffff" backgroundColor="#102e2e2e" transparent="1" />
</screen>
Binary file added src/skins/StyleFHD/images/key_0.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/skins/StyleFHD/images/key_1.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/skins/StyleFHD/images/key_2.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/skins/StyleFHD/images/key_3.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/skins/StyleFHD/images/key_4.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/skins/StyleFHD/images/key_5.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/skins/StyleFHD/images/key_6.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/skins/StyleFHD/images/key_7.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/skins/StyleFHD/images/key_8.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/skins/StyleFHD/images/key_9.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/skins/StyleFHD/images/key_epg.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/skins/StyleFHD/images/key_exit.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/skins/StyleFHD/images/key_help.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/skins/StyleFHD/images/key_menu.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/skins/StyleFHD/images/key_ok.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/skins/StyleFHD/images/key_text.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit b704078

Please sign in to comment.