Commit 08ba8423 authored by Jens Bache-Wiig's avatar Jens Bache-Wiig Committed by Daniel Molkentin
Browse files

Fixed tabs and missing pixmap

Change-Id: Ieaf7956f90a269cc582af5c6e8f08faa4b624b8e
Reviewed-on: http://codereview.qt.nokia.com/1649

Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarDaniel Molkentin <daniel.molkentin@nokia.com>
parent db5f5d56
......@@ -38,7 +38,7 @@ Rectangle {
height: Math.max(image.height-20, description.paintedHeight) + 68
color: "#00ffffff"
Components.QStyleItem { cursor: "pointinghandcursor"; anchors.fill: parent }
Components.QStyleItem { cursor: "pointinghandcursor" ; anchors.fill: parent }
Item {
visible: parent.state=="hover"
......@@ -74,7 +74,8 @@ Rectangle {
Image {
property bool hideImage : model.imageUrl === "" || status === Image.Error
id: image
anchors.top: title.bottom
smooth: true
anchors.top: description.top
anchors.right: parent.right
anchors.rightMargin: 30
width: hideImage ? 0 : 90
......
......@@ -67,7 +67,7 @@ Row {
anchors.fill: parent
text: model.modelData.title
elide: Text.ElideRight
color: "white"
color: "black"
}
MouseArea {
id: mouseArea
......@@ -79,13 +79,8 @@ Row {
State {
id: activeState; when: tabBar.current == index
PropertyChanges { target: tabBackground; source:"qrc:welcome/images/tab_active.png" }
PropertyChanges { target: text; color: "black" }
},
State {
id: hoverState; when: mouseArea.containsMouse
PropertyChanges { target: tabBackground; source:"qrc:welcome/images/tab_hover.png" }
PropertyChanges { target: text; color: "white" }
}
]
}
}
......
......@@ -36,6 +36,6 @@ Row {
property int rating : 2
property int totalRating: 3
Repeater { id: rep1; model: rating; Image { source: "img/face-star.png"; width: 22 } }
Repeater { id: rep2; model: totalRating-rating; Image { source: "img/draw-star.png"; width: 22 } }
Repeater { id: rep1; model: rating; Image { source: "qrc:/welcome/images/face-star.png"; width: 22 } }
Repeater { id: rep2; model: totalRating-rating; Image { source: "qrc:/welcome/images/draw-star.png"; width: 22 } }
}
src/plugins/welcome/images/tab_active.png

213 Bytes | W: | H:

src/plugins/welcome/images/tab_active.png

196 Bytes | W: | H:

src/plugins/welcome/images/tab_active.png
src/plugins/welcome/images/tab_active.png
src/plugins/welcome/images/tab_active.png
src/plugins/welcome/images/tab_active.png
  • 2-up
  • Swipe
  • Onion skin
src/plugins/welcome/images/tab_inactive.png

196 Bytes | W: | H:

src/plugins/welcome/images/tab_inactive.png

213 Bytes | W: | H:

src/plugins/welcome/images/tab_inactive.png
src/plugins/welcome/images/tab_inactive.png
src/plugins/welcome/images/tab_inactive.png
src/plugins/welcome/images/tab_inactive.png
  • 2-up
  • Swipe
  • Onion skin
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment