diff --git a/About.py b/About.py index be508e9..7fe92be 100644 --- a/About.py +++ b/About.py @@ -1,74 +1,63 @@ -import sys -import wx # This module uses the new wx namespace +# coding=utf-8 + +import wx import wx.html import wx.lib.wxpTag -#--------------------------------------------------------------------------- + +# --------------------------------------------------------------------------- + class MyAboutBox(wx.Dialog): text = ''' - -
- - - -
-

wxPython %s

- (%s)
- Running on Python %s
-
+ + +
+ + + + -

wxPython is a Python extension module that -encapsulates the wxWindows GUI classes.

+

NodeMCU PyFlasher

-

This demo shows off some of the capabilities -of wxPython. Select items from the menu or tree control, -sit back and enjoy. Be sure to take a peek at the source code for each -demo item so you can learn how to use the classes yourself.

+

Version %s

-

wxPython is brought to you by Robin Dunn and
-Total Control Software, Copyright (c) 1997-2011.

+

Fork the project on GitHub and help improve it + for all!

-

-Please see license.txt for licensing information. -

+

© 2016-2017 Marcel Stör. Licensed under MIT.

-

- - -

+

+ + + + +

''' - def __init__(self, parent): - wx.Dialog.__init__(self, parent, -1, 'About the wxPython demo',) + + def __init__(self, parent, version): + wx.Dialog.__init__(self, parent, -1, "About NodeMCU PyFlasher") html = wx.html.HtmlWindow(self, -1, size=(420, -1)) if "gtk2" in wx.PlatformInfo or "gtk3" in wx.PlatformInfo: html.SetStandardFonts() - py_version = sys.version.split()[0] - txt = self.text % (wx.VERSION_STRING, - ", ".join(wx.PlatformInfo[1:]), - py_version - ) + txt = self.text % version html.SetPage(txt) - btn = html.FindWindowById(wx.ID_OK) ir = html.GetInternalRepresentation() - html.SetSize( (ir.GetWidth()+25, ir.GetHeight()+25) ) + html.SetSize((ir.GetWidth() + 25, ir.GetHeight() + 25)) self.SetClientSize(html.GetSize()) self.CentreOnParent(wx.BOTH) -#--------------------------------------------------------------------------- - - - -if __name__ == '__main__': - app = wx.App() - dlg = MyAboutBox(None) - dlg.ShowModal() - dlg.Destroy() - app.MainLoop() +# --------------------------------------------------------------------------- diff --git a/Main.py b/Main.py index 2651536..64c1d2a 100644 --- a/Main.py +++ b/Main.py @@ -263,7 +263,7 @@ class NodeMcuFlasher(wx.Frame): def __on_help_about(self, event): from About import MyAboutBox - about = MyAboutBox(self) + about = MyAboutBox(self, __version__) about.ShowModal() about.Destroy() diff --git a/images/espressif-256.png b/images/espressif-256.png new file mode 100644 index 0000000..c4833c8 Binary files /dev/null and b/images/espressif-256.png differ diff --git a/images/python-256.png b/images/python-256.png new file mode 100644 index 0000000..1c5be40 Binary files /dev/null and b/images/python-256.png differ diff --git a/images/wxpython-256.png b/images/wxpython-256.png new file mode 100644 index 0000000..2284383 Binary files /dev/null and b/images/wxpython-256.png differ