commit/readFeeds: 2 new changesets

  • From: commits-noreply@xxxxxxxxxxxxx
  • To: nvda-addons-commits@xxxxxxxxxxxxx
  • Date: Tue, 06 Dec 2016 04:49:57 -0000

2 new commits in readFeeds:

https://bitbucket.org/nvdaaddonteam/readfeeds/commits/91400c8ba8d1/
Changeset:   91400c8ba8d1
Branch:      None
User:        norrumar
Date:        2016-12-06 03:52:31+00:00
Summary:     Set a default valid address to prevent key errors, suggested by 
Joseph Lee

Affected #:  1 file

diff --git a/addon/globalPlugins/readFeeds/__init__.py 
b/addon/globalPlugins/readFeeds/__init__.py
index 6057379..6fa4689 100644
--- a/addon/globalPlugins/readFeeds/__init__.py
+++ b/addon/globalPlugins/readFeeds/__init__.py
@@ -35,13 +35,14 @@ ADDON_INSTANCE = addonHandler.Addon(ADDON_DIR)
 ADDON_SUMMARY = ADDON_INSTANCE.manifest['summary']
 FEEDS_PATH = os.path.join(os.path.dirname(__file__), 
"personalFeeds").decode("mbcs")
 CONFIG_PATH = globalVars.appArgs.configPath
+DEFAULT_ADDRESS_FILE = "addressFile"
 # Translators: message presented when feeds cannot be reported.
 CAN_NOT_REPORT = _("Unable to refresh feed. Check your Internet conectivity or 
that the specified feed address is correct.")
 
 ### Configuration
 
 confspec = {
-       "addressFile": "string(default="")",
+       "addressFile": "string(default=addressFile)",
 }
 config.conf.spec["readFeeds"] = confspec
 
@@ -190,9 +191,13 @@ class FeedsDialog(wx.Dialog):
                self.stringSel = self.feedsList.StringSelection
                self.searchTextEdit.Enabled = self.sel >= 0
                self.articlesButton.Enabled = self.sel>= 0
-               self.deleteButton.Enabled = self.sel >= 0
-               self.renameButton.Enabled = self.sel >= 0
-               self.defaultButton.Enabled = (self.sel >= 0 and
+               self.deleteButton.Enabled = (self.sel >= 0 and 
+                       self.stringSel != DEFAULT_ADDRESS_FILE and 
+                       config.conf["readFeeds"]["addressFile"] != 
self.stringSel)
+               self.renameButton.Enabled = (self.sel >= 0 and
+                       self.stringSel != DEFAULT_ADDRESS_FILE and 
+                       config.conf["readFeeds"]["addressFile"] != 
self.stringSel)
+               self.defaultButton.Enabled = (self.sel >= 0 and 
                        self.stringSel != 
config.conf["readFeeds"]["addressFile"])
 
        def onArticles(self, evt):
@@ -248,8 +253,8 @@ class FeedsDialog(wx.Dialog):
                                return
                        curName = "%s.txt" % self.stringSel
                        newName = "%s.txt" % api.filterFileName(d.Value)
-                       os.rename(os.path.join(FEEDS_PATH, curName),
-                               os.path.join(FEEDS_PATH, newName))
+               os.rename(os.path.join(FEEDS_PATH, curName),
+                       os.path.join(FEEDS_PATH, newName))
                self.feedsList.SetString(self.sel, os.path.splitext(newName)[0])
 
        def onClose(self, evt):


https://bitbucket.org/nvdaaddonteam/readfeeds/commits/a959cd188ead/
Changeset:   a959cd188ead
Branch:      enhancedgui
User:        norrumar
Date:        2016-12-06 04:49:17+00:00
Summary:     Updated readme

Affected #:  1 file

diff --git a/readme.md b/readme.md
index 2c4136e..080f916 100644
--- a/readme.md
+++ b/readme.md
@@ -33,7 +33,9 @@ Opens a dialog with the following controls:
 - Set default: Sets the selected feed as the default, so that its articles can 
be accessed with NVDA's gestures.
 - Close: Closes the Feeds dialog.
 
-Note: If a feed named tempFeed is created, please rename it, as this file 
could be replaced when needed to create a feed whose name already exists.
+##### Notes #####
+- If a feed named tempFeed is created, please rename it, as this file could be 
replaced when needed to create a feed whose name already exists.
+- The feed set as the default can't be removed. The addressFile feed will be 
use as the default when the configuration is reset, so it can't be deleted.
 
 ####Copy feeds folder... ####

Repository URL: https://bitbucket.org/nvdaaddonteam/readfeeds/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.

Other related posts: