Add -v and "one true source"-ify program name

[munter.git] / munter / gui.py

diff --git a/munter/gui.py b/munter/gui.py
index fc5d82a9bf5ffbac5cbbd1a733e54589e86ab166..9b7e0c8d7d876233ff5fca3dafbcd0ffd6372aa6 100644 (file)
--- a/munter/gui.py
+++ b/munter/gui.py
@@ -7,6 +7,8 @@ GUI implementation
 
 import wx
 from . import munter
 
 import wx
 from . import munter

+from . import __progname__ as progname
+from . import __version__ as version

 
 class MainFrame(wx.Frame):
     """
 
 class MainFrame(wx.Frame):
     """


@@ -16,14 +18,14 @@ class MainFrame(wx.Frame):
     def __init__(self, *args, **kw):
         super(MainFrame, self).__init__(*args, **kw)
 
     def __init__(self, *args, **kw):
         super(MainFrame, self).__init__(*args, **kw)
 

-        self.SetTitle('Munter.py')
+        self.SetTitle(progname)

         self.SetSize(600, 400)
 
         self.props = self.init_props()
 
         self.pnl = wx.Panel(self)
 
         self.SetSize(600, 400)
 
         self.props = self.init_props()
 
         self.pnl = wx.Panel(self)
 

-        st = wx.StaticText(self.pnl, label="Munter.py")
+        st = wx.StaticText(self.pnl, label=progname)

         font = st.GetFont()
         font.PointSize += 10
         font = font.Bold()
         font = st.GetFont()
         font.PointSize += 10
         font = font.Bold()


@@ -152,13 +154,25 @@ class MainFrame(wx.Frame):
     def update_distance(self, event):
         value = self.te_distance.GetValue()
         if value:
     def update_distance(self, event):
         value = self.te_distance.GetValue()
         if value:

-            self.props['distance'] = float(value)
+            try:
+                new_val = float(value)
+                self.props['distance'] = new_val
+            except:
+                # reset GUI to last-accepted val
+                self.te_distance.SetValue(str(self.props['distance']))
+                pass

         self.update_mtc()
 
     def update_elevation(self, event):
         value = self.te_elevation.GetValue()
         if value:
         self.update_mtc()
 
     def update_elevation(self, event):
         value = self.te_elevation.GetValue()
         if value:

-            self.props['elevation'] = int(value)
+            try:
+                new_val = int(value)
+                self.props['elevation'] = new_val
+            except:
+                # reset GUI to last-accepted val
+                self.te_elevation.SetValue(str(self.props['elevation']))
+                pass

         self.update_mtc()
 
     def update_fitness(self, event):
         self.update_mtc()
 
     def update_fitness(self, event):