summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@digia.com>2013-09-17 12:38:46 +0200
committerThomas Hartmann <Thomas.Hartmann@digia.com>2013-09-17 14:45:14 +0200
commit0d0606a6d9dd5fda0874cd8cf3fd62c2e70f6788 (patch)
treea0751884643ebeba322b6544ea769559a23dc8db
parent984ca9ff3d7b1f8b28dd32306c6d244683957dbf (diff)
downloadqt-creator-0d0606a6d9dd5fda0874cd8cf3fd62c2e70f6788.tar.gz
WelcomePage: Use native text rendering
Task-number: QTCREATORBUG-10167 Change-Id: I0bf3d28ba2837cdbfa4f5a38148ee00fe2b1c897 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
-rw-r--r--share/qtcreator/welcomescreen/develop.qml4
-rw-r--r--share/qtcreator/welcomescreen/widgets/Delegate.qml8
-rw-r--r--share/qtcreator/welcomescreen/widgets/GettingStartedItem.qml6
-rw-r--r--share/qtcreator/welcomescreen/widgets/LinkedText.qml2
-rw-r--r--share/qtcreator/welcomescreen/widgets/LinksBar.qml2
-rw-r--r--share/qtcreator/welcomescreen/widgets/Logo.qml2
-rw-r--r--share/qtcreator/welcomescreen/widgets/NativeText.qml34
-rw-r--r--share/qtcreator/welcomescreen/widgets/PageCaption.qml2
-rw-r--r--share/qtcreator/welcomescreen/widgets/ProjectItem.qml2
-rw-r--r--share/qtcreator/welcomescreen/widgets/SearchBar.qml3
-rw-r--r--share/qtcreator/welcomescreen/widgets/SessionItem.qml4
-rw-r--r--share/qtcreator/welcomescreen/widgets/ToolTip.qml2
-rw-r--r--share/qtcreator/welcomescreen/widgets/qmldir1
13 files changed, 53 insertions, 19 deletions
diff --git a/share/qtcreator/welcomescreen/develop.qml b/share/qtcreator/welcomescreen/develop.qml
index e2a58eb9d8..be1b557a68 100644
--- a/share/qtcreator/welcomescreen/develop.qml
+++ b/share/qtcreator/welcomescreen/develop.qml
@@ -102,7 +102,7 @@ Rectangle {
visible: !recentProjects.scrollBarVisible
}
- Text {
+ NativeText {
id: sessionsTitle
x: pageCaption.x + pageCaption.textOffset
@@ -115,7 +115,7 @@ Rectangle {
font.bold: true
}
- Text {
+ NativeText {
id: recentProjectsTitle
x: 406
diff --git a/share/qtcreator/welcomescreen/widgets/Delegate.qml b/share/qtcreator/welcomescreen/widgets/Delegate.qml
index 39936e0ce0..889f871c50 100644
--- a/share/qtcreator/welcomescreen/widgets/Delegate.qml
+++ b/share/qtcreator/welcomescreen/widgets/Delegate.qml
@@ -97,7 +97,7 @@ Rectangle {
asynchronous: true
}
- Text {
+ NativeText {
id: length
visible: delegate.isVideo
@@ -123,7 +123,7 @@ Rectangle {
anchors.left: parent.left
}
- Text {
+ NativeText {
id: captionItem
x: 16
y: 170
@@ -139,7 +139,7 @@ Rectangle {
font: fonts.standardCaption
}
- Text {
+ NativeText {
id: descriptionItem
height: 43
color: "#7e7e7e"
@@ -169,7 +169,7 @@ Rectangle {
anchors.rightMargin: 10
}
- Text {
+ NativeText {
id: tags
x: 16
y: 198
diff --git a/share/qtcreator/welcomescreen/widgets/GettingStartedItem.qml b/share/qtcreator/welcomescreen/widgets/GettingStartedItem.qml
index 00b4f404fb..afa60d8914 100644
--- a/share/qtcreator/welcomescreen/widgets/GettingStartedItem.qml
+++ b/share/qtcreator/welcomescreen/widgets/GettingStartedItem.qml
@@ -23,7 +23,7 @@ Item {
smooth: true
visible: false
- Text {
+ NativeText {
color: "#f7f7f7"
font.bold: true
text: gettingStartedItem.number
@@ -34,7 +34,7 @@ Item {
}
}
- Text {
+ NativeText {
id: titleText
y: 188
color: colors.strongForegroundColor
@@ -46,7 +46,7 @@ Item {
font: fonts.standardCaption
}
- Text {
+ NativeText {
id: descriptionText
y: 246
height: 62
diff --git a/share/qtcreator/welcomescreen/widgets/LinkedText.qml b/share/qtcreator/welcomescreen/widgets/LinkedText.qml
index fa47a67c70..b460ac50a9 100644
--- a/share/qtcreator/welcomescreen/widgets/LinkedText.qml
+++ b/share/qtcreator/welcomescreen/widgets/LinkedText.qml
@@ -29,7 +29,7 @@
import QtQuick 2.1
-Text {
+NativeText {
id: root
height: 16
color: active ? "#f0f0f0" : colors.linkColor
diff --git a/share/qtcreator/welcomescreen/widgets/LinksBar.qml b/share/qtcreator/welcomescreen/widgets/LinksBar.qml
index 8b0e7a6642..88038a85cc 100644
--- a/share/qtcreator/welcomescreen/widgets/LinksBar.qml
+++ b/share/qtcreator/welcomescreen/widgets/LinksBar.qml
@@ -47,7 +47,7 @@ Item {
GradientStop { position: 0; color: "#f7f7f7" }
GradientStop { position: 1; color: "#e4e4e4" }
}
- Text {
+ NativeText {
id: text
horizontalAlignment: Qt.AlignHCenter; verticalAlignment: Qt.AlignVCenter
anchors.fill: parent
diff --git a/share/qtcreator/welcomescreen/widgets/Logo.qml b/share/qtcreator/welcomescreen/widgets/Logo.qml
index 080bb9c361..059c1c4dd0 100644
--- a/share/qtcreator/welcomescreen/widgets/Logo.qml
+++ b/share/qtcreator/welcomescreen/widgets/Logo.qml
@@ -32,7 +32,7 @@ import QtQuick 2.1
Image {
id: logo
source: "images/qtcreator.png"
- Text {
+ NativeText {
y: 21
color: "#424242"
text: "Qt Creator"
diff --git a/share/qtcreator/welcomescreen/widgets/NativeText.qml b/share/qtcreator/welcomescreen/widgets/NativeText.qml
new file mode 100644
index 0000000000..df33557b90
--- /dev/null
+++ b/share/qtcreator/welcomescreen/widgets/NativeText.qml
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+import QtQuick 2.1
+
+Text {
+ renderType: Text.NativeRendering
+}
diff --git a/share/qtcreator/welcomescreen/widgets/PageCaption.qml b/share/qtcreator/welcomescreen/widgets/PageCaption.qml
index 7a4ec89daa..906e3b5d5e 100644
--- a/share/qtcreator/welcomescreen/widgets/PageCaption.qml
+++ b/share/qtcreator/welcomescreen/widgets/PageCaption.qml
@@ -37,7 +37,7 @@ Item {
property int textOffset: captionText.x + captionText.width
property alias caption: captionText.text
- Text {
+ NativeText {
id: captionText
y: 9
color: "#515153"
diff --git a/share/qtcreator/welcomescreen/widgets/ProjectItem.qml b/share/qtcreator/welcomescreen/widgets/ProjectItem.qml
index 9a60ea4385..b21ecd71d5 100644
--- a/share/qtcreator/welcomescreen/widgets/ProjectItem.qml
+++ b/share/qtcreator/welcomescreen/widgets/ProjectItem.qml
@@ -58,7 +58,7 @@ Item {
onClicked: projectWelcomePage.requestProject(filePath)
}
- Text {
+ NativeText {
id: pathText
y: 18
color: "#6b6b6b"
diff --git a/share/qtcreator/welcomescreen/widgets/SearchBar.qml b/share/qtcreator/welcomescreen/widgets/SearchBar.qml
index ef8d23c1af..e2bb784e88 100644
--- a/share/qtcreator/welcomescreen/widgets/SearchBar.qml
+++ b/share/qtcreator/welcomescreen/widgets/SearchBar.qml
@@ -55,14 +55,13 @@ Rectangle {
font.family: "Helvetica"
}
- Text {
+ NativeText {
id: placeHolderText
visible: !lineEdit.text.length
text: qsTr("Search...")
anchors.fill: lineEdit
font: lineEdit.font
verticalAlignment: Text.AlignVCenter
- renderType: Text.NativeRendering
color: "gray"
}
}
diff --git a/share/qtcreator/welcomescreen/widgets/SessionItem.qml b/share/qtcreator/welcomescreen/widgets/SessionItem.qml
index 6835974e0f..5e6606c261 100644
--- a/share/qtcreator/welcomescreen/widgets/SessionItem.qml
+++ b/share/qtcreator/welcomescreen/widgets/SessionItem.qml
@@ -117,11 +117,11 @@ Item {
Repeater {
model: projectsPath
delegate: Column {
- Text {
+ NativeText {
text: projectsName[index]
font: fonts.boldDescription
}
- Text {
+ NativeText {
x: 4
function multiLinePath(path) {
if (path.length < 42)
diff --git a/share/qtcreator/welcomescreen/widgets/ToolTip.qml b/share/qtcreator/welcomescreen/widgets/ToolTip.qml
index 24a3b9edd7..8f68935ef2 100644
--- a/share/qtcreator/welcomescreen/widgets/ToolTip.qml
+++ b/share/qtcreator/welcomescreen/widgets/ToolTip.qml
@@ -98,7 +98,7 @@ Item {
}
}
- Text {
+ NativeText {
x: toolTip.margin
y: toolTip.margin
id: text
diff --git a/share/qtcreator/welcomescreen/widgets/qmldir b/share/qtcreator/welcomescreen/widgets/qmldir
index 8a5712d009..247b4b2853 100644
--- a/share/qtcreator/welcomescreen/widgets/qmldir
+++ b/share/qtcreator/welcomescreen/widgets/qmldir
@@ -18,4 +18,5 @@ PageLoader 1.0 PageLoader.qml
ToolTip 1.0 ToolTip.qml
IconAndLink 1.0 IconAndLink.qml
ComboBox 1.0 ComboBox.qml
+NativeText 1.0 NativeText.qml