diff options
author | Eike Ziller <eike.ziller@qt.io> | 2017-07-03 16:26:26 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2017-07-10 09:58:02 +0000 |
commit | c363c1d4eed9df12891c9fee1a29a9601f7ab457 (patch) | |
tree | d4d59253ec2bfbabb3b120df85c037dbf480a37e /src/plugins/help | |
parent | acc86aee5a16899acce24438174983334323f949 (diff) | |
download | qt-creator-c363c1d4eed9df12891c9fee1a29a9601f7ab457.tar.gz |
Add locator input widget to help windows
And move the "Show Sidebar" button into the status bar that we
need now anyhow.
Change-Id: I24bfa0991cbdcdba4d1a8cd6cbacde28d459972d
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/help')
-rw-r--r-- | src/plugins/help/helpwidget.cpp | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp index 3c0d14eca0..ca7c24d44a 100644 --- a/src/plugins/help/helpwidget.cpp +++ b/src/plugins/help/helpwidget.cpp @@ -43,8 +43,10 @@ #include <coreplugin/coreconstants.h> #include <coreplugin/icore.h> #include <coreplugin/findplaceholder.h> +#include <coreplugin/locator/locatormanager.h> #include <coreplugin/minisplitter.h> #include <coreplugin/sidebar.h> +#include <coreplugin/minisplitter.h> #include <texteditor/texteditorconstants.h> #include <utils/qtcassert.h> #include <utils/styledbar.h> @@ -56,6 +58,7 @@ #include <QPrinter> #include <QPrintDialog> #include <QStackedWidget> +#include <QStatusBar> #include <QToolButton> static const char kWindowSideBarSettingsKey[] = "Help/WindowSideBar"; @@ -83,9 +86,15 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget { m_viewerStack = new QStackedWidget; - auto hLayout = new QHBoxLayout(this); + auto topLayout = new QVBoxLayout; + topLayout->setMargin(0); + topLayout->setSpacing(0); + setLayout(topLayout); + + auto hLayout = new QHBoxLayout; hLayout->setMargin(0); hLayout->setSpacing(0); + topLayout->addLayout(hLayout, 10); m_sideBarSplitter = new Core::MiniSplitter(this); m_sideBarSplitter->setOpaqueResize(false); @@ -144,9 +153,23 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget connect(m_sideBar, &Core::SideBar::sideBarClosed, m_toggleSideBarAction, [this]() { m_toggleSideBarAction->setChecked(false); }); + if (style == ExternalWindow) { + auto statusBar = new QStatusBar; + topLayout->addWidget(statusBar); + auto splitter = new Core::NonResizingSplitter(statusBar); + statusBar->addPermanentWidget(splitter, 10); + auto statusBarWidget = new QWidget; + auto statusBarWidgetLayout = new QHBoxLayout; + statusBarWidgetLayout->setContentsMargins(0, 0, 3, 0); + statusBarWidget->setLayout(statusBarWidgetLayout); + splitter->addWidget(statusBarWidget); + splitter->addWidget(new QWidget); + auto locatorWidget = Core::LocatorManager::createLocatorInputWidget(window()); + statusBarWidgetLayout->addWidget(Core::Command::toolButtonWithAppendedShortcut( + m_toggleSideBarAction, cmd)); + statusBarWidgetLayout->addWidget(locatorWidget); + } } - if (style == ExternalWindow) - layout->addWidget(Core::Command::toolButtonWithAppendedShortcut(m_toggleSideBarAction, cmd)); if (style != ModeWidget) { m_switchToHelp = new QAction(tr("Open in Help Mode"), toolBar); |