1 new commit in StationPlaylist:
https://bitbucket.org/nvdaaddonteam/stationplaylist/commits/bfe6eea37c2e/
Changeset: bfe6eea37c2e
Branch: 7.x
User: josephsl
Date: 2016-03-29 18:40:48+00:00
Summary: Merge branch 'master' into 7.x
Affected #: 2 files
diff --git a/addon/appModules/splstudio/splconfui.py
b/addon/appModules/splstudio/splconfui.py
index 820edfd..4fe804f 100755
--- a/addon/appModules/splstudio/splconfui.py
+++ b/addon/appModules/splstudio/splconfui.py
@@ -763,6 +763,7 @@ class TriggersDialog(wx.Dialog):
mainSizer = wx.BoxSizer(wx.VERTICAL)
+ sizer = wx.BoxSizer(wx.VERTICAL)
# Translators: The label of a checkbox to toggle if selected
profile is an instant switch profile.
self.instantSwitchCheckbox=wx.CheckBox(self,wx.NewId(),label=_("This is an
&instant switch profile"))
self.instantSwitchCheckbox.SetValue(parent.switchProfile ==
parent.profiles.GetStringSelection().split(" <")[0])
diff --git a/addon/appModules/splstudio/splupdate.py
b/addon/appModules/splstudio/splupdate.py
index 4b18d8f..628f801 100755
--- a/addon/appModules/splstudio/splupdate.py
+++ b/addon/appModules/splstudio/splupdate.py
@@ -6,7 +6,6 @@
import urllib
import os # Essentially, update download is no different than file downloads.
-from calendar import month_abbr # Last modified date formatting.
import cPickle
import threading
import gui
@@ -65,13 +64,6 @@ def _versionFromURL(url):
name = filename.split(".nvda-addon")[0]
return name[name.find("-")+1:]
-def _lastModified(lastModified):
- # Add-ons server uses British date format (dd-mm-yyyy).
- day, month, year = lastModified.split()[1:4]
- # Adapted an entry on Stack Overflow on how to convert month names to
indecies.
- month = str({v: k for k,v in enumerate(month_abbr)}[month]).zfill(2)
- return "-".join([year, month, day])
-
# Run the progress thread from another thread because urllib.urlopen blocks
everyone.
_progressThread = None
@@ -92,17 +84,12 @@ def updateQualify(url):
# The add-on version is of the form "major.minor". The "-dev" suffix
indicates development release.
# Anything after "-dev" indicates a try or a custom build.
# LTS: Support upgrading between LTS releases.
- curVersion =SPLAddonVersion.split("-")[0]
- # Because we'll be using the same file name for snapshots...
- if "-dev" in SPLAddonVersion: curVersion+="-dev"
- size = hex(int(url.info().getheader("Content-Length")))
+ # 7.0: Just worry about version label differences (suggested by Jamie
Teh from NV Access).
+ curVersion =SPLAddonVersion
version = _versionFromURL(url.url)
# In case we are running the latest version, check the content length
(size).
if version == curVersion:
- if "-dev" not in version:
- return None
- elif ("-dev" in SPLAddonVersion and size != SPLAddonSize):
- return version
+ return None
elif version > curVersion:
return version
else:
@@ -162,7 +149,7 @@ def updateCheck(auto=False, continuous=False, lts=False):
checkMessage = _("You appear to be running a version
newer than the latest released version. Please reinstall the official version
to downgrade.")
else:
# Translators: Text shown if an add-on update is
available.
- checkMessage = _("Studio add-on {newVersion}
({modifiedDate}) is available. Would you like to update?".format(newVersion =
qualified, modifiedDate = _lastModified(url.info().getheader("Last-Modified"))))
+ checkMessage = _("Studio add-on {newVersion} is
available. Would you like to update?").format(newVersion = qualified)
updateCandidate = True
if not auto: stopUpdateProgress()
# Translators: Title of the add-on update check dialog.
Repository URL: https://bitbucket.org/nvdaaddonteam/stationplaylist/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
