From 19af01ed5cf48099eea28ae3ed0d30c136e6fedc Mon Sep 17 00:00:00 2001 From: Rahul Raturi Date: Thu, 24 Mar 2016 19:54:10 +0530 Subject: [PATCH] Avoid multiple instance of history and log dialogs --- picard/ui/mainwindow.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/picard/ui/mainwindow.py b/picard/ui/mainwindow.py index 3f10d68fe..aab08e52f 100644 --- a/picard/ui/mainwindow.py +++ b/picard/ui/mainwindow.py @@ -36,6 +36,7 @@ from picard.ui.options.dialog import OptionsDialog from picard.ui.infodialog import FileInfoDialog, AlbumInfoDialog, ClusterInfoDialog from picard.ui.infostatus import InfoStatus from picard.ui.passworddialog import PasswordDialog +from picard.ui.logview import LogView, HistoryView from picard.ui.util import ( find_starting_directory, ButtonLineEdit, @@ -106,6 +107,9 @@ class MainWindow(QtGui.QMainWindow): if not self.show_cover_art_action.isChecked(): self.cover_art_box.hide() + self.logDialog = LogView() + self.historyDialog = HistoryView() + bottomLayout = QtGui.QHBoxLayout() bottomLayout.setContentsMargins(0, 0, 0, 0) bottomLayout.setSpacing(0) @@ -720,12 +724,14 @@ class MainWindow(QtGui.QMainWindow): webbrowser2.goto('documentation') def show_log(self): - from picard.ui.logview import LogView - LogView(self).show() + self.logDialog.show() + self.logDialog.raise_() + self.logDialog.activateWindow() def show_history(self): - from picard.ui.logview import HistoryView - HistoryView(self).show() + self.historyDialog.show() + self.historyDialog.raise_() + self.historyDialog.activateWindow() def open_bug_report(self): webbrowser2.goto('troubleshooting')