From 439730ee8ab47555a626c7588e338f60e21954bc Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sun, 4 Aug 2013 21:38:44 +0200 Subject: [PATCH] changed startByGenre to according to the mockup --- data/qml/stations/CreateByArtist.qml | 3 ++- data/qml/stations/CreateByGenre.qml | 16 ++++++++++------ data/qml/tomahawkimports/TagCloud.qml | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/data/qml/stations/CreateByArtist.qml b/data/qml/stations/CreateByArtist.qml index 897cfe6a2..78bb33853 100644 --- a/data/qml/stations/CreateByArtist.qml +++ b/data/qml/stations/CreateByArtist.qml @@ -52,8 +52,9 @@ Item { Row { height: artistInputField.height - width: parent.width + width: Math.min(defaultFontHeight * 30, parent.width) spacing: defaultFontHeight * 0.5 + anchors.horizontalCenter: parent.horizontalCenter InputField { id: artistInputField diff --git a/data/qml/stations/CreateByGenre.qml b/data/qml/stations/CreateByGenre.qml index 017c0cf02..87be16b16 100644 --- a/data/qml/stations/CreateByGenre.qml +++ b/data/qml/stations/CreateByGenre.qml @@ -45,13 +45,12 @@ Item { HeaderLabel { id: headerText - anchors.horizontalCenter: parent.horizontalCenter - text: "Enter or pick a genre" + text: "Enter a genre," } Row { - width: defaultFontHeight * 30 - height: genreInputField.height + width: Math.min(defaultFontHeight * 30, parent.width) + height: parent.height * 0.2 spacing: defaultFontHeight * 0.5 anchors.horizontalCenter: parent.horizontalCenter @@ -64,16 +63,21 @@ Item { PushButton { id: createFromInputButton - text: "Go!" + text: "Create station" height: genreInputField.height enabled: genreInputField.text.length > 2 onClicked: createStation(genreInputField.text) } } + HeaderLabel { + text: "Or, pick one of your most listened genres" + } + Item { - height: parent.height - headerText.height - genreInputField.height + height: parent.height - y width: parent.width + clip: true TagCloud { anchors.fill: parent anchors.margins: parent.width / 6 diff --git a/data/qml/tomahawkimports/TagCloud.qml b/data/qml/tomahawkimports/TagCloud.qml index ccdc82cd3..3ab6828ae 100644 --- a/data/qml/tomahawkimports/TagCloud.qml +++ b/data/qml/tomahawkimports/TagCloud.qml @@ -33,7 +33,7 @@ Item { color: "gray" //text: controlModel.controlAt( index ).summary text: modelData - font.pointSize: 16 + font.pixelSize: defaultFontHeight * 1.8 anchors.verticalCenter: parent.verticalCenter //anchors.verticalCenterOffset: tagCloud.randomNumber(0, 15)