* add more font examples

* add missing properties to QmlFontValueType

3 files changed, 75 insertions, 26 deletions

diff --git a/examples/declarative/fonts/banner.qml b/examples/declarative/fonts/banner.qml
new file mode 100644
index 0000000..ece481b
--- /dev/null
+++ b/examples/declarative/fonts/banner.qml
@@ -0,0 +1,18 @@
+import Qt 4.6
+
+Rectangle {
+    id: screen
+    width: 640; height: 320; color: "steelblue"
+
+    property int pixelSize: screen.height * 1.25
+    property color textColor: "lightsteelblue"
+    property string text: "Hello world! "
+
+    Row {
+        y: -screen.height / 4.5
+        x: NumberAnimation { from: 0; to: -text.width; duration: 6000; running: true; repeat: true }
+        Text { id: text; font.pixelSize: screen.pixelSize; color: screen.textColor; text: screen.text }
+        Text { font.pixelSize: screen.pixelSize; color: screen.textColor; text: screen.text }
+        Text { font.pixelSize: screen.pixelSize; color: screen.textColor; text: screen.text }
+    }
+}
diff --git a/examples/declarative/fonts/fonts.qml b/examples/declarative/fonts/fonts.qml
index e68bdb6..80d82ad 100644
--- a/examples/declarative/fonts/fonts.qml
+++ b/examples/declarative/fonts/fonts.qml
@@ -1,12 +1,10 @@
 import Qt 4.6
 
 Rectangle {
-    property string myText: "Lorem ipsum dolor sit amet, consectetur adipisicing elit"
+    property string myText: "The quick brown fox jumps over the lazy dog."
 
-    width: 800; height: 600
-    color: palette.base
-
-    SystemPalette { id: palette; colorGroup: Qt.Active }
+    width: 800; height: 480
+    color: "steelblue"
 
     FontLoader { id: fixedFont; name: "Courier" }
 
@@ -17,28 +15,36 @@ Rectangle {
     FontLoader { id: webFont2; source: "http://wrong.address.org" }
 
     Column {
-        anchors.fill: parent
+        anchors.fill: parent; spacing: 10
         anchors.leftMargin: 10; anchors.rightMargin: 10
         Text {
-            text: myText
-            color: palette.windowText
+            text: myText; color: "lightsteelblue"
             width: parent.width; elide: Text.ElideRight
-            font.family: "Times"
-            font.pointSize: 32
+            font.family: "Times"; font.pointSize: 36
         }
         Text {
-            text: myText
-            color: palette.windowText
-            width: parent.width; elide: Text.ElideRight
-            font.family: fixedFont.name
-            font.pointSize: 32
+            text: myText; color: "lightsteelblue"
+            width: parent.width; elide: Text.ElideLeft
+            font.family: "Times"; font.pointSize: 36
+            font.capitalization: "AllUppercase"
+        }
+        Text {
+            text: myText; color: "lightsteelblue"
+            width: parent.width; elide: Text.ElideMiddle
+            font.family: fixedFont.name; font.pointSize: 36; font.weight: "Bold"
+            font.capitalization: "AllLowercase"
         }
         Text {
-            text: myText
-            color: palette.windowText
+            text: myText; color: "lightsteelblue"
             width: parent.width; elide: Text.ElideRight
-            font.family: localFont.name
-            font.pointSize: 32
+            font.family: fixedFont.name; font.pointSize: 36; font.italic: true
+            font.capitalization: "SmallCaps"
+        }
+        Text {
+            text: myText; color: "lightsteelblue"
+            width: parent.width; elide: Text.ElideLeft
+            font.family: localFont.name; font.pointSize: 36
+            font.capitalization: "Capitalize"
         }
         Text {
             text: {
@@ -46,10 +52,9 @@ Rectangle {
                 else if (webFont.status == 2) "Loading..."
                 else if (webFont.status == 3) "Error loading font"
             }
-            color: palette.windowText
-            width: parent.width; elide: Text.ElideRight
-            font.family: webFont.name
-            font.pointSize: 32
+            color: "lightsteelblue"
+            width: parent.width; elide: Text.ElideMiddle
+            font.family: webFont.name; font.pointSize: 36
         }
         Text {
             text: {
@@ -57,10 +62,9 @@ Rectangle {
                 else if (webFont2.status == 2) "Loading..."
                 else if (webFont2.status == 3) "Error loading font"
             }
-            color: palette.windowText
+            color: "lightsteelblue"
             width: parent.width; elide: Text.ElideRight
-            font.family: webFont2.name
-            font.pointSize: 32
+            font.family: webFont2.name; font.pointSize: 36
         }
     }
 }
diff --git a/examples/declarative/fonts/hello.qml b/examples/declarative/fonts/hello.qml
new file mode 100644
index 0000000..6aef3e6
--- /dev/null
+++ b/examples/declarative/fonts/hello.qml
@@ -0,0 +1,27 @@
+import Qt 4.6
+
+Rectangle {
+    id: screen; width: 800; height: 480; color: "black"
+
+    Item {
+        id: container; x: screen.width / 2; y: screen.height / 2
+        Text {
+            id: text; color: "white"; anchors.centerIn: parent
+            text: "Hello world!"; font.pixelSize: 60
+
+            font.letterSpacing: SequentialAnimation {
+                repeat: true; running: true
+                NumberAnimation { from: 100; to: 300; easing: "easeInQuad"; duration: 3000 }
+                ScriptAction { script: {
+                    container.y = (screen.height / 4) + (Math.random() * screen.height / 2)
+                    container.x = (screen.width / 4) + (Math.random() * screen.width / 2)
+                } }
+            }
+            opacity: SequentialAnimation {
+                repeat: true; running: true
+                NumberAnimation { from: 1; to: 0; duration: 2600 }
+                PauseAnimation { duration: 400 }
+            }
+        }
+    }
+}