clPlugin: get rid of CamelCase.

1 files changed, 28 insertions, 32 deletions

diff --git a/nephilim/plugins/AlbumCover.py b/nephilim/plugins/AlbumCover.py
index 5330189..fba252f 100644
--- a/nephilim/plugins/AlbumCover.py
+++ b/nephilim/plugins/AlbumCover.py
@@ -53,7 +53,7 @@ class wgAlbumCover(QtGui.QLabel):
         self.setPixmap(cover.scaled(self.size(), QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation))
         logging.info('Cover set.')
 
-        if (write and self.p.settings.value(self.p.getName() + '/store').toBool()
+        if (write and self.p.settings().value(self.p.name() + '/store').toBool()
            and self.cover_filepath):
             if cover.save(self.cover_filepath, 'png'):
                 logging.info('Cover saved.')
@@ -67,7 +67,7 @@ class wgAlbumCover(QtGui.QLabel):
 
     def refresh(self):
         logging.info("refreshing cover")
-        song = self.p.mpclient.current_song()
+        song = self.p.mpclient().current_song()
         if not song:
             self.clear()
             self.cover_loaded = False
@@ -80,18 +80,18 @@ class wgAlbumCover(QtGui.QLabel):
             self.cover_dirname  = ''
             self.cover_filepath = ''
         else:
-            dirname  = self.p.settings.value(self.p.getName() + '/coverdir').toString()
-            self.cover_dirname = expand_tags(dirname, (self.p.winMain, song))
-            filebase = self.p.settings.value(self.p.getName() + '/covername').toString()
+            dirname  = self.p.settings().value(self.p.name() + '/coverdir').toString()
+            self.cover_dirname = expand_tags(dirname, (self.p.parent(), song))
+            filebase = self.p.settings().value(self.p.name() + '/covername').toString()
             self.cover_filepath = '%s/%s'%(self.cover_dirname,
-                                           expand_tags(filebase, (self.p.winMain, song)).replace('/', '_'))
+                                           expand_tags(filebase, (self.p.parent(), song)).replace('/', '_'))
         self.fetch_cover(song)
 
     def fetch_cover(self, song):
         write = False
         if not QtCore.QFile.exists(self.cover_filepath):
             for i in (0, 1):
-                src = self.p.settings.value(self.p.getName() + '/method%i'%i).toInt()[0]
+                src = self.p.settings().value(self.p.name() + '/method%i'%i).toInt()[0]
                 if src == AC_FETCH_LOCAL_DIR and self.cover_dirname:
                     cover = self.fetch_local(song)
                 elif src == AC_FETCH_AMAZON:
@@ -108,7 +108,7 @@ class wgAlbumCover(QtGui.QLabel):
         self.set_cover(cover, write)
 
     def fetch_local_manual(self):
-        song = self.p.mpclient.current_song()
+        song = self.p.mpclient().current_song()
         if not song:
             return
 
@@ -157,7 +157,7 @@ class wgAlbumCover(QtGui.QLabel):
         return None
 
     def fetch_amazon_manual(self):
-        song = self.p.mpclient.current_song()
+        song = self.p.mpclient().current_song()
         if not song:
             return
         cover = self.fetch_amazon(song)
@@ -198,14 +198,10 @@ class wgAlbumCover(QtGui.QLabel):
 
 class AlbumCover(Plugin):
     o = None
-    DEFAULTS = {'coverdir' : '$musicdir/$songdir', 'covername' : '.cover_nephilim_$artist_$album',
-                'method0'  : 1, 'method1' : 1, 'store' : True}
-    def __init__(self, winMain):
-        Plugin.__init__(self, winMain, 'AlbumCover')
-        self.addListener('onSongChange' , self.refresh)
-        self.addListener('onReady'      , self.refresh)
-        self.addListener('onDisconnect' , self.refresh)
-        self.addListener('onStateChange', self.refresh)
+    DEFAULTS  = {'coverdir' : '$musicdir/$songdir', 'covername' : '.cover_nephilim_$artist_$album',
+                 'method0'  : 1, 'method1' : 1, 'store' : True}
+    LISTENERS = {'onSongChange' : 'refresh', 'onReady' : 'refresh', 'onDisconnect' : 'refresh',
+                 'onStateChange': 'refresh'}
 
     def _load(self):
         self.o = wgAlbumCover(self)
@@ -220,8 +216,8 @@ class AlbumCover(Plugin):
     def get_cover(self):
         return self.o.get_cover()
 
-    def _getDockWidget(self):
-        return self._createDock(self.o)
+    def _get_dock_widget(self):
+        return self._create_dock(self.o)
 
     class SettingsWidgetAlbumCover(Plugin.SettingsWidget):
         methods   = []
@@ -231,7 +227,7 @@ class AlbumCover(Plugin):
 
         def __init__(self, plugin):
             Plugin.SettingsWidget.__init__(self, plugin)
-            self.settings.beginGroup(self.plugin.getName())
+            self.settings().beginGroup(self.plugin.name())
 
             # fetching methods comboboxes
             self.methods = [QtGui.QComboBox(), QtGui.QComboBox()]
@@ -239,23 +235,23 @@ class AlbumCover(Plugin):
                 method.addItem('No method.')
                 method.addItem('Local dir')
                 method.addItem('Amazon')
-                method.setCurrentIndex(self.settings.value('method' + str(i)).toInt()[0])
+                method.setCurrentIndex(self.settings().value('method' + str(i)).toInt()[0])
 
             # store covers groupbox
             self.store = QtGui.QGroupBox('Store covers.')
             self.store.setToolTip('Should %s store its own copy of covers?'%APPNAME)
             self.store.setCheckable(True)
-            self.store.setChecked(self.settings.value('store').toBool())
+            self.store.setChecked(self.settings().value('store').toBool())
             self.store.setLayout(QtGui.QGridLayout())
 
             # paths to covers
-            self.coverdir  = QtGui.QLineEdit(self.settings.value('coverdir').toString())
+            self.coverdir  = QtGui.QLineEdit(self.settings().value('coverdir').toString())
             self.coverdir.setToolTip('Where should %s store covers.\n'
                                      '$musicdir will be expanded to path to MPD music library (as set by user)\n'
                                      '$songdir will be expanded to path to the song (relative to $musicdir\n'
                                      'other tags same as in covername'
                                       %APPNAME)
-            self.covername = QtGui.QLineEdit(self.settings.value('covername').toString())
+            self.covername = QtGui.QLineEdit(self.settings().value('covername').toString())
             self.covername.setToolTip('Filename for %s cover files.\n'
                                       'All tags supported by MPD will be expanded to their\n'
                                       'values for current song, e.g. $title, $track, $artist,\n'
@@ -270,16 +266,16 @@ class AlbumCover(Plugin):
             self._add_widget(self.methods[1], 'Method 1', 'Method to try if the first one fails.')
             self.layout().addWidget(self.store)
 
-            self.settings.endGroup()
+            self.settings().endGroup()
 
         def save_settings(self):
-            self.settings.beginGroup(self.plugin.getName())
-            self.settings.setValue('method0', QVariant(self.methods[0].currentIndex()))
-            self.settings.setValue('method1', QVariant(self.methods[1].currentIndex()))
-            self.settings.setValue('coverdir', QVariant(self.coverdir.text()))
-            self.settings.setValue('covername', QVariant(self.covername.text()))
-            self.settings.setValue('store', QVariant(self.store.isChecked()))
-            self.settings.endGroup()
+            self.settings().beginGroup(self.plugin.name())
+            self.settings().setValue('method0', QVariant(self.methods[0].currentIndex()))
+            self.settings().setValue('method1', QVariant(self.methods[1].currentIndex()))
+            self.settings().setValue('coverdir', QVariant(self.coverdir.text()))
+            self.settings().setValue('covername', QVariant(self.covername.text()))
+            self.settings().setValue('store', QVariant(self.store.isChecked()))
+            self.settings().endGroup()
             self.plugin.o.refresh()
 
     def get_settings_widget(self):