Merge pull request #465 from rahul-raturi/multiple_instance_dialog

PICARD-804: Avoid multiple instance of history and log dialogs
This commit is contained in:
Laurent Monin
2016-03-24 15:03:06 +01:00

View File

@@ -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')