From 6d7780613751d570e1d4d88609fc36d0f8ba546a Mon Sep 17 00:00:00 2001 From: JFoederer <32476108+JFoederer@users.noreply.github.com> Date: Fri, 12 Jan 2024 11:59:59 +0100 Subject: [PATCH 1/3] Keep yes/no choice symmetry in dialog text It is a bit odd to have two choices and only explain one. When there are no unsaved changes the choice is obvious and doesn't require the explainer for 'no' either. --- src/robotide/ui/mainframe.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/robotide/ui/mainframe.py b/src/robotide/ui/mainframe.py index bba68075a..ca2f67b7a 100644 --- a/src/robotide/ui/mainframe.py +++ b/src/robotide/ui/mainframe.py @@ -245,7 +245,7 @@ def _init_ui(self): self.aui_mgr.AddPane(tb3, aui.AuiPaneInfo().Name("tb3").Caption("Toolbar 3"). ToolbarPane().Top().Row(1).Position(1)) - + ##### End Test """ # self.leftpanel = wx.Panel(self, name="left_panel", size = (275, 250)) @@ -637,10 +637,10 @@ def ensure_on_screen(self): def show_confirm_reload_dlg(self, event): msg = [_('Workspace modifications detected on the file system.'), - _('Do you want to reload the workspace?'), - _('Answering will ignore the changes on disk.')] + _('Do you want to reload the workspace?')] if self.controller.is_dirty(): - msg.insert(2, _('Answering will discard unsaved changes.')) + msg += [_('Answering will discard unsaved changes.'), + _('Answering will ignore the changes on disk.')] ret = wx.MessageBox('\n'.join(msg), _('Files Changed On Disk'), style=wx.YES_NO | wx.ICON_WARNING) confirmed = ret == wx.YES From 174b72f7539113b2725363fe06c5b70e68cd765b Mon Sep 17 00:00:00 2001 From: JFoederer <32476108+JFoederer@users.noreply.github.com> Date: Fri, 12 Jan 2024 12:06:30 +0100 Subject: [PATCH 2/3] Simplify version parsing from GitHub --- src/robotide/application/updatenotifier.py | 10 ++++------ src/robotide/locale/RIDE.pot | 7 +------ src/robotide/locale/nl/LC_MESSAGES/RIDE.mo | Bin 33340 -> 33318 bytes src/robotide/locale/nl/LC_MESSAGES/RIDE.po | 8 ++------ src/robotide/locale/pt_BR/LC_MESSAGES/RIDE.mo | Bin 35765 -> 35751 bytes src/robotide/locale/pt_BR/LC_MESSAGES/RIDE.po | 8 ++------ src/robotide/locale/pt_PT/LC_MESSAGES/RIDE.mo | Bin 35649 -> 35635 bytes src/robotide/locale/pt_PT/LC_MESSAGES/RIDE.po | 8 ++------ 8 files changed, 11 insertions(+), 30 deletions(-) diff --git a/src/robotide/application/updatenotifier.py b/src/robotide/application/updatenotifier.py index eb9e5027e..f825c19f7 100644 --- a/src/robotide/application/updatenotifier.py +++ b/src/robotide/application/updatenotifier.py @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import builtins +import re import subprocess import sys # Configure wx uversion to allow running test app in __main__ @@ -98,18 +99,15 @@ def _get_response(params, method): def upgrade_from_dev_dialog(version_installed): - VERSION = None dev_version = urllib2.urlopen('https://raw.githubusercontent.com/robotframework/' 'RIDE/master/src/robotide/version.py', timeout=1).read().decode('utf-8') - master_code = compile(dev_version, 'version', 'exec') - main_dict = {'VERSION': VERSION} - exec(master_code, main_dict) # defines VERSION - if cmp_versions(version_installed, main_dict['VERSION']) == -1: + VERSION = re.findall("VERSION\s*=\s*'([\w.]*)'", dev_version)[0] + if cmp_versions(version_installed, VERSION) == -1: # Here is the Menu Help->Upgrade insertion part, try to highlight menu # wx.CANCEL_DEFAULT command = sys.executable + " -m pip install -U https://github.com/robotframework/RIDE/archive/master.zip" _add_content_to_clipboard(command) if not _askyesno(_("Upgrade?"), f"{SPC}{_('New development version is available.')}{SPC}\n{SPC}" - f"{_('You may install version ')}{main_dict['VERSION']}{_(' with:')}\n" + f"{_('You may install version %s with:') % VERSION}\n" f"{SPC}{command}{SPC}\n\n{SPC}{_('Click OK to Upgrade now!')}\n{SPC}" f"{_('After upgrade you will see another dialog informing to close this RIDE instance.')}" f"{SPC}\n", wx.GetActiveWindow(), no_default=True): diff --git a/src/robotide/locale/RIDE.pot b/src/robotide/locale/RIDE.pot index e5ecac325..9d25cb782 100644 --- a/src/robotide/locale/RIDE.pot +++ b/src/robotide/locale/RIDE.pot @@ -32,12 +32,7 @@ msgstr "" #: #: /home2/helio/github/RIDE/tools/../src/robotide/application/updatenotifier.py:112 -msgid " with:" -msgstr "" - -#: -#: /home2/helio/github/RIDE/tools/../src/robotide/application/updatenotifier.py:112 -msgid "You may install version " +msgid "You may install version %s with:" msgstr "" #: diff --git a/src/robotide/locale/nl/LC_MESSAGES/RIDE.mo b/src/robotide/locale/nl/LC_MESSAGES/RIDE.mo index 2ccb61485685caa87ba5cf22262ec3df104eb1b4..79a013757cb214c6a6cf83412c7b8bf0c777119c 100644 GIT binary patch delta 7524 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 delta 7545 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 diff --git a/src/robotide/locale/nl/LC_MESSAGES/RIDE.po b/src/robotide/locale/nl/LC_MESSAGES/RIDE.po index 71b33d291..8fd66525b 100644 --- a/src/robotide/locale/nl/LC_MESSAGES/RIDE.po +++ b/src/robotide/locale/nl/LC_MESSAGES/RIDE.po @@ -31,12 +31,8 @@ msgid "Upgrade?" msgstr "Bijwerken?" #: /home2/helio/github/RIDE/tools/../src/robotide/application/updatenotifier.py:112 -msgid " with:" -msgstr " met:" - -#: /home2/helio/github/RIDE/tools/../src/robotide/application/updatenotifier.py:112 -msgid "You may install version " -msgstr "Je kunt versie installeren " +msgid "You may install version %s with:" +msgstr "Je kunt versie %s installeren met:" #: /home2/helio/github/RIDE/tools/../src/robotide/application/updatenotifier.py:113 msgid "Click OK to Upgrade now!" diff --git a/src/robotide/locale/pt_BR/LC_MESSAGES/RIDE.mo b/src/robotide/locale/pt_BR/LC_MESSAGES/RIDE.mo index 9c4b2528fe8bcc4607ec15089663b814d23bc6a4..ae74b2f67b24d343a9fd3f2c5699e6d86d99d368 100644 GIT binary patch delta 7569 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 Sms*~tQIjWSY|C6cJ>dUJpj7$* delta 7581 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 diff --git a/src/robotide/locale/pt_BR/LC_MESSAGES/RIDE.po b/src/robotide/locale/pt_BR/LC_MESSAGES/RIDE.po index c76e0bb2f..40c1ee79d 100644 --- a/src/robotide/locale/pt_BR/LC_MESSAGES/RIDE.po +++ b/src/robotide/locale/pt_BR/LC_MESSAGES/RIDE.po @@ -31,12 +31,8 @@ msgid "Upgrade?" msgstr "Atualizar?" #: /home2/helio/github/RIDE/tools/../src/robotide/application/updatenotifier.py:112 -msgid " with:" -msgstr " com:" - -#: /home2/helio/github/RIDE/tools/../src/robotide/application/updatenotifier.py:112 -msgid "You may install version " -msgstr "Você pode instalar a versão " +msgid "You may install version %s with:" +msgstr "Você pode instalar a versão %s com:" #: /home2/helio/github/RIDE/tools/../src/robotide/application/updatenotifier.py:113 msgid "Click OK to Upgrade now!" diff --git a/src/robotide/locale/pt_PT/LC_MESSAGES/RIDE.mo b/src/robotide/locale/pt_PT/LC_MESSAGES/RIDE.mo index 5d347f5ba755ea359d68009fbb2ef7d4e93c070f..8ce92ac10d6cd8e398e4a02952233f5923bb5413 100644 GIT binary patch delta 7569 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 F{{y65NhJUP delta 7581 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 R(6%C~;Pv#1V{?Z4{2z}!PSOAX diff --git a/src/robotide/locale/pt_PT/LC_MESSAGES/RIDE.po b/src/robotide/locale/pt_PT/LC_MESSAGES/RIDE.po index 02e159001..831af427b 100644 --- a/src/robotide/locale/pt_PT/LC_MESSAGES/RIDE.po +++ b/src/robotide/locale/pt_PT/LC_MESSAGES/RIDE.po @@ -31,12 +31,8 @@ msgid "Upgrade?" msgstr "Atualizar?" #: /home2/helio/github/RIDE/tools/../src/robotide/application/updatenotifier.py:112 -msgid " with:" -msgstr " com:" - -#: /home2/helio/github/RIDE/tools/../src/robotide/application/updatenotifier.py:112 -msgid "You may install version " -msgstr "Você pode instalar a versão " +msgid "You may install version %s with:" +msgstr "Você pode instalar a versão %s com:" #: /home2/helio/github/RIDE/tools/../src/robotide/application/updatenotifier.py:113 msgid "Click OK to Upgrade now!" From c44536fc12cd89d3eca73d65b3aec78ba29ca776 Mon Sep 17 00:00:00 2001 From: JFoederer <32476108+JFoederer@users.noreply.github.com> Date: Fri, 12 Jan 2024 12:58:31 +0100 Subject: [PATCH 3/3] Prevent IndexError on corrupt input --- src/robotide/application/updatenotifier.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/robotide/application/updatenotifier.py b/src/robotide/application/updatenotifier.py index f825c19f7..a6d0dd914 100644 --- a/src/robotide/application/updatenotifier.py +++ b/src/robotide/application/updatenotifier.py @@ -101,13 +101,14 @@ def _get_response(params, method): def upgrade_from_dev_dialog(version_installed): dev_version = urllib2.urlopen('https://raw.githubusercontent.com/robotframework/' 'RIDE/master/src/robotide/version.py', timeout=1).read().decode('utf-8') - VERSION = re.findall("VERSION\s*=\s*'([\w.]*)'", dev_version)[0] - if cmp_versions(version_installed, VERSION) == -1: + matches = re.findall("VERSION\s*=\s*'([\w.]*)'", dev_version) + version_latest = matches[0] if matches else None + if cmp_versions(version_installed, version_latest) == -1: # Here is the Menu Help->Upgrade insertion part, try to highlight menu # wx.CANCEL_DEFAULT command = sys.executable + " -m pip install -U https://github.com/robotframework/RIDE/archive/master.zip" _add_content_to_clipboard(command) if not _askyesno(_("Upgrade?"), f"{SPC}{_('New development version is available.')}{SPC}\n{SPC}" - f"{_('You may install version %s with:') % VERSION}\n" + f"{_('You may install version %s with:') % version_latest}\n" f"{SPC}{command}{SPC}\n\n{SPC}{_('Click OK to Upgrade now!')}\n{SPC}" f"{_('After upgrade you will see another dialog informing to close this RIDE instance.')}" f"{SPC}\n", wx.GetActiveWindow(), no_default=True):