From ef1356dba047467ab1c8ae3de389117383cacbbc Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Mon, 31 Aug 2009 13:51:00 +1000 Subject: Update XmlListModel status to be in line with other QML objects that load from the network. --- demos/declarative/flickr/flickr-desktop.qml | 2 +- demos/declarative/flickr/flickr-mobile.qml | 2 +- src/declarative/extra/qmlxmllistmodel.cpp | 9 +++++---- src/declarative/extra/qmlxmllistmodel.h | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/demos/declarative/flickr/flickr-desktop.qml b/demos/declarative/flickr/flickr-desktop.qml index 5effc42..fca7e31 100644 --- a/demos/declarative/flickr/flickr-desktop.qml +++ b/demos/declarative/flickr/flickr-desktop.qml @@ -106,7 +106,7 @@ Item { Image { source: "common/pics/background.png"; anchors.fill: parent } RssModel { id: RssModel; tags : TagsEdit.text } - Loading { anchors.centerIn: parent; visible: RssModel.status } + Loading { anchors.centerIn: parent; visible: RssModel.status == 2 } GridView { id: PhotoGridView; model: RssModel; delegate: PhotoDelegate; cacheBuffer: 100 diff --git a/demos/declarative/flickr/flickr-mobile.qml b/demos/declarative/flickr/flickr-mobile.qml index a4692a3..47aea32 100644 --- a/demos/declarative/flickr/flickr-mobile.qml +++ b/demos/declarative/flickr/flickr-mobile.qml @@ -13,7 +13,7 @@ Item { Image { source: "mobile/images/stripes.png"; fillMode: "Tile"; anchors.fill: parent; opacity: 0.3 } Common.RssModel { id: RssModel } - Common.Loading { anchors.centerIn: parent; visible: RssModel.status } + Common.Loading { anchors.centerIn: parent; visible: RssModel.status == 2 } Item { id: Views diff --git a/src/declarative/extra/qmlxmllistmodel.cpp b/src/declarative/extra/qmlxmllistmodel.cpp index 60a28b4..4b67074 100644 --- a/src/declarative/extra/qmlxmllistmodel.cpp +++ b/src/declarative/extra/qmlxmllistmodel.cpp @@ -288,7 +288,7 @@ class QmlXmlListModelPrivate : public QObjectPrivate public: QmlXmlListModelPrivate() : isComponentComplete(true), size(-1), highestRole(Qt::UserRole) - , reply(0), status(QmlXmlListModel::Idle), progress(0.0) + , reply(0), status(QmlXmlListModel::Null), progress(0.0) , queryId(-1), roleObjects(this) {} bool isComponentComplete; @@ -547,7 +547,8 @@ void QmlXmlListModel::setNamespaceDeclarations(const QString &declarations) This property holds the status of data source loading. It can be one of: \list - \o Idle - no data source has been set, or the data source has been loaded + \o Null - no data source has been set + \o Ready - nthe data source has been loaded \o Loading - the data source is currently being loaded \o Error - an error occurred while loading the data source \endlist @@ -623,7 +624,7 @@ void QmlXmlListModel::reload() if (!d->xml.isEmpty()) { d->queryId = d->qmlXmlQuery.doQuery(d->query, d->namespaces, d->xml.toUtf8(), &d->roleObjects); d->progress = 1.0; - d->status = Idle; + d->status = Ready; emit progressChanged(d->progress); emit statusChanged(d->status); return; @@ -650,7 +651,7 @@ void QmlXmlListModel::requestFinished() d->reply = 0; d->status = Error; } else { - d->status = Idle; + d->status = Ready; QByteArray data = d->reply->readAll(); d->queryId = d->qmlXmlQuery.doQuery(d->query, d->namespaces, data, &d->roleObjects); disconnect(d->reply, 0, this, 0); diff --git a/src/declarative/extra/qmlxmllistmodel.h b/src/declarative/extra/qmlxmllistmodel.h index fbf95db..5f7c831 100644 --- a/src/declarative/extra/qmlxmllistmodel.h +++ b/src/declarative/extra/qmlxmllistmodel.h @@ -125,7 +125,7 @@ public: QString namespaceDeclarations() const; void setNamespaceDeclarations(const QString&); - enum Status { Idle, Loading, Error }; // ### should include Null for consistency? + enum Status { Null, Ready, Loading, Error }; Status status() const; qreal progress() const; -- cgit v0.12 From c070e8107fd7e103125746b3a1a5ccc22fde8bc2 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Mon, 31 Aug 2009 14:47:38 +1000 Subject: Readd FocusPanel. --- src/declarative/fx/fx.pri | 2 + src/declarative/fx/qfxfocuspanel.cpp | 94 ++++++++++++++++++++++++++++++++++++ src/declarative/fx/qfxfocuspanel.h | 77 +++++++++++++++++++++++++++++ 3 files changed, 173 insertions(+) create mode 100644 src/declarative/fx/qfxfocuspanel.cpp create mode 100644 src/declarative/fx/qfxfocuspanel.h diff --git a/src/declarative/fx/fx.pri b/src/declarative/fx/fx.pri index 47cce95..63ac818 100644 --- a/src/declarative/fx/fx.pri +++ b/src/declarative/fx/fx.pri @@ -18,6 +18,7 @@ HEADERS += \ fx/qfximagebase_p.h \ fx/qfxitem.h \ fx/qfxitem_p.h \ + fx/qfxfocuspanel.h \ fx/qfxfocusscope.h \ fx/qfxkeyproxy.h \ fx/qfxpositioners.h \ @@ -59,6 +60,7 @@ SOURCES += \ fx/qfximagebase.cpp \ fx/qfxpainteditem.cpp \ fx/qfxitem.cpp \ + fx/qfxfocuspanel.cpp \ fx/qfxfocusscope.cpp \ fx/qfxkeyproxy.cpp \ fx/qfxpositioners.cpp \ diff --git a/src/declarative/fx/qfxfocuspanel.cpp b/src/declarative/fx/qfxfocuspanel.cpp new file mode 100644 index 0000000..374f566 --- /dev/null +++ b/src/declarative/fx/qfxfocuspanel.cpp @@ -0,0 +1,94 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qfxfocuspanel.h" +#include + +QT_BEGIN_NAMESPACE + +QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,FocusPanel,QFxFocusPanel) + +/*! + \qmlclass FocusPanel + \brief The FocusPanel item explicitly creates a focus panel. + \inherits Item + + Focus panels assist in keyboard focus handling when building QML + applications. All the details are covered in the + \l {qmlfocus}{keyboard focus documentation}. +*/ + +/*! + \internal + \class QFxFocusPanel +*/ + +QFxFocusPanel::QFxFocusPanel(QFxItem *parent) : + QFxItem(parent) +{ + setFlag(ItemIsPanel); +} + +QFxFocusPanel::~QFxFocusPanel() +{ +} + +/*! + \qmlproperty bool FocusPanel::active + + Sets whether the item is the active focus panel. +*/ +void QFxFocusPanel::setActive(bool a) +{ + if (!scene()) + return; + + if (isActive() == a) + return; + + if (a) + scene()->setActivePanel(this); + else + scene()->setActivePanel(0); + emit activeChanged(); +} + +QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxfocuspanel.h b/src/declarative/fx/qfxfocuspanel.h new file mode 100644 index 0000000..ba4c1f5 --- /dev/null +++ b/src/declarative/fx/qfxfocuspanel.h @@ -0,0 +1,77 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QFXFOCUSPANEL_H +#define QFXFOCUSPANEL_H + +#include + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Declarative) + +class Q_DECLARATIVE_EXPORT QFxFocusPanel : public QFxItem +{ + Q_OBJECT + Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged) +public: + QFxFocusPanel(QFxItem *parent=0); + virtual ~QFxFocusPanel(); + + //bool isActive() const; + void setActive(bool); + +Q_SIGNALS: + void activeChanged(); + +private: + Q_DISABLE_COPY(QFxFocusPanel) +}; + +QT_END_NAMESPACE + +QML_DECLARE_TYPE(QFxFocusPanel) + +QT_END_HEADER + +#endif // QFXFOCUSPANEL_H -- cgit v0.12