[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [plasma-mediacenter] components: Various fixes so that QML runtime doesnt complain
From:       Shantanu Tushar <shaan7in () gmail ! com>
Date:       2012-06-21 14:41:58
Message-ID: 20120621144158.5D6FAA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 1274ca32a856f03d5698640f0ded799d4a73dd82 by Shantanu Tushar.
Committed on 21/06/2012 at 16:41.
Pushed by shantanu into branch 'master'.

Various fixes so that QML runtime doesnt complain

M  +2    -2    components/mediabrowser/MediaItemDelegate.qml
M  +18   -14   components/mediawelcome/BackendsListDelegate.qml
M  +16   -12   components/mediawelcome/RecentlyPlayedListDelegate.qml
M  +0    -1    components/playlist/Playlist.qml

http://commits.kde.org/plasma-mediacenter/1274ca32a856f03d5698640f0ded799d4a73dd82

diff --git a/components/mediabrowser/MediaItemDelegate.qml \
b/components/mediabrowser/MediaItemDelegate.qml index 15f0177..c0eed7a 100644
--- a/components/mediabrowser/MediaItemDelegate.qml
+++ b/components/mediabrowser/MediaItemDelegate.qml
@@ -96,7 +96,7 @@ Item {
 
         Text {
             id: itemText
-            text: hideLabel ? "" : display
+            text: hideLabel ? "" : ( display ? display : "" )
             visible: !hideLabel
             font.pointSize: 16
             color: "white"
@@ -123,7 +123,7 @@ Item {
 
     Text {
         id: workaroundForDecorationUpdate
-        text: decoration.toString()
+        text: decoration ? decoration.toString() : ""
         visible: false
 
         onTextChanged: iconImageLoader.checkAndLoad()
diff --git a/components/mediawelcome/BackendsListDelegate.qml \
b/components/mediawelcome/BackendsListDelegate.qml index ad5f1f3..950576d 100644
--- a/components/mediawelcome/BackendsListDelegate.qml
+++ b/components/mediawelcome/BackendsListDelegate.qml
@@ -20,21 +20,25 @@
 import QtQuick 1.1
 import org.kde.qtextracomponents 0.1 as QtExtraComponents
 
-Row {
-    spacing: 20
-
-    QtExtraComponents.QIconItem {
-        id: backendIcon
-        icon: decoration
-        height: parent.height
-        width: height
-    }
+Item {
+    Row {
+        anchors.fill: parent
+        spacing: 20
+
+        QtExtraComponents.QIconItem {
+            id: backendIcon
+            icon: decoration
+            height: parent.height
+            width: height
+        }
+
+        HomeScreenText {
+            height: parent.height
 
-    HomeScreenText {
-        height: parent.height
+            text: display
+            font.pointSize: 20
+        }
 
-        text: display
-        font.pointSize: 20
     }
 
     MouseArea {
@@ -43,4 +47,4 @@ Row {
     }
 
     ListView.onIsCurrentItemChanged: if (PathView.isCurrentItem) \
                homeScreenRootItem.selectedBackend = modelObject
-}
+}
\ No newline at end of file
diff --git a/components/mediawelcome/RecentlyPlayedListDelegate.qml \
b/components/mediawelcome/RecentlyPlayedListDelegate.qml index 07a7735..b8a07d6 \
                100644
--- a/components/mediawelcome/RecentlyPlayedListDelegate.qml
+++ b/components/mediawelcome/RecentlyPlayedListDelegate.qml
@@ -20,21 +20,25 @@
 import QtQuick 1.1
 import org.kde.qtextracomponents 0.1 as QtExtraComponents
 
-Row {
-    spacing: 20
+Item {
+    Row {
+        anchors.fill: parent
+        spacing: 20
 
-    QtExtraComponents.QIconItem {
-        id: backendIcon
-        icon: decoration
-        height: parent.height
-        width: height
-    }
+        QtExtraComponents.QIconItem {
+            id: backendIcon
+            icon: decoration
+            height: parent.height
+            width: height
+        }
+
+        HomeScreenText {
+            height: parent.height
 
-    HomeScreenText {
-        height: parent.height
+            text: display
+            font.pointSize: 20
+        }
 
-        text: display
-        font.pointSize: 20
     }
 
     MouseArea {
diff --git a/components/playlist/Playlist.qml b/components/playlist/Playlist.qml
index d6f3ba4..7fa8f61 100644
--- a/components/playlist/Playlist.qml
+++ b/components/playlist/Playlist.qml
@@ -31,7 +31,6 @@ import org.kde.plasma.components 0.1 as PlasmaComponents
     Rectangle {
         id: rect
         color: "lightblue"
-        anchors.left: clearPlaylist.right
         width: parent.width
         height: clearPlaylist.height
         opacity: 0.4


[prev in list] [next in list] [prev in thread] [next in thread]