From a5e447b4f8fb455908c2d03a378e905e83fc016e Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 29 Aug 2017 12:46:53 +0200 Subject: [PATCH] MessageManager: Allow more control when showing Pane Change-Id: I7169473818cf726545a85cdc686655b0d4dbf3e7 Reviewed-by: Eike Ziller --- src/plugins/coreplugin/messagemanager.cpp | 28 +++++++++++------------ src/plugins/coreplugin/messagemanager.h | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/plugins/coreplugin/messagemanager.cpp b/src/plugins/coreplugin/messagemanager.cpp index ee522b534a5..f8d2b975069 100644 --- a/src/plugins/coreplugin/messagemanager.cpp +++ b/src/plugins/coreplugin/messagemanager.cpp @@ -38,6 +38,19 @@ MessageManager *MessageManager::instance() return m_instance; } +void MessageManager::showOutputPane(Core::MessageManager::PrintToOutputPaneFlags flags) +{ + if (!m_messageOutputWindow) + return; + if (flags & Flash) { + m_messageOutputWindow->flash(); + } else if (flags & Silent) { + // Do nothing + } else { + m_messageOutputWindow->popup(IOutputPane::Flag(int(flags))); + } +} + MessageManager::MessageManager() { m_instance = this; @@ -60,24 +73,11 @@ void MessageManager::init() ExtensionSystem::PluginManager::addObject(m_messageOutputWindow); } -void MessageManager::showOutputPane() -{ - if (m_messageOutputWindow) - m_messageOutputWindow->popup(IOutputPane::ModeSwitch); -} - void MessageManager::write(const QString &text, PrintToOutputPaneFlags flags) { if (!m_messageOutputWindow) return; - if (flags & Flash) { - m_messageOutputWindow->flash(); - } else if (flags & Silent) { - // Do nothing - } else { - m_messageOutputWindow->popup(IOutputPane::Flag(int(flags))); - } - + showOutputPane(flags); m_messageOutputWindow->append(text + QLatin1Char('\n')); } diff --git a/src/plugins/coreplugin/messagemanager.h b/src/plugins/coreplugin/messagemanager.h index 395ac75e5d2..485807d76ea 100644 --- a/src/plugins/coreplugin/messagemanager.h +++ b/src/plugins/coreplugin/messagemanager.h @@ -42,8 +42,6 @@ class CORE_EXPORT MessageManager : public QObject public: static MessageManager *instance(); - static void showOutputPane(); - enum PrintToOutputPaneFlag { NoModeSwitch = IOutputPane::NoModeSwitch, ModeSwitch = IOutputPane::ModeSwitch, @@ -55,6 +53,8 @@ public: Q_DECLARE_FLAGS(PrintToOutputPaneFlags, PrintToOutputPaneFlag) + static void showOutputPane(Core::MessageManager::PrintToOutputPaneFlags flags = NoModeSwitch); + public slots: static void write(const QString &text, Core::MessageManager::PrintToOutputPaneFlags flags = NoModeSwitch);