diff --git a/lib/extensions/install.py b/lib/extensions/install.py index 6c179beb5..d8e91a8de 100644 --- a/lib/extensions/install.py +++ b/lib/extensions/install.py @@ -56,6 +56,13 @@ class InstallerFrame(wx.Frame): self.path_input.SetValue(dialog.GetPath()) def install_button_clicked(self, event): + if sys.platform == "win32": + # On windows, the default icon shows as a broken image. No idea + # why. Workaround: don't show an icon. + style = wx.ICON_NONE + else: + style = 0 + try: self.install_addons('palettes') self.install_addons('symbols') @@ -63,12 +70,12 @@ class InstallerFrame(wx.Frame): wx.MessageDialog(self, _('Inkscape add-on installation failed') + ': \n' + traceback.format_exc(), _('Installation Failed'), - wx.OK).ShowModal() + wx.OK | style).ShowModal() else: wx.MessageDialog(self, _('Inkscape add-on files have been installed. Please restart Inkscape to load the new add-ons.'), _('Installation Completed'), - wx.OK).ShowModal() + wx.OK | style).ShowModal() self.Destroy() diff --git a/messages.po b/messages.po index 78f0a3b2b..12eb42e0b 100644 --- a/messages.po +++ b/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2018-08-24 21:20-0400\n" +"POT-Creation-Date: 2018-08-24 21:25-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -509,25 +509,25 @@ msgstr "" msgid "Choose Inkscape directory" msgstr "" -#: lib/extensions/install.py:64 +#: lib/extensions/install.py:71 msgid "Inkscape add-on installation failed" msgstr "" -#: lib/extensions/install.py:65 +#: lib/extensions/install.py:72 msgid "Installation Failed" msgstr "" -#: lib/extensions/install.py:69 +#: lib/extensions/install.py:76 msgid "" "Inkscape add-on files have been installed. Please restart Inkscape to " "load the new add-ons." msgstr "" -#: lib/extensions/install.py:70 +#: lib/extensions/install.py:77 msgid "Installation Completed" msgstr "" -#: lib/extensions/install.py:104 +#: lib/extensions/install.py:111 msgid "Ink/Stitch Add-ons Installer" msgstr ""