Split some parts of winMain into a subclass of QApplication.

1 files changed, 10 insertions, 36 deletions

diff --git a/nephilim/winMain.py b/nephilim/winMain.py
index 1ea6213..5b79d38 100644
--- a/nephilim/winMain.py
+++ b/nephilim/winMain.py
@@ -23,8 +23,6 @@ import logging
 from misc import APPNAME, sec2min, appIcon
 from mpclient import MPClient
 from connect_wg import ConnectWidget
-from settings_wg import SettingsWidget
-import plugins
 
 DEFAULT_LAYOUT_FILE = 'default_layout'
 
@@ -38,10 +36,8 @@ class winMain(QtGui.QMainWindow):
     mLayout     = None
 
     wConnect  = None
-    wSettings = None
 
     mpclient = None
-    plugins  = None
     settings = None
 
     # Statusbar objects
@@ -49,10 +45,10 @@ class winMain(QtGui.QMainWindow):
     time_slider = None
     time_label  = None
 
-    def __init__(self, parent=None):
-        QtGui.QWidget.__init__(self, parent)
+    def __init__(self):
+        QtGui.QWidget.__init__(self)
         self.settings = QtCore.QSettings()
-        self.mpclient = MPClient()
+        self.mpclient = QtGui.QApplication.instance().mpclient
 
         self.wConnect = ConnectWidget(self)
 
@@ -82,13 +78,13 @@ class winMain(QtGui.QMainWindow):
         # separator
         m.addSeparator()
         # quit
-        m.addAction("Quit", self.quit).setIcon(QtGui.QIcon('gfx/gtk-quit.svg'))
+        m.addAction("Quit", QtGui.QApplication.instance().quit).setIcon(QtGui.QIcon('gfx/gtk-quit.svg'))
 
         # menu options
         m=mBar.addMenu("Options")
         m.setTearOffEnabled(True)
         # settings
-        m.addAction("Settings", self.showWinSettings).setIcon(QtGui.QIcon('gfx/gtk-preferences.svg'))
+        m.addAction("Settings", QtGui.QApplication.instance().show_settings_win).setIcon(QtGui.QIcon('gfx/gtk-preferences.svg'))
 
         # menu layout
         self.mLayout=mBar.addMenu("Layout")
@@ -99,21 +95,12 @@ class winMain(QtGui.QMainWindow):
         menu_toolbar.addWidget(mBar)
         self.addToolBar(QtCore.Qt.TopToolBarArea, menu_toolbar)
 
-        showWinSettings = False # are there new plugins?
-        self.plugins = plugins.Plugins(self, self.mpclient)
-        for plugin in self.plugins.plugins():
-            if self.settings.value(plugin.name() + '/load') == None:
-                showWinSettings = True
-            if self.settings.value(plugin.name() + '/load', QVariant(True)).toBool():
-                self.plugins.load(plugin.name())
-
         self.updateLayoutMenu()
         self.setDockOptions(QtGui.QMainWindow.AllowNestedDocks \
                 |QtGui.QMainWindow.AllowTabbedDocks \
                 |QtGui.QMainWindow.VerticalTabs)
         self.setDockNestingEnabled(True)
         self.restoreGeometry(self.settings.value('geometry').toByteArray())
-        self.restoreLayout()
 
         " add event handlers"
         self.connect(self.mpclient, QtCore.SIGNAL('connected'),       self.onConnected)
@@ -122,27 +109,19 @@ class winMain(QtGui.QMainWindow):
         self.connect(self.mpclient, QtCore.SIGNAL('state_changed'),   self.update_state_messages)
         self.connect(self.mpclient, QtCore.SIGNAL('time_changed'),    self.on_time_change)
 
-        self.enableAll(True)
+#        self.enableAll(True)
         self.wConnect.monitor()
 
         self.update_state_messages()
         self.show()
-        if showWinSettings:
-            self.showWinSettings()
-
-    def quit(self):
-        # unload all plugins
-        for plugin in self.plugins.loaded_plugins():
-            plugin.unload()
 
+    def on_quit(self):
         self.settings.setValue('geometry', QVariant(self.saveGeometry()))
-        self.settings.sync()
-        QtCore.QCoreApplication.exit()
 
     def updateLayoutMenu(self):
         self.mLayout.clear()
         self.mLayout.addAction('Save layout', self.saveLayout)
-        self.mLayout.addAction('Restore layout', self.restoreLayout)
+        self.mLayout.addAction('Restore layout', self.restore_layout)
         self.mLayout.addSeparator()
         # create checkable menu
         a=QtGui.QAction('Show titlebars', self)
@@ -207,7 +186,7 @@ class winMain(QtGui.QMainWindow):
 
     def saveLayout(self):
         self.settings.setValue('layout', QVariant(self.saveState()))
-    def restoreLayout(self):
+    def restore_layout(self):
         layout = self.settings.value('layout').toByteArray()
         if not layout:
             try:
@@ -217,11 +196,6 @@ class winMain(QtGui.QMainWindow):
                 return
         self.restoreState(layout)
 
-    def showWinSettings(self):
-        if not self.wSettings:
-            self.wSettings = SettingsWidget(self)
-        self.wSettings.show()
-        self.wSettings.raise_()
 
     def onConnected(self):
         self.mDisconnect.setEnabled(True)
@@ -236,7 +210,7 @@ class winMain(QtGui.QMainWindow):
                 pass
 
     def initialiseData(self):
-        self.enableAll(True)
+#        self.enableAll(True)
         self.setStatus("")
 
     def onDisconnect(self):