Merge pull request #95 from balshetzer/master

Live configuration and machine status display

application/plover

@@ -1,30 +1,6 @@
 #!/usr/bin/env python
 
-import sys
-import wx
-import traceback
-import os
+from plover.main import main
 
-import plover.gui.main
-import plover.oslayer.processlock
+main()
 
-def show_error(title, message):
-    app = wx.PySimpleApp()
-    print message
-    alert_dialog = wx.MessageDialog(None,
-                                    message,
-                                    title,
-                                    wx.OK | wx.ICON_INFORMATION)
-    alert_dialog.ShowModal()
-    alert_dialog.Destroy()
-
-try:
-    # Ensure only one instance of Plover is running at a time.
-    with plover.oslayer.processlock.PloverLock():
-        gui = plover.gui.main.PloverGUI()
-        gui.MainLoop()
-except plover.oslayer.processlock.LockNotAcquiredException:
-    show_error('Error', 'Another instance of Plover is already running.')
-except:
-    show_error('Unexpected error', traceback.format_exc())
-    os._exit(1)

plover/__init__.py

@@ -3,10 +3,10 @@
 
 """Plover: Open Source Stenography Software"""
 
-__version__ = '2.2.0'
+__version__ = '2.2.1'
 __copyright__ = '(C) 2010-2011 Joshua Harlan Lifton'
 __url__ = 'http://stenoknight.com/plover'
-__download_url__ = 'https://launchpad.net/plover'
+__download_url__ = 'https://github.com/plover/plover'
 __credits__ = ['Stenographer: Mirabai Knight',
                'Coder: Joshua Harlan Lifton',
                'Contributors: Hesky Fisher']