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

QmlDesigner: Refactor designmode widget

Browse Source 
Change-Id: I5a84408333afb8e6043f76eb0b9f028d8d78e2f3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2013-02-04 18:49:03 +01:00
committed by Thomas Hartmann
parent 89efd76c2c
commit 7456fa239a
1 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -428,30 +428,7 @@ void DesignModeWidget::setup()
setupNavigatorHistory(currentDesignDocument()->textEditor()); setupNavigatorHistory(currentDesignDocument()->textEditor());
// right area: // right area:
QWidget *centerWidget = new QWidget; QWidget *centerWidget = createCenterWidget();
{
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);
}
// m_mainSplitter area: // m_mainSplitter area:
m_mainSplitter->addWidget(m_leftSideBar); m_mainSplitter->addWidget(m_leftSideBar);
@@ -567,6 +544,35 @@ void DesignModeWidget::addNavigatorHistoryEntry(const QString &fileName)
++m_navigatorHistoryCounter; ++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<RewriterView::Error> &errors) void DesignModeWidget::showErrorMessage(const QList<RewriterView::Error> &errors)
{ {
Q_ASSERT(!errors.isEmpty()); Q_ASSERT(!errors.isEmpty());