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

Updated layout and graphics for welcome page

Browse Source 
Done with Danimo. Most changes are cosmetic but we modified
the tutorial listing and re-arranged some of the layouts to
better reflect the suggestions by Ergosign and Nigel.
This commit is contained in:
Jens Bache-Wiig
2010-04-09 17:41:46 +02:00
parent a2a68fd4dc
commit 0b1da27722
9 changed files with 814 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/welcomemodetreewidget.cpp
View File

@@ -40,11 +40,11 @@ void WelcomeModeLabel::setStyledText(const QString &text)
{ {
QString rc = QLatin1String( QString rc = QLatin1String(
"<html><head><style type=\"text/css\">p, li { white-space: pre-wrap; }</style></head>" "<html><head><style type=\"text/css\">p, li { white-space: pre-wrap; }</style></head>"
"<body style=\" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;\">" "<body style=\" font-weight:500; font-style:normal;\">"
"<p style=\" margin-top:16px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">" "<p style=\" margin-top:16px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">"
"<span style=\" font-size:x-large; color:#555555;\">"); "<span style=\" font-size:large; color:#555555;\">");
rc += text; rc += text;
rc += QLatin1String("</span></p><hr/></body></html>"); rc += QLatin1String("</span></p></body></html>");
setText(rc); setText(rc);
} }

2
src/plugins/projectexplorer/projectwelcomepagewidget.cpp
View File

@@ -76,7 +76,7 @@ ProjectWelcomePageWidget::ProjectWelcomePageWidget(QWidget *parent) :
ui(new Ui::ProjectWelcomePageWidget) ui(new Ui::ProjectWelcomePageWidget)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->projTitleLabel->setStyledText(tr("Open Recent Project")); ui->projTitleLabel->setStyledText(tr("Recent Projects"));
ui->recentSessionsTitleLabel->setStyledText(tr("Resume Session")); ui->recentSessionsTitleLabel->setStyledText(tr("Resume Session"));
updateWelcomePage(WelcomePageData()); updateWelcomePage(WelcomePageData());

529
src/plugins/projectexplorer/projectwelcomepagewidget.ui
View File

@@ -13,231 +13,320 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="topMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item> <item>
<widget class="QFrame" name="recentSessionsFrame"> <widget class="QFrame" name="frame">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>270</width>
<height>130</height>
</size>
</property>
<property name="styleSheet"> <property name="styleSheet">
<string/> <string notr="true">#frame{
border: 1px solid #c9c9c9;
border-radius: 3px;
padding: 2px;
background: #f9f9f9;
margin: 1px;
}</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <property name="frameShape">
<property name="horizontalSpacing"> <enum>QFrame::StyledPanel</enum>
<number>0</number> </property>
</property> <property name="frameShadow">
<property name="verticalSpacing"> <enum>QFrame::Raised</enum>
<number>3</number> </property>
</property> <layout class="QVBoxLayout" name="verticalLayout_2">
<item row="0" column="0" colspan="3"> <item>
<widget class="Utils::WelcomeModeLabel" name="recentSessionsTitleLabel"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="sizePolicy"> <item>
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Maximum"> <widget class="QFrame" name="recentProjectsFrame">
<horstretch>0</horstretch> <property name="styleSheet">
<verstretch>0</verstretch> <string/>
</sizepolicy> </property>
</property> <layout class="QGridLayout" name="gridLayout_5">
<property name="alignment"> <property name="horizontalSpacing">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <number>0</number>
</property> </property>
</widget> <property name="verticalSpacing">
<number>3</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<item row="3" column="0" colspan="3">
<widget class="Utils::WelcomeModeTreeWidget" name="projTreeWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::NoSelection</enum>
</property>
<property name="verticalScrollMode">
<enum>QAbstractItemView::ScrollPerPixel</enum>
</property>
<property name="rootIsDecorated">
<bool>false</bool>
</property>
<property name="uniformRowHeights">
<bool>true</bool>
</property>
<property name="allColumnsShowFocus">
<bool>true</bool>
</property>
<property name="columnCount">
<number>2</number>
</property>
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
<attribute name="headerDefaultSectionSize">
<number>24</number>
</attribute>
<attribute name="headerMinimumSectionSize">
<number>0</number>
</attribute>
<attribute name="headerDefaultSectionSize">
<number>24</number>
</attribute>
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
<attribute name="headerMinimumSectionSize">
<number>0</number>
</attribute>
<column>
<property name="text">
<string notr="true">1</string>
</property>
</column>
<column>
<property name="text">
<string notr="true">2</string>
</property>
</column>
</widget>
</item>
<item row="6" column="0">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0" colspan="3">
<widget class="Utils::WelcomeModeLabel" name="projTitleLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QFrame" name="recentSessionsFrame">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>270</width>
<height>130</height>
</size>
</property>
<property name="styleSheet">
<string/>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<property name="horizontalSpacing">
<number>0</number>
</property>
<property name="verticalSpacing">
<number>3</number>
</property>
<item row="1" column="0" colspan="3">
<widget class="Utils::WelcomeModeLabel" name="recentSessionsTitleLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item row="3" column="0" colspan="3">
<widget class="Utils::WelcomeModeTreeWidget" name="sessTreeWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::NoSelection</enum>
</property>
<property name="verticalScrollMode">
<enum>QAbstractItemView::ScrollPerPixel</enum>
</property>
<property name="rootIsDecorated">
<bool>false</bool>
</property>
<property name="uniformRowHeights">
<bool>true</bool>
</property>
<property name="allColumnsShowFocus">
<bool>true</bool>
</property>
<property name="columnCount">
<number>2</number>
</property>
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
<attribute name="headerDefaultSectionSize">
<number>24</number>
</attribute>
<attribute name="headerMinimumSectionSize">
<number>0</number>
</attribute>
<attribute name="headerDefaultSectionSize">
<number>24</number>
</attribute>
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
<attribute name="headerMinimumSectionSize">
<number>0</number>
</attribute>
<column>
<property name="text">
<string notr="true">1</string>
</property>
</column>
<column>
<property name="text">
<string notr="true">2</string>
</property>
</column>
</widget>
</item>
<item row="6" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</item> </item>
<item row="1" column="0" colspan="3"> <item>
<widget class="Utils::WelcomeModeTreeWidget" name="sessTreeWidget"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="sizePolicy"> <property name="spacing">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <number>6</number>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="focusPolicy"> <item>
<enum>Qt::NoFocus</enum> <spacer name="horizontalSpacer_2">
</property> <property name="orientation">
<property name="frameShape"> <enum>Qt::Horizontal</enum>
<enum>QFrame::NoFrame</enum> </property>
</property> <property name="sizeHint" stdset="0">
<property name="selectionMode"> <size>
<enum>QAbstractItemView::NoSelection</enum> <width>40</width>
</property> <height>20</height>
<property name="verticalScrollMode"> </size>
<enum>QAbstractItemView::ScrollPerPixel</enum> </property>
</property> </spacer>
<property name="rootIsDecorated"> </item>
<bool>false</bool> <item>
</property> <widget class="QPushButton" name="manageSessionsButton">
<property name="uniformRowHeights"> <property name="minimumSize">
<bool>true</bool> <size>
</property> <width>180</width>
<property name="allColumnsShowFocus"> <height>40</height>
<bool>true</bool> </size>
</property> </property>
<property name="columnCount"> <property name="focusPolicy">
<number>2</number> <enum>Qt::TabFocus</enum>
</property> </property>
<attribute name="headerVisible"> <property name="text">
<bool>false</bool> <string>Manage Sessions...</string>
</attribute> </property>
<attribute name="headerDefaultSectionSize"> </widget>
<number>24</number> </item>
</attribute> <item>
<attribute name="headerMinimumSectionSize"> <widget class="QPushButton" name="createNewProjectButton">
<number>0</number> <property name="minimumSize">
</attribute> <size>
<column> <width>180</width>
<property name="text"> <height>40</height>
<string notr="true">1</string> </size>
</property> </property>
</column> <property name="focusPolicy">
<column> <enum>Qt::TabFocus</enum>
<property name="text"> </property>
<string notr="true">2</string> <property name="text">
</property> <string>Create Project...</string>
</column> </property>
</widget> <property name="icon">
</item> <iconset resource="../coreplugin/core.qrc">
<item row="3" column="0"> <normaloff>:/core/images/filenew.png</normaloff>:/core/images/filenew.png</iconset>
<widget class="QPushButton" name="manageSessionsButton"> </property>
<property name="focusPolicy"> <property name="flat">
<enum>Qt::TabFocus</enum> <bool>false</bool>
</property> </property>
<property name="text"> </widget>
<string>Manage Sessions...</string> </item>
</property> </layout>
</widget>
</item>
<item row="4" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QFrame" name="recentProjectsFrame">
<property name="styleSheet">
<string/>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<property name="horizontalSpacing">
<number>0</number>
</property>
<property name="verticalSpacing">
<number>3</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<item row="0" column="0" colspan="3">
<widget class="Utils::WelcomeModeLabel" name="projTitleLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item row="1" column="0" colspan="3">
<widget class="Utils::WelcomeModeTreeWidget" name="projTreeWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::NoSelection</enum>
</property>
<property name="verticalScrollMode">
<enum>QAbstractItemView::ScrollPerPixel</enum>
</property>
<property name="rootIsDecorated">
<bool>false</bool>
</property>
<property name="uniformRowHeights">
<bool>true</bool>
</property>
<property name="allColumnsShowFocus">
<bool>true</bool>
</property>
<property name="columnCount">
<number>2</number>
</property>
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
<attribute name="headerDefaultSectionSize">
<number>24</number>
</attribute>
<attribute name="headerMinimumSectionSize">
<number>0</number>
</attribute>
<column>
<property name="text">
<string notr="true">1</string>
</property>
</column>
<column>
<property name="text">
<string notr="true">2</string>
</property>
</column>
</widget>
</item>
<item row="3" column="0">
<widget class="QPushButton" name="createNewProjectButton">
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
</property>
<property name="text">
<string>Create New Project...</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
<item row="4" column="0">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item> </item>
</layout> </layout>
<zorder></zorder>
<zorder>layoutWidget</zorder>
<zorder>horizontalSpacer_2</zorder>
<zorder>horizontalSpacer_2</zorder>
</widget> </widget>
</item> </item>
</layout> </layout>
@@ -254,6 +343,8 @@
<header>utils/welcomemodetreewidget.h</header> <header>utils/welcomemodetreewidget.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources/> <resources>
<include location="../coreplugin/core.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

20
src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
View File

@@ -71,16 +71,12 @@ GettingStartedWelcomePageWidget::GettingStartedWelcomePageWidget(QWidget *parent
connect(ui->tutorialTreeWidget, SIGNAL(activated(QString)), SLOT(slotOpenHelpPage(const QString&))); connect(ui->tutorialTreeWidget, SIGNAL(activated(QString)), SLOT(slotOpenHelpPage(const QString&)));
ui->tutorialTreeWidget->addItem(tr("<b>Qt Creator - A quick tour</b>"), ui->tutorialTreeWidget->addItem(tr("The Qt Creator User Interface"),
QString("qthelp://com.nokia.qtcreator.%1%2/doc/index.html").arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR)); QString("qthelp://com.nokia.qtcreator.%1%2/doc/index.html").arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR));
ui->tutorialTreeWidget->addItem(tr("Creating an address book"), ui->tutorialTreeWidget->addItem(tr("Creating a Qt C++ Application"),
QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-writing-program.html?view=split"));
ui->tutorialTreeWidget->addItem(tr("Creating a Qt Quick Application"),
QLatin1String("qthelp://com.nokia.qtcreator/doc/tutorials-addressbook-sdk.html?view=split")); QLatin1String("qthelp://com.nokia.qtcreator/doc/tutorials-addressbook-sdk.html?view=split"));
ui->tutorialTreeWidget->addItem(tr("Understanding widgets"),
QLatin1String("qthelp://com.trolltech.qt/qdoc/widgets-tutorial.html?view=split"));
ui->tutorialTreeWidget->addItem(tr("Building with qmake"),
QLatin1String("qthelp://com.trolltech.qmake/qdoc/qmake-tutorial.html?view=split"));
ui->tutorialTreeWidget->addItem(tr("Writing test cases"),
QLatin1String("qthelp://com.trolltech.qt/qdoc/qtestlib-tutorial.html?view=split"));
srand(QDateTime::currentDateTime().toTime_t()); srand(QDateTime::currentDateTime().toTime_t());
QStringList tips = tipsOfTheDay(); QStringList tips = tipsOfTheDay();
@@ -93,7 +89,7 @@ GettingStartedWelcomePageWidget::GettingStartedWelcomePageWidget(QWidget *parent
connect(ui->nextTipBtn, SIGNAL(clicked()), this, SLOT(slotNextTip())); connect(ui->nextTipBtn, SIGNAL(clicked()), this, SLOT(slotNextTip()));
connect(ui->prevTipBtn, SIGNAL(clicked()), this, SLOT(slotPrevTip())); connect(ui->prevTipBtn, SIGNAL(clicked()), this, SLOT(slotPrevTip()));
connect(ui->createNewProjectButton, SIGNAL(clicked()), this, SLOT(slotCreateNewProject()));
} }
GettingStartedWelcomePageWidget::~GettingStartedWelcomePageWidget() GettingStartedWelcomePageWidget::~GettingStartedWelcomePageWidget()
@@ -278,6 +274,12 @@ void GettingStartedWelcomePageWidget::slotOpenContextHelpPage(const QString& url
helpManager->handleHelpRequest(url % QLatin1String("?view=split")); helpManager->handleHelpRequest(url % QLatin1String("?view=split"));
} }
void GettingStartedWelcomePageWidget::slotCreateNewProject()
{
Core::ICore::instance()->showNewItemDialog(tr("New Project..."),
Core::IWizard::wizardsOfKind(Core::IWizard::ProjectWizard));
}
void GettingStartedWelcomePageWidget::slotNextTip() void GettingStartedWelcomePageWidget::slotNextTip()
{ {
QStringList tips = tipsOfTheDay(); QStringList tips = tipsOfTheDay();

1
src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.h
View File

@@ -57,6 +57,7 @@ private slots:
void slotOpenExample(); void slotOpenExample();
void slotNextTip(); void slotNextTip();
void slotPrevTip(); void slotPrevTip();
void slotCreateNewProject();
private: private:
QStringList tipsOfTheDay(); QStringList tipsOfTheDay();

596
src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
View File

@@ -13,290 +13,373 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" rowspan="2"> <property name="bottomMargin">
<widget class="QFrame" name="tutorialsFrame"> <number>2</number>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <item row="2" column="0">
<horstretch>0</horstretch> <widget class="QFrame" name="contentframe">
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>400</width>
<height>16777215</height>
</size>
</property>
<property name="styleSheet"> <property name="styleSheet">
<string/> <string notr="true">#contentframe{
border: 1px solid #c9c9c9;
border-radius: 3px;
padding: 2px;
background: #f9f9f9;
margin: 1px;
}</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_6"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0"> <item row="0" column="0">
<widget class="Utils::WelcomeModeLabel" name="tutorialsTitleLabel"> <layout class="QGridLayout" name="gridLayout">
<property name="sizePolicy"> <item row="0" column="0" rowspan="2">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <widget class="QFrame" name="tutorialsFrame">
<horstretch>0</horstretch> <property name="sizePolicy">
<verstretch>0</verstretch> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
</sizepolicy> <horstretch>0</horstretch>
</property> <verstretch>0</verstretch>
<property name="alignment"> </sizepolicy>
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="Utils::WelcomeModeTreeWidget" name="tutorialTreeWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::NoSelection</enum>
</property>
<property name="verticalScrollMode">
<enum>QAbstractItemView::ScrollPerPixel</enum>
</property>
<property name="rootIsDecorated">
<bool>false</bool>
</property>
<property name="uniformRowHeights">
<bool>true</bool>
</property>
<property name="allColumnsShowFocus">
<bool>true</bool>
</property>
<property name="columnCount">
<number>2</number>
</property>
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
<attribute name="headerDefaultSectionSize">
<number>24</number>
</attribute>
<attribute name="headerMinimumSectionSize">
<number>0</number>
</attribute>
<attribute name="headerDefaultSectionSize">
<number>24</number>
</attribute>
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
<attribute name="headerMinimumSectionSize">
<number>0</number>
</attribute>
<column>
<property name="text">
<string notr="true">1</string>
</property>
</column>
<column>
<property name="text">
<string notr="true">2</string>
</property>
</column>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="1">
<widget class="QFrame" name="demosExamplesFrame">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>400</width>
<height>16777215</height>
</size>
</property>
<property name="styleSheet">
<string/>
</property>
<layout class="QGridLayout" name="gridLayout_8">
<property name="rightMargin">
<number>8</number>
</property>
<property name="horizontalSpacing">
<number>0</number>
</property>
<item row="0" column="0" colspan="3">
<widget class="Utils::WelcomeModeLabel" name="demoTitleLabel">
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="examplesButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Examples not installed...</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="1">
<widget class="QFrame" name="didyouKnowFrame">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>400</width>
<height>16777215</height>
</size>
</property>
<property name="styleSheet">
<string/>
</property>
<layout class="QGridLayout" name="gridLayout_11">
<property name="rightMargin">
<number>9</number>
</property>
<item row="0" column="0">
<widget class="Utils::WelcomeModeLabel" name="didYouKnowTitleLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QTextBrowser" name="didYouKnowTextBrowser">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<layout class="QGridLayout" name="gridLayout_10">
<property name="spacing">
<number>0</number>
</property>
<item row="0" column="0" colspan="2">
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeType"> <property name="maximumSize">
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>400</width>
<height>2</height> <height>16777215</height>
</size> </size>
</property> </property>
</spacer>
</item>
<item row="1" column="0">
<widget class="QToolButton" name="prevTipBtn">
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QToolButton{ <string/>
</property>
<layout class="QGridLayout" name="gridLayout_6">
<property name="verticalSpacing">
<number>12</number>
</property>
<item row="0" column="0">
<widget class="Utils::WelcomeModeLabel" name="tutorialsTitleLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="Utils::WelcomeModeTreeWidget" name="tutorialTreeWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::NoSelection</enum>
</property>
<property name="verticalScrollMode">
<enum>QAbstractItemView::ScrollPerPixel</enum>
</property>
<property name="rootIsDecorated">
<bool>false</bool>
</property>
<property name="uniformRowHeights">
<bool>true</bool>
</property>
<property name="allColumnsShowFocus">
<bool>true</bool>
</property>
<property name="columnCount">
<number>2</number>
</property>
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
<attribute name="headerDefaultSectionSize">
<number>24</number>
</attribute>
<attribute name="headerMinimumSectionSize">
<number>0</number>
</attribute>
<attribute name="headerDefaultSectionSize">
<number>24</number>
</attribute>
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
<attribute name="headerMinimumSectionSize">
<number>0</number>
</attribute>
<column>
<property name="text">
<string notr="true">1</string>
</property>
</column>
<column>
<property name="text">
<string notr="true">2</string>
</property>
</column>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="1">
<widget class="QFrame" name="demosExamplesFrame">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>400</width>
<height>16777215</height>
</size>
</property>
<property name="styleSheet">
<string/>
</property>
<layout class="QGridLayout" name="gridLayout_8">
<property name="rightMargin">
<number>8</number>
</property>
<property name="horizontalSpacing">
<number>0</number>
</property>
<item row="1" column="0">
<widget class="Utils::WelcomeModeLabel" name="demoTitleLabel">
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QPushButton" name="examplesButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="text">
<string>Examples not installed...</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="1">
<widget class="QFrame" name="didyouKnowFrame">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>400</width>
<height>16777215</height>
</size>
</property>
<property name="styleSheet">
<string/>
</property>
<layout class="QGridLayout" name="gridLayout_11">
<property name="verticalSpacing">
<number>12</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<item row="0" column="0">
<widget class="Utils::WelcomeModeLabel" name="didYouKnowTitleLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item row="0" column="1">
<layout class="QGridLayout" name="gridLayout_10">
<property name="spacing">
<number>0</number>
</property>
<item row="0" column="0" colspan="2">
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>2</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="QToolButton" name="prevTipBtn">
<property name="styleSheet">
<string notr="true">QToolButton{
border-right:solid 0 px; border-right:solid 0 px;
height:16px; height:16px;
width:12px; width:12px;
} }
</string> </string>
</property> </property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../welcome/welcome.qrc"> <iconset resource="../welcome/welcome.qrc">
<normaloff>:/welcome/images/arrow-left.png</normaloff>:/welcome/images/arrow-left.png</iconset> <normaloff>:/welcome/images/arrow-left.png</normaloff>:/welcome/images/arrow-left.png</iconset>
</property> </property>
<property name="arrowType"> <property name="arrowType">
<enum>Qt::NoArrow</enum> <enum>Qt::NoArrow</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QToolButton" name="nextTipBtn"> <widget class="QToolButton" name="nextTipBtn">
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QToolButton{ <string notr="true">QToolButton{
border-left:solid 0 px; border-left:solid 0 px;
height:16px; height:16px;
width:12px; width:12px;
} }
</string> </string>
</property> </property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../welcome/welcome.qrc"> <iconset resource="../welcome/welcome.qrc">
<normaloff>:/welcome/images/arrow-right.png</normaloff>:/welcome/images/arrow-right.png</iconset> <normaloff>:/welcome/images/arrow-right.png</normaloff>:/welcome/images/arrow-right.png</iconset>
</property> </property>
<property name="arrowType"> <property name="arrowType">
<enum>Qt::NoArrow</enum> <enum>Qt::NoArrow</enum>
</property> </property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>2</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="1" column="0" colspan="2">
<widget class="QTextBrowser" name="didYouKnowTextBrowser">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2"> </layout>
<spacer name="verticalSpacer_3"> </item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
<number>6</number>
</property>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>40</width>
<height>2</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item>
<widget class="QPushButton" name="createNewProjectButton">
<property name="minimumSize">
<size>
<width>180</width>
<height>40</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
</property>
<property name="text">
<string>Create Project...</string>
</property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
<normaloff>:/core/images/filenew.png</normaloff>:/core/images/filenew.png</iconset>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>
@@ -317,6 +400,7 @@
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../coreplugin/core.qrc"/>
<include location="../welcome/welcome.qrc"/> <include location="../welcome/welcome.qrc"/>
</resources> </resources>
<connections/> <connections/>

BIN
src/plugins/welcome/images/background_center_frame.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

2
src/plugins/welcome/welcomemode.cpp
View File

@@ -172,8 +172,6 @@ void WelcomeMode::initPlugins()
if (debug) if (debug)
qDebug() << "WelcomeMode::initPlugins" << plugin->title(); qDebug() << "WelcomeMode::initPlugins" << plugin->title();
} }
m_d->buttonLayout->addSpacing(5);
QSettings *settings = Core::ICore::instance()->settings(); QSettings *settings = Core::ICore::instance()->settings();
const int tabId = settings->value(QLatin1String(currentPageSettingsKeyC), 0).toInt(); const int tabId = settings->value(QLatin1String(currentPageSettingsKeyC), 0).toInt();

181
src/plugins/welcome/welcomemode.ui
View File

@@ -33,7 +33,6 @@ QToolButton, QPushButton, QComboBox {
QComboBox::down-arrow { QComboBox::down-arrow {
image: url(:/welcome/images/combobox_arrow.png); image: url(:/welcome/images/combobox_arrow.png);
} }
QComboBox:drop-down QComboBox:drop-down
{ {
subcontrol-origin: padding; subcontrol-origin: padding;
@@ -54,6 +53,17 @@ QToolButton:disabled, QPushButton:disabled, QComboBox::disabled {
QToolButton:pressed, QPushButton:pressed{ QToolButton:pressed, QPushButton:pressed{
border-image: url(:/welcome/images/btn_26_pressed.png) 4; border-image: url(:/welcome/images/btn_26_pressed.png) 4;
} }
QPushButton::menu-indicator{
subcontrol-origin: margin;
subcontrol-position: center right;
right: 4px;
}
QPushButton{
outline: none;
margin: 2
}
</string> </string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_4">
@@ -66,13 +76,19 @@ QToolButton:pressed, QPushButton:pressed{
<item> <item>
<widget class="QWidget" name="gradientWidget" native="true"> <widget class="QWidget" name="gradientWidget" native="true">
<property name="styleSheet"> <property name="styleSheet">
<string>#gradientWidget { <string notr="true">/*
#gradientWidget {
background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(247, 247, 247, 255), stop:1 rgba(215, 215, 215, 255)); background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(247, 247, 247, 255), stop:1 rgba(215, 215, 215, 255));
}</string> }
*/
#gradientWidget {
border-image: url(:/core/images/welcomebg.png) 4;
}
</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>4</number> <number>0</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>4</number> <number>4</number>
@@ -91,19 +107,21 @@ QToolButton:pressed, QPushButton:pressed{
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>662</width> <width>662</width>
<height>515</height> <height>490</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>662</width> <width>662</width>
<height>16777215</height> <height>490</height>
</size> </size>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">#mainFrame { <string notr="true">#mainFrame {
border-image: url(:/welcome/images/background_center_frame.png) 4; border-image: url(:/welcome/images/background_center_frame.png);
border-width: 4; border-width: 4;
padding:-3;
padding-bottom:20 ;
} }
</string> </string>
</property> </property>
@@ -255,29 +273,32 @@ QToolButton:pressed {
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>8</number>
</property>
<property name="topMargin">
<number>1</number>
</property>
<property name="rightMargin"> <property name="rightMargin">
<number>20</number> <number>13</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>17</number> <number>10</number>
</property> </property>
<item> <item>
<spacer name="horizontalSpacer_5"> <widget class="QPushButton" name="feedbackButton">
<property name="orientation"> <property name="focusPolicy">
<enum>Qt::Horizontal</enum> <enum>Qt::TabFocus</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="styleSheet">
<size> <string notr="true">height:19px;</string>
<width>40</width>
<height>20</height>
</size>
</property> </property>
</spacer>
</item>
<item>
<widget class="QLabel" name="helpUsLabel">
<property name="text"> <property name="text">
<string>Help us make Qt Creator even better</string> <string>Feedback</string>
</property>
<property name="icon">
<iconset resource="welcome.qrc">
<normaloff>:/welcome/images/feedback_arrow.png</normaloff>:/welcome/images/feedback_arrow.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@@ -298,22 +319,116 @@ QToolButton:pressed {
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="feedbackButton"> <widget class="QLabel" name="helpUsLabel">
<property name="focusPolicy"> <property name="palette">
<enum>Qt::TabFocus</enum> <palette>
</property> <active>
<property name="styleSheet"> <colorrole role="WindowText">
<string notr="true">height:19px;</string> <brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Text">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="ButtonText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Text">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="ButtonText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Text">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="ButtonText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property> </property>
<property name="text"> <property name="text">
<string>Feedback</string> <string>Help us make Qt Creator even better</string>
</property>
<property name="icon">
<iconset resource="welcome.qrc">
<normaloff>:/welcome/images/feedback_arrow.png</normaloff>:/welcome/images/feedback_arrow.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>