diff options
| -rw-r--r-- | clPlugin.py | 10 | ||||
| -rw-r--r-- | misc.py | 4 | ||||
| -rw-r--r-- | mpclient.py (renamed from clMonty.py) | 4 | ||||
| -rwxr-xr-x | nephilim.py (renamed from montypc.py) | 2 | ||||
| -rw-r--r-- | plugins/AlbumCover.py | 16 | ||||
| -rw-r--r-- | plugins/Filebrowser.py | 4 | ||||
| -rw-r--r-- | plugins/Library.py | 10 | ||||
| -rw-r--r-- | plugins/Lyrics.py | 8 | ||||
| -rw-r--r-- | plugins/Notify.py | 14 | ||||
| -rw-r--r-- | plugins/PlayControl.py | 28 | ||||
| -rw-r--r-- | plugins/Playlist.py | 12 | ||||
| -rw-r--r-- | plugins/Systray.py | 26 | ||||
| -rw-r--r-- | winConnect.py | 10 | ||||
| -rw-r--r-- | winMain.py | 32 | ||||
| -rw-r--r-- | winSettings.py | 18 |
15 files changed, 99 insertions, 99 deletions
diff --git a/clPlugin.py b/clPlugin.py index f76acc9..efbd502 100644 --- a/clPlugin.py +++ b/clPlugin.py @@ -12,7 +12,7 @@ class Plugin: winMain = None loaded = None listeners = None - monty = None + mpclient = None DEFAULTS = {} def __init__(self, winMain, name): @@ -20,7 +20,7 @@ class Plugin: self.winMain = winMain self.loaded = False self.listeners = [] - self.monty = winMain.monty + self.mpclient = winMain.mpclient self.settings = QtCore.QSettings(ORGNAME, APPNAME) #init settings @@ -46,7 +46,7 @@ class Plugin: if len(self.listeners): logging.debug("adding %s listeners"%(len(self.listeners))) for listener in self.listeners: - self.monty.add_listener(listener[0], listener[1]) + self.mpclient.add_listener(listener[0], listener[1]) self._load() opts=QtGui.QDockWidget.DockWidgetClosable|QtGui.QDockWidget.DockWidgetMovable @@ -59,7 +59,7 @@ class Plugin: if len(self.listeners): logging.debug("removing %s listeners"%(len(self.listeners))) for listener in self.listeners: - self.monty.removeListener(listener[0], listener[1]) + self.mpclient.removeListener(listener[0], listener[1]) self._unload() dock_widget = self.getDockWidget() @@ -71,7 +71,7 @@ class Plugin: def isLoaded(self): return self.loaded - def addMontyListener(self, event, callback): + def addListener(self, event, callback): self.listeners.append([event, callback]) def getDockWidget(self, opts=None): @@ -10,8 +10,8 @@ import logging socket.setdefaulttimeout(8) appIcon = 'gfx/icon.png' -APPNAME = 'montypc' -ORGNAME = 'montypc' +APPNAME = 'nephilim' +ORGNAME = 'nephilim' def doEvents(): """Make some time for necessary events.""" @@ -5,8 +5,8 @@ from misc import * import mpd from threading import Thread -class Monty(QtCore.QObject): - """The Monty class offers another layer above pympd, with usefull events.""" +class MPClient(QtCore.QObject): + """This class offers another layer above pympd, with usefull events.""" _client = None # MPD client _listeners = None # array of listeners: { event: (listeners)* } @@ -1,6 +1,6 @@ #!/usr/bin/python -# montypc.py +# mpclientpc.py import sys from PyQt4 import QtGui diff --git a/plugins/AlbumCover.py b/plugins/AlbumCover.py index d8b1f24..e49fe0e 100644 --- a/plugins/AlbumCover.py +++ b/plugins/AlbumCover.py @@ -39,7 +39,7 @@ class wgAlbumCover(QtGui.QLabel): def select_cover_file(self): try: - song = self.p.monty.getCurrentSong() + song = self.p.mpclient.getCurrentSong() file = QtGui.QFileDialog.getOpenFileName(self , "Select album cover for %s - %s"%(song.getArtist(), song.getAlbum()) , self.cover_dirname @@ -60,7 +60,7 @@ class wgAlbumCover(QtGui.QLabel): def refresh(self, params = None): logging.info("refreshing cover") - song = self.p.monty.getCurrentSong() + song = self.p.mpclient.getCurrentSong() if not song: self.clear() self.update() @@ -131,7 +131,7 @@ class wgAlbumCover(QtGui.QLabel): return None def fetch_amazon(self): - self.fetchCoverSrc(self.p.monty.getCurrentSong(), AC_FETCH_INTERNET) + self.fetchCoverSrc(self.p.mpclient.getCurrentSong(), AC_FETCH_INTERNET) self.refresh() def fetchCoverSrc(self, song, src): @@ -174,17 +174,17 @@ class wgAlbumCover(QtGui.QLabel): class pluginAlbumCover(Plugin): o = None - DEFAULTS = {'coverdir' : '$musicdir/$songdir', 'covername' : '.cover_monty_$artist_$album', + DEFAULTS = {'coverdir' : '$musicdir/$songdir', 'covername' : '.cover_mpclient_$artist_$album', 'action0' : 1, 'action1' : 1} def __init__(self, winMain): Plugin.__init__(self, winMain, 'AlbumCover') def _load(self): self.o = wgAlbumCover(self, None) - self.monty.add_listener('onSongChange' , self.o.refresh) - self.monty.add_listener('onReady' , self.o.refresh) - self.monty.add_listener('onDisconnect' , self.o.refresh) - self.monty.add_listener('onStateChange', self.o.refresh) + self.mpclient.add_listener('onSongChange' , self.o.refresh) + self.mpclient.add_listener('onReady' , self.o.refresh) + self.mpclient.add_listener('onDisconnect' , self.o.refresh) + self.mpclient.add_listener('onStateChange', self.o.refresh) self.o.refresh() def _unload(self): self.o = None diff --git a/plugins/Filebrowser.py b/plugins/Filebrowser.py index 83500e3..9b39a05 100644 --- a/plugins/Filebrowser.py +++ b/plugins/Filebrowser.py @@ -37,11 +37,11 @@ class pluginFilebrowser(Plugin): if self.model.hasChildren(index): self.view.setRootIndex(index) else: - if not 'file://' in self.monty.urlhandlers(): + if not 'file://' in self.mpclient.urlhandlers(): self.setStatus('file:// handler not available. Connect via unix domain sockets.') return paths = [] for index in self.view.selectedIndexes(): paths.append(u'file://' + self.model.filePath(index)) - self.monty.addToPlaylist(paths) + self.mpclient.addToPlaylist(paths) diff --git a/plugins/Library.py b/plugins/Library.py index 64f68a3..101fce4 100644 --- a/plugins/Library.py +++ b/plugins/Library.py @@ -18,9 +18,9 @@ class pluginLibrary(Plugin): self.settings = QtCore.QSettings(ORGNAME, APPNAME) def _load(self): self.o = LibraryWidget(self) - self.monty.add_listener('onReady', self.o.fill_library) - self.monty.add_listener('onDisconnect', self.o.fill_library) - self.monty.add_listener('onUpdateDBFinish', self.o.fill_library) + self.mpclient.add_listener('onReady', self.o.fill_library) + self.mpclient.add_listener('onDisconnect', self.o.fill_library) + self.mpclient.add_listener('onUpdateDBFinish', self.o.fill_library) def _unload(self): self.o = None @@ -97,7 +97,7 @@ class LibraryWidget(QtGui.QWidget): #build a tree from library tree = [{},self.library.invisibleRootItem()] - for song in self.plugin.monty.listLibrary(): + for song in self.plugin.mpclient.listLibrary(): cur_item = tree for part in str(self.modes.currentText()).split('/'): tag = song.getTag(part) @@ -141,7 +141,7 @@ class LibraryWidget(QtGui.QWidget): paths = [] for item in self.library.selectedItems(): self.item_to_playlist(item, paths) - self.plugin.monty.addToPlaylist(paths) + self.plugin.mpclient.addToPlaylist(paths) def item_to_playlist(self, item, add_queue): if item.type() == 1000: diff --git a/plugins/Lyrics.py b/plugins/Lyrics.py index 55034e5..f0efb55 100644 --- a/plugins/Lyrics.py +++ b/plugins/Lyrics.py @@ -35,12 +35,12 @@ class wgLyrics(QtGui.QWidget): class pluginLyrics(Plugin): o = None DEFAULTS = {'sites' : ['lyricwiki'], 'lyricdir' : '$musicdir/$songdir', - 'lyricname' : '.lyric_monty_$artist_$album_$song'} + 'lyricname' : '.lyric_mpclient_$artist_$album_$song'} def __init__(self, winMain): Plugin.__init__(self, winMain, 'Lyrics') - self.addMontyListener('onSongChange', self.refresh) - self.addMontyListener('onReady', self.refresh) + self.addListener('onSongChange', self.refresh) + self.addListener('onReady', self.refresh) def _load(self): self.o = wgLyrics(self) def _unload(self): @@ -53,7 +53,7 @@ class pluginLyrics(Plugin): def refresh(self, params = None): lyrics = None - song = self.monty.getCurrentSong() + song = self.mpclient.getCurrentSong() if not song: self.o.set_lyrics(None, None) return diff --git a/plugins/Notify.py b/plugins/Notify.py index ebfa00e..40767fa 100644 --- a/plugins/Notify.py +++ b/plugins/Notify.py @@ -89,11 +89,11 @@ class pluginNotify(Plugin): 'timer' : 3} def __init__(self, winMain): Plugin.__init__(self, winMain, 'Notify') - self.addMontyListener('onSongChange', self.onSongChange) - self.addMontyListener('onReady', self.onReady) - self.addMontyListener('onDisconnect', self.onDisconnect) - self.addMontyListener('onStateChange', self.onStateChange) - self.addMontyListener('onVolumeChange', self.onVolumeChange) + self.addListener('onSongChange', self.onSongChange) + self.addListener('onReady', self.onReady) + self.addListener('onDisconnect', self.onDisconnect) + self.addListener('onStateChange', self.onStateChange) + self.addListener('onVolumeChange', self.onVolumeChange) def _load(self): self.o = winNotify(self, self.winMain) @@ -103,7 +103,7 @@ class pluginNotify(Plugin): return "Show interesting events in a popup window." def onSongChange(self, params): - song = self.monty.getCurrentSong() + song = self.mpclient.getCurrentSong() if not song: return self.settings.beginGroup(self.name) @@ -112,7 +112,7 @@ class pluginNotify(Plugin): self.settings.endGroup() def onReady(self, params): - self.o.show('montypc loaded!', self.settings.value(self.name + '/timer').toInt()[0]) + self.o.show('mpclientpc loaded!', self.settings.value(self.name + '/timer').toInt()[0]) def onDisconnect(self, params): self.o.show('Disconnected!', self.settings.value(self.name + '/timer').toInt()[0]) diff --git a/plugins/PlayControl.py b/plugins/PlayControl.py index 371fd84..8a17280 100644 --- a/plugins/PlayControl.py +++ b/plugins/PlayControl.py @@ -59,12 +59,12 @@ class wgPlayControl(QtGui.QToolBar): self.random = QtGui.QPushButton(QtGui.QIcon('gfx/random.png'), '', self) self.random.setToolTip('Random') self.random.setCheckable(True) - self.connect(self.random, QtCore.SIGNAL('toggled(bool)'), self.p.monty.random) + self.connect(self.random, QtCore.SIGNAL('toggled(bool)'), self.p.mpclient.random) self.repeat = QtGui.QPushButton(QtGui.QIcon('gfx/repeat.png'), '', self) self.repeat.setToolTip('Repeat') self.repeat.setCheckable(True) - self.connect(self.repeat, QtCore.SIGNAL('toggled(bool)'), self.p.monty.repeat) + self.connect(self.repeat, QtCore.SIGNAL('toggled(bool)'), self.p.mpclient.repeat) self.addWidget(self.btnPlayPause) self.addWidget(self.btnStop) @@ -85,7 +85,7 @@ class wgPlayControl(QtGui.QToolBar): self.queuedSongs.extend(songs) def onStateChange(self, params): - status = self.p.monty.getStatus() + status = self.p.mpclient.getStatus() if status['state'] == 'play': self.btnPlayPause.changeIcon('gfx/media-playback-pause.svg') @@ -98,27 +98,27 @@ class wgPlayControl(QtGui.QToolBar): self.slrVolume.setValue(params['newVolume']) def onBtnPlayPauseClick(self): - status=self.p.monty.getStatus() + status=self.p.mpclient.getStatus() if status['state']=='play': - self.p.monty.pause() + self.p.mpclient.pause() logging.info("Toggling playback") elif status['state']=='stop': - self.p.monty.play(None) + self.p.mpclient.play(None) logging.info("Pausing playback") else: - self.p.monty.resume() + self.p.mpclient.resume() def onBtnStopClick(self): - self.p.monty.stop() + self.p.mpclient.stop() logging.info("Stopping playback") def onBtnPreviousClick(self): - self.p.monty.previous() + self.p.mpclient.previous() logging.info("Playing previous") def onBtnNextClick(self): - self.p.monty.next() + self.p.mpclient.next() logging.info("Playing next") def onVolumeSliderChange(self): v=self.slrVolume.value() - self.p.monty.setVolume(v) + self.p.mpclient.setVolume(v) if v<=1: mode='mute' else: @@ -146,9 +146,9 @@ class pluginPlayControl(Plugin): DEFAULTS = {'queue' : ''} def __init__(self, winMain): Plugin.__init__(self, winMain, 'PlayControl') - self.addMontyListener('onStateChange', self.onStateChange) - self.addMontyListener('onVolumeChange', self.onVolumeChange) - self.addMontyListener('onReady', self.onStateChange) + self.addListener('onStateChange', self.onStateChange) + self.addListener('onVolumeChange', self.onVolumeChange) + self.addListener('onReady', self.onStateChange) def _load(self): self.o = wgPlayControl(self, None) self.o.loadQueue() diff --git a/plugins/Playlist.py b/plugins/Playlist.py index 00daf18..8fc315b 100644 --- a/plugins/Playlist.py +++ b/plugins/Playlist.py @@ -15,9 +15,9 @@ class pluginPlaylist(Plugin): Plugin.__init__(self, winMain, 'Playlist') def _load(self): self.o = PlaylistWidget(self) - self.monty.add_listener('onPlaylistChange', self.on_playlist_change) - self.monty.add_listener('onDisconnect', self.on_playlist_change) - self.monty.add_listener('onReady', self.on_playlist_change) + self.mpclient.add_listener('onPlaylistChange', self.on_playlist_change) + self.mpclient.add_listener('onDisconnect', self.on_playlist_change) + self.mpclient.add_listener('onReady', self.on_playlist_change) def _unload(self): self.o = None @@ -67,12 +67,12 @@ class PlaylistWidget(QtGui.QWidget): self.plugin.settings.setValue(self.plugin.getName() + '/header_state', QVariant(self.header().saveState())) def _song_activated(self, item): - self.plugin.monty.play(item.data(0, QtCore.Qt.UserRole).toPyObject().getID()) + self.plugin.mpclient.play(item.data(0, QtCore.Qt.UserRole).toPyObject().getID()) def fill(self): columns = self.plugin.settings.value(self.plugin.getName() + '/columns').toStringList() self.clear() - for song in self.plugin.monty.listPlaylist(): + for song in self.plugin.mpclient.listPlaylist(): item = QtGui.QTreeWidgetItem() for i in range(len(columns)): item.setText(i, unicode(song.getTag(str(columns[i])))) @@ -85,7 +85,7 @@ class PlaylistWidget(QtGui.QWidget): for item in self.selectedItems(): ids.append(item.data(0, QtCore.Qt.UserRole).toPyObject().getID()) - self.plugin.monty.deleteFromPlaylist(ids) + self.plugin.mpclient.deleteFromPlaylist(ids) else: QtGui.QTreeWidget.keyPressEvent(self, event) diff --git a/plugins/Systray.py b/plugins/Systray.py index 9aa5e7f..a85f0b8 100644 --- a/plugins/Systray.py +++ b/plugins/Systray.py @@ -14,11 +14,11 @@ class pluginSystray(Plugin): pixmap = None def __init__(self, winMain): Plugin.__init__(self, winMain, 'Systray') - self.addMontyListener('onSongChange', self.update) - self.addMontyListener('onReady', self.update) - self.addMontyListener('onConnect', self.update) - self.addMontyListener('onDisconnect', self.update) - self.addMontyListener('onTimeChange', self.update) # TODO only update this when necessary, i.e. mouse-hover etc + self.addListener('onSongChange', self.update) + self.addListener('onReady', self.update) + self.addListener('onConnect', self.update) + self.addListener('onDisconnect', self.update) + self.addListener('onTimeChange', self.update) # TODO only update this when necessary, i.e. mouse-hover etc self.appIcon=QtGui.QIcon(appIcon) def _load(self): @@ -29,7 +29,7 @@ class pluginSystray(Plugin): if type(event)==QtGui.QWheelEvent: numDegrees=event.delta() / 8 numSteps=5*numDegrees/15 - self.plugin.monty.setVolume(self.plugin.monty.getVolume() + numSteps) + self.plugin.mpclient.setVolume(self.plugin.mpclient.getVolume() + numSteps) event.accept() return True return False @@ -48,13 +48,13 @@ class pluginSystray(Plugin): self.o=None self.winMain._wheelEvent=None def getInfo(self): - return "Display the montypc icon in the systray." + return "Display the mpclientpc icon in the systray." def update(self, params): - status = self.monty.getStatus() + status = self.mpclient.getStatus() if not status: return - song = self.monty.getCurrentSong() + song = self.mpclient.getCurrentSong() values={'state':''} values['state']={'play':'playing', 'stop':'stopped', 'pause':'paused'}[status['state']] @@ -65,7 +65,7 @@ class pluginSystray(Plugin): if song: self.o.setToolTip(song.expand_tags(self.format)) else: - self.o.setToolTip("montypc not playing") + self.o.setToolTip("mpclientpc not playing") try: curTime=(64*status['time'])/status['length'] @@ -100,10 +100,10 @@ class pluginSystray(Plugin): w.move(x, y) elif reason==QtGui.QSystemTrayIcon.MiddleClick: # middle mouse button - if self.monty.isPlaying(): - self.monty.pause() + if self.mpclient.isPlaying(): + self.mpclient.pause() else: - self.monty.resume() + self.mpclient.resume() class SettingsWidgetSystray(Plugin.SettingsWidget): format = None diff --git a/winConnect.py b/winConnect.py index 1c3d3e7..45789ac 100644 --- a/winConnect.py +++ b/winConnect.py @@ -9,7 +9,7 @@ class winConnect(QtGui.QWidget): txtPort=None lblInfo=None _timerID=None - monty = None + mpclient = None settings = None @@ -20,7 +20,7 @@ class winConnect(QtGui.QWidget): self.txtPort = QtGui.QLineEdit(self.settings.value('MPD/port', QVariant('6600')).toString()) self.txtPort.setValidator(QtGui.QIntValidator(1, 65535, self.txtPort)) self.lblInfo = QtGui.QLabel("connecting ...") - self.monty = parent.monty + self.mpclient = parent.mpclient frame=QtGui.QVBoxLayout() inputs=QtGui.QHBoxLayout() @@ -38,8 +38,8 @@ class winConnect(QtGui.QWidget): self.center() doEvents() - self.monty.add_listener('onReady', self.onReady) - self.monty.add_listener('onConnect', self.onConnect) + self.mpclient.add_listener('onReady', self.onReady) + self.mpclient.add_listener('onConnect', self.onConnect) def center(self): screen = QtGui.QDesktopWidget().screenGeometry() @@ -79,7 +79,7 @@ class winConnect(QtGui.QWidget): self.lblInfo.setText('Trying to connect to '+host+':'+str(port)+' ...') doEvents() - self.monty.connect(host, port) + self.mpclient.connect(host, port) doEvents() def windowActivationChange(self, bool): @@ -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']) diff --git a/winSettings.py b/winSettings.py index 95c194c..08873df 100644 --- a/winSettings.py +++ b/winSettings.py @@ -16,7 +16,7 @@ class winSettings(QtGui.QWidget): settings_wg = [] class SettingsWidgetMPD(QtGui.QWidget): - monty = None + mpclient = None settings = None host_txt = None port_txt = None @@ -24,10 +24,10 @@ class winSettings(QtGui.QWidget): update = None outputs = None - def __init__(self, monty): + def __init__(self, mpclient): QtGui.QWidget.__init__(self) self.settings = QtCore.QSettings(ORGNAME, APPNAME) - self.monty = monty + self.mpclient = mpclient self.settings.beginGroup('MPD') self.host_txt = QtGui.QLineEdit(self.settings.value('host', QVariant('localhost')).toString()) @@ -42,18 +42,18 @@ class winSettings(QtGui.QWidget): self.outputs.setLayout(QtGui.QVBoxLayout()) class Output(QtGui.QCheckBox): id = None - monty = None + mpclient = None def change_state(self, state): - self.monty.set_output(self.id, state) + self.mpclient.set_output(self.id, state) - for output in self.monty.get_outputs(): + for output in self.mpclient.get_outputs(): box = Output(output['outputname']) if output['outputenabled'] == '1': box.setChecked(True) else: box.setChecked(False) box.id = int(output['outputid']) - box.monty = self.monty + box.mpclient = self.mpclient self.connect(box, QtCore.SIGNAL('stateChanged(int)'), box.change_state) self.outputs.layout().addWidget(box) @@ -72,7 +72,7 @@ class winSettings(QtGui.QWidget): self.settings.endGroup() def update_db(self): - self.monty.updateDB() + self.mpclient.updateDB() def __init__(self, winMain, parent=None): QtGui.QWidget.__init__(self, parent) @@ -83,7 +83,7 @@ class winSettings(QtGui.QWidget): self.btnClose = Button('close', self.onBtnCloseClick) tabWidget = QtGui.QTabWidget(parent) - self.settings_wg.append(self.SettingsWidgetMPD(self.winMain.monty)) + self.settings_wg.append(self.SettingsWidgetMPD(self.winMain.mpclient)) tabWidget.addTab(self.settings_wg[-1], 'MPD settings') self.lstPlugins = QtGui.QListWidget(self) |