diff options
Diffstat (limited to 'winMain.py')
| -rw-r--r-- | winMain.py | 54 |
1 files changed, 30 insertions, 24 deletions
@@ -5,7 +5,7 @@ import copy from misc import * from clSettings import settings,mpdSettings -from clMonty import monty +from clMonty import Monty import plugins @@ -28,11 +28,15 @@ class winMain(QtGui.QMainWindow): wConnect=None wSettings=None + " MPD object" + monty = None + def __init__(self, parent=None): QtGui.QWidget.__init__(self, parent) - self.setWindowTitle("montypc - An MPD client") + self.setWindowTitle("self.montypc - An MPD client") + self.monty = Monty() - self.wConnect=winConnect() + self.wConnect=winConnect(self) self.statusBar() # create a statusbar mBar=self.menuBar() # create a menubar @@ -41,9 +45,9 @@ class winMain(QtGui.QMainWindow): m.setTearOffEnabled(True) # connect self.mConnect=m.addAction('Connect ...', self.wConnect.monitor) - self.mConnect.setIcon(QtGui.QIcon('gfx/connect.png')) + self.mConnect.setIcon(QtGui.QIcon(appIcon)) # disconnect - self.mDisconnect=m.addAction('Disconnect', monty.disconnect) + self.mDisconnect=m.addAction('Disconnect', self.monty.disconnect) self.mDisconnect.setIcon(QtGui.QIcon('gfx/disconnect.png')) # separator m.addSeparator() @@ -91,21 +95,21 @@ class winMain(QtGui.QMainWindow): self.restoreLayout() " add event handlers" - monty.addListener('onReady', self.onReady) - monty.addListener('onConnect', self.onConnect) - monty.addListener('onDisconnect', self.onDisconnect) - monty.addListener('onUpdateDBStart', self.onUpdateDBStart) - monty.addListener('onUpdateDBFinish', self.onUpdateDBFinish) + self.monty.addListener('onReady', self.onReady) + self.monty.addListener('onConnect', self.onConnect) + self.monty.addListener('onDisconnect', self.onDisconnect) + self.monty.addListener('onUpdateDBStart', self.onUpdateDBStart) + self.monty.addListener('onUpdateDBFinish', self.onUpdateDBFinish) self.enableAll(True) - self.setWindowIcon(appIcon) + self.setWindowIcon(QtGui.QIcon(appIcon)) # set icon in system tray self.wConnect.monitor() self.show() if newPlugins: self.showWinSettings() - doEvents() + doEvents def quit(self): # unload all plugins @@ -169,9 +173,11 @@ class winMain(QtGui.QMainWindow): self.mMenuVisible=a ret.addAction(self.mMenuVisible) ret.addSeparator() - actions=QtGui.QMainWindow.createPopupMenu(self).actions() - for i in xrange(len(actions)-1): - ret.addAction(actions[i]) + menu = QtGui.QMainWindow.createPopupMenu(self) + if menu: + actions = menu.actions() + for i in xrange(len(actions)-1): + ret.addAction(actions[i]) return ret def switchMenubar(self, val): self.menuBar().setVisible(val) @@ -207,7 +213,7 @@ class winMain(QtGui.QMainWindow): self.setStatus('Restoring library and playlist ...') self.mDisconnect.setEnabled(True) self.mConnect.setEnabled(False) - doEvents() + doEvents def enableAll(self, value): for k,entry in plugins.listPlugins().iteritems(): @@ -220,20 +226,20 @@ class winMain(QtGui.QMainWindow): def initialiseData(self): """Initialise the library, playlist and some other small things""" self.setStatus("Filling library ...") - doEvents() + doEvents self.fillLibrary() - doEvents() + doEvents self.setStatus("Filling playlist ...") - doEvents() + doEvents self.fillPlaylist() - doEvents() + doEvents self.setStatus("Doing the rest ...") - doEvents() + doEvents self.enableAll(True) self.setStatus("") - doEvents() + doEvents def resizeEvent(self, event): settings.set('winMain.size', '%i %i'%(self.width(),self.height())) @@ -258,14 +264,14 @@ class winMain(QtGui.QMainWindow): def fillPlaylist(self): """Fill the playlist.""" try: - self.getPlaylistList().updateSongs(monty.listPlaylist()) + self.getPlaylistList().updateSongs(self.monty.listPlaylist()) except: pass def fillLibrary(self): """Fill the library.""" try: - self.getLibraryList().updateSongs(monty.listLibrary()) + self.getLibraryList().updateSongs(self.monty.listLibrary()) except: pass |