diff options
Diffstat (limited to 'winMain.py')
| -rw-r--r-- | winMain.py | 32 |
1 files changed, 16 insertions, 16 deletions
@@ -3,7 +3,7 @@ from PyQt4.QtCore import QVariant from traceback import print_exc from misc import * -from clMonty import Monty +from mpclient import MPClient import plugins @@ -27,7 +27,7 @@ class winMain(QtGui.QMainWindow): wSettings=None " MPD object" - monty = None + mpclient = None " Statusbar objects" statuslabel = None @@ -38,7 +38,7 @@ class winMain(QtGui.QMainWindow): def __init__(self, parent=None): QtGui.QWidget.__init__(self, parent) self.settings = QtCore.QSettings(ORGNAME, APPNAME) - self.monty = Monty() + self.mpclient = MPClient() self.wConnect=winConnect(self) @@ -63,7 +63,7 @@ class winMain(QtGui.QMainWindow): self.mConnect=m.addAction('Connect ...', self.wConnect.monitor) self.mConnect.setIcon(QtGui.QIcon(appIcon)) # disconnect - self.mDisconnect=m.addAction('Disconnect', self.monty.disconnect) + self.mDisconnect=m.addAction('Disconnect', self.mpclient.disconnect) self.mDisconnect.setIcon(QtGui.QIcon('gfx/disconnect.png')) # separator m.addSeparator() @@ -109,14 +109,14 @@ class winMain(QtGui.QMainWindow): self.restoreLayout() " add event handlers" - self.monty.add_listener('onReady', self.onReady) - self.monty.add_listener('onConnect', self.onConnect) - self.monty.add_listener('onDisconnect', self.onDisconnect) - self.monty.add_listener('onUpdateDBStart', self.onUpdateDBStart) - self.monty.add_listener('onUpdateDBFinish', self.onUpdateDBFinish) - self.monty.add_listener('onSongChange', self.on_song_change) - self.monty.add_listener('onStateChange', self.update_state_messages) - self.monty.add_listener('onTimeChange', self.on_time_change) + self.mpclient.add_listener('onReady', self.onReady) + self.mpclient.add_listener('onConnect', self.onConnect) + self.mpclient.add_listener('onDisconnect', self.onDisconnect) + self.mpclient.add_listener('onUpdateDBStart', self.onUpdateDBStart) + self.mpclient.add_listener('onUpdateDBFinish', self.onUpdateDBFinish) + self.mpclient.add_listener('onSongChange', self.on_song_change) + self.mpclient.add_listener('onStateChange', self.update_state_messages) + self.mpclient.add_listener('onTimeChange', self.on_time_change) self.enableAll(True) self.setWindowIcon(QtGui.QIcon(appIcon)) @@ -261,8 +261,8 @@ class winMain(QtGui.QMainWindow): self.setStatus('Updating the database. Please wait ...') def update_state_messages(self, params = None): - song = self.monty.getCurrentSong() - if song and self.monty.isPlaying(): + song = self.mpclient.getCurrentSong() + if song and self.mpclient.isPlaying(): self.setWindowTitle(song.getTitle() + " by " + song.getArtist()) self.statuslabel.setText("Now playing " + song.getTitle() + " by " + song.getArtist() + " on " + song.getAlbum()) else: @@ -270,10 +270,10 @@ class winMain(QtGui.QMainWindow): self.statuslabel.setText("") def on_time_slider_change(self): - self.monty.seek(self.time_slider.value()) + self.mpclient.seek(self.time_slider.value()) def on_song_change(self, params): - status = self.monty.getStatus() + status = self.mpclient.getStatus() self.time_slider.setMaximum(status['length']) self.time_slider.setEnabled(True) self.time_label.duration = sec2min(status['length']) |