From 57b4148867b78732d2c9fbd6876447b13c49322a Mon Sep 17 00:00:00 2001 From: Stojce Slavkovski Date: Tue, 17 Dec 2013 22:12:24 +0100 Subject: [PATCH] Dialog position / toggle --- interface/resources/styles/log_dialog.qss | 2 +- interface/src/Menu.cpp | 4 ++-- interface/src/ui/LogDialog.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/resources/styles/log_dialog.qss b/interface/resources/styles/log_dialog.qss index c5601a9ab6..fe3675f682 100644 --- a/interface/resources/styles/log_dialog.qss +++ b/interface/resources/styles/log_dialog.qss @@ -1,5 +1,5 @@ QPlainTextEdit { - font-family: Inconsolata, Lucida Console, Andale Mono, Monaco; + font-family: Inconsolata, Lucida Console, Andale Mono, Monaco; font-size: 16px; padding-left: 28px; color: #333333; diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index f14106bf49..5ea9bc8810 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -1032,10 +1032,10 @@ void Menu::showLogDialog() { if (! _logDialog) { _logDialog = new LogDialog(Application::getInstance()->getGLWidget()); connect(_logDialog, SIGNAL(closed()), SLOT(logDialogClosed())); - _logDialog->show(); + } else { + _logDialog->close(); } - _logDialog->raise(); } void Menu::logDialogClosed() { diff --git a/interface/src/ui/LogDialog.cpp b/interface/src/ui/LogDialog.cpp index 5717521d90..09e66eac75 100644 --- a/interface/src/ui/LogDialog.cpp +++ b/interface/src/ui/LogDialog.cpp @@ -21,7 +21,7 @@ int cursorMeta = qRegisterMetaType("QTextCursor"); int blockMeta = qRegisterMetaType("QTextBlock"); LogDialog::LogDialog(QWidget* parent) : - QDialog(parent, Qt::Window | Qt::WindowCloseButtonHint | Qt::WindowStaysOnTopHint) { + QDialog(parent, Qt::Dialog | Qt::WindowCloseButtonHint | Qt::WindowStaysOnTopHint) { setWindowTitle("Log");