summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <wyskas@gmail.com>2009-06-21 17:13:51 +0200
committerAnton Khirnov <wyskas@gmail.com>2009-06-21 17:13:51 +0200
commit264c0b0ccdf702ab2e4ddc3bc09c758fa05b8245 (patch)
treeb1fef20980c2cffb1374fc5e43a1e07a83723950
parent00e55bb03f0ea063e522927144ecb6ca8f5629d7 (diff)
plugin: make loaded a var instead of a function.
-rw-r--r--nephilim/plugin.py6
-rw-r--r--nephilim/plugins/__init__.py4
-rw-r--r--nephilim/settings_wg.py2
3 files changed, 6 insertions, 6 deletions
diff --git a/nephilim/plugin.py b/nephilim/plugin.py
index bd620f0..59f9a16 100644
--- a/nephilim/plugin.py
+++ b/nephilim/plugin.py
@@ -28,9 +28,11 @@ class Plugin(QtCore.QObject):
logger = None
mpclient = None
+ # public, read-only
+ loaded = None
+
_dock_widget = None
_settings = None
- _loaded = None
_parent = None
o = None
@@ -83,8 +85,6 @@ class Plugin(QtCore.QObject):
self._settingsWidget = None
self.disconnect(self.mpclient, QtCore.SIGNAL('connect_changed'), self.set_enabled)
self._loaded = False
- def is_loaded(self):
- return self._loaded
def set_enabled(self, val):
if self.o:
self.o.setEnabled(val)
diff --git a/nephilim/plugins/__init__.py b/nephilim/plugins/__init__.py
index a3463a2..c2cc9fa 100644
--- a/nephilim/plugins/__init__.py
+++ b/nephilim/plugins/__init__.py
@@ -63,7 +63,7 @@ class Plugins:
def unload(self, name):
if name in self._plugins:
- if self._plugins[name].is_loaded():
+ if self._plugins[name].loaded:
self._plugins[name].unload()
def plugins(self):
@@ -72,6 +72,6 @@ class Plugins:
def loaded_plugins(self):
list = []
for plugin in self._plugins.values():
- if plugin.is_loaded():
+ if plugin.loaded:
list.append(plugin)
return list
diff --git a/nephilim/settings_wg.py b/nephilim/settings_wg.py
index 2f65bc5..81d4006 100644
--- a/nephilim/settings_wg.py
+++ b/nephilim/settings_wg.py
@@ -157,7 +157,7 @@ class SettingsWidget(QtGui.QWidget):
self.pluginlist.clear()
for plugin in self.plugins.plugins():
item = QtGui.QListWidgetItem("%s\t%s"%(plugin.name, plugin.info()))
- if plugin.is_loaded():
+ if plugin.loaded:
item.setCheckState(QtCore.Qt.Checked)
else:
item.setCheckState(QtCore.Qt.Unchecked)