From 490d6cf345183de53761bb1e974ca2704eb96327 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 22 Jan 2010 10:43:20 +0100 Subject: Copy updated images from demos/samegame to samegame tutorial --- .../samegame/samegame4/content/pics/background.png | Bin 153328 -> 313930 bytes .../samegame/samegame4/content/pics/blueStone.png | Bin 2691 -> 3054 bytes .../samegame/samegame4/content/pics/greenStone.png | Bin 2662 -> 2932 bytes .../samegame/samegame4/content/pics/redStone.png | Bin 2604 -> 2902 bytes .../samegame4/content/pics/yellowStone.png | Bin 2667 -> 3056 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/examples/declarative/tutorials/samegame/samegame4/content/pics/background.png b/examples/declarative/tutorials/samegame/samegame4/content/pics/background.png index 25e885f..3734a27 100644 Binary files a/examples/declarative/tutorials/samegame/samegame4/content/pics/background.png and b/examples/declarative/tutorials/samegame/samegame4/content/pics/background.png differ diff --git a/examples/declarative/tutorials/samegame/samegame4/content/pics/blueStone.png b/examples/declarative/tutorials/samegame/samegame4/content/pics/blueStone.png index bf342e0..20e43c7 100644 Binary files a/examples/declarative/tutorials/samegame/samegame4/content/pics/blueStone.png and b/examples/declarative/tutorials/samegame/samegame4/content/pics/blueStone.png differ diff --git a/examples/declarative/tutorials/samegame/samegame4/content/pics/greenStone.png b/examples/declarative/tutorials/samegame/samegame4/content/pics/greenStone.png index 5ac14a5..b568a19 100644 Binary files a/examples/declarative/tutorials/samegame/samegame4/content/pics/greenStone.png and b/examples/declarative/tutorials/samegame/samegame4/content/pics/greenStone.png differ diff --git a/examples/declarative/tutorials/samegame/samegame4/content/pics/redStone.png b/examples/declarative/tutorials/samegame/samegame4/content/pics/redStone.png index b099f60..36b09a2 100644 Binary files a/examples/declarative/tutorials/samegame/samegame4/content/pics/redStone.png and b/examples/declarative/tutorials/samegame/samegame4/content/pics/redStone.png differ diff --git a/examples/declarative/tutorials/samegame/samegame4/content/pics/yellowStone.png b/examples/declarative/tutorials/samegame/samegame4/content/pics/yellowStone.png index c56124a..b1ce762 100644 Binary files a/examples/declarative/tutorials/samegame/samegame4/content/pics/yellowStone.png and b/examples/declarative/tutorials/samegame/samegame4/content/pics/yellowStone.png differ -- cgit v0.12 From 7e4838a9c1abd201b967ac040354effb7712750d Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 22 Jan 2010 10:39:04 +0100 Subject: Remove samegame README (mentioned images have been replaced) --- demos/declarative/samegame/README | 10 ---------- examples/declarative/tutorials/samegame/samegame4/README | 10 ---------- 2 files changed, 20 deletions(-) delete mode 100644 demos/declarative/samegame/README delete mode 100644 examples/declarative/tutorials/samegame/samegame4/README diff --git a/demos/declarative/samegame/README b/demos/declarative/samegame/README deleted file mode 100644 index 244b205..0000000 --- a/demos/declarative/samegame/README +++ /dev/null @@ -1,10 +0,0 @@ -This demo uses pictures from the KDE project (www.kde.org), -specifically the images from the KSame game. These images are - -background.png -blueStone.png -redStone.png -greenStone.png -yellowStone.png - -and are presumably under the same GPL2 license as the rest of kdegames diff --git a/examples/declarative/tutorials/samegame/samegame4/README b/examples/declarative/tutorials/samegame/samegame4/README deleted file mode 100644 index 244b205..0000000 --- a/examples/declarative/tutorials/samegame/samegame4/README +++ /dev/null @@ -1,10 +0,0 @@ -This demo uses pictures from the KDE project (www.kde.org), -specifically the images from the KSame game. These images are - -background.png -blueStone.png -redStone.png -greenStone.png -yellowStone.png - -and are presumably under the same GPL2 license as the rest of kdegames -- cgit v0.12 From 63cc393716c6455555e1e6283a43c718c8616cb3 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 22 Jan 2010 11:10:10 +0100 Subject: Replace FreeMono by OCRA font --- examples/declarative/fonts/fonts.qml | 2 +- examples/declarative/fonts/fonts/FreeMono.ttf | Bin 267400 -> 0 bytes examples/declarative/fonts/fonts/tarzeau_ocr_a.ttf | Bin 0 -> 24544 bytes 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 examples/declarative/fonts/fonts/FreeMono.ttf create mode 100644 examples/declarative/fonts/fonts/tarzeau_ocr_a.ttf diff --git a/examples/declarative/fonts/fonts.qml b/examples/declarative/fonts/fonts.qml index c7af666..275ad43 100644 --- a/examples/declarative/fonts/fonts.qml +++ b/examples/declarative/fonts/fonts.qml @@ -8,7 +8,7 @@ Rectangle { FontLoader { id: fixedFont; name: "Courier" } - FontLoader { id: localFont; source: "fonts/FreeMono.ttf" } + FontLoader { id: localFont; source: "fonts/tarzenau-ocr-a.ttf" } FontLoader { id: webFont; source: "http://www.princexml.com/fonts/steffmann/Starburst.ttf" } FontLoader { id: webFont2; source: "http://wrong.address.org" } diff --git a/examples/declarative/fonts/fonts/FreeMono.ttf b/examples/declarative/fonts/fonts/FreeMono.ttf deleted file mode 100644 index d7ce52d..0000000 Binary files a/examples/declarative/fonts/fonts/FreeMono.ttf and /dev/null differ diff --git a/examples/declarative/fonts/fonts/tarzeau_ocr_a.ttf b/examples/declarative/fonts/fonts/tarzeau_ocr_a.ttf new file mode 100644 index 0000000..cf93f96 Binary files /dev/null and b/examples/declarative/fonts/fonts/tarzeau_ocr_a.ttf differ -- cgit v0.12