summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@theqtcompany.com>2015-11-27 10:03:03 +0200
committerKatja Marttila <katja.marttila@theqtcompany.com>2015-11-27 12:40:28 +0000
commit9610769d380f43bc4d624d001fee9bec3aca9f28 (patch)
tree6ca86ded8aa05a19e4473eb418a24c30d214b12b
parentda6b5d7b76224cdbced0d19e10a0f2d5282369e1 (diff)
Launcher UI changes
Center application description text Divide launcher title into two rows if does not fit to one Remove the play button Replace bottom url text Change-Id: I17ab525eb719e442d30a7e1127ffbac13edc0cb4 Task-number: QTEE-987 Task-number: QTEE-989 Task-number: QTEE-995 Task-number: QTEE-993 Reviewed-by: Kalle Viironen <kalle.viironen@theqtcompany.com>
-rw-r--r--qml/LaunchScreen.qml35
-rw-r--r--qml/Main.qml5
2 files changed, 7 insertions, 33 deletions
diff --git a/qml/LaunchScreen.qml b/qml/LaunchScreen.qml
index efa303f..66b50bf 100644
--- a/qml/LaunchScreen.qml
+++ b/qml/LaunchScreen.qml
@@ -106,48 +106,23 @@ Item {
}
}
- Image {
- id: playButton
- source: "images/Play_btn.png"
- x: list.width/3.5
- y: list.cellHeight + engine.mm(2)
- MouseArea {
- id: mouse
- anchors.fill: parent
- onClicked: {
- engine.launchApplication(applicationsModel.query(list.currentIndex, "location"),
- applicationsModel.query(list.currentIndex, "mainFile"),
- applicationsModel.query(list.currentIndex, "name"))
- }
- }
- }
- Text {
- id: playText
- text: "LAUNCH DEMO"
- color: window.qtgreen
- font.pixelSize: engine.fontSize()
- anchors.verticalCenter: playButton.verticalCenter
- anchors.left: playButton.right
- anchors.leftMargin: engine.mm(4)
- }
-
Text {
id: nameLabel
- x: playButton.x
+ x: list.width/4 + engine.mm(2)
+ y: list.cellHeight + engine.mm(10)
+ width: list.cellWidth - engine.mm(2)
font.pixelSize: engine.fontSize()
color: "black"
font.bold: true
- anchors.top: playButton.bottom
- anchors.topMargin: engine.mm(4)
wrapMode: Text.WordWrap
}
Text {
id: descriptionLabel
- width: list.cellWidth - engine.mm(4)//list.width/2.5
+ width: nameLabel.width
font.pixelSize: engine.smallFontSize()
color: "black"
- x: playButton.x
+ x: nameLabel.x
anchors.top: nameLabel.bottom
anchors.bottom: parent.bottom
wrapMode: Text.WordWrap
diff --git a/qml/Main.qml b/qml/Main.qml
index 6b5d816..9974653 100644
--- a/qml/Main.qml
+++ b/qml/Main.qml
@@ -329,18 +329,17 @@ Window {
Item {
id: url
+ x: appGrid.width/4 + engine.mm(2)
anchors.bottom: parent.bottom;
- anchors.horizontalCenter: parent.horizontalCenter;
anchors.margins: height/2
width: urlLabel.width
height: urlLabel.height
Text {
id: urlLabel;
- text: "http://www.qt.io/qt-for-device-creation"
+ text: "Visit Qt.io/qt-for-device-creation"
color: qtgreen
font.pixelSize: engine.sensibleButtonSize() * 0.2
- font.bold: true
}
}
}