Small fixes to photoviewer demo

2 files changed, 14 insertions, 12 deletions

diff --git a/demos/declarative/photoviewer/PhotoViewerCore/images/background.png b/demos/declarative/photoviewer/PhotoViewerCore/images/background.png
deleted file mode 100644
index 81d9a45..0000000
--- a/demos/declarative/photoviewer/PhotoViewerCore/images/background.png
+++ /dev/null
diff --git a/demos/declarative/photoviewer/photoviewer.qml b/demos/declarative/photoviewer/photoviewer.qml
index 2b0b6a9..5ce02f3 100644
--- a/demos/declarative/photoviewer/photoviewer.qml
+++ b/demos/declarative/photoviewer/photoviewer.qml
@@ -1,13 +1,13 @@
 import Qt 4.6
 import PhotoViewerCore 1.0
 
-Image {
+Rectangle {
     id: mainWindow
 
     property real downloadProgress: 0
     property bool imageLoading: false
 
-    width: 800; height: 480; source: "PhotoViewerCore/images/background.png"; fillMode: Image.Tile
+    width: 800; height: 480; color: "#d5d6d8"
 
     Script { source: "PhotoViewerCore/script/script.js" }
 
@@ -18,28 +18,30 @@ Image {
         ListElement { tag: "Central Park" }
     }
 
-    VisualDataModel {
-        id: albumVisualModel; delegate: AlbumDelegate { }
-        model: photosModel
-    }
+    VisualDataModel { id: albumVisualModel; model: photosModel; delegate: AlbumDelegate {} }
 
-    GridView { width: parent.width; height: parent.height; cellWidth: 210; cellHeight: 220; model: albumVisualModel.parts.album }
+    GridView {
+        width: parent.width; height: parent.height; cellWidth: 210; cellHeight: 220; model: albumVisualModel.parts.album
+        visible: albumsShade.opacity != 1.0
+    }
 
-    Image {
-        id: albumsShade; source: "PhotoViewerCore/images/background.png"; fillMode: Image.Tile
-        width: parent.width; height: parent.height; opacity: 0
+    Rectangle {
+        id: albumsShade; color: mainWindow.color
+        width: parent.width; height: parent.height; opacity: 0.0
     }
 
     ListView { anchors.fill: parent; model: albumVisualModel.parts.browser; interactive: false }
 
     Tag { id: backTag; label: "Back"; rotation: 3; x: parent.width - backTag.width - 6; y: -backTag.height - 8 }
 
-    Rectangle { id: photosShade; color: 'black'; width: parent.width; height: parent.height; opacity: 0 }
+    Rectangle { id: photosShade; color: 'black'; width: parent.width; height: parent.height; opacity: 0; visible: opacity != 0.0 }
+
     ListView { anchors.fill: parent; model: albumVisualModel.parts.fullscreen; interactive: false }
+
     Item { id: foreground; anchors.fill: parent }
 
     ProgressBar {
         progress: mainWindow.downloadProgress; width: parent.width; height: 4
-        anchors.bottom: parent.bottom; opacity: mainWindow.imageLoading
+        anchors.bottom: parent.bottom; opacity: mainWindow.imageLoading; visible: opacity != 0.0
     }
 }