From 42288b18f416ea72a88e9a81ef441de629897271 Mon Sep 17 00:00:00 2001 From: con Date: Wed, 29 Jun 2011 12:17:52 +0200 Subject: [PATCH] Fix upper bar in welcome mode. Change-Id: I83c5a7a0dcb5dab7cd428c6131b12abb140829b2 Reviewed-on: http://codereview.qt.nokia.com/889 Reviewed-by: Qt Sanity Bot Reviewed-by: Daniel Molkentin --- share/qtcreator/welcomescreen/welcomescreen.qml | 10 ---------- src/plugins/welcome/welcomeplugin.cpp | 17 ++++++++++------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/share/qtcreator/welcomescreen/welcomescreen.qml b/share/qtcreator/welcomescreen/welcomescreen.qml index 67a5a3a980d..41320c46cf9 100644 --- a/share/qtcreator/welcomescreen/welcomescreen.qml +++ b/share/qtcreator/welcomescreen/welcomescreen.qml @@ -11,16 +11,6 @@ Image { onCurrentChanged: welcomeMode.activePlugin = current Component.onCompleted: current = welcomeMode.activePlugin - BorderImage { - id: headerLine - anchors.top: parent.top - anchors.left: parent.left - anchors.right: parent.right - // FIXME: 25 px and get rid of border - height: 24 - border { top: 1; bottom: 1} - source: "qrc:welcome/images/tab_inactive.png" - } BorderImage { id: inner_background Image { diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index 344eb5b11da..2c6e2b6e6e8 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -118,7 +118,7 @@ private slots: void modeChanged(Core::IMode*); private: - QScrollArea *m_scrollArea; + QWidget *m_modeWidget; QDeclarativeView *m_welcomePage; QHBoxLayout * buttonLayout; QList m_pluginList; @@ -140,10 +140,13 @@ WelcomeMode::WelcomeMode() : m_welcomePage = new QDeclarativeView; m_welcomePage->setResizeMode(QDeclarativeView::SizeRootObjectToView); - m_scrollArea = new QScrollArea; - m_scrollArea->setFrameStyle(QFrame::NoFrame|QFrame::Plain); - m_scrollArea->setWidget(m_welcomePage); - m_scrollArea->setWidgetResizable(true); + m_modeWidget = new QWidget; + QVBoxLayout *layout = new QVBoxLayout; + layout->setMargin(0); + layout->setSpacing(0); + layout->addWidget(new Utils::StyledBar); + layout->addWidget(m_welcomePage); + m_modeWidget->setLayout(layout); PluginManager *pluginManager = PluginManager::instance(); connect(pluginManager, SIGNAL(objectAdded(QObject*)), SLOT(welcomePluginAdded(QObject*))); @@ -151,14 +154,14 @@ WelcomeMode::WelcomeMode() : Core::ModeManager *modeManager = Core::ICore::instance()->modeManager(); connect(modeManager, SIGNAL(currentModeChanged(Core::IMode*)), SLOT(modeChanged(Core::IMode*))); - setWidget(m_scrollArea); + setWidget(m_modeWidget); } WelcomeMode::~WelcomeMode() { QSettings *settings = Core::ICore::instance()->settings(); settings->setValue(QLatin1String(currentPageSettingsKeyC), activePlugin()); - delete m_scrollArea; + delete m_modeWidget; } bool sortFunction(Utils::IWelcomePage * a, Utils::IWelcomePage *b)