basic settings implementation (display)

1 files changed, 11 insertions, 5 deletions

diff --git a/winMain.py b/winMain.py
index a949107..4553134 100644
--- a/winMain.py
+++ b/winMain.py
@@ -11,7 +11,7 @@ from clMonty import monty
 from plugins import *
 
 from winConnect import winConnect
-from winSettings import showSettingsWindow
+from winSettings import winSettings
 
 from wgSongList import SongList
 from wgPlaylist import Playlist
@@ -40,9 +40,9 @@ class winMain(QtGui.QMainWindow):
 
 		self.plugins={}
 		opts=QtGui.QDockWidget.DockWidgetClosable|QtGui.QDockWidget.DockWidgetMovable
-		for p in [pluginPlayControl, pluginSongStatus, pluginAlbumCover, \
-				pluginLyrics, pluginPlaylist, pluginLibrary, \
-				pluginSystray]:
+		for p in [pluginPlaylist, pluginLibrary, \
+				pluginPlayControl, pluginSongStatus, pluginAlbumCover, \
+				pluginLyrics, pluginSystray]:
 			plugin=p(self)
 			self.plugins[plugin.getName().lower()]=plugin
 			dock=plugin.getDockWidget(opts)
@@ -71,7 +71,7 @@ class winMain(QtGui.QMainWindow):
 		m=mBar.addMenu("Options")
 		m.setTearOffEnabled(True)
 		# settings
-		m.addAction("Settings", showSettingsWindow).setIcon(QtGui.QIcon('gfx/gtk-preferences.svg'))
+		m.addAction("Settings", self.showWinSettings).setIcon(QtGui.QIcon('gfx/gtk-preferences.svg'))
 
 		# menu layout
 		m=mBar.addMenu("Layout")
@@ -104,6 +104,9 @@ class winMain(QtGui.QMainWindow):
 		# set icon in system tray
 		self.wConnect.monitor()
 
+		self.wSettings=winSettings(self)
+		self.showWinSettings()
+
 		self.show()
 		doEvents()
 
@@ -143,6 +146,9 @@ class winMain(QtGui.QMainWindow):
 		except:
 			pass
 
+	def showWinSettings(self):
+		self.wSettings.show()
+
 	def onReady(self, params):
 		self.initialiseData()