removal of clLibrary

some comments

1 files changed, 13 insertions, 23 deletions

diff --git a/winMain.py b/winMain.py
index ba1932d..7dc2575 100644
--- a/winMain.py
+++ b/winMain.py
@@ -1,5 +1,4 @@
 from clMonty import monty
-from clLibrary import Library
 from PyQt4 import QtGui, QtCore
 from traceback import *
 import time
@@ -42,23 +41,15 @@ class winMain(QtGui.QWidget):
 	" system tray object"
 	sysTray=None
 
-	"Models"
-	" model of the lstLibrary"
-	mLibrary=None
-
 	"Other vars"
-	" array containing objects to disable/enable on disconnect/connect"
-	disableObjects=None
-	" current highlighted line"
-	curLine=None
+	" all objects which should be disabled when there is no connection"
+	controlObjects=None
 	_timerID=None
 
 	def __init__(self, parent=None):
 		QtGui.QWidget.__init__(self, parent)
 		self.setWindowTitle("montypc - An MPD client")
 
-		self.curLine=None
-
 		" set GUI stuff"
 		self.lstPlaylist=Playlist(parent, self, ['artist', 'title', 'album'], 'The Playlist'
 				, self.onPlaylistDoubleClick, self.onPlaylistKeyPress)
@@ -109,7 +100,7 @@ class winMain(QtGui.QWidget):
 
 		self.resize(1024,960)
 
-		self.disableObjects=[self.lstPlaylist, self.lstLibrary, self.slrTime
+		self.controlObjects=[self.lstPlaylist, self.lstLibrary, self.slrTime
 				, self.slrVolume
 				, self.btnPlayPause, self.btnStop, self.btnPrevious
 				, self.btnNext]
@@ -129,7 +120,7 @@ class winMain(QtGui.QWidget):
 		monty.addListener('onConnect', self.onConnect)
 		monty.addListener('onDisconnect', self.onDisconnect)
 
-		self.enableObjects(self.disableObjects, False)
+		self.enableObjects(self.controlObjects, False)
 		self.setWindowIcon(appIcon)
 		# set icon in system tray
 		self.sysTray=QtGui.QSystemTrayIcon(appIcon, parent)
@@ -220,12 +211,13 @@ class winMain(QtGui.QWidget):
 		return QtGui.QWidget.keyPressEvent(self, event)
 	
 	def onLibraryKeyPress(self, event):
-		" add selection, or entire library to playlist using ENTER-key"
 		if event.key()==QtCore.Qt.Key_Enter or event.key()==QtCore.Qt.Key_Return:
+			# Add selection, or entire library to playlist using ENTER-key.
 			self.addLibrarySelToPlaylist()
 		return QtGui.QWidget.keyPressEvent(self, event)
 
 	def enableObjects(self, objects, enable):
+		"""Enables or disables all $objects"""
 		for object in objects:
 			object.setEnabled(enable)
 
@@ -271,11 +263,7 @@ class winMain(QtGui.QWidget):
 		doEvents()
 
 	def initialiseData(self):
-		self.setStatus("Retrieving library ...")
-		doEvents()
-		self.mLibrary=Library()
-		doEvents()
-
+		"""Initialise the library, playlist and some other small things"""
 		self.setStatus("Filling library ...")
 		doEvents()
 		self.fillLibrary()
@@ -288,21 +276,22 @@ class winMain(QtGui.QWidget):
 		
 		self.setStatus("Doing the rest ...")
 		doEvents()
-		self.enableObjects(self.disableObjects, True)
+		self.enableObjects(self.controlObjects, True)
 		self.updatePlayingInfo()
 		self.setStatus("")
 		doEvents()
 
 	
 	def onDisconnect(self, params):
-		self.enableObjects(self.disableObjects, False)
-
+		self.enableObjects(self.controlObjects, False)
 
 	def fillPlaylist(self):
+		"""Fill the playlist."""
 		self.lstPlaylist.update(monty.listPlaylist())
 
 	def fillLibrary(self):
-		self.lstLibrary.update(self.mLibrary.list())
+		"""Fill the library."""
+		self.lstLibrary.update(monty.listLibrary())
 	
 	def onLibraryDoubleClick(self):
 		self.addLibrarySelToPlaylist()
@@ -322,6 +311,7 @@ class winMain(QtGui.QWidget):
 			monty.pause()
 		elif status['state']=='stop':
 			if self.lstPlaylist.getSelItemID()==-1:
+				# if nothing selected, set it on first row
 				self.lstPlaylist.selectRow(0)
 			self.onPlaylistDoubleClick()
 		else: