warnings--

data/qml/stations/CreateByArtist.qml

@@ -46,20 +46,24 @@ Item {
             }
         }
 
-        ArtistView {
-            id: artistView
+        Item {
             height: parent.height - headerText.height - artistInputField.height - parent.spacing * 3
             width: parent.width
-            model: artistChartsModel
-            clip: true
-            delegateHeight: defaultFontHeight * 6
+            ArtistView {
+                id: artistView
+                height: parent.height
+                width: parent.width
+                model: artistChartsModel
+                clip: true
+                delegateHeight: defaultFontHeight * 6
 
-            onItemClicked: {
-                createStation(artistChartsModel.itemFromIndex(index).artistName);
+                onItemClicked: {
+                    createStation(artistChartsModel.itemFromIndex(index).artistName);
+                }
+            }
+            ScrollBar {
+                listView: artistView
             }
-        }
-        ScrollBar {
-            listView: artistView
         }
     }
 }

data/qml/stations/CreateByGenre.qml

@@ -51,7 +51,7 @@ Item {
 
         Row {
             width: defaultFontHeight * 30
-            height: artistInputField.height
+            height: genreInputField.height
             spacing: defaultFontHeight * 0.5
             anchors.horizontalCenter: parent.horizontalCenter
 

data/qml/tomahawkimports/FlexibleHeader.qml

@@ -144,9 +144,10 @@ Rectangle {
             rightMargin: -backButton.width - root.spacing - nextButton.width
             bottom: parent.bottom
             margins: root.spacing
-
-            onRightMarginChanged: print("#+#+#+#+", anchors.rightMargin)
         }
+        width: childrenRect.width
+        spacing: root.spacing
+        layoutDirection: Qt.RightToLeft
 
         states: [
             State {
@@ -166,10 +167,6 @@ Rectangle {
 
         ]
 
-        width: childrenRect.width
-        spacing: root.spacing
-        layoutDirection: Qt.RightToLeft
-
         Behavior on anchors.rightMargin {
             NumberAnimation { duration: 200 }
         }
@@ -178,14 +175,12 @@ Rectangle {
             id: nextButton
             anchors.verticalCenter: parent.verticalCenter
             text: root.nextButtonText
-//            visible: root.showNextButton
             onClicked: root.nextPressed();
         }
         PushButton {
             id: backButton
             anchors.verticalCenter: parent.verticalCenter
             text: root.backButtonText
-//            visible: root.showBackButton
             onClicked: root.backPressed();
         }
         InputField {

data/qml/tomahawkimports/PushButton.qml

@@ -4,7 +4,7 @@ import QtQuick 1.1
 Rectangle {
     id: root
     height: buttonText.height * 1.4
-    width: childrenRect.width + (spacing * 2)
+    width: buttonText.width + (spacing * 2)
     radius: defaultFontHeight * 0.25
     border.width: defaultFontHeight * 0.05
     border.color: "#a7a7a7"
@@ -23,7 +23,6 @@ Rectangle {
         id: buttonText
         anchors.centerIn: root
         font.pointSize: defaultFontSize
-        text: root.text
         color: mouseArea.pressed ? "white" : "black"
     }