diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml index 208966f..cac9156 100644 --- a/resources/language/English/strings.xml +++ b/resources/language/English/strings.xml @@ -26,6 +26,12 @@ Could not connect to search site Could not download torrent data + + + working + seeding + stopped + RPC Settings Host diff --git a/resources/lib/gui.py b/resources/lib/gui.py index a528d11..3e5cfdb 100644 --- a/resources/lib/gui.py +++ b/resources/lib/gui.py @@ -69,15 +69,16 @@ class TransmissionGUI(xbmcgui.WindowXMLDialog): self.repeater.start() def updateTorrents(self): list = self.getControl(20) + statuses = {'stopped': _(302), + 'seeding': _(301), + 'downloading': _(300)} torrents = self.transmission.info() for i, torrent in torrents.iteritems(): + status = statuses[torrent.status] statusline = "[%(status)s] %(down)s down (%(pct).2f%%), %(up)s up (Ratio: %(ratio).2f)" % \ {'down': Bytes.format(torrent.downloadedEver), 'pct': torrent.progress, \ 'up': Bytes.format(torrent.uploadedEver), 'ratio': torrent.ratio, \ 'status': torrent.status} - if torrent.status is 'downloading': - statusline += " ETA: %(eta)s" % \ - {'eta': torrent.eta} if i not in self.list: # Create a new list item l = xbmcgui.ListItem(label=torrent.name, label2=statusline) @@ -89,8 +90,9 @@ class TransmissionGUI(xbmcgui.WindowXMLDialog): self.torrents = torrents l.setLabel(torrent.name) l.setLabel2(statusline) + l.setProperty('TorrentStatus', status) l.setProperty('TorrentID', str(i)) - l.setProperty('TorrentProgress', "%.2ff" % torrent.progress) + l.setProperty('TorrentProgress', "%.2f" % torrent.progress) l.setInfo('torrent', torrent.fields) l.setInfo('video', {'episode': int(torrent.progress)}) diff --git a/resources/skins/Default/720p/script-Transmission-main.xml b/resources/skins/Default/720p/script-Transmission-main.xml index cf34ea8..6df605f 100644 --- a/resources/skins/Default/720p/script-Transmission-main.xml +++ b/resources/skins/Default/720p/script-Transmission-main.xml @@ -14,8 +14,8 @@ 980 560 transmission-main.png - WindowOpen - WindowClose + WindowOpen + WindowClose @@ -150,7 +150,7 @@ 16 exit-focus.png exit-nofocus.png - 11 + 11