From bf5f7f6db51ef1ddc3fb002d12bfb597c0a748f8 Mon Sep 17 00:00:00 2001 From: Yann Bodson Date: Fri, 31 Jul 2009 12:49:59 +1000 Subject: Add an example using FontFamily. --- examples/declarative/fonts/fonts.qml | 66 +++++++++++++++++++++++ examples/declarative/fonts/fonts/Fontin-Bold.ttf | Bin 0 -> 30916 bytes 2 files changed, 66 insertions(+) create mode 100644 examples/declarative/fonts/fonts.qml create mode 100644 examples/declarative/fonts/fonts/Fontin-Bold.ttf diff --git a/examples/declarative/fonts/fonts.qml b/examples/declarative/fonts/fonts.qml new file mode 100644 index 0000000..eb8cfef --- /dev/null +++ b/examples/declarative/fonts/fonts.qml @@ -0,0 +1,66 @@ +import Qt 4.6 + +Rect { + property string myText: "Lorem ipsum dolor sit amet, consectetur adipisicing elit" + + width: 800; height: 600 + color: Palette.base + + Palette { id: Palette; colorGroup: "Active" } + + FontFamily { id: FixedFont; name: "Courier" } + + FontFamily { id: LocalFont; source: "fonts/Fontin-Bold.ttf" } + /* A font by Jos Buivenga (exljbris) -> www.exljbris.nl */ + + FontFamily { id: WebFont; source: "http://www.princexml.com/fonts/steffmann/Starburst.ttf" } + FontFamily { id: WebFont2; source: "http://wrong.address.org" } + + VerticalLayout { + anchors.fill: parent + anchors.leftMargin: 10; anchors.rightMargin: 10 + Text { + text: myText + color: Palette.windowText + width: parent.width; elide: "ElideRight" + font.family: "Times" + font.size: 32 + } + Text { + text: myText + color: Palette.windowText + width: parent.width; elide: "ElideRight" + font.family: FixedFont.name + font.size: 32 + } + Text { + text: myText + color: Palette.windowText + width: parent.width; elide: "ElideRight" + font.family: LocalFont.name + font.size: 32 + } + Text { + text: { + if (WebFont.status == 1) myText + else if (WebFont.status == 2) "Loading..." + else if (WebFont.status == 3) "Error loading font" + } + color: Palette.windowText + width: parent.width; elide: "ElideRight" + font.family: WebFont.name + font.size: 32 + } + Text { + text: { + if (WebFont2.status == 1) myText + else if (WebFont2.status == 2) "Loading..." + else if (WebFont2.status == 3) "Error loading font" + } + color: Palette.windowText + width: parent.width; elide: "ElideRight" + font.family: WebFont2.name + font.size: 32 + } + } +} diff --git a/examples/declarative/fonts/fonts/Fontin-Bold.ttf b/examples/declarative/fonts/fonts/Fontin-Bold.ttf new file mode 100644 index 0000000..f6a33b0 Binary files /dev/null and b/examples/declarative/fonts/fonts/Fontin-Bold.ttf differ -- cgit v0.12 From 638fd43d2f6bcc78596b3288fe226f0cfdd3fbc7 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Fri, 31 Jul 2009 05:08:53 +0200 Subject: Remove unused functionality. Introduced by b2797c66343ba0cc2e276c7f24e512b59788b6f7, made superfluous by c0c89664feec6fa6d70b4ffb44a8cfdac9de532f (merge conflict resolution that made use of QGraphicsItem::focusItem(). Reviewed-by: Aaron Kennedy --- src/gui/graphicsview/qgraphicsscene.cpp | 15 --------------- src/gui/graphicsview/qgraphicsscene.h | 1 - src/gui/graphicsview/qgraphicsscene_p.h | 2 -- 3 files changed, 18 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index d35ecb6..5e37ff8 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -2661,21 +2661,6 @@ QGraphicsItem *QGraphicsScene::focusItem() const } /*! - \internal - Returns the focus item for \a item. In the presence of focus realms, - the focus item is the leaf descendant of \a item that would gain active - focus if \a item were given active focus. If not focus realms are involved, - \a item is returned. -*/ -QGraphicsItem *QGraphicsScene::focusItem(QGraphicsItem *item) const -{ - Q_D(const QGraphicsScene); - while (item && d->focusItemForFocusArea.contains(item)) - item = d->focusItemForFocusArea.value(item); - return item; -} - -/*! Sets the scene's focus item to \a item, with the focus reason \a focusReason, after removing focus from any previous item that may have had focus. diff --git a/src/gui/graphicsview/qgraphicsscene.h b/src/gui/graphicsview/qgraphicsscene.h index 2fe58b9..c0c6e75 100644 --- a/src/gui/graphicsview/qgraphicsscene.h +++ b/src/gui/graphicsview/qgraphicsscene.h @@ -209,7 +209,6 @@ public: void removeItem(QGraphicsItem *item); QGraphicsItem *focusItem() const; - QGraphicsItem *focusItem(QGraphicsItem *item) const; void setFocusItem(QGraphicsItem *item, Qt::FocusReason focusReason = Qt::OtherFocusReason); bool hasFocus() const; void setFocus(Qt::FocusReason focusReason = Qt::OtherFocusReason); diff --git a/src/gui/graphicsview/qgraphicsscene_p.h b/src/gui/graphicsview/qgraphicsscene_p.h index a93f342..bceeb5f 100644 --- a/src/gui/graphicsview/qgraphicsscene_p.h +++ b/src/gui/graphicsview/qgraphicsscene_p.h @@ -259,8 +259,6 @@ public: bool allItemsIgnoreTouchEvents; void enableTouchEventsOnViews(); - QHash focusItemForFocusArea; - void updateInputMethodSensitivityInViews(); }; -- cgit v0.12 From deec49bf6662d89f238b5651d92cb1b4293cc7d5 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Fri, 31 Jul 2009 05:15:48 +0200 Subject: Add missing QDebug operator entry for ItemNegativeZStacksBehindParent. Reviewed-by: TrustMe --- src/gui/graphicsview/qgraphicsitem.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index c5f771b..3fc3547 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -10033,6 +10033,9 @@ QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemFlag flag) case QGraphicsItem::ItemAcceptsInputMethod: str = "ItemAcceptsInputMethod"; break; + case QGraphicsItem::ItemNegativeZStacksBehindParent: + str = "ItemNegativeZStacksBehindParent"; + break; case QGraphicsItem::ItemAutoDetectsFocusProxy: str = "ItemAutoDetectsFocusProxy"; break; -- cgit v0.12