fix parent of dict folder window error.

This commit is contained in:
St.Huang 2018-07-09 14:54:44 +08:00
parent 3292ca21f3
commit 58873423d4

View File

@ -179,6 +179,7 @@ class OptionsDialog(QDialog):
self.setWindowFlags(Qt.CustomizeWindowHint | self.setWindowFlags(Qt.CustomizeWindowHint |
Qt.WindowTitleHint | Qt.WindowCloseButtonHint | Qt.WindowMinMaxButtonsHint) Qt.WindowTitleHint | Qt.WindowCloseButtonHint | Qt.WindowMinMaxButtonsHint)
self.parent = parent self.parent = parent
self.browser = browser
self.connect(self, SIGNAL('before_build'), self._before_build, Qt.QueuedConnection) self.connect(self, SIGNAL('before_build'), self._before_build, Qt.QueuedConnection)
self.connect(self, SIGNAL('after_build'), self._after_build, Qt.QueuedConnection) self.connect(self, SIGNAL('after_build'), self._after_build, Qt.QueuedConnection)
# from PyQt4 import QtCore, QtGui # from PyQt4 import QtCore, QtGui
@ -192,7 +193,7 @@ class OptionsDialog(QDialog):
self.setLayout(self.main_layout) self.setLayout(self.main_layout)
# size and signal # size and signal
self.resize(widget_size.dialog_width, 4 * widget_size.map_max_height + widget_size.dialog_height_margin) self.resize(widget_size.dialog_width, 4 * widget_size.map_max_height + widget_size.dialog_height_margin)
self.emit(SIGNAL('before_build'), browser) self.emit(SIGNAL('before_build'), self.browser)
def _before_build(self, browser=None): def _before_build(self, browser=None):
for cls in service_manager.services: for cls in service_manager.services:
@ -269,7 +270,7 @@ class OptionsDialog(QDialog):
def show_fm_dialog(self): def show_fm_dialog(self):
self.save() self.save()
self.close() self.close()
show_fm_dialog() show_fm_dialog(self.browser)
def show_about(self): def show_about(self):
QMessageBox.about(self, _('ABOUT'), Template.tmpl_about) QMessageBox.about(self, _('ABOUT'), Template.tmpl_about)
@ -520,9 +521,10 @@ def show_options(browser = None):
opt_dialog.raise_() opt_dialog.raise_()
opt_dialog.exec_() opt_dialog.exec_()
def show_fm_dialog(): def show_fm_dialog(browser = None):
'''open dictionary folder manager window''' '''open dictionary folder manager window'''
fm_dialog = FoldersManageDialog(mw) parent = mw if browser is None else browser
fm_dialog = FoldersManageDialog(parent)
fm_dialog.activateWindow() fm_dialog.activateWindow()
fm_dialog.raise_() fm_dialog.raise_()
if fm_dialog.exec_() == QDialog.Accepted: if fm_dialog.exec_() == QDialog.Accepted: