Split some parts of winMain into a subclass of QApplication.

1 files changed, 3 insertions, 10 deletions

diff --git a/nephilim.py b/nephilim.py
index 4e7ce45..48fe2b9 100755
--- a/nephilim.py
+++ b/nephilim.py
@@ -27,21 +27,14 @@ try:
 except ImportError:
     sys.exit('PyQt4 not found. Ensure that it is installed.')
 
-from nephilim.winMain import winMain
-from nephilim.misc    import APPNAME, ORGNAME, appIcon
-
+from nephilim.nephilim_app import NephilimApp
 
 def main():
     try:
-        app = QtGui.QApplication(sys.argv)
-        app.setApplicationName(APPNAME)
-        app.setOrganizationName(ORGNAME)
-        app.setWindowIcon(QtGui.QIcon(appIcon))
+        app = NephilimApp(sys.argv)
 
-        wMain = winMain()
-        wMain.show()
         app.exec_()
-        wMain.quit()
+        app.quit()
     except Exception, e:
         print_exc()