clPlugin: get rid of CamelCase.

1 files changed, 14 insertions, 18 deletions

diff --git a/nephilim/plugins/Playlist.py b/nephilim/plugins/Playlist.py
index e57c9ac..d8c4347 100644
--- a/nephilim/plugins/Playlist.py
+++ b/nephilim/plugins/Playlist.py
@@ -3,32 +3,28 @@ from PyQt4.QtCore import QVariant
 
 from ..clPlugin import Plugin
 
-# Dependencies:
-#   playcontrol
 class Playlist(Plugin):
     o        = None
-    DEFAULTS = {'columns': ['track', 'title', 'artist',
-                            'date', 'album', 'length']}
+    DEFAULTS  = {'columns': ['track', 'title', 'artist',
+                             'date', 'album', 'length']}
+    LISTENERS = {'onPlaylistChange' : 'on_playlist_change',
+                 'onDisconnect' : 'on_playlist_change', 'onReady' : 'on_playlist_change'}
 
-    def __init__(self, winMain):
-        Plugin.__init__(self, winMain, 'Playlist')
     def _load(self):
         self.o = PlaylistWidget(self)
-        self.mpclient.add_listener('onPlaylistChange', self.on_playlist_change)
-        self.mpclient.add_listener('onDisconnect', self.on_playlist_change)
-        self.mpclient.add_listener('onReady', self.on_playlist_change)
 
     def _unload(self):
         self.o = None
     def getInfo(self):
         return "The playlist showing the songs that will be played."
 
-    def _getDockWidget(self):
-        return self._createDock(self.o)
+    def _get_dock_widget(self):
+        return self._create_dock(self.o)
 
     def on_playlist_change(self, params = None):
         self.o.fill_playlist()
 
+
 class PlaylistWidget(QtGui.QWidget):
     plugin   = None
     playlist = None
@@ -55,23 +51,23 @@ class PlaylistWidget(QtGui.QWidget):
             self.setSelectionMode(QtGui.QTreeWidget.ExtendedSelection)
             self.setAlternatingRowColors(True)
             self.setRootIsDecorated(False)
-            columns = self.plugin.settings.value(self.plugin.getName() + '/columns').toStringList()
+            columns = self.plugin.settings().value(self.plugin.name() + '/columns').toStringList()
             self.setColumnCount(len(columns))
             self.setHeaderLabels(columns)
-            self.header().restoreState(self.plugin.settings.value(self.plugin.getName() + '/header_state').toByteArray())
+            self.header().restoreState(self.plugin.settings().value(self.plugin.name() + '/header_state').toByteArray())
             self.connect(self, QtCore.SIGNAL('itemActivated(QTreeWidgetItem*, int)'), self._song_activated)
             self.connect(self.header(), QtCore.SIGNAL('geometriesChanged()'), self._save_state)
 
         def _save_state(self):
-            self.plugin.settings.setValue(self.plugin.getName() + '/header_state', QVariant(self.header().saveState()))
+            self.plugin.settings().setValue(self.plugin.name() + '/header_state', QVariant(self.header().saveState()))
 
         def _song_activated(self, item):
-            self.plugin.mpclient.play(item.data(0, QtCore.Qt.UserRole).toPyObject().getID())
+            self.plugin.mpclient().play(item.data(0, QtCore.Qt.UserRole).toPyObject().getID())
 
         def fill(self):
-            columns = self.plugin.settings.value(self.plugin.getName() + '/columns').toStringList()
+            columns = self.plugin.settings().value(self.plugin.name() + '/columns').toStringList()
             self.clear()
-            for song in self.plugin.mpclient.playlist():
+            for song in self.plugin.mpclient().playlist():
                 item = QtGui.QTreeWidgetItem()
                 for i in range(len(columns)):
                     item.setText(i, unicode(song.getTag(str(columns[i]))))
@@ -84,7 +80,7 @@ class PlaylistWidget(QtGui.QWidget):
                 for item in self.selectedItems():
                     ids.append(item.data(0, QtCore.Qt.UserRole).toPyObject().getID())
 
-                self.plugin.mpclient.delete(ids)
+                self.plugin.mpclient().delete(ids)
             else:
                 QtGui.QTreeWidget.keyPressEvent(self, event)