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

Fix upper bar in welcome mode.

Browse Source 
Change-Id: I83c5a7a0dcb5dab7cd428c6131b12abb140829b2
Reviewed-on: http://codereview.qt.nokia.com/889
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
This commit is contained in:
con
2011-06-29 12:17:52 +02:00
committed by Eike Ziller
parent 11d4cbc141
commit 42288b18f4
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
share/qtcreator/welcomescreen/welcomescreen.qml
View File

@@ -11,16 +11,6 @@ Image {
onCurrentChanged: welcomeMode.activePlugin = current onCurrentChanged: welcomeMode.activePlugin = current
Component.onCompleted: current = welcomeMode.activePlugin 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 { BorderImage {
id: inner_background id: inner_background
Image { Image {

17
src/plugins/welcome/welcomeplugin.cpp
View File

@@ -118,7 +118,7 @@ private slots:
void modeChanged(Core::IMode*); void modeChanged(Core::IMode*);
private: private:
QScrollArea *m_scrollArea; QWidget *m_modeWidget;
QDeclarativeView *m_welcomePage; QDeclarativeView *m_welcomePage;
QHBoxLayout * buttonLayout; QHBoxLayout * buttonLayout;
QList<QObject*> m_pluginList; QList<QObject*> m_pluginList;
@@ -140,10 +140,13 @@ WelcomeMode::WelcomeMode() :
m_welcomePage = new QDeclarativeView; m_welcomePage = new QDeclarativeView;
m_welcomePage->setResizeMode(QDeclarativeView::SizeRootObjectToView); m_welcomePage->setResizeMode(QDeclarativeView::SizeRootObjectToView);
m_scrollArea = new QScrollArea; m_modeWidget = new QWidget;
m_scrollArea->setFrameStyle(QFrame::NoFrame|QFrame::Plain); QVBoxLayout *layout = new QVBoxLayout;
m_scrollArea->setWidget(m_welcomePage); layout->setMargin(0);
m_scrollArea->setWidgetResizable(true); layout->setSpacing(0);
layout->addWidget(new Utils::StyledBar);
layout->addWidget(m_welcomePage);
m_modeWidget->setLayout(layout);
PluginManager *pluginManager = PluginManager::instance(); PluginManager *pluginManager = PluginManager::instance();
connect(pluginManager, SIGNAL(objectAdded(QObject*)), SLOT(welcomePluginAdded(QObject*))); connect(pluginManager, SIGNAL(objectAdded(QObject*)), SLOT(welcomePluginAdded(QObject*)));
@@ -151,14 +154,14 @@ WelcomeMode::WelcomeMode() :
Core::ModeManager *modeManager = Core::ICore::instance()->modeManager(); Core::ModeManager *modeManager = Core::ICore::instance()->modeManager();
connect(modeManager, SIGNAL(currentModeChanged(Core::IMode*)), SLOT(modeChanged(Core::IMode*))); connect(modeManager, SIGNAL(currentModeChanged(Core::IMode*)), SLOT(modeChanged(Core::IMode*)));
setWidget(m_scrollArea); setWidget(m_modeWidget);
} }
WelcomeMode::~WelcomeMode() WelcomeMode::~WelcomeMode()
{ {
QSettings *settings = Core::ICore::instance()->settings(); QSettings *settings = Core::ICore::instance()->settings();
settings->setValue(QLatin1String(currentPageSettingsKeyC), activePlugin()); settings->setValue(QLatin1String(currentPageSettingsKeyC), activePlugin());
delete m_scrollArea; delete m_modeWidget;
} }
bool sortFunction(Utils::IWelcomePage * a, Utils::IWelcomePage *b) bool sortFunction(Utils::IWelcomePage * a, Utils::IWelcomePage *b)