diff options
| author | Anton Khirnov <wyskas@gmail.com> | 2009-08-21 13:40:16 +0200 |
|---|---|---|
| committer | Anton Khirnov <wyskas@gmail.com> | 2009-08-21 14:54:50 +0200 |
| commit | 0e23f7776fd104d8713cb705438c21559addc1d9 (patch) | |
| tree | fb3303d6f6a0c86ac92febca1dd827c2218c60c7 /nephilim/plugins/Lyrics.py | |
| parent | 4636982682d69c0fc5fea724344f02c94c6cb741 (diff) | |
switch to new-style PyQt4 signals.
Diffstat (limited to 'nephilim/plugins/Lyrics.py')
| -rw-r--r-- | nephilim/plugins/Lyrics.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/nephilim/plugins/Lyrics.py b/nephilim/plugins/Lyrics.py index 15160d8..1a88dd1 100644 --- a/nephilim/plugins/Lyrics.py +++ b/nephilim/plugins/Lyrics.py @@ -59,7 +59,7 @@ class LyricsWidget(QtGui.QWidget): self.__toolbar.addAction(QtGui.QIcon('gfx/refresh.png'), 'Refresh lyrics', self.plugin.refresh) edit = self.__toolbar.addAction(QtGui.QIcon('gfx/edit.png'), 'Edit lyrics') edit.setCheckable(True) - edit.connect(edit, QtCore.SIGNAL('toggled(bool)'), self.__toggle_editable) + edit.toggled.connect(self.__toggle_editable) self.__toolbar.addAction(QtGui.QIcon('gfx/save.png'), 'Save lyrics', self.__save_lyrics) self.__toolbar.addAction(QtGui.QIcon('gfx/delete.png'), 'Delete stored file', self.plugin.del_lyrics_file) @@ -100,7 +100,6 @@ class LyricsWidget(QtGui.QWidget): self.logger.info('Lyrics not found.') self.__text_view.insertPlainText('Lyrics not found.') - class Lyrics(Plugin): # public, read-only o = None @@ -196,7 +195,7 @@ class Lyrics(Plugin): url = QtCore.QUrl('http://www.animelyrics.com/search.php') url.setQueryItems([('t', 'performer'), ('q', song.artist())]) self.fetch2(song, url) - self.connect(self.srep, QtCore.SIGNAL('finished()'), self.__handle_search_res) + self.srep.finished.connect(self.__handle_search_res) def __handle_search_res(self): # TODO use Qt xml functions @@ -217,7 +216,7 @@ class Lyrics(Plugin): self.logger.info('Found Animelyrics song URL: %s.'%url) self.mrep = self.nam.get(QtNetwork.QNetworkRequest(url)) - self.connect(self.mrep, QtCore.SIGNAL('finished()'), self.__handle_lyrics) + self.mrep.finished.connect(self.__handle_lyrics) def __handle_lyrics(self): lyrics = '' @@ -310,11 +309,11 @@ class Lyrics(Plugin): def _load(self): self.refresh_fetchers() self.o = LyricsWidget(self) - self.connect(self.mpclient, QtCore.SIGNAL('song_changed'), self.refresh) + self.mpclient.song_changed.connect(self.refresh) def _unload(self): self.o = None self.__fetchers = None - self.disconnect(self.mpclient, QtCore.SIGNAL('song_changed'), self.refresh) + self.mpclient.song_changed.disconnect(self.refresh) def info(self): return "Show (and fetch) the lyrics of the currently playing song." @@ -389,5 +388,5 @@ class Lyrics(Plugin): for fetcher in self.available_fetchers: if fetcher.name == name: self.__fetchers.append(fetcher(self)) - self.connect(self.__fetchers[-1], QtCore.SIGNAL('finished'), self.__new_lyrics_fetched) + self.__fetchers[-1].finished.connect(self.__new_lyrics_fetched) |