Split some parts of winMain into a subclass of QApplication.

1 files changed, 13 insertions, 12 deletions

diff --git a/nephilim/settings_wg.py b/nephilim/settings_wg.py
index d757e83..8886144 100644
--- a/nephilim/settings_wg.py
+++ b/nephilim/settings_wg.py
@@ -27,11 +27,13 @@ import plugin
 class SettingsWidget(QtGui.QWidget):
     save_btn     = None
     close_btn    = None
-    pluginlist = None
-    main_win     = None
+    pluginlist   = None
     settings     = None
     settings_wg  = []
 
+    mpclient   = None
+    plugins    = None
+
     class SettingsWidgetMPD(plugin.Plugin.SettingsWidget):
         mpclient = None
         host_txt = None
@@ -116,23 +118,24 @@ class SettingsWidget(QtGui.QWidget):
         def update_db(self):
             self.mpclient.update_db()
 
-    def __init__(self, main_win):
-        QtGui.QWidget.__init__(self, main_win, QtCore.Qt.Window)
+    def __init__(self, mpclient, plugins):
+        QtGui.QWidget.__init__(self, None, QtCore.Qt.Window)
         self.settings = QtCore.QSettings()
-        self.main_win = main_win
+        self.plugins  = plugins
+        self.mpclient = mpclient
 
         self.save_btn  = Button('save all', self.save_clicked)
         self.close_btn = Button('close',    self.close_clicked)
 
         tab_wg = QtGui.QTabWidget(self)
-        self.settings_wg.append(self.SettingsWidgetMPD(self.main_win.mpclient))
+        self.settings_wg.append(self.SettingsWidgetMPD(mpclient))
         tab_wg.addTab(self.settings_wg[-1], 'MPD settings')
 
         self.pluginlist = QtGui.QListWidget(self)
         self.fill_pluginlist()
         tab_wg.addTab(self.pluginlist, 'Plugins')
 
-        for plugin in self.main_win.plugins.loaded_plugins():
+        for plugin in self.plugins.loaded_plugins():
             wg = plugin.get_settings_widget()
             if wg:
                 self.settings_wg.append(wg)
@@ -152,7 +155,7 @@ class SettingsWidget(QtGui.QWidget):
 
     def fill_pluginlist(self):
         self.pluginlist.clear()
-        for plugin in self.main_win.plugins.plugins():
+        for plugin in self.plugins.plugins():
             item = QtGui.QListWidgetItem("%s\t%s"%(plugin.name(), plugin.info()))
             if plugin.is_loaded():
                 item.setCheckState(QtCore.Qt.Checked)
@@ -178,13 +181,11 @@ class SettingsWidget(QtGui.QWidget):
         name   = str(item.text()[0:str(item.text()).find('\t')])
         if toload:
             # refresh the plugin file
-            self.main_win.plugins.load(name)
+            self.plugins.load(name)
             self.fill_pluginlist()
-            self.main_win.restoreLayout()
         else:
-            self.main_win.plugins.unload(name)
+            self.plugins.unload(name)
         self.settings.setValue(name + '/load', QtCore.QVariant(toload))
 
     def closeEvent(self, event):
         self.settings_wg        = None
-        self.main_win.wSettings = None