diff --git a/gui/updateDialog.py b/gui/updateDialog.py index 795bec739..ec389186b 100644 --- a/gui/updateDialog.py +++ b/gui/updateDialog.py @@ -21,60 +21,61 @@ import wx import bitmapLoader import config import service +import dateutil.parser class UpdateDialog(wx.Dialog): def __init__(self, parent, release): wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = "Pyfa Update", pos = wx.DefaultPosition, size = wx.Size( 400,300 ), style = wx.DEFAULT_DIALOG_STYLE ) - + self.UpdateSettings = service.settings.UpdateSettings.getInstance() self.releaseInfo = release self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize ) - + mainSizer = wx.BoxSizer( wx.VERTICAL ) - + headSizer = wx.BoxSizer( wx.HORIZONTAL ) - + self.headingText = wx.StaticText( self, wx.ID_ANY, "Pyfa Update Available!", wx.DefaultPosition, wx.DefaultSize, wx.ALIGN_CENTRE ) self.headingText.Wrap( -1 ) self.headingText.SetFont( wx.Font( 14, 74, 90, 92, False) ) - + headSizer.Add( self.headingText, 1, wx.ALL, 5 ) mainSizer.Add( headSizer, 0, wx.EXPAND, 5 ) - + mainSizer.Add( wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ), 0, wx.EXPAND |wx.ALL, 5 ) - + versionSizer = wx.BoxSizer( wx.HORIZONTAL ) if(self.releaseInfo['prerelease']): self.releaseText = wx.StaticText( self, wx.ID_ANY, "Pre-release", wx.DefaultPosition, wx.DefaultSize, wx.ALIGN_RIGHT ) self.releaseText.SetFont( wx.Font( 12, 74, 90, 92, False) ) self.releaseText.SetForegroundColour( wx.Colour( 230, 0, 0 ) ) - else: + else: self.releaseText = wx.StaticText( self, wx.ID_ANY, "Stable", wx.DefaultPosition, wx.DefaultSize, wx.ALIGN_RIGHT ) self.releaseText.SetFont( wx.Font( 12, 74, 90, 90, False) ) self.releaseText.Wrap( -1 ) versionSizer.Add( self.releaseText, 1, wx.ALL, 5 ) - + self.versionText = wx.StaticText( self, wx.ID_ANY, self.releaseInfo['tag_name'], wx.DefaultPosition, wx.DefaultSize, wx.ALIGN_LEFT ) self.versionText.Wrap( -1 ) self.versionText.SetFont( wx.Font( 12, 74, 90, 90, False) ) - + versionSizer.Add( self.versionText, 1, wx.ALL, 5 ) versionSizer.AddSpacer( ( 15, 5), 0, wx.EXPAND, 5 ) - + mainSizer.Add( versionSizer, 0, wx.EXPAND, 5 ) mainSizer.AddSpacer( ( 0, 5), 0, wx.EXPAND, 5 ) + releaseDate = dateutil.parser.parse(self.releaseInfo['created_at']) notesSizer = wx.BoxSizer( wx.HORIZONTAL ) - - self.notesTextCtrl = wx.TextCtrl( self, wx.ID_ANY, self.releaseInfo['body'], wx.DefaultPosition, wx.DefaultSize, wx.TE_AUTO_URL|wx.TE_MULTILINE|wx.TE_READONLY|wx.DOUBLE_BORDER|wx.TRANSPARENT_WINDOW ) + self.notesTextCtrl = wx.TextCtrl( self, wx.ID_ANY, str(releaseDate.date())+":\n\n"+self.releaseInfo['body'], wx.DefaultPosition, wx.DefaultSize, wx.TE_AUTO_URL|wx.TE_MULTILINE|wx.TE_READONLY|wx.DOUBLE_BORDER|wx.TRANSPARENT_WINDOW ) notesSizer.Add( self.notesTextCtrl, 1, wx.EXPAND|wx.LEFT|wx.RIGHT, 5 ) mainSizer.Add( notesSizer, 1, wx.EXPAND, 5 ) - + self.supressCheckbox = wx.CheckBox( self, wx.ID_ANY, "Don't remind me again for this release", wx.DefaultPosition, wx.DefaultSize, 0 ) self.supressCheckbox.Bind(wx.EVT_CHECKBOX, self.SuppressChange) @@ -97,23 +98,23 @@ class UpdateDialog(wx.Dialog): self.SetSizer( mainSizer ) self.Layout() - # Handle use-case of suppressing a release, then a new version becoming available. - # If that new version is not suppressed, the old version will remain in the preferences and - # may cause confusion. If this dialog box is popping up for any reason, that mean we can + # Handle use-case of suppressing a release, then a new version becoming available. + # If that new version is not suppressed, the old version will remain in the preferences and + # may cause confusion. If this dialog box is popping up for any reason, that mean we can # safely reset this setting self.UpdateSettings.set('version', None) - + self.Centre( wx.BOTH ) def OnClose(self, e): self.Destroy() - + def SuppressChange(self, e): if (self.supressCheckbox.IsChecked()): self.UpdateSettings.set('version', self.releaseInfo['tag_name']) else: self.UpdateSettings.set('version', None) - + def OnDownload(self, e): wx.LaunchDefaultBrowser('https://github.com/DarkFenX/Pyfa/releases/tag/'+self.releaseInfo['tag_name']) self.OnClose(e) \ No newline at end of file