Author: rshortt
Date: Tue Jan 29 13:14:41 2008
New Revision: 3011
Log:
Use the Vera font already in the data directory, add which notifier to use in
test_common.py and select it using the new API.
Modified:
trunk/canvas/test/animation/menu.py
trunk/canvas/test/canvas_xml.py
trunk/canvas/test/clip_test.py
trunk/canvas/test/clock.xml
trunk/canvas/test/container_test.py
trunk/canvas/test/hello.py
trunk/canvas/test/hello.xml
trunk/canvas/test/rect_test.py
trunk/canvas/test/test_common.py
trunk/canvas/test/xml_clock.py
Modified: trunk/canvas/test/animation/menu.py
==============================================================================
--- trunk/canvas/test/animation/menu.py (original)
+++ trunk/canvas/test/animation/menu.py Tue Jan 29 13:14:41 2008
@@ -89,8 +89,8 @@
bg = c.add_child(kaa.canvas.Image("royale/background.jpg"), width="100%",
height="100%")
marquee_box = c.add_child(canvas.Container(), width="100%")
-title_text = marquee_box.add_child(canvas.Text("Kaa Demo", "trebuc", 92),
right="100%")
-section_text = marquee_box.add_child(canvas.Text(font="trebuc", size=72),
vcenter="50%")
+title_text = marquee_box.add_child(canvas.Text("Kaa Demo", "../data/Vera",
92), right="100%")
+section_text = marquee_box.add_child(canvas.Text(font="../data/Vera",
size=72), vcenter="50%")
def start_animate_title_text():
title_text.set_color(a = 80)
@@ -119,7 +119,7 @@
selector_box = c.add_child(kaa.canvas.Container(), width = 200, clip = "auto")
# Load the menu item selector animation.
-selector = selector_box.add_child(kaa.canvas.Image("royale/list_selector.mng"))
+selector = selector_box.add_child(kaa.canvas.Image("royale/list_selector.png"))
# Set the border to 10 pixels in all directions, so that scaling the selector
# won't distort its edges.
selector.set_border(7, 7, 7, 7)
@@ -144,7 +144,7 @@
# If you don't have Trebuchet installed, change this font name.
# Offset the item 15 pixels from the top (gives each item a bit of
# padding)
- menu_items.append(menu.add_child(canvas.Text(item, font="trebuc"),
top=offset))
+ menu_items.append(menu.add_child(canvas.Text(item, font="../data/Vera"),
top=offset))
# We want to know when the menu item changes position or size, so we can
# update the selector image.
Modified: trunk/canvas/test/canvas_xml.py
==============================================================================
--- trunk/canvas/test/canvas_xml.py (original)
+++ trunk/canvas/test/canvas_xml.py Tue Jan 29 13:14:41 2008
@@ -2,6 +2,8 @@
import kaa, kaa.canvas
from test_common import *
+kaa.main.select_notifier(notifier)
+
if len(sys.argv) < 2:
print 'ERROR: you must specify the canvas xml file as an argument'
print 'usage: %s <canvas_xml>' % sys.argv[0]
Modified: trunk/canvas/test/clip_test.py
==============================================================================
--- trunk/canvas/test/clip_test.py (original)
+++ trunk/canvas/test/clip_test.py Tue Jan 29 13:14:41 2008
@@ -1,6 +1,8 @@
import kaa, kaa.canvas
from test_common import *
+kaa.main.select_notifier(notifier)
+
if output == "DirectFB":
canvas = kaa.canvas.DirectFBCanvas(size)
elif output == "FB":
@@ -12,10 +14,10 @@
c = canvas.add_container(width=100, height=100, hcenter="50%", top=30)
c.add_child(kaa.canvas.Rectangle(), width=200, height=200, color="#44ffff55")
-c.add_child(kaa.canvas.Text("Text and rect will overflow"), clip = None)
+c.add_child(kaa.canvas.Text("Text and rect will overflow", font="data/Vera"),
clip = None)
c = canvas.add_container(width=100, height=100, clip="auto", hcenter="50%",
top=300)
c.add_child(kaa.canvas.Rectangle(), width=200, height=200, color="#ff44ff55")
-c.add_child(kaa.canvas.Text("Text is clipped"))
+c.add_child(kaa.canvas.Text("Text is clipped", font="data/Vera"))
kaa.main.run()
Modified: trunk/canvas/test/clock.xml
==============================================================================
--- trunk/canvas/test/clock.xml (original)
+++ trunk/canvas/test/clock.xml Tue Jan 29 13:14:41 2008
@@ -1,4 +1,4 @@
<canvas class="clock">
<image file="data/background.jpg" />
- <text hcenter="50%" vcenter="50%" name="time">Current time goes here</text>
+ <text hcenter="50%" vcenter="50%" name="time" font="data/Vera">Current
time goes here</text>
</canvas>
Modified: trunk/canvas/test/container_test.py
==============================================================================
--- trunk/canvas/test/container_test.py (original)
+++ trunk/canvas/test/container_test.py Tue Jan 29 13:14:41 2008
@@ -1,6 +1,8 @@
import kaa, kaa.canvas
from test_common import *
+kaa.main.select_notifier(notifier)
+
if output == "DirectFB":
canvas = kaa.canvas.DirectFBCanvas(size)
elif output == "FB":
@@ -16,7 +18,7 @@
frame.set_border(30, 30, 30, 30)
container.add_child(frame, width = "75%", height = "50%")
-text = kaa.canvas.Text("Text inside a container.")
+text = kaa.canvas.Text("Text inside a container.", font="data/Vera")
container.add_child(text, hcenter = "50%", vcenter = "50%")
kaa.main.run()
Modified: trunk/canvas/test/hello.py
==============================================================================
--- trunk/canvas/test/hello.py (original)
+++ trunk/canvas/test/hello.py Tue Jan 29 13:14:41 2008
@@ -1,6 +1,9 @@
+import kaa
import kaa.canvas
from test_common import *
+kaa.main.select_notifier(notifier)
+
if output == "DirectFB":
canvas = kaa.canvas.DirectFBCanvas(size)
elif output == "FB":
@@ -12,7 +15,7 @@
background = kaa.canvas.Image("data/background.jpg")
canvas.add_child(background)
-hello = kaa.canvas.Text("Hello world!")
+hello = kaa.canvas.Text("Hello world!", font="data/Vera")
hello.move(hcenter = "50%", vcenter = "50%")
canvas.add_child(hello)
Modified: trunk/canvas/test/hello.xml
==============================================================================
--- trunk/canvas/test/hello.xml (original)
+++ trunk/canvas/test/hello.xml Tue Jan 29 13:14:41 2008
@@ -1,4 +1,4 @@
<canvas class="hello">
<image file="data/background.jpg" />
- <text hcenter="50%" vcenter="50%">Hello world!</text>
+ <text hcenter="50%" vcenter="50%" font="data/Vera">Hello world!</text>
</canvas>
Modified: trunk/canvas/test/rect_test.py
==============================================================================
--- trunk/canvas/test/rect_test.py (original)
+++ trunk/canvas/test/rect_test.py Tue Jan 29 13:14:41 2008
@@ -1,6 +1,8 @@
import kaa, kaa.canvas
from test_common import *
+kaa.main.select_notifier(notifier)
+
if output == "DirectFB":
canvas = kaa.canvas.DirectFBCanvas(size)
elif output == "FB":
Modified: trunk/canvas/test/test_common.py
==============================================================================
--- trunk/canvas/test/test_common.py (original)
+++ trunk/canvas/test/test_common.py Tue Jan 29 13:14:41 2008
@@ -4,3 +4,6 @@
# Your display resolution
size = (800, 600)
+
+# The notifier to use
+notifier = "generic"
Modified: trunk/canvas/test/xml_clock.py
==============================================================================
--- trunk/canvas/test/xml_clock.py (original)
+++ trunk/canvas/test/xml_clock.py Tue Jan 29 13:14:41 2008
@@ -1,6 +1,8 @@
import time, kaa, kaa.canvas
from test_common import *
+kaa.main.select_notifier(notifier)
+
if output == "DirectFB":
canvas = kaa.canvas.DirectFBCanvas(size)
elif output == "FB":
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
