diff options
| -rw-r--r-- | nephilim/nephilim_app.py | 11 | ||||
| -rw-r--r-- | nephilim/winMain.py | 9 |
2 files changed, 12 insertions, 8 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 diff --git a/nephilim/winMain.py b/nephilim/winMain.py index 61d5948..0ecd7c4 100644 --- a/nephilim/winMain.py +++ b/nephilim/winMain.py @@ -21,7 +21,6 @@ from PyQt4.QtCore import QVariant import logging from misc import APPNAME, sec2min, appIcon -from connect_wg import ConnectWidget DEFAULT_LAYOUT_FILE = 'default_layout' @@ -34,9 +33,6 @@ class winMain(QtGui.QMainWindow): mDisconnect = None __layout_menu = None - wConnect = None - - # Statusbar objects __statuslabel = None __time_slider = None @@ -49,7 +45,6 @@ class winMain(QtGui.QMainWindow): self.settings = QtCore.QSettings() self.mpclient = mpclient - self.wConnect = ConnectWidget(self) # statusbar self.statusBar() @@ -69,7 +64,7 @@ class winMain(QtGui.QMainWindow): m = mBar.addMenu("File") m.setTearOffEnabled(True) # connect - self.mConnect=m.addAction('Connect ...', self.wConnect.monitor) + self.mConnect=m.addAction('Connect ...', QtGui.QApplication.instance().show_connect_win) self.mConnect.setIcon(QtGui.QIcon(appIcon)) # disconnect self.mDisconnect=m.addAction('Disconnect', self.mpclient.disconnect_mpd) @@ -107,8 +102,6 @@ class winMain(QtGui.QMainWindow): self.connect(self.mpclient, QtCore.SIGNAL('state_changed'), self.__update_state_messages) self.connect(self.mpclient, QtCore.SIGNAL('time_changed'), self.__on_time_change) - self.wConnect.monitor() - self.__update_state_messages() self.show() |