diff options
| author | Anton Khirnov <wyskas@gmail.com> | 2009-06-21 14:55:29 +0200 |
|---|---|---|
| committer | Anton Khirnov <wyskas@gmail.com> | 2009-06-21 16:09:47 +0200 |
| commit | 78352e76bddcef61d7eb24841651e54e1c074ce8 (patch) | |
| tree | c373f977ea08e3020f444bcb71980b5937dddb0d /nephilim | |
| parent | f1b21811f412cbd7879371a0b5eb3fe8c5780f0a (diff) | |
Lyrics: print an error if importing Lyricwiki client fails.
Diffstat (limited to 'nephilim')
| -rw-r--r-- | nephilim/connect_wg.py | 4 | ||||
| -rw-r--r-- | nephilim/nephilim_app.py | 2 | ||||
| -rw-r--r-- | nephilim/plugins/Lyrics.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nephilim/connect_wg.py b/nephilim/connect_wg.py index 888eef1..8df84f1 100644 --- a/nephilim/connect_wg.py +++ b/nephilim/connect_wg.py @@ -28,9 +28,9 @@ class ConnectWidget(QtGui.QWidget): mpclient = None settings = None - def __init__(self, parent): + def __init__(self): QtGui.QWidget.__init__(self) - self.mpclient = parent.mpclient + self.mpclient = QtGui.QApplication.instance().mpclient self.settings = QtCore.QSettings() self.host_txt = QtGui.QLineEdit(self.settings.value('MPD/host', QVariant('localhost')).toString()) diff --git a/nephilim/nephilim_app.py b/nephilim/nephilim_app.py index 9581bb4..8caf187 100644 --- a/nephilim/nephilim_app.py +++ b/nephilim/nephilim_app.py @@ -56,7 +56,7 @@ class NephilimApp(QtGui.QApplication): self.settings = QtCore.QSettings() #init connection window - self.__connect_win = ConnectWidget(self) + self.__connect_win = ConnectWidget() #init main window self.main_win = winMain(self.mpclient) diff --git a/nephilim/plugins/Lyrics.py b/nephilim/plugins/Lyrics.py index 5f6d579..9c55a12 100644 --- a/nephilim/plugins/Lyrics.py +++ b/nephilim/plugins/Lyrics.py @@ -28,7 +28,7 @@ try: import LyricWiki_client _available_sites.append('lyricwiki') except ImportError: - pass + print 'Lyrics: error importing LyricWiki. Make sure that ZSI is installed.' class wgLyrics(QtGui.QWidget): txtView = None # text-object |