Merge pull request #85 from TWBlueQS/next-gen

Added the date indication to the new updates available dialog and updated readme
This commit is contained in:
Manuel Cortez 2016-11-09 13:18:06 -06:00 committed by GitHub
commit ca0f00e27d
5 changed files with 10 additions and 3 deletions

View File

@ -96,6 +96,10 @@ This dependency has been built using pure basic 4.61. Its source can be found at
Important! Install these 3 apps into the same folder, otherwise you won't be able to build the pa.c version. For example: D:\portableApps\NSISPortable, D:\PortableApps\PortableApps.com installer, ... Important! Install these 3 apps into the same folder, otherwise you won't be able to build the pa.c version. For example: D:\portableApps\NSISPortable, D:\PortableApps\PortableApps.com installer, ...
#### Dependencies to make the spell checker multilingual ####
In order to add the support for spell checking in more languages than english you need to add some additional dictionaries to pyenchant. These are located on the dictionaries folder under windows-dependencies. Simply copy them to the share/enchant/myspell folder located in your enchant installation or in the compiled copy of TWBlue.
### Running TW Blue from source ### Running TW Blue from source
Now that you have installed all these packages, you can run TW Blue from source using a command prompt. Navigate to the repo's src directory, and type the following command: Now that you have installed all these packages, you can run TW Blue from source using a command prompt. Navigate to the repo's src directory, and type the following command:

View File

@ -28,10 +28,11 @@ def perform_update(endpoint, current_version, app_name='', password=None, update
logger.debug("No update for this architecture") logger.debug("No update for this architecture")
return False return False
available_description = available_update.get('description', None) available_description = available_update.get('description', None)
available_date = available_update.get('date', None)
update_url = available_update ['downloads'][platform.system()+platform.architecture()[0][:2]] update_url = available_update ['downloads'][platform.system()+platform.architecture()[0][:2]]
logger.info("A new update is available. Version %s" % available_version) logger.info("A new update is available. Version %s" % available_version)
donation() donation()
if callable(update_available_callback) and not update_available_callback(version=available_version, description=available_description): #update_available_callback should return a falsy value to stop the process if callable(update_available_callback) and not update_available_callback(version=available_version, description=available_description, date=available_date): #update_available_callback should return a falsy value to stop the process
logger.info("User canceled update.") logger.info("User canceled update.")
return return
base_path = tempfile.mkdtemp() base_path = tempfile.mkdtemp()

View File

@ -5,8 +5,8 @@ import utils
progress_dialog = None progress_dialog = None
def available_update_dialog(version, description): def available_update_dialog(version, description, date):
dialog = wx.MessageDialog(None, _(u"There's a new %s version available. Would you like to download it now?\n\n %s version: %s\n\nChanges:\n%s") % (application.name, application.name, version, description), _(u"New version for %s") % application.name, style=wx.YES|wx.NO|wx.ICON_WARNING) dialog = wx.MessageDialog(None, _(u"There's a new %s version available, released on %s. Would you like to download it now?\n\n %s version: %s\n\nChanges:\n%s") % (application.name, date, application.name, version, description), _(u"New version for %s") % application.name, style=wx.YES|wx.NO|wx.ICON_WARNING)
if dialog.ShowModal() == wx.ID_YES: if dialog.ShowModal() == wx.ID_YES:
return True return True
else: else:

View File

@ -1,4 +1,5 @@
{"current_version": "10.99", {"current_version": "10.99",
"description": "Changes: Read the changelog from the help menu in the menu bar.", "description": "Changes: Read the changelog from the help menu in the menu bar.",
"date": "day_name_abr month day_numb, 2016",
"downloads": "downloads":
{"Windows32": "http://twblue.es/pubs/twblue_snapshot.zip"}} {"Windows32": "http://twblue.es/pubs/twblue_snapshot.zip"}}

View File

@ -1,5 +1,6 @@
{"current_version": "0.87", {"current_version": "0.87",
"description": "The first version for the new generation of TWBlue.", "description": "The first version for the new generation of TWBlue.",
"date": "day_name_abr month day_numb, 2016",
"downloads": "downloads":
{"Windows32": "http://twblue.es/pubs/twblue_ngen_0.80_x86.zip", {"Windows32": "http://twblue.es/pubs/twblue_ngen_0.80_x86.zip",
"Windows64": "http://twblue.es/pubs/twblue_ngen_0.80_x64.zip"}} "Windows64": "http://twblue.es/pubs/twblue_ngen_0.80_x64.zip"}}