Refactoring so there is a single source for the version.

[cura.git] / Cura / gui / aboutWindow.py

diff --git a/Cura/gui/aboutWindow.py b/Cura/gui/aboutWindow.py
index a3ea676346657bd7a0788cdec89f0f0b6fb3fdb2..4ec9e2ff38b5e9de4a3a8bb7ca13191731bf50ea 100644 (file)
--- a/Cura/gui/aboutWindow.py
+++ b/Cura/gui/aboutWindow.py
@@ -2,10 +2,11 @@ __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AG
 
 import wx
 import platform
+from Cura.util import version
 
 class aboutWindow(wx.Frame):
-       def __init__(self):
-               super(aboutWindow, self).__init__(None, title="About", style = wx.DEFAULT_DIALOG_STYLE)
+       def __init__(self, parent):
+               super(aboutWindow, self).__init__(parent, title=_("About"), style = wx.DEFAULT_DIALOG_STYLE)
 
                wx.EVT_CLOSE(self, self.OnClose)
 
@@ -21,13 +22,14 @@ class aboutWindow(wx.Frame):
                title.SetFont(wx.Font(18, wx.SWISS, wx.NORMAL, wx.BOLD))
                s.Add(title, flag=wx.ALIGN_CENTRE|wx.EXPAND|wx.BOTTOM, border=5)
 
-               s.Add(wx.StaticText(p, -1, 'Version 14.09-1.07'))
+               version_num = version.getVersion()
+               s.Add(wx.StaticText(p, -1, 'Version {}'.format(version_num)))
                s.Add(wx.StaticText(p, -1, 'End solution for Open Source Fused Filament Fabrication 3D printing.'), flag=wx.TOP, border=5)
                s.Add(wx.StaticText(p, -1, 'Cura is currently developed and maintained by David Braam and Ultimaker.'), flag=wx.TOP, border=5)
                s.Add(wx.StaticText(p, -1, 'Cura LulzBot Edition has been modified and maintained by Aleph Objects, Inc.'))
                s.Add(wx.StaticText(p, -1, 'for use with LulzBot 3D printers.'))
 
-               s.Add(wx.StaticText(p, -1, 'Cura is build with the following components:'), flag=wx.TOP, border=10)
+               s.Add(wx.StaticText(p, -1, 'Cura is built with the following components:'), flag=wx.TOP, border=10)
                self.addComponent('Cura', 'Graphical user interface', 'AGPLv3', 'https://github.com/daid/Cura')
                self.addComponent('CuraEngine', 'GCode Generator', 'AGPLv3', 'https://github.com/Ultimaker/CuraEngine')
                self.addComponent('Clipper', 'Polygon clipping library', 'Boost', 'http://www.angusj.com/delphi/clipper.php')
@@ -43,7 +45,7 @@ class aboutWindow(wx.Frame):
                        self.addComponent('comtypes', 'Library to help with windows taskbar features on Windows 7', 'MIT', 'http://starship.python.net/crew/theller/comtypes/')
                        self.addComponent('EjectMedia', 'Utility to safe-remove SD cards', 'Freeware', 'http://www.uwe-sieber.de/english.html')
                self.addComponent('Pymclevel', 'Python library for reading Minecraft levels.', 'ISC', 'https://github.com/mcedit/pymclevel')
-               s.Add(wx.StaticText(p, -1, "Copyright (C) 2014 Aleph Objects, Inc. - Release under terms of the AGPLv3 License"), flag=wx.TOP, border=10)
+               s.Add(wx.StaticText(p, -1, "Copyright (C) 2014 Aleph Objects, Inc. - Released under terms of the AGPLv3 License"), flag=wx.TOP, border=10)
                s.Add(wx.StaticText(p, -1, "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License"))
                #Translations done by:
                #Dutch: Charlotte Jansen