From 6fb2cedfe04b2248406718adaa4fe856b21542df Mon Sep 17 00:00:00 2001 From: howard-stearns Date: Fri, 15 Jul 2016 13:42:31 -0700 Subject: [PATCH] card default image: settable, use to start, and reset when needed --- interface/resources/qml/AddressBarDialog.qml | 4 +--- interface/resources/qml/hifi/Card.qml | 6 ++++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml index 220aa794b9..4cb550cd53 100644 --- a/interface/resources/qml/AddressBarDialog.qml +++ b/interface/resources/qml/AddressBarDialog.qml @@ -275,9 +275,7 @@ Window { } console.log('suggestion:', JSON.stringify(data)); target.userStory = data; - if (data.lobby) { - target.image.source = data.lobby; - } + target.image.source = data.lobby || ''; // should fail to load and thus use default target.placeText = data.name; target.usersText = data.online_users + ((data.online_users === 1) ? ' user' : ' users'); target.visible = true; diff --git a/interface/resources/qml/hifi/Card.qml b/interface/resources/qml/hifi/Card.qml index 342c469303..8b2d1133da 100644 --- a/interface/resources/qml/hifi/Card.qml +++ b/interface/resources/qml/hifi/Card.qml @@ -21,11 +21,14 @@ Rectangle { property alias image: lobby; property alias placeText: place.text; property alias usersText: users.text; + // FIXME: let's get our own + property string defaultPicture: "http://www.davidluke.com/wp-content/themes/david-luke/media/ims/placeholder720.gif"; HifiConstants { id: hifi } Image { id: lobby; width: parent.width; height: parent.height; + source: defaultPicture; fillMode: Image.PreserveAspectCrop; // source gets filled in later anchors.verticalCenter: parent.verticalCenter; @@ -33,8 +36,7 @@ Rectangle { onStatusChanged: { if (status == Image.Error) { console.log("source: " + source + ": failed to load " + JSON.stringify(userStory)); - // FIXME: let's get our own - source = "http://www.davidluke.com/wp-content/themes/david-luke/media/ims/placeholder720.gif" + source = defaultPicture; } } }