Begin switch to QSettings.

4 files changed, 26 insertions, 32 deletions

diff --git a/montypc.py b/montypc.py
index 3657363..f1309c0 100755
--- a/montypc.py
+++ b/montypc.py
@@ -6,6 +6,7 @@ import sys
 from PyQt4 import QtGui
 from winMain import winMain
 from traceback import print_exc
+from misc import APPNAME
 
 
 def main():
diff --git a/winConnect.py b/winConnect.py
index ad3476c..33efc18 100644
--- a/winConnect.py
+++ b/winConnect.py
@@ -1,8 +1,8 @@
 from PyQt4 import QtGui, QtCore
+from PyQt4.QtCore import QVariant
 import time
 from misc import *
 from traceback import print_exc
-from clSettings import settings
 
 class winConnect(QtGui.QWidget):
     txtHost=None
@@ -10,12 +10,14 @@ class winConnect(QtGui.QWidget):
     lblInfo=None
     _timerID=None
     monty = None
+    settings = None
 
 
     def __init__(self,parent):
         QtGui.QWidget.__init__(self, parent)
-        self.txtHost=QtGui.QLineEdit(settings.get('host', 'localhost'))
-        self.txtPort=QtGui.QLineEdit(settings.get('port', '6600'))
+        self.settings = QtCore.QSettings(ORGNAME, APPNAME)
+        self.txtHost=QtGui.QLineEdit(self.settings.value('host', QVariant('localhost')).toString())
+        self.txtPort=QtGui.QLineEdit(self.settings.value('port', QVariant('6600')).toString())
         self.lblInfo=QtGui.QLabel("connecting ...")
         self.monty = parent.monty
 
@@ -61,8 +63,8 @@ class winConnect(QtGui.QWidget):
             self._timerID=None
         self.lblInfo.setText('Connected!\nRestoring library and playlist ...')
         doEvents()
-        settings.set('host', str(self.txtHost.text()))
-        settings.set('port', str(self.txtPort.text()))
+        self.settings.setValue('host', QVariant(self.txtHost.text()))
+        self.settings.setValue('port', QVariant(self.txtPort.text()))
         self.txtHost.setEnabled(False)
         self.txtPort.setEnabled(False)
         doEvents()
diff --git a/winMain.py b/winMain.py
index 9cf6212..18138dc 100644
--- a/winMain.py
+++ b/winMain.py
@@ -1,8 +1,8 @@
 from PyQt4 import QtGui, QtCore
+from PyQt4.QtCore import QVariant
 from traceback import print_exc
 
 from misc import *
-from clSettings import settings,mpdSettings
 from clMonty import Monty
 
 import plugins
@@ -34,8 +34,10 @@ class winMain(QtGui.QMainWindow):
     time_slider = None
     time_label  = None
 
+    settings = None
     def __init__(self, parent=None):
         QtGui.QWidget.__init__(self, parent)
+        self.settings = QtCore.QSettings(ORGNAME, APPNAME)
         self.monty = Monty()
 
         self.wConnect=winConnect(self)
@@ -83,8 +85,9 @@ class winMain(QtGui.QMainWindow):
             # load the plugin
             plugin=plugins.loadPlugin(entry[plugins.PLUGIN_CLASS], self)
             if plugin:
-                showWinSettings=showWinSettings|(settings.get('%s.load'%(plugin.getName(True)), None)==None)
-                if settings.get('%s.load'%(plugin.getName(True)), '1')=='1':
+                if self.settings.value(plugin.getName() + '/load') == None:
+                    showWinSettings = True
+                if self.settings.value(plugin.getName() + '/load', QVariant(True)).toBool():
                     # load new plugins by default
                     try:
                         plugin.load()
@@ -97,17 +100,7 @@ class winMain(QtGui.QMainWindow):
                 |QtGui.QMainWindow.AllowTabbedDocks \
                 |QtGui.QMainWindow.VerticalTabs)
         self.setDockNestingEnabled(True)
-
-        try:
-            x,y=settings.getIntTuple('winMain.pos')
-        except:
-            x,y=0,0
-        try:
-            w,h=settings.getIntTuple('winMain.size')
-        except:
-            w,h=800,600
-        self.resize(w,h)
-        self.move(x,y)
+        self.restoreGeometry(self.settings.value('geometry').toByteArray())
         self.restoreLayout()
 
         " add event handlers"
@@ -138,6 +131,8 @@ class winMain(QtGui.QMainWindow):
             if p and p.isLoaded():
                 p.unload()
 
+        self.settings.setValue('geometry', QVariant(self.saveGeometry()))
+        self.settings.sync()
         QtCore.QCoreApplication.exit()
 
 
@@ -149,7 +144,7 @@ class winMain(QtGui.QMainWindow):
         # create checkable menu
         a=QtGui.QAction('Show titlebars', self)
         a.setCheckable(True)
-        a.setChecked(settings.get('winMain.show.titlebars', '1')=='1')
+        a.setChecked(self.settings.value('show_titlebars', QVariant(True)).toBool())
         self.toggleTitleBars(a.isChecked())
         self.connect(a, QtCore.SIGNAL('toggled(bool)'), self.toggleTitleBars)
         self.mLayout.addAction(a)
@@ -161,9 +156,9 @@ class winMain(QtGui.QMainWindow):
 
     def toggleTitleBars(self, val):
         if val:
-            settings.set('winMain.show.titlebars', '1')
+            self.settings.setValue('show_titlebars', QVariant(True))
         else:
-            settings.set('winMain.show.titlebars', '0')
+            self.settings.setValue('show_titlebars', QVariant(False))
         for dock in self.docks:
             if val:
                 dock.setTitleBarWidget(None)
@@ -248,11 +243,6 @@ class winMain(QtGui.QMainWindow):
         self.setStatus("")
         doEvents
 
-    def resizeEvent(self, event):
-        settings.set('winMain.size', '%i %i'%(self.width(),self.height()))
-    def moveEvent(self, event):
-        settings.set('winMain.pos', '%i %i'%(self.x(),self.y()))
-
     def onDisconnect(self, params):
         logging.info("Disconnected from MPD")
         self.mDisconnect.setEnabled(False)
diff --git a/winSettings.py b/winSettings.py
index e9723fd..e4efeb5 100644
--- a/winSettings.py
+++ b/winSettings.py
@@ -2,7 +2,6 @@ from PyQt4 import QtGui, QtCore
 import sys
 
 from misc import *
-from clSettings import settings
 import plugins
 
 
@@ -12,10 +11,12 @@ class winSettings(QtGui.QWidget):
     lstPlugins=None
 
     winMain=None
+    settings = None
 
 
     def __init__(self, winMain, parent=None):
         QtGui.QWidget.__init__(self, parent)
+        self.settings = QtCore.QSettings(ORGNAME, APPNAME)
         self.winMain=winMain
 
         self.btnSave=Button('save all', self.onBtnSaveClick)
@@ -67,10 +68,10 @@ class winSettings(QtGui.QWidget):
                     else:
                         item.setCheckState(QtCore.Qt.Unchecked)
 
-                    if settings.get('%s.load'%(plugin.getName(True)),None)==None:
+                    if self.settings.value(plugin.getName() + '/load') == None:
                         # load new plugins by default
                         item.setTextColor(QtCore.Qt.blue)
-                        settings.set('%s.load'%(plugin.getName(True)), 1)
+                        self.settings.setValue(plugin.getName() + '/load', QVariant(True))
 
             else:
                 item=QtGui.QListWidgetItem("%s\t%s"%(entry[plugins.PLUGIN_CLASS], entry[plugins.PLUGIN_MSG]))
@@ -91,7 +92,7 @@ class winSettings(QtGui.QWidget):
          self.close()
     def onlstPluginItemChanged(self, item):
         # check here if we have to load or unload the plugin!
-        toload=int(item.checkState()==QtCore.Qt.Checked)
+        toload = (item.checkState() == QtCore.Qt.Checked)
         className=str(item.text()[0:str(item.text()).find('\t')])
         if toload:
             # refresh the plugin file
@@ -105,7 +106,7 @@ class winSettings(QtGui.QWidget):
             if plugin:
                 plugin.unload()
         if plugin:
-            settings.set('%s.load'%(plugin.getName(True)), toload)
+            self.settings.setValue(plugin.getName() + '/load', QVariant(toload))
     def closeEvent(self, event):
         map(lambda entry: entry[plugins.PLUGIN_INSTANCE] and entry[plugins.PLUGIN_INSTANCE].resetSettingCache(), plugins.listPlugins().values())
         self.winMain.wSettings=None