From b7040780503d55ccd2e8e51596855a746253b0cf Mon Sep 17 00:00:00 2001 From: MacDisein Date: Sun, 18 Oct 2015 19:38:30 +0200 Subject: [PATCH] Version ist jetzt 3.2, Bugfixes --- src/SerienRecorder.py | 21 ++++--- src/SerienRecorderUpdateScreen.py | 2 +- src/skins/AtileHD/SR_Skin.xml | 2 +- src/skins/StyleFHD/SR_Skin.xml | 74 +++++++++++++++++++++++++ src/skins/StyleFHD/images/key_0.png | Bin 0 -> 260 bytes src/skins/StyleFHD/images/key_1.png | Bin 0 -> 148 bytes src/skins/StyleFHD/images/key_2.png | Bin 0 -> 263 bytes src/skins/StyleFHD/images/key_3.png | Bin 0 -> 265 bytes src/skins/StyleFHD/images/key_4.png | Bin 0 -> 232 bytes src/skins/StyleFHD/images/key_5.png | Bin 0 -> 238 bytes src/skins/StyleFHD/images/key_6.png | Bin 0 -> 275 bytes src/skins/StyleFHD/images/key_7.png | Bin 0 -> 255 bytes src/skins/StyleFHD/images/key_8.png | Bin 0 -> 285 bytes src/skins/StyleFHD/images/key_9.png | Bin 0 -> 268 bytes src/skins/StyleFHD/images/key_epg.png | Bin 0 -> 285 bytes src/skins/StyleFHD/images/key_exit.png | Bin 0 -> 277 bytes src/skins/StyleFHD/images/key_help.png | Bin 0 -> 229 bytes src/skins/StyleFHD/images/key_menu.png | Bin 0 -> 269 bytes src/skins/StyleFHD/images/key_ok.png | Bin 0 -> 294 bytes src/skins/StyleFHD/images/key_text.png | Bin 0 -> 450 bytes 20 files changed, 88 insertions(+), 11 deletions(-) create mode 100644 src/skins/StyleFHD/SR_Skin.xml create mode 100644 src/skins/StyleFHD/images/key_0.png create mode 100644 src/skins/StyleFHD/images/key_1.png create mode 100644 src/skins/StyleFHD/images/key_2.png create mode 100644 src/skins/StyleFHD/images/key_3.png create mode 100644 src/skins/StyleFHD/images/key_4.png create mode 100644 src/skins/StyleFHD/images/key_5.png create mode 100644 src/skins/StyleFHD/images/key_6.png create mode 100644 src/skins/StyleFHD/images/key_7.png create mode 100644 src/skins/StyleFHD/images/key_8.png create mode 100644 src/skins/StyleFHD/images/key_9.png create mode 100644 src/skins/StyleFHD/images/key_epg.png create mode 100644 src/skins/StyleFHD/images/key_exit.png create mode 100644 src/skins/StyleFHD/images/key_help.png create mode 100644 src/skins/StyleFHD/images/key_menu.png create mode 100644 src/skins/StyleFHD/images/key_ok.png create mode 100644 src/skins/StyleFHD/images/key_text.png diff --git a/src/SerienRecorder.py b/src/SerienRecorder.py index 4160f63..a6b0539 100644 --- a/src/SerienRecorder.py +++ b/src/SerienRecorder.py @@ -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 = "" @@ -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") @@ -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)) @@ -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 @@ -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): @@ -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() @@ -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: @@ -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"): @@ -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() diff --git a/src/SerienRecorderUpdateScreen.py b/src/SerienRecorderUpdateScreen.py index b30f62e..b6cdd04 100644 --- a/src/SerienRecorderUpdateScreen.py +++ b/src/SerienRecorderUpdateScreen.py @@ -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() diff --git a/src/skins/AtileHD/SR_Skin.xml b/src/skins/AtileHD/SR_Skin.xml index 96d8287..c005f08 100644 --- a/src/skins/AtileHD/SR_Skin.xml +++ b/src/skins/AtileHD/SR_Skin.xml @@ -36,7 +36,7 @@ - + diff --git a/src/skins/StyleFHD/SR_Skin.xml b/src/skins/StyleFHD/SR_Skin.xml new file mode 100644 index 0000000..8fa1155 --- /dev/null +++ b/src/skins/StyleFHD/SR_Skin.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/skins/StyleFHD/images/key_0.png b/src/skins/StyleFHD/images/key_0.png new file mode 100644 index 0000000000000000000000000000000000000000..d145e1307aba82f63d32167812d782bca052a4c1 GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XbOU@sTn`;OR905z<>fVP+O#ug&V+@9ty#0CySw}P_3H~4 zE=)*BXl!iE&dz@H=#hhigT3?>Q=rCNPZ!6Kid%0kZ4_!y;9yH|G1yvn|9|1-tc(c~ zyI&_wcxvr3VV3ZhW=Rc(R(1!8jk6S-vh0nd8;lPHs!1g@-nqmgvSgx}!}ABL&N@`^ zF4=rC%j~6H@I#(e_Z4p~pLmr?=iDYK_4K>*|9;!ez|4@~Wa{TO?^XlQVg^rFKbLh* G2~7ZG9c9=6 literal 0 HcmV?d00001 diff --git a/src/skins/StyleFHD/images/key_1.png b/src/skins/StyleFHD/images/key_1.png new file mode 100644 index 0000000000000000000000000000000000000000..f868c9657b9a3aa604047c48f5a4bc24aade1151 GIT binary patch literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XcmjMvTpvApbp87E?(S{}2ZxPcuP_0{}1C8#k- sxQQl&9yoEpWK}}Q!2OV literal 0 HcmV?d00001 diff --git a/src/skins/StyleFHD/images/key_2.png b/src/skins/StyleFHD/images/key_2.png new file mode 100644 index 0000000000000000000000000000000000000000..a40c9c949aba4dc725de3cf184672f6c112b9bc0 GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X3<7*YT+7PJy1Toxv$Lm7o95-^b>_^O>({S`g@vtIv*ysD zLye7%+qP|6xNu=YLc*g*j~pBvw1r}{fO>O1T^vIyZoRp*ldnNR!1bb|gW2AH|L=Dl zJEY3fI`^Y!@LZk=?K*Q$@XvElO1Q1CS$(IN!Qz#Vw>{=j$+>LwYPyWV9_F3pE=sE$ z62cny>s2sxmrJeim)Npt&hZtwVqLeM9TCi&;>uq0cNrNovRf*x2L*TGc)EiJz#V)boXdWVBlns;+t{Q zsEO;-hrEkE2WAAVTfi8~xX1hY;(u5Eyy05<>U3ApydT~7{|O~9+{?6l&YQksF3@TQ MPgg&ebxsLQ090LW1ONa4 literal 0 HcmV?d00001 diff --git a/src/skins/StyleFHD/images/key_4.png b/src/skins/StyleFHD/images/key_4.png new file mode 100644 index 0000000000000000000000000000000000000000..31f1b2daeaa027da03917eb7aac92b1ca0b51479 GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xv;urWT(4ih-re1O=+L3EvNA6(uWj45g@uJJT)6PenKO-z zjoI1RYu2oJ^yra;gTvv1xC=mCA)YRdAr-gYTrw1DP~dU7DBv(9=UsiQ=7P(gZ(7`JqJ@hDT^Hk4l2rsv<3uR>}g~vWivW==zzrrYv!)dDi%q`8Ic>Fh&`B` cU(ap8z`|hkr1x4!HPCzpPgg&ebxsLQ011Uxz5oCK literal 0 HcmV?d00001 diff --git a/src/skins/StyleFHD/images/key_5.png b/src/skins/StyleFHD/images/key_5.png new file mode 100644 index 0000000000000000000000000000000000000000..9e81ffb9205cb44c31f3c3c707a622b193e56b25 GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xv;urWT+7PJu3x`?=FFKxhYoppc{MgRhJ}T7cXv;lHf`a; zg$W4>+1c5T9zAk!a7cKvBMqo4%G1R$q~cc6162kIH_-&Gga?ewX`t`E1vNLDSba!`e+qP}t!i8R5 zUel&c%g)YjY;1h==#hhigWtm1!$6HSo-U3d6}R3@isWlh;BoQ3dGX`F<6B$g9lF>r zsIg3{^l5KhH+_+O1anRX_k`A)jEj_W7`AQLa#}$C7srm9^=xNE3fLq%;@C0|bcQ+i z)yX!fIR3e?g54`vMJtnUpPytw_JfS*qm5saKe<-5RbAd{^E!W`i~i5%`~Soe81}w5 VE!ypS*%9at22WQ%mvv4FO#mW9ZUO)R literal 0 HcmV?d00001 diff --git a/src/skins/StyleFHD/images/key_7.png b/src/skins/StyleFHD/images/key_7.png new file mode 100644 index 0000000000000000000000000000000000000000..b9edde83fe4c3cbaf0e78349576d9ff3db35d557 GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X3<7*YT+f_2Gi}({S$cXzK@vnC-S!OP3*(4j+NVPR!u zWeXQB%+AhkY;4@NZQG+qj~pBv=9h?e0`;bPx;TbZ+sb>4HW8$9n|>E}qWmQ_`1+ zUuf_;Xz0?l!2OoS2g4u++e?0qp+8^UjA!CuSmJAy{lelwH_$=`Pgg&ebxsLQ05Zy9 AG5`Po literal 0 HcmV?d00001 diff --git a/src/skins/StyleFHD/images/key_8.png b/src/skins/StyleFHD/images/key_8.png new file mode 100644 index 0000000000000000000000000000000000000000..03b78b3f83d931d4d1634b7e7e8cd3c99a20b6cf GIT binary patch literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X3<7*YT+7PJwr$(y<>ht#`t|Pa?rGDe9XfO^%b!v$?g#xo1Uj&2lAXpY~@J%{1(QqG$)9S$#J61?R& zmU1cv&Au0_b7k2*GsTjV+A5wNECDZWn4W7aSf0b*d$PqxeM?K!3Cj;M*9zA-6;G(k g`~6_MJ*xzRx2vV$%KVwUK<6-cy85}Sb4q9e04Y~*eEgnPbQgQ3eBu}9R1s;~eY76-O*RPv6M}%E| zLGj`juXGgNs(xbTclgxcFVpd&lc%6TPWu6e!iQ&^ED=8M0-mw0os!A#ogKZPK})Cg z-NJVc8q3o+ot)aA`SF?->k};rhL^XOI9wAv{Kd5WcQt3H{NHcw49pDr&rBb_`{z6t P=l}*!S3j3^P6HQvYffjL8f&Qld@j~g9}AF?@ke>Xj5!K~WJ@alP($<5$RiRZpCtT$X> zmANDA!B}!^ssUf9FJr_W@nR;OXk;vd$@?2>_k?b?pEE literal 0 HcmV?d00001 diff --git a/src/skins/StyleFHD/images/key_exit.png b/src/skins/StyleFHD/images/key_exit.png new file mode 100644 index 0000000000000000000000000000000000000000..c487b3a54ddb5733da8442e78c37d85e01d4e346 GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X3<7*YT)n)!y1TpAtXY$gkT7l9wCmTemz9-m+qP}t!i9$p z9SREzJ9FktV`F1>cJ`x3j~pBv)G{<=fqJVwT^vIyZoQf0$=6`O;ri0%<@0~rMK4Uf zxXWylkjuXt|6ikZ7S^K73Gkmewt+d7{iS3rN(ZpIP^+t_vTGxzeW6sl+XC;wG&1E&Fl Y(NXjGvIy-6pfeaeUHx3vIVCg!0NEmHz5oCK literal 0 HcmV?d00001 diff --git a/src/skins/StyleFHD/images/key_help.png b/src/skins/StyleFHD/images/key_help.png new file mode 100644 index 0000000000000000000000000000000000000000..6289f51e1c81f17d62da4bd24b2aec92aa5d1b1a GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XR04cLT)Vrw!@|POoH?^?+qUfN>}k`cd3kwVzka>3v2o$T zg^wORa&U0ieoN>kP<^~C3Zx7&`x-qr0T{f&T`;R!I#2}Es Y@Z3;yquB=W9-tKrp00i_>zopr09F-I*#H0l literal 0 HcmV?d00001 diff --git a/src/skins/StyleFHD/images/key_menu.png b/src/skins/StyleFHD/images/key_menu.png new file mode 100644 index 0000000000000000000000000000000000000000..09288e0dd9b40b73fcdb02c816ec9dc886afe09a GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XbOU@sTo*1}*x1;(ZQHi)?(XdD>}k`cUB7-kEG%rznl*N=Qg}^ytx}@^oxBPZLPcgx% zyHf4vS!tp_lpH)vqqej_A}U{r!e)J zp?k>!^XLQfY^)VNl{I{mJmE3Ze(^W$4#7Y=+L2Q)24-mg?V{-B_t%QS+l0Gv2o$T zh1uEJWo2d8uU~)k=+T)oXB-?Hnv$+=0P5}Wba4!+xb^1JX}%T(9@Yz=1m@1X_vwGV z^|lOCwH4gcHyJSczsP02+U=@eArZhLaH}tJKWAb=088%8nT;(w?oNpRE(T9mKbLh*2~7aQGk1sp literal 0 HcmV?d00001 diff --git a/src/skins/StyleFHD/images/key_text.png b/src/skins/StyleFHD/images/key_text.png new file mode 100644 index 0000000000000000000000000000000000000000..ae55ffdaffd0cb5565cd343b997f810751e61e7f GIT binary patch literal 450 zcmV;z0X_bSP)71ML|J9Q&Ur|t*xV@qhMfQ!otG0 zx3`>}oQ#Z&PEJmBb#!*8l(j07*qoM6N<$g1^VciU0rr literal 0 HcmV?d00001