winMain:cosmetics.

2 files changed, 14 insertions, 21 deletions

diff --git a/nephilim/plugins/Playlist.py b/nephilim/plugins/Playlist.py
index 2ac8bbb..533fb41 100644
--- a/nephilim/plugins/Playlist.py
+++ b/nephilim/plugins/Playlist.py
@@ -63,7 +63,7 @@ class PlaylistWidget(QtGui.QWidget):
             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().id())
 
         def fill(self):
             columns = self.plugin.settings().value(self.plugin.name() + '/columns').toStringList()
@@ -79,7 +79,7 @@ class PlaylistWidget(QtGui.QWidget):
             if event.matches(QtGui.QKeySequence.Delete):
                 ids = []
                 for item in self.selectedItems():
-                    ids.append(item.data(0, QtCore.Qt.UserRole).toPyObject().getID())
+                    ids.append(item.data(0, QtCore.Qt.UserRole).toPyObject().id())
 
                 self.plugin.mpclient().delete(ids)
             else:
diff --git a/nephilim/winMain.py b/nephilim/winMain.py
index b68b17a..6dc3368 100644
--- a/nephilim/winMain.py
+++ b/nephilim/winMain.py
@@ -1,42 +1,36 @@
 from PyQt4 import QtGui, QtCore
 from PyQt4.QtCore import QVariant
-from traceback import print_exc
+import logging
 
-from misc import *
+from misc import ORGNAME, APPNAME, sec2min, appIcon
 from mpclient import MPClient
-
-import plugins
-
 from winConnect import winConnect
 from winSettings import winSettings
-import logging
+import plugins
 
 DEFAULT_LAYOUT_FILE = 'default_layout'
 
 class winMain(QtGui.QMainWindow):
     """The winMain class is mpc's main window, showing the playlists and control-interface"""
-    docks=[]
+    docks = []
 
     " menus"
-    mConnect=None
-    mDisconnect=None
-    mLayout=None
+    mConnect    = None
+    mDisconnect = None
+    mLayout     = None
 
-    " connection window"
-    wConnect=None
-    wSettings=None
+    wConnect  = None
+    wSettings = None
 
-    " MPD object"
     mpclient = None
-    " plugins interface"
-    plugins = None
+    plugins  = None
+    settings = None
 
-    " Statusbar objects"
+    # Statusbar objects
     statuslabel = None
     time_slider = None
     time_label  = None
 
-    settings = None
     def __init__(self, parent=None):
         QtGui.QWidget.__init__(self, parent)
         self.settings = QtCore.QSettings(ORGNAME, APPNAME)
@@ -131,7 +125,6 @@ class winMain(QtGui.QMainWindow):
         self.settings.sync()
         QtCore.QCoreApplication.exit()
 
-
     def updateLayoutMenu(self):
         self.mLayout.clear()
         self.mLayout.addAction('Save layout', self.saveLayout)