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

diff --git a/ChangeLog b/ChangeLog
index dd4ea2fc96b9c4c398e0eaae12cfe18d42959fba..d89e8f7132ea84ac3a0090865250acafb5d1cfab 100644 (file)
--- 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
 
        * 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>
 
 
 2011-11-18  Christian Weiske  <cweiske@cweiske.de>
 

diff --git a/README.rst b/README.rst
index 8c44dc3007308fc7a11ad095f876898b80707c17..f01642da072f75d8e734c1bb76ddf4f78f7affa9 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -12,7 +12,6 @@ Open issues
 ===========
 - page import via atom feed/opml
 - move mode to re-order pages
 ===========
 - 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?
 
 - configurable text size per page
 - how to show clock in lcd?
 

diff --git a/src/CurlyTx.py b/src/CurlyTx.py
index 85970ca1846d8051f14b5dbdcbb7a282987fd3f4..ae31a335ff7b4e48b5c2e2f1c462c4e570f4945d 100644 (file)
--- a/src/CurlyTx.py
+++ b/src/CurlyTx.py
@@ -139,8 +139,9 @@ class CurlyTx(Screen,HelpableScreen):
             self.loadNoPage()
             return
 
             self.loadNoPage()
             return
 

+        pageCount = len(config.plugins.CurlyTx.pages)

         pageId = int(pageId)
         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:
             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
 
         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
 
         self.currentPage = pageId
         self.currentUrl = url