From: Christian Weiske <cweiske@cweiske.de>
Date: Mon, 21 Nov 2011 19:12:14 +0000 (+0100)
Subject: show current page when multiple ones are defined: "2/6"
X-Git-Tag: v1.0.0~42
X-Git-Url: https://git.cweiske.de/enigma2-curlytx.git/commitdiff_plain/3ba0cac2e1c77bcef3bcf4598484f26fd6e90434

show current page when multiple ones are defined: "2/6"
---

diff --git a/ChangeLog b/ChangeLog
index dd4ea2f..d89e8f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* hide color buttons when no/only one page configured
 	* hide default page config option when no page defined
+	* show current page when multiple ones are defined: "2/6"
 
 2011-11-18  Christian Weiske  <cweiske@cweiske.de>
 
diff --git a/README.rst b/README.rst
index 8c44dc3..f01642d 100644
--- a/README.rst
+++ b/README.rst
@@ -12,7 +12,6 @@ Open issues
 ===========
 - page import via atom feed/opml
 - move mode to re-order pages
-- show current page when multiple ones are defined: "2/6"
 - configurable text size per page
 - how to show clock in lcd?
 
diff --git a/src/CurlyTx.py b/src/CurlyTx.py
index 85970ca..ae31a33 100644
--- a/src/CurlyTx.py
+++ b/src/CurlyTx.py
@@ -139,8 +139,9 @@ class CurlyTx(Screen,HelpableScreen):
             self.loadNoPage()
             return
 
+        pageCount = len(config.plugins.CurlyTx.pages)
         pageId = int(pageId)
-        if pageId > (len(config.plugins.CurlyTx.pages) - 1):
+        if pageId > (pageCount - 1):
             if len(config.plugins.CurlyTx.pages) == 0:
                 self.loadNoPage()
             else:
@@ -149,6 +150,10 @@ class CurlyTx(Screen,HelpableScreen):
 
         url   = config.plugins.CurlyTx.pages[pageId].uri.value
         title = config.plugins.CurlyTx.pages[pageId].title.value
+
+        if pageCount > 1:
+            title = "{0} [{1}/{2}]".format(title, pageId + 1, pageCount)
+
         self.currentPage = pageId
         self.currentUrl = url