From 0b1da277227abcb00860e81a032bfbb2b8ad1a99 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jbache@trolltech.com>
Date: Fri, 9 Apr 2010 17:41:46 +0200
Subject: [PATCH] Updated layout and graphics for welcome page
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.
---
src/libs/utils/welcomemodetreewidget.cpp | 6 +-
.../projectwelcomepagewidget.cpp | 2 +-
.../projectwelcomepagewidget.ui | 527 +++++++++-------
.../gettingstartedwelcomepagewidget.cpp | 20 +-
.../gettingstartedwelcomepagewidget.h | 1 +
.../gettingstartedwelcomepagewidget.ui | 586 ++++++++++--------
.../images/background_center_frame.png | Bin 3381 -> 2178 bytes
src/plugins/welcome/welcomemode.cpp | 2 -
src/plugins/welcome/welcomemode.ui | 181 +++++-
9 files changed, 808 insertions(+), 517 deletions(-)
diff --git a/src/libs/utils/welcomemodetreewidget.cpp b/src/libs/utils/welcomemodetreewidget.cpp
index 2d9ebaa4dd3..df85bd00c5e 100644
--- a/src/libs/utils/welcomemodetreewidget.cpp
+++ b/src/libs/utils/welcomemodetreewidget.cpp
@@ -40,11 +40,11 @@ void WelcomeModeLabel::setStyledText(const QString &text)
{
QString rc = QLatin1String(
"<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;\">"
- "<span style=\" font-size:x-large; color:#555555;\">");
+ "<span style=\" font-size:large; color:#555555;\">");
rc += text;
- rc += QLatin1String("</span></p><hr/></body></html>");
+ rc += QLatin1String("</span></p></body></html>");
setText(rc);
}
diff --git a/src/plugins/projectexplorer/projectwelcomepagewidget.cpp b/src/plugins/projectexplorer/projectwelcomepagewidget.cpp
index f1332e03cbb..46bc3e0dabc 100644
--- a/src/plugins/projectexplorer/projectwelcomepagewidget.cpp
+++ b/src/plugins/projectexplorer/projectwelcomepagewidget.cpp
@@ -76,7 +76,7 @@ ProjectWelcomePageWidget::ProjectWelcomePageWidget(QWidget *parent) :
ui(new Ui::ProjectWelcomePageWidget)
{
ui->setupUi(this);
- ui->projTitleLabel->setStyledText(tr("Open Recent Project"));
+ ui->projTitleLabel->setStyledText(tr("Recent Projects"));
ui->recentSessionsTitleLabel->setStyledText(tr("Resume Session"));
updateWelcomePage(WelcomePageData());
diff --git a/src/plugins/projectexplorer/projectwelcomepagewidget.ui b/src/plugins/projectexplorer/projectwelcomepagewidget.ui
index cb94d9b53bc..23b5bc84a13 100644
--- a/src/plugins/projectexplorer/projectwelcomepagewidget.ui
+++ b/src/plugins/projectexplorer/projectwelcomepagewidget.ui
@@ -13,231 +13,320 @@
<property name="windowTitle">
<string>Form</string>
</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>
- <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>
+ <widget class="QFrame" name="frame">
<property name="styleSheet">
- <string/>
+ <string notr="true">#frame{
+ border: 1px solid #c9c9c9;
+ border-radius: 3px;
+ padding: 2px;
+ background: #f9f9f9;
+ margin: 1px;
+}</string>
</property>
- <layout class="QGridLayout" name="gridLayout_3">
- <property name="horizontalSpacing">
- <number>0</number>
- </property>
- <property name="verticalSpacing">
- <number>3</number>
- </property>
- <item row="0" 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="1" 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>
- <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="manageSessionsButton">
- <property name="focusPolicy">
- <enum>Qt::TabFocus</enum>
- </property>
- <property name="text">
- <string>Manage Sessions...</string>
- </property>
- </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 name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
</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>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <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="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 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>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <property name="spacing">
+ <number>6</number>
</property>
- </spacer>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="manageSessionsButton">
+ <property name="minimumSize">
+ <size>
+ <width>180</width>
+ <height>40</height>
+ </size>
+ </property>
+ <property name="focusPolicy">
+ <enum>Qt::TabFocus</enum>
+ </property>
+ <property name="text">
+ <string>Manage Sessions...</string>
+ </property>
+ </widget>
+ </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>
</item>
</layout>
+ <zorder></zorder>
+ <zorder>layoutWidget</zorder>
+ <zorder>horizontalSpacer_2</zorder>
+ <zorder>horizontalSpacer_2</zorder>
</widget>
</item>
</layout>
@@ -254,6 +343,8 @@
<header>utils/welcomemodetreewidget.h</header>
</customwidget>
</customwidgets>
- <resources/>
+ <resources>
+ <include location="../coreplugin/core.qrc"/>
+ </resources>
<connections/>
</ui>
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
index 3b479af45ce..305052d2a45 100644
--- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
+++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
@@ -71,16 +71,12 @@ GettingStartedWelcomePageWidget::GettingStartedWelcomePageWidget(QWidget *parent
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));
- 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"));
- 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());
QStringList tips = tipsOfTheDay();
@@ -93,7 +89,7 @@ GettingStartedWelcomePageWidget::GettingStartedWelcomePageWidget(QWidget *parent
connect(ui->nextTipBtn, SIGNAL(clicked()), this, SLOT(slotNextTip()));
connect(ui->prevTipBtn, SIGNAL(clicked()), this, SLOT(slotPrevTip()));
-
+ connect(ui->createNewProjectButton, SIGNAL(clicked()), this, SLOT(slotCreateNewProject()));
}
GettingStartedWelcomePageWidget::~GettingStartedWelcomePageWidget()
@@ -278,6 +274,12 @@ void GettingStartedWelcomePageWidget::slotOpenContextHelpPage(const QString& url
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()
{
QStringList tips = tipsOfTheDay();
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.h b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.h
index a2e981c70f5..d3b59b62544 100644
--- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.h
+++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.h
@@ -57,6 +57,7 @@ private slots:
void slotOpenExample();
void slotNextTip();
void slotPrevTip();
+ void slotCreateNewProject();
private:
QStringList tipsOfTheDay();
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
index facd533e3ac..5a47cbf4121 100644
--- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
+++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
@@ -13,290 +13,373 @@
<property name="windowTitle">
<string>Form</string>
</property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0" rowspan="2">
- <widget class="QFrame" name="tutorialsFrame">
- <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>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <property name="bottomMargin">
+ <number>2</number>
+ </property>
+ <item row="2" column="0">
+ <widget class="QFrame" name="contentframe">
<property name="styleSheet">
- <string/>
- </property>
- <layout class="QGridLayout" name="gridLayout_6">
- <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>
+ <string notr="true">#contentframe{
+ border: 1px solid #c9c9c9;
+ border-radius: 3px;
+ padding: 2px;
+ background: #f9f9f9;
+ margin: 1px;
+}</string>
</property>
- <property name="maximumSize">
- <size>
- <width>400</width>
- <height>16777215</height>
- </size>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
</property>
- <property name="styleSheet">
- <string/>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
</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>
+ <layout class="QGridLayout" name="gridLayout_3">
<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 name="sizeType">
- <enum>QSizePolicy::Preferred</enum>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0" rowspan="2">
+ <widget class="QFrame" name="tutorialsFrame">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="sizeHint" stdset="0">
+ <property name="maximumSize">
<size>
- <width>20</width>
- <height>2</height>
+ <width>400</width>
+ <height>16777215</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;
- height:16px;
- width:12px;
-}
-</string>
- </property>
- <property name="text">
<string/>
</property>
- <property name="icon">
- <iconset resource="../welcome/welcome.qrc">
- <normaloff>:/welcome/images/arrow-left.png</normaloff>:/welcome/images/arrow-left.png</iconset>
+ <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="arrowType">
- <enum>Qt::NoArrow</enum>
+ <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="QToolButton" name="nextTipBtn">
+ <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 notr="true">QToolButton{
+ <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;
+ height:16px;
+ width:12px;
+}
+</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="../welcome/welcome.qrc">
+ <normaloff>:/welcome/images/arrow-left.png</normaloff>:/welcome/images/arrow-left.png</iconset>
+ </property>
+ <property name="arrowType">
+ <enum>Qt::NoArrow</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QToolButton" name="nextTipBtn">
+ <property name="styleSheet">
+ <string notr="true">QToolButton{
border-left:solid 0 px;
height:16px;
width:12px;
}
</string>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset resource="../welcome/welcome.qrc">
- <normaloff>:/welcome/images/arrow-right.png</normaloff>:/welcome/images/arrow-right.png</iconset>
- </property>
- <property name="arrowType">
- <enum>Qt::NoArrow</enum>
- </property>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="../welcome/welcome.qrc">
+ <normaloff>:/welcome/images/arrow-right.png</normaloff>:/welcome/images/arrow-right.png</iconset>
+ </property>
+ <property name="arrowType">
+ <enum>Qt::NoArrow</enum>
+ </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>
</item>
- <item row="2" column="0" colspan="2">
- <spacer name="verticalSpacer_3">
+ </layout>
+ </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">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>20</width>
- <height>2</height>
+ <width>40</width>
+ <height>20</height>
</size>
</property>
</spacer>
</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>
</item>
</layout>
@@ -317,6 +400,7 @@
</customwidget>
</customwidgets>
<resources>
+ <include location="../coreplugin/core.qrc"/>
<include location="../welcome/welcome.qrc"/>
</resources>
<connections/>
diff --git a/src/plugins/welcome/images/background_center_frame.png b/src/plugins/welcome/images/background_center_frame.png
index d1628e22c27b47cc1f75a3ff054c7232f7ac0208..c69f1447283362f2924228071be74b6cd04d41b7 100644
GIT binary patch
literal 2178
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
literal 3381
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
DdJY;3
diff --git a/src/plugins/welcome/welcomemode.cpp b/src/plugins/welcome/welcomemode.cpp
index 01afc50316b..31ffc19be22 100644
--- a/src/plugins/welcome/welcomemode.cpp
+++ b/src/plugins/welcome/welcomemode.cpp
@@ -172,8 +172,6 @@ void WelcomeMode::initPlugins()
if (debug)
qDebug() << "WelcomeMode::initPlugins" << plugin->title();
}
- m_d->buttonLayout->addSpacing(5);
-
QSettings *settings = Core::ICore::instance()->settings();
const int tabId = settings->value(QLatin1String(currentPageSettingsKeyC), 0).toInt();
diff --git a/src/plugins/welcome/welcomemode.ui b/src/plugins/welcome/welcomemode.ui
index 648ed840292..14a1189a7ff 100644
--- a/src/plugins/welcome/welcomemode.ui
+++ b/src/plugins/welcome/welcomemode.ui
@@ -33,7 +33,6 @@ QToolButton, QPushButton, QComboBox {
QComboBox::down-arrow {
image: url(:/welcome/images/combobox_arrow.png);
}
-
QComboBox:drop-down
{
subcontrol-origin: padding;
@@ -54,6 +53,17 @@ QToolButton:disabled, QPushButton:disabled, QComboBox::disabled {
QToolButton:pressed, QPushButton:pressed{
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>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
@@ -66,13 +76,19 @@ QToolButton:pressed, QPushButton:pressed{
<item>
<widget class="QWidget" name="gradientWidget" native="true">
<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));
-}</string>
+}
+*/
+#gradientWidget {
+ border-image: url(:/core/images/welcomebg.png) 4;
+}
+</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
- <number>4</number>
+ <number>0</number>
</property>
<property name="topMargin">
<number>4</number>
@@ -91,19 +107,21 @@ QToolButton:pressed, QPushButton:pressed{
<property name="minimumSize">
<size>
<width>662</width>
- <height>515</height>
+ <height>490</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>662</width>
- <height>16777215</height>
+ <height>490</height>
</size>
</property>
<property name="styleSheet">
<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;
+ padding:-3;
+ padding-bottom:20 ;
}
</string>
</property>
@@ -255,29 +273,32 @@ QToolButton:pressed {
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="leftMargin">
+ <number>8</number>
+ </property>
+ <property name="topMargin">
+ <number>1</number>
+ </property>
<property name="rightMargin">
- <number>20</number>
+ <number>13</number>
</property>
<property name="bottomMargin">
- <number>17</number>
+ <number>10</number>
</property>
<item>
- <spacer name="horizontalSpacer_5">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <widget class="QPushButton" name="feedbackButton">
+ <property name="focusPolicy">
+ <enum>Qt::TabFocus</enum>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
+ <property name="styleSheet">
+ <string notr="true">height:19px;</string>
</property>
- </spacer>
- </item>
- <item>
- <widget class="QLabel" name="helpUsLabel">
<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>
</widget>
</item>
@@ -298,22 +319,116 @@ QToolButton:pressed {
</spacer>
</item>
<item>
- <widget class="QPushButton" name="feedbackButton">
- <property name="focusPolicy">
- <enum>Qt::TabFocus</enum>
- </property>
- <property name="styleSheet">
- <string notr="true">height:19px;</string>
+ <widget class="QLabel" name="helpUsLabel">
+ <property name="palette">
+ <palette>
+ <active>
+ <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>
+ </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 name="text">
- <string>Feedback</string>
- </property>
- <property name="icon">
- <iconset resource="welcome.qrc">
- <normaloff>:/welcome/images/feedback_arrow.png</normaloff>:/welcome/images/feedback_arrow.png</iconset>
+ <string>Help us make Qt Creator even better</string>
</property>
</widget>
</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>
</item>
</layout>
--
GitLab