Commit f697224a authored by Daniel Molkentin's avatar Daniel Molkentin
Browse files

First iteration of reworked welcome screen.

parent 581dca0a
......@@ -57,5 +57,7 @@
<file>images/welcomemode/product_logo.png</file>
<file>images/welcomemode/qt_logo.png</file>
<file>images/welcomemode/rc_combined.png</file>
<file>images/welcomemode/background_center_frame.png</file>
<file>images/welcomemode/center_frame_header.png</file>
</qresource>
</RCC>
......@@ -106,6 +106,13 @@ WelcomeMode::WelcomeMode() :
updateWelcomePage(WelcomePageData());
QButtonGroup *btnGrp = new QButtonGroup(this);
btnGrp->addButton(m_d->ui.gettingStartedSectButton, 0);
btnGrp->addButton(m_d->ui.developSectButton, 1);
btnGrp->addButton(m_d->ui.communitySectButton, 2);
connect(btnGrp, SIGNAL(buttonClicked(int)), m_d->ui.stackedWidget, SLOT(setCurrentIndex(int)));
connect(m_d->ui.gettingStartedButton, SIGNAL(clicked()), SIGNAL(requestHelp()));
connect(m_d->ui.feedbackButton, SIGNAL(clicked()), SLOT(slotFeedback()));
connect(m_d->ui.restoreSessionButton, SIGNAL(clicked()), SLOT(slotRestoreLastSession()));
......
......@@ -6,11 +6,16 @@
<rect>
<x>0</x>
<y>0</y>
<width>777</width>
<height>922</height>
<width>721</width>
<height>637</height>
</rect>
</property>
<layout class="QVBoxLayout" name="topLayout">
<property name="styleSheet">
<string>#Core--Internal--WelcomePage {
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>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>0</number>
</property>
......@@ -20,152 +25,214 @@
<item>
<widget class="QWidget" name="gradientWidget" native="true">
<property name="styleSheet">
<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));
}
*, * *, * * *, * * * *, * * * * * {
font-family: Arial, Trebuchet, Lucida, sans-serif;
font-size: 12px;
color: #5e5e5e;
}
#recentSessionsFrame, #recentProjectsFrame {
border-image: url(:/core/images/welcomemode/rc_combined.png) 8;
border-width: 8;
}
</string>
<string>#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>
</property>
<layout class="QGridLayout" name="gradientLayout">
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>0</number>
</property>
<property name="spacing">
<number>0</number>
</property>
<item row="0" column="1">
<layout class="QVBoxLayout" name="contentsLayout">
<property name="spacing">
<number>0</number>
<item row="0" column="2">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<item>
<spacer name="topSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>50</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="welcomeLayout">
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="logoLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="core.qrc">:/core/images/welcomemode/product_logo.png</pixmap>
</property>
</widget>
</item>
<item>
<spacer name="logoSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="welcomeLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>360</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>&lt;style&gt;
h1 {
font-size: 24px;
font-weight: normal;
color: #4d4d4d;
margin-top: 0px;
margin-bottom: 20px;
<property name="sizeHint" stdset="0">
<size>
<width>17</width>
<height>57</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>11</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="1" colspan="2">
<widget class="QFrame" name="mainFrame">
<property name="minimumSize">
<size>
<width>662</width>
<height>515</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>662</width>
<height>515</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">#mainFrame {
border-image: url(:/core/images/welcomemode/background_center_frame.png) 4;
border-width: 4;
}
</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QFrame" name="headerFrame">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>649</width>
<height>89</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>649</width>
<height>89</height>
</size>
</property>
<property name="styleSheet">
<string>#headerFrame {
border-image: url(:/core/images/welcomemode/center_frame_header.png) 0;
border-width: 0;
}
</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
</item>
<item>
<widget class="QFrame" name="navFrame">
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="styleSheet">
<string>#navFrame QToolButton {
border: none;
font-size: 10pt;
color: grey;
}
p {
margin-top: 0px;
margin-bottom: 7px;
#navFrame QToolButton:hover {
color: black;
}
&lt;/style&gt;
&lt;p&gt;&amp;nbsp;&lt;/p&gt;
&lt;h1&gt;Welcome&lt;/h1&gt;
&lt;!-- QTextDocument does not support line-height, so wrap the lines manually ... --&gt;
&lt;p&gt;Qt Creator is an intuitive, modern cross platform IDE that&lt;/p&gt; &lt;p&gt;enables developers to create graphically appealing applications&lt;/p&gt;
&lt;p&gt;for desktop, embedded, and mobile devices. Click on &lt;strong&gt;Getting&lt;/strong&gt;&lt;/p&gt;
&lt;p&gt;&lt;strong&gt;Started&lt;/strong&gt; to begin developing with Qt Creator.&lt;/p&gt;
&lt;hr style=&quot;margin-top:15px&quot;/&gt;
</string>
#navFrame QToolButton:checked {
color: black;
border-bottom: 1px solid palette(Text);
}</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<property name="leftMargin">
<number>0</number>
</property>
<property name="wordWrap">
<bool>true</bool>
<property name="rightMargin">
<number>0</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="gettingStartedLayout">
<item>
<spacer name="gettingStartedSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>1</width>
<height>1</height>
</size>
<property name="bottomMargin">
<number>0</number>
</property>
</spacer>
</item>
<item>
<widget class="Core::Internal::WelcomeModeButton" name="gettingStartedButton">
<property name="styleSheet">
<string>* {
<item row="0" column="0">
<widget class="QToolButton" name="gettingStartedSectButton">
<property name="text">
<string>Getting Started</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="autoExclusive">
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QToolButton" name="developSectButton">
<property name="text">
<string>Develop</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="autoExclusive">
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QToolButton" name="communitySectButton">
<property name="text">
<string>Community</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
<number>1</number>
</property>
<widget class="QWidget" name="page">
<widget class="Core::Internal::WelcomeModeButton" name="gettingStartedButton">
<property name="geometry">
<rect>
<x>280</x>
<y>150</y>
<width>128</width>
<height>25</height>
</rect>
</property>
<property name="styleSheet">
<string>* {
border-image: url(:/core/images/welcomemode/btn_27.png) 7;
border-width: 7;
padding: -2px 0;
......@@ -179,187 +246,168 @@ p {
color: white;
}
</string>
</property>
<property name="text">
<string>&lt;qt&gt;Getting Started &amp;gt;&amp;gt;</string>
</property>
</property>
<property name="text">
<string>&lt;qt&gt;Getting Started &amp;gt;&amp;gt;</string>
</property>
</widget>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="middelSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>1</width>
<height>50</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="recentListsLayout">
<property name="spacing">
<number>0</number>
</property>
<item>
<layout class="QVBoxLayout" name="recentSessionsLayout" stretch="0,1">
<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="maximumSize">
<size>
<width>270</width>
<height>16777215</height>
</size>
</property>
<property name="styleSheet">
<string>#recentSessionsFrame {
border-image: url(:/core/images/welcomemode/rc_combined.png) 8;
border-width: 8;
}
</string>
</property>
<layout class="QGridLayout" name="recentSessionsFrameLayout">
<property name="leftMargin">
<number>4</number>
<widget class="QWidget" name="page_2">
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="1" colspan="3">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="topMargin">
<number>4</number>
<property name="sizeHint" stdset="0">
<size>
<width>578</width>
<height>34</height>
</size>
</property>
<property name="rightMargin">
<number>12</number>
</spacer>
</item>
<item row="1" column="0">
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="bottomMargin">
<number>2</number>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="horizontalSpacing">
<number>11</number>
<property name="sizeHint" stdset="0">
<size>
<width>19</width>
<height>20</height>
</size>
</property>
<item row="0" column="0">
<widget class="QLabel" name="iconLabel">
<property name="pixmap">
<pixmap resource="core.qrc">:/core/images/welcomemode/mode_project.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="QLabel" name="titleLabel">
<property name="text">
<string notr="true">&lt;style&gt;
h2 {
font-size: 18px;
font-weight: normal;
color: #7c92a1;
margin-bottom: 0px;
}
&lt;/style&gt;
&lt;h2&gt;Recent Sessions&lt;/h2&gt;
&lt;hr/&gt;
</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item row="1" column="1" colspan="2">
<widget class="Core::Internal::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>
</spacer>
</item>
<item row="1" column="1">
<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="maximumSize">
<size>
<width>270</width>
<height>16777215</height>
</size>
</property>
<property name="styleSheet">
<string/>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<widget class="QLabel" name="iconLabel">
<property name="pixmap">
<pixmap resource="core.qrc">:/core/images/welcomemode/mode_project.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</column>
<column>
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="QLabel" name="titleLabel">
<property name="text">
<string notr="true">2</string>
<string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:16px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:x-large; color:#555555;&quot;&gt;Sessions&lt;/spa