From 62b79ded0e4267d06ecf26ae7fc6b73d8b335df8 Mon Sep 17 00:00:00 2001
From: Yann Bodson <yann.bodson@nokia.com>
Date: Fri, 31 Jul 2009 11:16:44 +1000
Subject: QmlFontFamily improvements Add a 'status' property instead of
 'loading'. Improve documentaion.

---
 src/declarative/util/qmlfontfamily.cpp | 33 +++++++++++++++++++++++++--------
 src/declarative/util/qmlfontfamily.h   | 10 +++++++---
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/declarative/util/qmlfontfamily.cpp b/src/declarative/util/qmlfontfamily.cpp
index e539085..a82527b 100644
--- a/src/declarative/util/qmlfontfamily.cpp
+++ b/src/declarative/util/qmlfontfamily.cpp
@@ -57,14 +57,14 @@ class QmlFontFamilyPrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QmlFontFamily);
 
 public:
-    QmlFontFamilyPrivate() : reply(0), loading(false) {}
+    QmlFontFamilyPrivate() : reply(0), status(QmlFontFamily::Null) {}
 
     void addFontToDatabase(const QByteArray &);
 
     QUrl url;
     QString name;
     QNetworkReply *reply;
-    bool loading;
+    QmlFontFamily::Status status;
 };
 
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,FontFamily,QmlFontFamily)
@@ -72,6 +72,15 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,FontFamily,QmlFontFamily)
 /*!
     \qmlclass FontFamily QmlFontFamily
     \ingroup group_utility
+    \brief This item allows using fonts by name or url.
+
+    \code
+        FontFamily { id: FixedFont; name: "Courier" }
+        FontFamily { id: WebFont; source: "http://www.mysite.com/myfont.ttf" }
+
+	Text { text: "Fixed-size font"; font.family: FixedFont.name }
+	Text { text: "Fancy font"; font.family: WebFont.name }
+    \endcode
 */
 QmlFontFamily::QmlFontFamily(QObject *parent)
     : QObject(*(new QmlFontFamilyPrivate), parent)
@@ -82,6 +91,10 @@ QmlFontFamily::~QmlFontFamily()
 {
 }
 
+/*!
+    \qmlproperty FontFamily::source
+    The source for the font.
+*/
 QUrl QmlFontFamily::source() const
 {
     Q_D(const QmlFontFamily);
@@ -95,8 +108,8 @@ void QmlFontFamily::setSource(const QUrl &url)
         return;
     d->url = qmlContext(this)->resolvedUrl(url);
 
-    d->loading = true;
-    emit loadingChanged();
+    d->status = Loading;
+    emit statusChanged();
 #ifndef QT_NO_LOCALFILE_OPTIMIZED_QML
     if (d->url.scheme() == QLatin1String("file")) {
         QFile file(d->url.toLocalFile());
@@ -128,10 +141,10 @@ void QmlFontFamily::setName(const QString &name)
     emit nameChanged();
 }
 
-bool QmlFontFamily::isLoading() const
+QmlFontFamily::Status QmlFontFamily::status() const
 {
     Q_D(const QmlFontFamily);
-    return d->loading;
+    return d->status;
 }
 
 void QmlFontFamily::replyFinished()
@@ -140,6 +153,9 @@ void QmlFontFamily::replyFinished()
     if (!d->reply->error()) {
         QByteArray ba = d->reply->readAll();
         d->addFontToDatabase(ba);
+    } else {
+	d->status = Error;
+        emit statusChanged();
     }
     d->reply->deleteLater();
     d->reply = 0;
@@ -153,11 +169,12 @@ void QmlFontFamilyPrivate::addFontToDatabase(const QByteArray &ba)
     if (id != -1) {
         name = QFontDatabase::applicationFontFamilies(id).at(0);
         emit q->nameChanged();
-        loading = false;
-        emit q->loadingChanged();
+        status = QmlFontFamily::Ready;
     } else {
+        status = QmlFontFamily::Error;
         qWarning() << "Cannot load font: " << name << url;
     }
+    emit q->statusChanged();
 }
 
 QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlfontfamily.h b/src/declarative/util/qmlfontfamily.h
index c647f67..17b6635 100644
--- a/src/declarative/util/qmlfontfamily.h
+++ b/src/declarative/util/qmlfontfamily.h
@@ -56,12 +56,15 @@ class Q_DECLARATIVE_EXPORT QmlFontFamily : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QmlFontFamily)
+    Q_ENUMS(Status)
 
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
-    Q_PROPERTY(bool loading READ isLoading NOTIFY loadingChanged)
+    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
 
 public:
+    enum Status { Null = 0, Ready, Loading, Error };
+
     QmlFontFamily(QObject *parent = 0);
     ~QmlFontFamily();
 
@@ -71,14 +74,14 @@ public:
     QString name() const;
     void setName(const QString &name);
 
-    bool isLoading() const;
+    Status status() const;
 
 private Q_SLOTS:
     void replyFinished();
 
 Q_SIGNALS:
     void nameChanged();
-    void loadingChanged();
+    void statusChanged();
 };
 
 QT_END_NAMESPACE
@@ -88,3 +91,4 @@ QML_DECLARE_TYPE(QmlFontFamily)
 QT_END_HEADER
 
 #endif // QMLFONTFAMILY_H
+
-- 
cgit v0.12