feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Move some code to where it belongs really.

Browse Source
This commit is contained in:
kh1
2010-07-21 14:56:03 +02:00
parent a59a1e5d37
commit 37b06903d3
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/help/helpmode.cpp
View File

@@ -30,15 +30,12 @@
#include "helpmode.h" #include "helpmode.h"
#include "helpconstants.h" #include "helpconstants.h"
#include <coreplugin/findplaceholder.h>
#include <QtGui/QWidget> #include <QtGui/QWidget>
#include <QtGui/QLayout>
using namespace Help; using namespace Help;
using namespace Help::Internal; using namespace Help::Internal;
HelpMode::HelpMode(QWidget *widget, QWidget *centralWidget, QObject *parent) HelpMode::HelpMode(QWidget *widget, QObject *parent)
: BaseMode(parent) : BaseMode(parent)
{ {
setDisplayName(tr("Help")); setDisplayName(tr("Help"));
@@ -46,8 +43,6 @@ HelpMode::HelpMode(QWidget *widget, QWidget *centralWidget, QObject *parent)
setIcon(QIcon(QLatin1String(":/fancyactionbar/images/mode_Reference.png"))); setIcon(QIcon(QLatin1String(":/fancyactionbar/images/mode_Reference.png")));
setPriority(Constants::P_MODE_HELP); setPriority(Constants::P_MODE_HELP);
setWidget(widget); setWidget(widget);
centralWidget->layout()->setSpacing(0);
centralWidget->layout()->addWidget(new Core::FindToolBarPlaceHolder(centralWidget));
} }

2
src/plugins/help/helpmode.h
View File

@@ -42,7 +42,7 @@ class HelpMode : public Core::BaseMode
Q_OBJECT Q_OBJECT
public: public:
HelpMode(QWidget *widget, QWidget *centralWidget, QObject *parent = 0); HelpMode(QWidget *widget, QObject *parent = 0);
}; };
} // namespace Internal } // namespace Internal

7
src/plugins/help/helpplugin.cpp
View File

@@ -296,6 +296,11 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
mainWidgetLayout->addWidget(createToolBar()); mainWidgetLayout->addWidget(createToolBar());
mainWidgetLayout->addWidget(m_centralWidget); mainWidgetLayout->addWidget(m_centralWidget);
if (QLayout *layout = m_centralWidget->layout()) {
layout->setSpacing(0);
layout->addWidget(new Core::FindToolBarPlaceHolder(m_centralWidget));
}
HelpIndexFilter *helpIndexFilter = new HelpIndexFilter(); HelpIndexFilter *helpIndexFilter = new HelpIndexFilter();
addAutoReleasedObject(helpIndexFilter); addAutoReleasedObject(helpIndexFilter);
connect(helpIndexFilter, SIGNAL(linkActivated(QUrl)), this, connect(helpIndexFilter, SIGNAL(linkActivated(QUrl)), this,
@@ -310,7 +315,7 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
connect(m_core->modeManager(), SIGNAL(currentModeChanged(Core::IMode*, connect(m_core->modeManager(), SIGNAL(currentModeChanged(Core::IMode*,
Core::IMode*)), this, SLOT(modeChanged(Core::IMode*, Core::IMode*))); Core::IMode*)), this, SLOT(modeChanged(Core::IMode*, Core::IMode*)));
addAutoReleasedObject(m_mode = new HelpMode(m_splitter, m_centralWidget)); addAutoReleasedObject(m_mode = new HelpMode(m_splitter));
m_mode->setContext(modecontext); m_mode->setContext(modecontext);
return true; return true;