From 34cc07dee5c909e0262386edf578ced4d646d784 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <wyskas@gmail.com>
Date: Wed, 19 Aug 2009 09:49:15 +0200
Subject: plugin: make settings a var, not a function.

---
 nephilim/plugin.py | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'nephilim/plugin.py')

diff --git a/nephilim/plugin.py b/nephilim/plugin.py
index 9bad75c..fd521f0 100644
--- a/nephilim/plugin.py
+++ b/nephilim/plugin.py
@@ -27,12 +27,12 @@ class Plugin(QtCore.QObject):
     name        = None
     logger      = None
     mpclient    = None
+    settings    = None
 
     # public, read-only
     loaded       = None
 
     _dock_widget = None
-    _settings    = None
     _parent      = None
 
     o            = None
@@ -44,17 +44,17 @@ class Plugin(QtCore.QObject):
         self.mpclient  = mpclient
         self._parent    = parent
         self.loaded    = False
-        self._settings  = QtCore.QSettings()
+        self.settings  = QtCore.QSettings()
 
         self.logger     = logging.getLogger(self.name)
 
         #init settings
         self.logger.debug('Initializing default settings.')
-        self._settings.beginGroup(name)
+        self.settings.beginGroup(name)
         for key in self.DEFAULTS:
-            if not self._settings.contains(key):
-                self._settings.setValue(key, QVariant(self.DEFAULTS[key]))
-        self._settings.endGroup()
+            if not self.settings.contains(key):
+                self.settings.setValue(key, QVariant(self.DEFAULTS[key]))
+        self.settings.endGroup()
 
     def info(self):
         return ''
@@ -62,8 +62,6 @@ class Plugin(QtCore.QObject):
         return self._parent
     def set_status(self, status):
         self._parent.setStatus(status)
-    def settings(self):
-        return self._settings
 
     def load(self):
         self.logger.info('loading')
@@ -82,7 +80,7 @@ class Plugin(QtCore.QObject):
         if dock_widget:
             QtGui.QApplication.instance().main_win.remove_dock(dock_widget)
         self._dock_widget     = None
-        self._settingsWidget = None
+        self.settingsWidget = None
         self.disconnect(self.mpclient, QtCore.SIGNAL('connect_changed'), self.set_enabled)
         self.loaded        = False
     def set_enabled(self, val):
@@ -99,17 +97,17 @@ class Plugin(QtCore.QObject):
     class SettingsWidget(QtGui.QWidget):
         """ plugins should subclass this"""
         plugin   = None
-        _settings = None
+        settings = None
 
         def __init__(self, plugin):
             QtGui.QWidget.__init__(self)
             self.plugin    = plugin
-            self._settings = QtCore.QSettings()
+            self.settings = QtCore.QSettings()
 
         def settings(self):
-            return self._settings
+            return self.settings
 
-        def save_settings(self):
+        def savesettings(self):
             """ reimplement this"""
             pass
 
-- 
cgit v1.2.3