From 7bddc405426ba4581dff7adcdc70240bf0daa048 Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Thu, 7 May 2009 17:00:28 +1000 Subject: Space after tags --- demos/declarative/flickr/content/ImageDetails.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/declarative/flickr/content/ImageDetails.qml b/demos/declarative/flickr/content/ImageDetails.qml index 6c354f6..6ef65db 100644 --- a/demos/declarative/flickr/content/ImageDetails.qml +++ b/demos/declarative/flickr/content/ImageDetails.qml @@ -42,7 +42,7 @@ Flipable { LikeOMeter { x: 40; y: 250; rating: Container.rating } - Flickable { id: Flickable; x: 220; width: 480; height: 230; y: 120; clip: true + Flickable { id: Flickable; x: 220; width: 480; height: 210; y: 130; clip: true viewportWidth: 480; viewportHeight: DescriptionText.height WebView { id: DescriptionText; width: parent.width -- cgit v0.12 From dae02071a9e985b3ea847f08af6849ff2daad3c3 Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Fri, 8 May 2009 09:13:25 +1000 Subject: Fix double-click. --- src/declarative/canvas/qsimplecanvas_graphicsview.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/declarative/canvas/qsimplecanvas_graphicsview.cpp b/src/declarative/canvas/qsimplecanvas_graphicsview.cpp index dd4012b..5c6f2f5 100644 --- a/src/declarative/canvas/qsimplecanvas_graphicsview.cpp +++ b/src/declarative/canvas/qsimplecanvas_graphicsview.cpp @@ -110,7 +110,6 @@ void QSimpleGraphicsItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) p = p->parent(); } owner->mouseReleaseEvent(event); - ungrabMouse(); } void QSimpleGraphicsItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) -- cgit v0.12 From 792ce37abd5c48e6e1811287eb23e35e32303bca Mon Sep 17 00:00:00 2001 From: Yann Bodson Date: Fri, 8 May 2009 09:45:18 +1000 Subject: Fixes for the slider. --- demos/declarative/flickr/content/ImageDetails.qml | 3 ++- demos/declarative/flickr/content/Slider.qml | 1 + demos/declarative/flickr/flickr.qml | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/demos/declarative/flickr/content/ImageDetails.qml b/demos/declarative/flickr/content/ImageDetails.qml index 6c354f6..1e52235 100644 --- a/demos/declarative/flickr/content/ImageDetails.qml +++ b/demos/declarative/flickr/content/ImageDetails.qml @@ -3,6 +3,7 @@ Flipable { property var frontContainer: ContainerFront property var flickableArea: Flickable + property var slider: Slider property string photoTitle: "" property string photoDescription: "" property string photoTags: "" @@ -96,7 +97,7 @@ Flipable { anchors.centeredIn: parent; color: "white"; font.bold: true } - Slider { id: Slider; x: 25; y: 374; imageWidth: Container.photoWidth; imageHeight: Container.photoHeight } + Slider { id: Slider; x: 25; y: 374; visible: BigImage.status == 0; imageWidth: Container.photoWidth; imageHeight: Container.photoHeight } } states: [ diff --git a/demos/declarative/flickr/content/Slider.qml b/demos/declarative/flickr/content/Slider.qml index ba9d842..c6a3e5e 100644 --- a/demos/declarative/flickr/content/Slider.qml +++ b/demos/declarative/flickr/content/Slider.qml @@ -3,6 +3,7 @@ Item { property var value: Handle.x / Slider.xMax property int xMax: Slider.width - Handle.width - 2 + property var handle: Handle property int imageWidth property int imageHeight diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml index 85af8e3..dc150cb 100644 --- a/demos/declarative/flickr/flickr.qml +++ b/demos/declarative/flickr/flickr.qml @@ -58,6 +58,7 @@ Item { ImageDetails.photoDate = photoDate; ImageDetails.photoUrl = url; ImageDetails.rating = 0; + ImageDetails.slider.handle.x = ImageDetails.slider.xMax; Wrapper.state = "Details"; } } @@ -121,7 +122,7 @@ Item { Image { source: "content/pics/background.png"; opaque: true } GridView { - id: PhotoGridView; model: FeedModel; delegate: PhotoDelegate + id: PhotoGridView; model: FeedModel; delegate: PhotoDelegate; cacheBuffer: 100 cellWidth: 105; cellHeight: 105; x:32; y: 80; width: 800; height: 330; z: 1 } -- cgit v0.12 From 93b289cb9d2ff48e5b894a0b91fa5372df399004 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Fri, 8 May 2009 10:47:03 +1000 Subject: Warn when dereferencing a non-existant name --- src/declarative/qml/script/qmlbasicscript.cpp | 1 + src/declarative/qml/script/qmlbasicscript_p.h | 1 + 2 files changed, 2 insertions(+) diff --git a/src/declarative/qml/script/qmlbasicscript.cpp b/src/declarative/qml/script/qmlbasicscript.cpp index 603e6ba..ee537e4 100644 --- a/src/declarative/qml/script/qmlbasicscript.cpp +++ b/src/declarative/qml/script/qmlbasicscript.cpp @@ -789,6 +789,7 @@ QVariant QmlBasicScript::run(QmlContext *context, void *voidCache, CacheState *c state = Incremental; } + qWarning("ReferenceError: %s is not defined", id); } else { // instr.type == ScriptInstruction::Fetch QVariant o = stack.pop(); diff --git a/src/declarative/qml/script/qmlbasicscript_p.h b/src/declarative/qml/script/qmlbasicscript_p.h index bcb7d00..fb9951e 100644 --- a/src/declarative/qml/script/qmlbasicscript_p.h +++ b/src/declarative/qml/script/qmlbasicscript_p.h @@ -39,6 +39,7 @@ public: }; int coreType; + bool isValid() const { return type != Invalid; } bool isCore() const { return type == Core; } bool isExplicit() const { return type == Explicit; } void clear(); -- cgit v0.12