From 7456fa239af55cb18abf85ad3f7765d69dc9512d Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Mon, 4 Feb 2013 18:49:03 +0100 Subject: [PATCH] QmlDesigner: Refactor designmode widget Change-Id: I5a84408333afb8e6043f76eb0b9f028d8d78e2f3 Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/designmodewidget.cpp | 54 +++++++++++--------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index dced711d08e..ac5b08c1e58 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/src/plugins/qmldesigner/designmodewidget.cpp @@ -428,30 +428,7 @@ void DesignModeWidget::setup() setupNavigatorHistory(currentDesignDocument()->textEditor()); // right area: - QWidget *centerWidget = new QWidget; - { - QVBoxLayout *rightLayout = new QVBoxLayout(centerWidget); - rightLayout->setMargin(0); - rightLayout->setSpacing(0); - rightLayout->addWidget(m_fakeToolBar); - //### we now own these here - rightLayout->addWidget(viewManager().statesEditorWidget()); - - FormEditorContext *formEditorContext = new FormEditorContext(viewManager().formEditorWidget()); - Core::ICore::addContextObject(formEditorContext); - - NavigatorContext *navigatorContext = new NavigatorContext(viewManager().navigatorWidget()); - Core::ICore::addContextObject(navigatorContext); - - // editor and output panes - m_outputPlaceholderSplitter->addWidget(viewManager().formEditorWidget()); - m_outputPlaceholderSplitter->addWidget(m_outputPanePlaceholder); - m_outputPlaceholderSplitter->setStretchFactor(0, 10); - m_outputPlaceholderSplitter->setStretchFactor(1, 0); - m_outputPlaceholderSplitter->setOrientation(Qt::Vertical); - - rightLayout->addWidget(m_outputPlaceholderSplitter); - } + QWidget *centerWidget = createCenterWidget(); // m_mainSplitter area: m_mainSplitter->addWidget(m_leftSideBar); @@ -567,6 +544,35 @@ void DesignModeWidget::addNavigatorHistoryEntry(const QString &fileName) ++m_navigatorHistoryCounter; } +QWidget *DesignModeWidget::createCenterWidget() const +{ + QWidget *centerWidget = new QWidget; + + QVBoxLayout *rightLayout = new QVBoxLayout(centerWidget); + rightLayout->setMargin(0); + rightLayout->setSpacing(0); + rightLayout->addWidget(m_fakeToolBar); + //### we now own these here + rightLayout->addWidget(viewManager().statesEditorWidget()); + + FormEditorContext *formEditorContext = new FormEditorContext(viewManager().formEditorWidget()); + Core::ICore::addContextObject(formEditorContext); + + NavigatorContext *navigatorContext = new NavigatorContext(viewManager().navigatorWidget()); + Core::ICore::addContextObject(navigatorContext); + + // editor and output panes + m_outputPlaceholderSplitter->addWidget(viewManager().formEditorWidget()); + m_outputPlaceholderSplitter->addWidget(m_outputPanePlaceholder); + m_outputPlaceholderSplitter->setStretchFactor(0, 10); + m_outputPlaceholderSplitter->setStretchFactor(1, 0); + m_outputPlaceholderSplitter->setOrientation(Qt::Vertical); + + rightLayout->addWidget(m_outputPlaceholderSplitter); + + return centerWidget; +} + void DesignModeWidget::showErrorMessage(const QList &errors) { Q_ASSERT(!errors.isEmpty());