From 23d8e4debf2bb4be051056e81dcf72c4491e1f65 Mon Sep 17 00:00:00 2001 From: Jakob Leben Date: Wed, 5 Sep 2012 15:51:01 +0200 Subject: [PATCH] sc ide: use DockWidget::toggleViewAction() + make Post Window closable --- editors/sc-ide/widgets/main_window.cpp | 9 ++------- editors/sc-ide/widgets/main_window.hpp | 1 - editors/sc-ide/widgets/post_window.cpp | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/editors/sc-ide/widgets/main_window.cpp b/editors/sc-ide/widgets/main_window.cpp index b2bfc2592..111ce8c05 100644 --- a/editors/sc-ide/widgets/main_window.cpp +++ b/editors/sc-ide/widgets/main_window.cpp @@ -286,12 +286,6 @@ void MainWindow::createActions() connect(act, SIGNAL(triggered()), this, SLOT(showReplaceTool())); // View - mActions[ShowDocList] = act = new QAction(tr("&Documents"), this); - act->setStatusTip(tr("Show/Hide the Documents dock")); - act->setCheckable(true); - connect(act, SIGNAL(triggered(bool)), mDocListDock, SLOT(setVisible(bool))); - connect(mDocListDock, SIGNAL(visibilityChanged(bool)), act, SLOT(setChecked(bool))); - mActions[ShowCmdLine] = act = new QAction(tr("&Command Line"), this); act->setStatusTip(tr("Command line for quick code evaluation")); act->setShortcut(tr("Ctrl+E", "Show command line")); @@ -417,7 +411,8 @@ void MainWindow::createMenus() menu = new QMenu(tr("&View"), this); submenu = new QMenu(tr("&Docks"), this); - submenu->addAction( mActions[ShowDocList] ); + submenu->addAction( mPostDock->toggleViewAction() ); + submenu->addAction( mDocListDock->toggleViewAction() ); menu->addMenu(submenu); menu->addSeparator(); submenu = menu->addMenu(tr("&Tool Panels")); diff --git a/editors/sc-ide/widgets/main_window.hpp b/editors/sc-ide/widgets/main_window.hpp index cfca1e783..4d77f47be 100644 --- a/editors/sc-ide/widgets/main_window.hpp +++ b/editors/sc-ide/widgets/main_window.hpp @@ -74,7 +74,6 @@ public: Replace, // View - ShowDocList, ShowCmdLine, ShowGoToLineTool, CloseToolBox, diff --git a/editors/sc-ide/widgets/post_window.cpp b/editors/sc-ide/widgets/post_window.cpp index 7a4900b4c..5f4745d04 100644 --- a/editors/sc-ide/widgets/post_window.cpp +++ b/editors/sc-ide/widgets/post_window.cpp @@ -179,7 +179,7 @@ PostDock::PostDock(QWidget* parent): QDockWidget(tr("Post window"), parent) { setAllowedAreas(Qt::BottomDockWidgetArea | Qt::RightDockWidgetArea | Qt::LeftDockWidgetArea); - setFeatures(DockWidgetFloatable | DockWidgetMovable); + setFeatures(DockWidgetFloatable | DockWidgetMovable | DockWidgetClosable); mPostWindow = new PostWindow(this); setWidget(mPostWindow); -- 2.11.4.GIT