From 48134939c0b005b964adac2a3aec9c426f049ecd Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Tue, 21 Jul 2009 15:55:46 +0200
Subject: [PATCH] Back to the bottom.
---
src/plugins/coreplugin/editormanager/editorview.cpp | 5 ++---
src/plugins/coreplugin/outputpane.cpp | 2 +-
src/plugins/debugger/debuggeroutputwindow.cpp | 2 +-
src/plugins/find/findtoolbar.cpp | 2 +-
src/plugins/help/helpplugin.cpp | 2 +-
5 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp
index bc823fc68fa..55d98f395e4 100644
--- a/src/plugins/coreplugin/editormanager/editorview.cpp
+++ b/src/plugins/coreplugin/editormanager/editorview.cpp
@@ -145,9 +145,6 @@ EditorView::EditorView(OpenEditorsModel *model, QWidget *parent) :
connect(m_lockButton, SIGNAL(clicked()), this, SLOT(makeEditorWritable()));
connect(m_closeButton, SIGNAL(clicked()), this, SLOT(closeView()), Qt::QueuedConnection);
}
- {
- tl->addWidget(new FindToolBarPlaceHolder(this));
- }
{
m_infoWidget->setFrameStyle(QFrame::Panel | QFrame::Raised);
m_infoWidget->setLineWidth(1);
@@ -180,6 +177,8 @@ EditorView::EditorView(OpenEditorsModel *model, QWidget *parent) :
tl->addWidget(m_container);
+ tl->addWidget(new FindToolBarPlaceHolder(this));
+
{
m_statusHLine->setFrameStyle(QFrame::HLine);
diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp
index 3954eb25838..228c653919d 100644
--- a/src/plugins/coreplugin/outputpane.cpp
+++ b/src/plugins/coreplugin/outputpane.cpp
@@ -205,8 +205,8 @@ 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);
+ mainlayout->addWidget(new Core::FindToolBarPlaceHolder(this));
setLayout(mainlayout);
m_buttonsWidget = new QWidget;
diff --git a/src/plugins/debugger/debuggeroutputwindow.cpp b/src/plugins/debugger/debuggeroutputwindow.cpp
index d9328b33fbd..a0cdcf531bb 100644
--- a/src/plugins/debugger/debuggeroutputwindow.cpp
+++ b/src/plugins/debugger/debuggeroutputwindow.cpp
@@ -313,10 +313,10 @@ DebuggerOutputWindow::DebuggerOutputWindow(QWidget *parent)
QVBoxLayout *layout = new QVBoxLayout(this);
layout->setMargin(0);
layout->setSpacing(0);
+ layout->addWidget(m_splitter);
#ifndef GDBDEBUGGERLEAN
layout->addWidget(new Core::FindToolBarPlaceHolder(this));
#endif
- layout->addWidget(m_splitter);
setLayout(layout);
#ifndef GDBDEBUGGERLEAN
diff --git a/src/plugins/find/findtoolbar.cpp b/src/plugins/find/findtoolbar.cpp
index 482f3fc8406..0ad3ecc44b9 100644
--- a/src/plugins/find/findtoolbar.cpp
+++ b/src/plugins/find/findtoolbar.cpp
@@ -74,7 +74,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
//setup ui
m_ui.setupUi(this);
setFocusProxy(m_ui.findEdit);
-// setProperty("topBorder", true);
+ setProperty("topBorder", true);
setSingleRow(false);
m_ui.findEdit->setAttribute(Qt::WA_MacShowFocusRect, false);
m_ui.replaceEdit->setAttribute(Qt::WA_MacShowFocusRect, false);
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index df08859d230..f6e8db8fb33 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -474,12 +474,12 @@ void HelpPlugin::createRightPaneSideBar()
addAutoReleasedObject(new Core::BaseRightPaneWidget(m_rightPaneSideBar));
rightPaneLayout->addWidget(w);
- rightPaneLayout->addWidget(new Core::FindToolBarPlaceHolder(m_rightPaneSideBar));
m_helpViewerForSideBar = new HelpViewer(m_helpEngine, 0);
Aggregation::Aggregate *agg = new Aggregation::Aggregate();
agg->add(m_helpViewerForSideBar);
agg->add(new HelpViewerFindSupport(m_helpViewerForSideBar));
rightPaneLayout->addWidget(m_helpViewerForSideBar);
+ rightPaneLayout->addWidget(new Core::FindToolBarPlaceHolder(m_rightPaneSideBar));
#if defined(QT_NO_WEBKIT)
QFont font = m_helpViewerForSideBar->font();
font = qVariantValue<QFont>(m_helpEngine->customValue(QLatin1String("font"),
--
GitLab