diff options
author | Anton Khirnov <wyskas@gmail.com> | 2009-06-21 13:12:34 +0200 |
---|---|---|
committer | Anton Khirnov <wyskas@gmail.com> | 2009-06-21 13:12:34 +0200 |
commit | f1b21811f412cbd7879371a0b5eb3fe8c5780f0a (patch) | |
tree | a4942bf45f1b13d658aff22b434006b31bc0fe7b /nephilim/nephilim_app.py | |
parent | 07096fbc4cb7ab38bc2cf1058879b44fb35719dd (diff) |
move connection window to nephilim_app.
Diffstat (limited to 'nephilim/nephilim_app.py')
-rw-r--r-- | nephilim/nephilim_app.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/nephilim/nephilim_app.py b/nephilim/nephilim_app.py index 2c4f421..9581bb4 100644 --- a/nephilim/nephilim_app.py +++ b/nephilim/nephilim_app.py @@ -21,6 +21,7 @@ from winMain import winMain from misc import ORGNAME, APPNAME, appIcon from mpclient import MPClient from settings_wg import SettingsWidget +from connect_wg import ConnectWidget import plugins class NephilimApp(QtGui.QApplication): @@ -37,6 +38,8 @@ class NephilimApp(QtGui.QApplication): # private "settings window" __settings_win = None + "connection window" + __connect_win = None def __init__(self, argv): QtGui.QApplication.__init__(self, argv) @@ -52,6 +55,9 @@ class NephilimApp(QtGui.QApplication): #init settings self.settings = QtCore.QSettings() + #init connection window + self.__connect_win = ConnectWidget(self) + #init main window self.main_win = winMain(self.mpclient) @@ -66,9 +72,12 @@ class NephilimApp(QtGui.QApplication): self.connect(self, QtCore.SIGNAL('aboutToQuit()'), self.__cleanup) + if show_settings: self.show_settings_win() self.main_win.restore_layout() + self.__connect_win.monitor() + QtGui.QApplication.exec_() def __cleanup(self): @@ -86,6 +95,8 @@ class NephilimApp(QtGui.QApplication): self.connect(self.__settings_win, QtCore.SIGNAL('destroyed()'), 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 |