diff --git a/src/plugins/projectexplorer/projectwelcomepagewidget.ui b/src/plugins/projectexplorer/projectwelcomepagewidget.ui
index 2e4ad9a954698f10b90d96a8b0b32229309f38c0..75c1b37901cc144aa63b65ffd9f79fce0a419c6e 100644
--- a/src/plugins/projectexplorer/projectwelcomepagewidget.ui
+++ b/src/plugins/projectexplorer/projectwelcomepagewidget.ui
@@ -14,22 +14,22 @@
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
<property name="topMargin">
- <number>9</number>
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item>
- <widget class="QFrame" name="frame">
+ <widget class="QFrame" name="contentframe">
<property name="styleSheet">
- <string notr="true">#frame{
- border: 1px solid #c9c9c9;
- border-radius: 3px;
- padding: 2px;
- background: #f9f9f9;
- margin: 1px;
-}</string>
+ <string notr="true"/>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
@@ -46,15 +46,15 @@
<string/>
</property>
<layout class="QGridLayout" name="gridLayout_5">
- <property name="rightMargin">
- <number>9</number>
- </property>
<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">
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
index 5a47cbf41215c6d92ed3590a397e2c5d1b636580..86e3456e96519722693fcf2ad17353f8e1949cd2 100644
--- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
+++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
@@ -14,19 +14,22 @@
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
<property name="bottomMargin">
<number>2</number>
</property>
<item row="2" column="0">
<widget class="QFrame" name="contentframe">
<property name="styleSheet">
- <string notr="true">#contentframe{
- border: 1px solid #c9c9c9;
- border-radius: 3px;
- padding: 2px;
- background: #f9f9f9;
- margin: 1px;
-}</string>
+ <string notr="true"/>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
@@ -245,16 +248,16 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
- <height>2</height>
+ <height>13</height>
</size>
</property>
</spacer>
</item>
- <item row="1" column="0">
- <widget class="QToolButton" name="prevTipBtn">
+ <item row="1" column="1">
+ <widget class="QToolButton" name="nextTipBtn">
<property name="styleSheet">
<string notr="true">QToolButton{
- border-right:solid 0 px;
+ border-left:solid 0 px;
height:16px;
width:12px;
}
@@ -265,18 +268,18 @@
</property>
<property name="icon">
<iconset resource="../welcome/welcome.qrc">
- <normaloff>:/welcome/images/arrow-left.png</normaloff>:/welcome/images/arrow-left.png</iconset>
+ <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="1" column="1">
- <widget class="QToolButton" name="nextTipBtn">
+ <item row="1" column="0">
+ <widget class="QToolButton" name="prevTipBtn">
<property name="styleSheet">
<string notr="true">QToolButton{
- border-left:solid 0 px;
+ border-right:solid 0 px;
height:16px;
width:12px;
}
@@ -287,7 +290,7 @@
</property>
<property name="icon">
<iconset resource="../welcome/welcome.qrc">
- <normaloff>:/welcome/images/arrow-right.png</normaloff>:/welcome/images/arrow-right.png</iconset>
+ <normaloff>:/welcome/images/arrow-left.png</normaloff>:/welcome/images/arrow-left.png</iconset>
</property>
<property name="arrowType">
<enum>Qt::NoArrow</enum>
@@ -302,7 +305,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
- <height>2</height>
+ <height>13</height>
</size>
</property>
</spacer>
@@ -383,6 +386,7 @@
</layout>
</item>
</layout>
+ <zorder>createNewProjectButton</zorder>
</widget>
</item>
</layout>
diff --git a/src/plugins/welcome/communitywelcomepagewidget.ui b/src/plugins/welcome/communitywelcomepagewidget.ui
index 99ebed14b3ef2f96290bf649ade81812669a20c2..d48b8fcfe14f26d5f421dcd98194fb9285384690 100644
--- a/src/plugins/welcome/communitywelcomepagewidget.ui
+++ b/src/plugins/welcome/communitywelcomepagewidget.ui
@@ -13,257 +13,289 @@
<property name="windowTitle">
<string>Form</string>
</property>
- <layout class="QHBoxLayout" name="horizontalLayout">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>2</number>
+ </property>
<item>
- <widget class="QFrame" name="labsFrame">
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Plain</enum>
+ <widget class="QFrame" name="contentframe">
+ <property name="styleSheet">
+ <string notr="true">#contentframe{
+ border: none 0px;
+ border-bottom: 1px solid #c9c9c9;
+ background: #f9f9f9;
+ margin: 0px;
+}</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <widget class="Utils::WelcomeModeLabel" name="labsTitleLabel">
- <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>
- <widget class="Utils::WelcomeModeTreeWidget" name="newsTreeWidget">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>340</width>
- <height>0</height>
- </size>
- </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>
- <widget class="QFrame" name="sitesFrame">
<property name="frameShape">
- <enum>QFrame::NoFrame</enum>
+ <enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
- <enum>QFrame::Plain</enum>
+ <enum>QFrame::Raised</enum>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
+ <layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <widget class="Utils::WelcomeModeLabel" name="supportSitesTitleLabel">
- <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>
- <widget class="Utils::WelcomeModeTreeWidget" name="supportSitesTreeWidget">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="focusPolicy">
- <enum>Qt::NoFocus</enum>
- </property>
+ <widget class="QFrame" name="labsFrame">
<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>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="Utils::WelcomeModeLabel" name="labsTitleLabel">
+ <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>
+ <widget class="Utils::WelcomeModeTreeWidget" name="newsTreeWidget">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>340</width>
+ <height>0</height>
+ </size>
+ </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>
- <widget class="Utils::WelcomeModeLabel" name="miscSitesTitleLabel">
- <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>
- <widget class="Utils::WelcomeModeTreeWidget" name="miscSitesTreeWidget">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="focusPolicy">
- <enum>Qt::NoFocus</enum>
- </property>
+ <widget class="QFrame" name="sitesFrame">
<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>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="Utils::WelcomeModeLabel" name="supportSitesTitleLabel">
+ <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>
+ <widget class="Utils::WelcomeModeTreeWidget" name="supportSitesTreeWidget">
+ <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>
+ <widget class="Utils::WelcomeModeLabel" name="miscSitesTitleLabel">
+ <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>
+ <widget class="Utils::WelcomeModeTreeWidget" name="miscSitesTreeWidget">
+ <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>
</layout>
diff --git a/src/plugins/welcome/images/background_center_frame.png b/src/plugins/welcome/images/background_center_frame.png
index c69f1447283362f2924228071be74b6cd04d41b7..a4ed651f14516ee9fa13c5bdd783422059ab35e1 100644
Binary files a/src/plugins/welcome/images/background_center_frame.png and b/src/plugins/welcome/images/background_center_frame.png differ
diff --git a/src/plugins/welcome/welcomemode.ui b/src/plugins/welcome/welcomemode.ui
index 7e19c4411ca3f3d130858edf1bc37d8f32d6ba08..9925cc3753de4a5835cbe219eb8b008b424aa50f 100644
--- a/src/plugins/welcome/welcomemode.ui
+++ b/src/plugins/welcome/welcomemode.ui
@@ -107,13 +107,13 @@ QToolButton:pressed, QPushButton:pressed{
<property name="minimumSize">
<size>
<width>662</width>
- <height>500</height>
+ <height>520</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>662</width>
- <height>500</height>
+ <height>520</height>
</size>
</property>
<property name="styleSheet">
@@ -123,7 +123,13 @@ QToolButton:pressed, QPushButton:pressed{
padding:-3;
padding-bottom:20 ;
}
-</string>
+
+#contentframe{
+ border: none 0px;
+ border-bottom: 1px solid #c9c9c9;
+ background: #ffffff;
+ margin: 0px;
+}</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>