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

QmlDesigner: keep centralTabWidget for later use

Browse Source 
Change-Id: I564e178ba049d963af9a7b5ab8e208c50bcba12c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Tim Jenssen
2016-11-18 16:06:09 +01:00
parent 99723f69ce
commit 2908d42b60
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmldesigner/designmodewidget.cpp
View File

@@ -516,7 +516,10 @@ QWidget *DesignModeWidget::createCenterWidget()
m_topSideBar = createTopSideBarWidget(viewManager().widgetInfos()); m_topSideBar = createTopSideBarWidget(viewManager().widgetInfos());
horizontalLayout->addWidget(m_topSideBar.data()); horizontalLayout->addWidget(m_topSideBar.data());
horizontalLayout->addWidget(createCentralSplitter(viewManager().widgetInfos())); Core::MiniSplitter *centralSplitter = createCentralSplitter(viewManager().widgetInfos());
m_centralTabWidget = centralSplitter->findChild<QTabWidget*>("centralTabWidget");
Q_ASSERT(m_centralTabWidget);
horizontalLayout->addWidget(centralSplitter);
return centerWidget; return centerWidget;
} }
@@ -585,6 +588,11 @@ CrumbleBar *DesignModeWidget::crumbleBar() const
return m_crumbleBar; return m_crumbleBar;
} }
QTabWidget *DesignModeWidget::centralTabWidget() const
{
return m_centralTabWidget;
}
QString DesignModeWidget::contextHelpId() const QString DesignModeWidget::contextHelpId() const
{ {
if (currentDesignDocument()) if (currentDesignDocument())

6
src/plugins/qmldesigner/designmodewidget.h
View File

@@ -34,6 +34,10 @@
#include <QWidget> #include <QWidget>
#include <QScopedPointer> #include <QScopedPointer>
QT_BEGIN_NAMESPACE
class QTabWidget;
QT_END_NAMESPACE
namespace Core { namespace Core {
class SideBar; class SideBar;
class SideBarItem; class SideBarItem;
@@ -80,6 +84,7 @@ public:
bool gotoCodeWasClicked(); bool gotoCodeWasClicked();
CrumbleBar* crumbleBar() const; CrumbleBar* crumbleBar() const;
QTabWidget* centralTabWidget() const;
public slots: public slots:
void updateErrorStatus(const QList<RewriterError> &errors); void updateErrorStatus(const QList<RewriterError> &errors);
@@ -107,6 +112,7 @@ private: // functions
private: // variables private: // variables
QSplitter *m_mainSplitter = nullptr; QSplitter *m_mainSplitter = nullptr;
QPointer<DocumentWarningWidget> m_warningWidget; QPointer<DocumentWarningWidget> m_warningWidget;
QTabWidget* m_centralTabWidget = nullptr;
QScopedPointer<Core::SideBar> m_leftSideBar; QScopedPointer<Core::SideBar> m_leftSideBar;
QScopedPointer<Core::SideBar> m_rightSideBar; QScopedPointer<Core::SideBar> m_rightSideBar;