From 28125675aa7b8b2d5dfbd7590af9dcc198e9d232 Mon Sep 17 00:00:00 2001 From: ims Date: Tue, 8 Jan 2013 17:51:21 +0100 Subject: [PATCH] cosmetic for synaptic --- plugin/ui.py | 23 +++++++++++++++++------ setup.py | 2 +- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/plugin/ui.py b/plugin/ui.py index 8314a74..e84b4b8 100644 --- a/plugin/ui.py +++ b/plugin/ui.py @@ -359,6 +359,7 @@ def __init__(self, session): self.midx = 0 self.maxMap = 0 self.selection = 0 + self.firstSynaptic = False self.Limited = LimitedDownloader(5) # limit for parallel downloading @@ -650,8 +651,14 @@ def setIndex(self): self.idx = self.startIdx def afterCfg(self, data=True): - self.displayMeteoType() + if self.isSynaptic: + self.displaySynoptic(True) + self.displayInfo(self.idx+1,self.maxFrames,self.frame[self.idx]) + if cfg.display.value > "1": + self["slide"].show() + return + self.displayMeteoType() if self.lastdir != cfg.tmpdir.value: self.readFiles(delay=0.5) if self.filesOK: @@ -787,6 +794,7 @@ def redrawBorder(self): else: self.picload.startDecode(PPATH + BACKGROUND[len(BACKGROUND)-1]) self.merLoad.startDecode(PPATH + MER[len(TYPE)-1]) + self.firstSynaptic = False else: if TYPE[self.typ] == "csr": self.picload.startDecode(PPATH + BACKGROUND[self.typ]) @@ -847,8 +855,11 @@ def stopSlideShow(self): if self.isReading: self.isReading = False else: # if is not slideshow with STOP button: + if not self.isSynaptic: + self.firstSynaptic = True self.isSynaptic = True - self.redrawBorder() + if self.firstSynaptic: + self.redrawBorder() self.displaySynoptic() def slideShowEvent(self): @@ -892,8 +903,10 @@ def readMap(self): self.map.append(x[0][0][:-4]) self.maxMap += 1 - def displaySynoptic(self): + def displaySynoptic(self, decrease=False): if self.maxMap > 0: + if decrease: # for return from config only + self.midx -= 1 self.isSynaptic = True path = TMPDIR + SUBDIR + "/" + self.map[self.midx] + ".gif" if fileExists(path): @@ -904,7 +917,6 @@ def displaySynoptic(self): else: self.midx = 0 - def timeFormat(self, name): epochTimeUTC = mktime(strptime(name,'%Y%m%d%H%M')) if cfg.localtime.value: @@ -1556,8 +1568,7 @@ def __init__(self, session): self["key_green"] = Label(_("Save")) self["key_red"] = Label(_("Cancel")) - self["description"] = Label("") - self["statusbar"] = Label("ims (c) 2012. v1.71") + self["statusbar"] = Label("ims (c) 2012. v1.72") self["actions"] = ActionMap(["SetupActions", "ColorActions"], { "green": self.save, diff --git a/setup.py b/setup.py index 24e01c9..d0ec8ae 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ pkg = 'Extensions.MeteoViewer' setup (name = 'enigma2-plugin-extensions-meteoviewer', - version = '1.71', + version = '1.72', description = 'meteo pictures viewer', packages = [pkg], package_dir = {pkg: 'plugin'},