From 6cd1f2c9d3cf002291f94cb3791f9583ca85b410 Mon Sep 17 00:00:00 2001 From: dfighter1985 Date: Mon, 9 Jun 2014 17:55:45 +0200 Subject: [PATCH] Move the log trigger menu item into it's own menu, and remove the menu when unloading the plugin. --- code/studio/src/plugins/log/log_plugin.cpp | 8 ++++++-- code/studio/src/plugins/log/log_plugin.h | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/studio/src/plugins/log/log_plugin.cpp b/code/studio/src/plugins/log/log_plugin.cpp index 2017ed91a..562b3bb6f 100644 --- a/code/studio/src/plugins/log/log_plugin.cpp +++ b/code/studio/src/plugins/log/log_plugin.cpp @@ -45,6 +45,7 @@ namespace Plugin CLogPlugin::CLogPlugin(QWidget *parent): QDockWidget(parent) { m_ui.setupUi(this); + logMenu = NULL; } CLogPlugin::~CLogPlugin() @@ -63,6 +64,9 @@ namespace Plugin NLMISC::InfoLog->removeDisplayer(m_displayer); delete m_displayer; + delete logMenu; + logMenu = NULL; + delete m_libContext; m_libContext = NULL; } @@ -82,13 +86,13 @@ namespace Plugin Core::ICore *core = Core::ICore::instance(); Core::MenuManager *menuManager = core->menuManager(); - QMenu *viewMenu = menuManager->menu(Core::Constants::M_VIEW); QMainWindow *wnd = Core::ICore::instance()->mainWindow(); wnd->addDockWidget(Qt::RightDockWidgetArea, this); hide(); - viewMenu->addAction(this->toggleViewAction()); + logMenu = menuManager->menuBar()->addMenu( "Log" ); + logMenu->addAction(toggleViewAction()); } void CLogPlugin::setNelContext(NLMISC::INelContext *nelContext) diff --git a/code/studio/src/plugins/log/log_plugin.h b/code/studio/src/plugins/log/log_plugin.h index 2221195a8..9e4f64419 100644 --- a/code/studio/src/plugins/log/log_plugin.h +++ b/code/studio/src/plugins/log/log_plugin.h @@ -85,6 +85,8 @@ namespace Plugin NLQT::CQtDisplayer *m_displayer; + QMenu *logMenu; + }; } // namespace Plugin