diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f4cbdd02..647e80f8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: GIT_SUBMODULE_STRATEGY: recursive PYTHON: "C:\\python310\\python.exe" - PYTHON37: "C:\\python37\\python.exe" + PYTHON37: "C:\\python37\\python.exe" # for Windows 7 support. NSIS: "C:\\program files (x86)\\nsis\\makensis.exe" stages: @@ -44,7 +44,45 @@ twblue32: # Move the generated script nsis file to artifacts, so we won't need python when generating the installer. - move scripts/twblue.nsi artifacts/twblue.nsi only: - - schedules + - tags + artifacts: + paths: + - artifacts + expire_in: 1 day + +twblue64: + tags: + - shared-windows + - windows + - windows-1809 + before_script: + - Set-Variable -Name "time" -Value (date -Format "%H:%m") + - echo ${time} + - echo "started by ${GITLAB_USER_NAME}" + - choco install python --version 3.10.8 -y + - '&$env:PYTHON -V' + - '&$env:PYTHON -m pip install --upgrade pip' + - '&$env:PYTHON -m pip install --upgrade -r requirements.txt' + stage: build + interruptible: true + script: + # Create html documentation firstly. + - cd doc + - '&$env:PYTHON documentation_importer.py' + - cd ..\src + - '&$env:PYTHON ..\doc\generator.py' + - '&$env:PYTHON write_version_data.py' + - New-Item "appkeys.py" -ItemType File -Value "twitter_api_key='$TWITTER_API_KEY'`ntwitter_api_secret='$TWITTER_API_SECRET'" + - '&$env:PYTHON setup.py build' + - cd .. + - mkdir artifacts + - cd scripts + - '&$env:PYTHON make_archive.py' + - cd .. + - mv src/dist artifacts/TWBlue64 + - move src/twblue.zip artifacts/twblue_x64.zip + only: + - tags artifacts: paths: - artifacts @@ -88,44 +126,6 @@ twblueWin7: - artifacts expire_in: 1 day -twblue64: - tags: - - shared-windows - - windows - - windows-1809 - before_script: - - Set-Variable -Name "time" -Value (date -Format "%H:%m") - - echo ${time} - - echo "started by ${GITLAB_USER_NAME}" - - choco install python --version 3.10.8 -y - - '&$env:PYTHON -V' - - '&$env:PYTHON -m pip install --upgrade pip' - - '&$env:PYTHON -m pip install --upgrade -r requirements.txt' - stage: build - interruptible: true - script: - # Create html documentation firstly. - - cd doc - - '&$env:PYTHON documentation_importer.py' - - cd ..\src - - '&$env:PYTHON ..\doc\generator.py' - - '&$env:PYTHON write_version_data.py' - - New-Item "appkeys.py" -ItemType File -Value "twitter_api_key='$TWITTER_API_KEY'`ntwitter_api_secret='$TWITTER_API_SECRET'" - - '&$env:PYTHON setup.py build' - - cd .. - - mkdir artifacts - - cd scripts - - '&$env:PYTHON make_archive.py' - - cd .. - - mv src/dist artifacts/TWBlue64 - - move src/twblue.zip artifacts/twblue_x64.zip - only: - - schedules - artifacts: - paths: - - artifacts - expire_in: 1 day - generate_versions: stage: make_installer tags: @@ -145,7 +145,7 @@ generate_versions: - '&$env:NSIS installer.nsi' - move twblue_setup.exe ../artifacts only: - - schedules + - tags artifacts: paths: - artifacts @@ -162,4 +162,4 @@ upload: - python ../scripts/upload.py only: - tags -# - schedules \ No newline at end of file + - schedules \ No newline at end of file diff --git a/doc/changelog.md b/doc/changelog.md index b0d5c55a..b6209b09 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -2,11 +2,17 @@ TWBlue Changelog ## changes in this version +* per popular request, We will generate a 32-bit portable version of TWBlue available for Windows 7 operating systems. This version will not be supported in our automatic updater, so in case using such version, you would need to download it manually every time there is a new update. TWBlue will continue to be available for Windows 7 as long as it is possible to build it using Python 3.7. +* Fixed a couple of bugs that were making TWBlue unable to be opened in some computers. * Twitter: * Fixed a bug that was making sent direct messages to be placed in received direct messages buffer. * When quoting a tweet, you can use all 280 characters to send your quoted tweet, as opposed to the 256 characters TWBlue allowed before. + * Fixed a bug that was making TWBlue unable to reply to direct messages by using the "reply" keystroke. * Mastodon: * Added account settings dialog. + * Added template editing functionality for mastodon accounts. + * When a post is edited, TWBlue will update the post object in the buffer to reflect the latest edit. + * Fixed a small issue that was preventing TWBlue to display some posts in their corresponding dialog. ## Changes in version 2022.12.6 diff --git a/src/update/wxUpdater.py b/src/update/wxUpdater.py index 6ba6fd2a..11cf090e 100644 --- a/src/update/wxUpdater.py +++ b/src/update/wxUpdater.py @@ -1,23 +1,24 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import -from __future__ import division -from __future__ import unicode_literals -from builtins import str -from past.utils import old_div import wx +import sys import application from . import utils progress_dialog = None def available_update_dialog(version, description, date): - 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 "3.7" not in sys.version: # Modern operating systems + update_msg = _("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) + styles = wx.YES|wx.NO|wx.ICON_WARNING + else: + update_msg = _("There's a new %s version available, released on %s. Updates are not automatic in Windows 7, so you would need to visit TWBlue's download website to get the latest version.\n\n %s version: %s\n\nChanges:\n%s") % (application.name, date, application.name, version, description) + styles = wx.OK|wx.ICON_WARNING + dialog = wx.MessageDialog(None, update_msg, _("New version for %s") % application.name, style=styles) if dialog.ShowModal() == wx.ID_YES: return True else: return False - def create_progress_dialog(): return wx.ProgressDialog(_(u"Download in Progress"), _(u"Downloading the new version..."), parent=None, maximum=100)