summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <wyskas@gmail.com>2009-11-21 11:28:15 +0100
committerAnton Khirnov <wyskas@gmail.com>2009-11-21 11:28:15 +0100
commitce80e156d269076c148b9e8592b6f2ae74e0680f (patch)
tree0d95e4d660b9547cfebeb46d1e2ed38e2257d038
parentd3b9598cb75aee28b10d46f7ed58607d738bc98e (diff)
fixed opening settings window multiple times
there should be a better way though.
-rw-r--r--nephilim/nephilim_app.py5
-rw-r--r--nephilim/settings_wg.py3
2 files changed, 3 insertions, 5 deletions
diff --git a/nephilim/nephilim_app.py b/nephilim/nephilim_app.py
index 1374108..45992d7 100644
--- a/nephilim/nephilim_app.py
+++ b/nephilim/nephilim_app.py
@@ -93,15 +93,12 @@ class NephilimApp(QtGui.QApplication):
if not self.__settings_win:
self.__settings_win = SettingsWidget(self.mpclient, self.plugins)
- self.__settings_win.destroyed.connect(self.__del_settings_win)
self.__settings_win.show()
self.__settings_win.raise_()
+
def show_connect_win(self):
self.__connect_win.monitor()
- def __del_settings_win(self):
- self.__settings_win = None
-
def expand_tags(self, str):
ret = str
ret = ret.replace('$musicdir', self.settings.value('MPD/music_dir').toString())
diff --git a/nephilim/settings_wg.py b/nephilim/settings_wg.py
index f1c07d1..9c9744c 100644
--- a/nephilim/settings_wg.py
+++ b/nephilim/settings_wg.py
@@ -179,4 +179,5 @@ class SettingsWidget(QtGui.QWidget):
self.settings.setValue(name + '/load', QtCore.QVariant(toload))
def closeEvent(self, event):
- self.settings_wg = None
+ self.hide()
+ event.ignore()