diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index 7ffa12b5710ebaef4963ada376d81e17dda16485..a3c77126fa20e82e1b816683a45edaa8a4cf6dfb 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -44,14 +44,13 @@
<file>images/unlocked.png</file>
<file>images/extension.png</file>
<file>images/darkclosebutton.png</file>
- <file>images/welcomemode/btn_feedback.png</file>
- <file>images/welcomemode/btn_feedback_hover.png</file>
- <file>images/welcomemode/btn_getting_started.png</file>
- <file>images/welcomemode/btn_getting_started_hover.png</file>
- <file>images/welcomemode/btn_restore_session.png</file>
- <file>images/welcomemode/btn_restore_session_hover.png</file>
+ <file>images/welcomemode/btn_26.png</file>
+ <file>images/welcomemode/btn_26_hover.png</file>
+ <file>images/welcomemode/btn_27.png</file>
+ <file>images/welcomemode/btn_27_hover.png</file>
+ <file>images/welcomemode/feedback_arrow.png</file>
+ <file>images/welcomemode/feedback_arrow_hover.png</file>
<file>images/welcomemode/feedback-bar-background.png</file>
- <file>images/welcomemode/feedback-text.png</file>
<file>images/welcomemode/list_bullet_arrow.png</file>
<file>images/welcomemode/mode_project.png</file>
<file>images/welcomemode/nokia_logo.png</file>
diff --git a/src/plugins/coreplugin/images/welcomemode/btn_26.png b/src/plugins/coreplugin/images/welcomemode/btn_26.png
new file mode 100644
index 0000000000000000000000000000000000000000..17d9a83c6e8cfb0648f0164c03d135525428a66d
Binary files /dev/null and b/src/plugins/coreplugin/images/welcomemode/btn_26.png differ
diff --git a/src/plugins/coreplugin/images/welcomemode/btn_26_hover.png b/src/plugins/coreplugin/images/welcomemode/btn_26_hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a5937803abafbdff713084a0ec44481fc49eb5b
Binary files /dev/null and b/src/plugins/coreplugin/images/welcomemode/btn_26_hover.png differ
diff --git a/src/plugins/coreplugin/images/welcomemode/btn_27.png b/src/plugins/coreplugin/images/welcomemode/btn_27.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcdf90ded2b5acbdd61e854abb7bc96eb265300e
Binary files /dev/null and b/src/plugins/coreplugin/images/welcomemode/btn_27.png differ
diff --git a/src/plugins/coreplugin/images/welcomemode/btn_27_hover.png b/src/plugins/coreplugin/images/welcomemode/btn_27_hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bc8680d7fa5d13b54c5151b11b8e0d82213c9e5
Binary files /dev/null and b/src/plugins/coreplugin/images/welcomemode/btn_27_hover.png differ
diff --git a/src/plugins/coreplugin/images/welcomemode/btn_feedback.png b/src/plugins/coreplugin/images/welcomemode/btn_feedback.png
deleted file mode 100644
index ad972b082a56619913a3255af5d75d84329957b7..0000000000000000000000000000000000000000
Binary files a/src/plugins/coreplugin/images/welcomemode/btn_feedback.png and /dev/null differ
diff --git a/src/plugins/coreplugin/images/welcomemode/btn_feedback_hover.png b/src/plugins/coreplugin/images/welcomemode/btn_feedback_hover.png
deleted file mode 100644
index ebf3d5754a9e3fba83875664d8327f805216d94a..0000000000000000000000000000000000000000
Binary files a/src/plugins/coreplugin/images/welcomemode/btn_feedback_hover.png and /dev/null differ
diff --git a/src/plugins/coreplugin/images/welcomemode/btn_getting_started.png b/src/plugins/coreplugin/images/welcomemode/btn_getting_started.png
deleted file mode 100644
index affd4b25acba1df39d3436d360439c6bb45f1d7f..0000000000000000000000000000000000000000
Binary files a/src/plugins/coreplugin/images/welcomemode/btn_getting_started.png and /dev/null differ
diff --git a/src/plugins/coreplugin/images/welcomemode/btn_getting_started_hover.png b/src/plugins/coreplugin/images/welcomemode/btn_getting_started_hover.png
deleted file mode 100644
index e6145de709e95ea9241db17b38864e075f93eac7..0000000000000000000000000000000000000000
Binary files a/src/plugins/coreplugin/images/welcomemode/btn_getting_started_hover.png and /dev/null differ
diff --git a/src/plugins/coreplugin/images/welcomemode/btn_restore_session.png b/src/plugins/coreplugin/images/welcomemode/btn_restore_session.png
deleted file mode 100644
index 4698c19a9c46767b3942af87e98589a6c6a1f079..0000000000000000000000000000000000000000
Binary files a/src/plugins/coreplugin/images/welcomemode/btn_restore_session.png and /dev/null differ
diff --git a/src/plugins/coreplugin/images/welcomemode/btn_restore_session_hover.png b/src/plugins/coreplugin/images/welcomemode/btn_restore_session_hover.png
deleted file mode 100644
index 30c878207df7458120b3bc41e85b4ca1b0cd722b..0000000000000000000000000000000000000000
Binary files a/src/plugins/coreplugin/images/welcomemode/btn_restore_session_hover.png and /dev/null differ
diff --git a/src/plugins/coreplugin/images/welcomemode/feedback-text.png b/src/plugins/coreplugin/images/welcomemode/feedback-text.png
deleted file mode 100644
index 5f6f05843fbc0452b31538c8f9666db9199ba255..0000000000000000000000000000000000000000
Binary files a/src/plugins/coreplugin/images/welcomemode/feedback-text.png and /dev/null differ
diff --git a/src/plugins/coreplugin/images/welcomemode/feedback_arrow.png b/src/plugins/coreplugin/images/welcomemode/feedback_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..8766098a5a6e4250800eefb959610e109bfd08fe
Binary files /dev/null and b/src/plugins/coreplugin/images/welcomemode/feedback_arrow.png differ
diff --git a/src/plugins/coreplugin/images/welcomemode/feedback_arrow_hover.png b/src/plugins/coreplugin/images/welcomemode/feedback_arrow_hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..43d9907144a322b3dacdd1023481a244b894587e
Binary files /dev/null and b/src/plugins/coreplugin/images/welcomemode/feedback_arrow_hover.png differ
diff --git a/src/plugins/coreplugin/welcomemode.cpp b/src/plugins/coreplugin/welcomemode.cpp
index ac8f87874ba9c619510a4b213118a2a6f1b3cef8..ee85691c4252c84144e8f93be4a26d4dedf04b85 100644
--- a/src/plugins/coreplugin/welcomemode.cpp
+++ b/src/plugins/coreplugin/welcomemode.cpp
@@ -227,7 +227,8 @@ void WelcomeMode::slotFeedback()
WelcomeModeButton::WelcomeModeButton(QWidget *parent) :
QLabel(parent),
- m_isPressed(false)
+ m_isPressed(false),
+ m_isInited(false)
{
setCursor(QCursor(Qt::PointingHandCursor));
}
@@ -247,6 +248,28 @@ void WelcomeModeButton::mouseReleaseEvent(QMouseEvent *event)
}
}
+void WelcomeModeButton::enterEvent(QEvent *)
+{
+ if (!m_isInited) {
+ m_isInited = true;
+ m_text = text();
+ m_hoverText = m_text;
+ m_hoverText.replace(QLatin1String(".png"), QLatin1String("_hover.png"));
+ if (m_text == m_hoverText) {
+ m_text.clear();
+ m_hoverText.clear();
+ }
+ }
+ if (!m_hoverText.isEmpty())
+ setText(m_hoverText);
+}
+
+void WelcomeModeButton::leaveEvent(QEvent *)
+{
+ if (!m_text.isEmpty())
+ setText(m_text);
+}
+
// --- WelcomeModeTreeWidget
WelcomeModeTreeWidget::WelcomeModeTreeWidget(QWidget *parent) :
diff --git a/src/plugins/coreplugin/welcomemode.ui b/src/plugins/coreplugin/welcomemode.ui
index 8692e27c711dd4e4e3a5d4146dc2260fe27fe152..f093d62f6d40df5e5c0b4991c0df5a07ec638bdc 100644
--- a/src/plugins/coreplugin/welcomemode.ui
+++ b/src/plugins/coreplugin/welcomemode.ui
@@ -164,22 +164,25 @@ p {
</item>
<item>
<widget class="Core::Internal::WelcomeModeButton" name="gettingStartedButton">
- <property name="minimumSize">
- <size>
- <width>133</width>
- <height>29</height>
- </size>
- </property>
<property name="styleSheet">
<string>* {
- background-image: url(":/core/images/welcomemode/btn_getting_started.png");
+ border-image: url(:/core/images/welcomemode/btn_27.png) 7;
+ border-width: 7;
+ padding: -2px 0;
+ font-size: 12px;
+ font-family: lucida sans, dejavu sans, sans serif;
+ color: black;
}
*:hover {
- background-image: url(:/core/images/welcomemode/btn_getting_started_hover.png)
+ border-image: url(:/core/images/welcomemode/btn_27_hover.png) 7;
+ color: white;
}
</string>
</property>
+ <property name="text">
+ <string><qt>Getting Started &gt;&gt;</string>
+ </property>
</widget>
</item>
</layout>
@@ -281,45 +284,6 @@ h2 {
</property>
</widget>
</item>
- <item row="2" column="1">
- <spacer name="restoreButtonSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>1</width>
- <height>1</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="2" column="2">
- <widget class="Core::Internal::WelcomeModeButton" name="restoreSessionButton">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>137</width>
- <height>27</height>
- </size>
- </property>
- <property name="styleSheet">
- <string>* {
- background-image: url(":/core/images/welcomemode/btn_restore_session.png");
-}
-
-*:hover {
- background-image: url(:/core/images/welcomemode/btn_restore_session_hover.png)
-}
-</string>
- </property>
- </widget>
- </item>
<item row="1" column="1" colspan="2">
<widget class="Core::Internal::WelcomeModeTreeWidget" name="sessTreeWidget">
<property name="sizePolicy">
@@ -374,7 +338,7 @@ h2 {
</widget>
</item>
<item row="2" column="0">
- <spacer name="verticalSpacer_2">
+ <spacer name="restoreButtonVerticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
@@ -386,6 +350,45 @@ h2 {
</property>
</spacer>
</item>
+ <item row="2" column="2">
+ <widget class="Core::Internal::WelcomeModeButton" name="restoreSessionButton">
+ <property name="styleSheet">
+ <string>* {
+ border-image: url(:/core/images/welcomemode/btn_26.png) 7;
+ border-width: 7;
+ padding: -2px 0;
+ font-size: 12px;
+ font-family: lucida sans, dejavu sans, sans serif;
+ color: black;
+}
+
+*:hover {
+ border-image: url(:/core/images/welcomemode/btn_26_hover.png) 7;
+ color: white;
+}
+</string>
+ </property>
+ <property name="text">
+ <string><qt>Restore Last Session &gt;&gt;</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <spacer name="restoreButtonSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Ignored</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>1</width>
+ <height>1</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</widget>
</item>
@@ -711,45 +714,31 @@ background-image: url(:/core/images/welcomemode/feedback-bar-background.png);
<number>0</number>
</property>
<property name="horizontalSpacing">
- <number>6</number>
+ <number>10</number>
</property>
<property name="verticalSpacing">
<number>0</number>
</property>
- <item row="0" column="0" rowspan="3">
- <widget class="QLabel" name="feedbackLabel">
- <property name="text">
- <string/>
- </property>
- <property name="pixmap">
- <pixmap resource="core.qrc">:/core/images/welcomemode/feedback-text.png</pixmap>
- </property>
- </widget>
- </item>
<item row="1" column="1">
<widget class="Core::Internal::WelcomeModeButton" name="feedbackButton">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>102</width>
- <height>26</height>
- </size>
- </property>
<property name="styleSheet">
<string>* {
- background-image: url(":/core/images/welcomemode/btn_feedback.png");
+ border-image: url(:/core/images/welcomemode/btn_26.png) 7;
+ border-width: 7;
+ padding: -2px 2px;
+ font-size: 12px;
+ font-family: lucida sans, dejavu sans, sans serif;
}
*:hover {
- background-image: url(:/core/images/welcomemode/btn_feedback_hover.png)
+ border-image: url(:/core/images/welcomemode/btn_26_hover.png) 7;
+ color: white;
}
</string>
</property>
+ <property name="text">
+ <string><qt>Feedback&nbsp;&nbsp;<img src=":/core/images/welcomemode/feedback_arrow.png" /></string>
+ </property>
</widget>
</item>
<item row="1" column="2">
@@ -771,7 +760,7 @@ background-image: url(:/core/images/welcomemode/feedback-bar-background.png);
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
+ <enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -787,16 +776,23 @@ background-image: url(:/core/images/welcomemode/feedback-bar-background.png);
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
+ <enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>1</width>
- <height>0</height>
+ <height>1</height>
</size>
</property>
</spacer>
</item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="helpUsLabel">
+ <property name="text">
+ <string>Help us make Qt Creator even better</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
diff --git a/src/plugins/coreplugin/welcomemode_p.h b/src/plugins/coreplugin/welcomemode_p.h
index ad8bcecab71cbbd519bb9ccc40915604171317ba..49e4642da23978be882e5458789f8ce22de660ba 100644
--- a/src/plugins/coreplugin/welcomemode_p.h
+++ b/src/plugins/coreplugin/welcomemode_p.h
@@ -50,9 +50,14 @@ signals:
protected:
virtual void mousePressEvent(QMouseEvent *event);
virtual void mouseReleaseEvent(QMouseEvent *event);
+ virtual void enterEvent(QEvent *event);
+ virtual void leaveEvent(QEvent *event);
private:
bool m_isPressed;
+ bool m_isInited;
+ QString m_text;
+ QString m_hoverText;
};
class WelcomeModeTreeWidget : public QTreeWidget