From 22d41fb37ef6ea9b2b0fae37c4e748b89b280666 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Tue, 21 Jul 2009 13:30:35 +0200
Subject: [PATCH] Add missing find tool bar placeholders.
---
src/plugins/coreplugin/mainwindow.cpp | 1 -
src/plugins/coreplugin/outputpane.cpp | 2 ++
src/plugins/debugger/debuggeroutputwindow.cpp | 7 ++++++-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index eafe8063af5..38ecd025ab8 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -303,7 +303,6 @@ bool MainWindow::init(QString *errorMessage)
oph->setCloseable(false);
outputModeWidget->layout()->addWidget(oph);
oph->setVisible(true); // since the output pane placeholder is invisible at startup by default (which makes sense in most cases)
- outputModeWidget->layout()->addWidget(new Core::FindToolBarPlaceHolder(outputModeWidget));
outputModeWidget->setFocusProxy(oph);
connect(m_modeManager, SIGNAL(currentModeChanged(Core::IMode*)),
diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp
index 7033ffd6857..3954eb25838 100644
--- a/src/plugins/coreplugin/outputpane.cpp
+++ b/src/plugins/coreplugin/outputpane.cpp
@@ -37,6 +37,7 @@
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/findplaceholder.h>
#include <extensionsystem/pluginmanager.h>
@@ -204,6 +205,7 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) :
toolLayout->addWidget(m_opToolBarWidgets);
toolLayout->addWidget(m_closeButton);
mainlayout->addWidget(m_toolBar);
+ mainlayout->addWidget(new Core::FindToolBarPlaceHolder(this));
mainlayout->addWidget(m_outputWidgetPane, 10);
setLayout(mainlayout);
diff --git a/src/plugins/debugger/debuggeroutputwindow.cpp b/src/plugins/debugger/debuggeroutputwindow.cpp
index 837747e85d1..d9328b33fbd 100644
--- a/src/plugins/debugger/debuggeroutputwindow.cpp
+++ b/src/plugins/debugger/debuggeroutputwindow.cpp
@@ -48,6 +48,7 @@
#ifndef GDBDEBUGGERLEAN
#include <aggregation/aggregate.h>
+#include <coreplugin/findplaceholder.h>
#include <find/basetextfind.h>
using namespace Find;
@@ -309,8 +310,12 @@ DebuggerOutputWindow::DebuggerOutputWindow(QWidget *parent)
m_splitter->addWidget(m_inputText);
m_splitter->addWidget(m_combinedText);
- QGridLayout *layout = new QGridLayout(this);
+ QVBoxLayout *layout = new QVBoxLayout(this);
layout->setMargin(0);
+ layout->setSpacing(0);
+#ifndef GDBDEBUGGERLEAN
+ layout->addWidget(new Core::FindToolBarPlaceHolder(this));
+#endif
layout->addWidget(m_splitter);
setLayout(layout);
--
GitLab