From b09b6bd36220ef66f28308f36a129844560d35c4 Mon Sep 17 00:00:00 2001 From: nickthetait Date: Mon, 10 Aug 2015 15:23:48 -0600 Subject: [PATCH] Partial implementation of release notes --- Cura/gui/app.py | 2 +- Cura/gui/newVersionDialog.py | 57 +++--------------------------------- 2 files changed, 5 insertions(+), 54 deletions(-) diff --git a/Cura/gui/app.py b/Cura/gui/app.py index dc051bf6..91bea92d 100644 --- a/Cura/gui/app.py +++ b/Cura/gui/app.py @@ -155,7 +155,7 @@ class CuraApp(wx.App): if profile.getPreference('last_run_version') != version.getVersion(False): profile.putPreference('last_run_version', version.getVersion(False)) profile.performVersionUpgrade() - #newVersionDialog.newVersionDialog().Show() + newVersionDialog.newVersionDialog().Show() # Must happen before the main window is created, in case there are changes # that would affect it (such as machine name changes) diff --git a/Cura/gui/newVersionDialog.py b/Cura/gui/newVersionDialog.py index a75b539b..cc628e8a 100644 --- a/Cura/gui/newVersionDialog.py +++ b/Cura/gui/newVersionDialog.py @@ -1,11 +1,11 @@ __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import wx -from Cura.gui import firmwareInstall from Cura.util import version -from Cura.util import profile class newVersionDialog(wx.Dialog): + url = "code.alephobjects.com/w/cura/release-notes/" + def __init__(self): super(newVersionDialog, self).__init__(None, title="Welcome to the new version!") @@ -25,51 +25,8 @@ class newVersionDialog(wx.Dialog): s.Add(wx.StaticText(p, -1, 'Welcome to the new version of Cura.')) s.Add(wx.StaticText(p, -1, '(This dialog is only shown once)')) s.Add(wx.StaticLine(p), flag=wx.EXPAND|wx.TOP|wx.BOTTOM, border=10) - s.Add(wx.StaticText(p, -1, 'New in this version:')) - s.Add(wx.StaticText(p, -1, '* Fixed saving to SD card on MacOS and linux')) - s.Add(wx.StaticText(p, -1, '* Fixed Cura not starting up for some Windows users')) - s.Add(wx.StaticText(p, -1, '* Fixed UM2 problem where material was not retracted at the end of the print')) - s.Add(wx.StaticText(p, -1, '* Fixed UM2 problem where material was not pushed forward after changing material during a pause')) - s.Add(wx.StaticText(p, -1, 'New in 15.01:')) - s.Add(wx.StaticText(p, -1, '* Improved handling of large 3D models')) - s.Add(wx.StaticText(p, -1, '* Added top/bottom speed setting')) - s.Add(wx.StaticText(p, -1, '* Improved quickprint profiles (thanks to Paul Candler)')) - s.Add(wx.StaticText(p, -1, '* Added single layer view (thanks to pmsimard)')) - s.Add(wx.StaticText(p, -1, '* Added option to replicate local folder structure to SD card (thanks to pmsimard')) - s.Add(wx.StaticText(p, -1, '* Added UM2go support')) - s.Add(wx.StaticText(p, -1, '* Added UM2extended support')) - s.Add(wx.StaticText(p, -1, '* Improved UM2 platform rendering, to show where the actual bed clips are located')) - s.Add(wx.StaticText(p, -1, '* Fixed problems with PauseAtHeight plugin (thanks to pmsimard)')) - s.Add(wx.StaticText(p, -1, '* Finally fixed the filament and print time tags in the gcode')) - s.Add(wx.StaticText(p, -1, '* Fixed plugins with UltiGCode')) - s.Add(wx.StaticText(p, -1, '* New TweakAtZ 4.0 from Dim3nsioneer')) - s.Add(wx.StaticText(p, -1, '* Improved support for Mach3 and LinuxCNC based printers')) - s.Add(wx.StaticText(p, -1, '* Added flow in cubic mm on each of the speed settings tooltips')) - - self.hasUltimaker = None - self.hasUltimaker2 = None - for n in xrange(0, profile.getMachineCount()): - if profile.getMachineSetting('machine_type', n) == 'ultimaker': - self.hasUltimaker = n - if profile.getMachineSetting('machine_type', n) == 'ultimaker2': - self.hasUltimaker2 = n - if self.hasUltimaker is not None and False: - s.Add(wx.StaticLine(p), flag=wx.EXPAND|wx.TOP|wx.BOTTOM, border=10) - s.Add(wx.StaticText(p, -1, 'New firmware for your Ultimaker Original:')) - s.Add(wx.StaticText(p, -1, '* .')) - button = wx.Button(p, -1, 'Install now') - self.Bind(wx.EVT_BUTTON, self.OnUltimakerFirmware, button) - s.Add(button, flag=wx.TOP, border=5) - if self.hasUltimaker2 is not None: - s.Add(wx.StaticLine(p), flag=wx.EXPAND|wx.TOP|wx.BOTTOM, border=10) - s.Add(wx.StaticText(p, -1, 'New firmware for your Ultimaker2:')) - s.Add(wx.StaticText(p, -1, '* Added option to change filament when pausing during a print.')) - s.Add(wx.StaticText(p, -1, '* Prevent temperature display jitter (thanks to TinkerGnome)')) - s.Add(wx.StaticText(p, -1, '* Fixed problems with filenames containing an umlaut.')) - s.Add(wx.StaticText(p, -1, '* Improved pause handling (thanks to ThinkerGnome)')) - button = wx.Button(p, -1, 'Install now') - self.Bind(wx.EVT_BUTTON, self.OnUltimaker2Firmware, button) - s.Add(button, flag=wx.TOP, border=5) + s.Add(wx.StaticText(p, -1, 'Take a look at what is new and fixed here:')) + s.Add(wx.HyperlinkCtrl(p, -1, newVersionDialog.url)) s.Add(wx.StaticLine(p), flag=wx.EXPAND|wx.TOP|wx.BOTTOM, border=10) button = wx.Button(p, -1, 'Ok') @@ -79,12 +36,6 @@ class newVersionDialog(wx.Dialog): self.Fit() self.Centre() - def OnUltimakerFirmware(self, e): - firmwareInstall.InstallFirmware(machineIndex=self.hasUltimaker) - - def OnUltimaker2Firmware(self, e): - firmwareInstall.InstallFirmware(machineIndex=self.hasUltimaker2) - def OnOk(self, e): self.Close() -- 2.30.2