changeset 242:561751c094b8

Switched default font in the editor to FreeSans. Fixed the layertool to not use _setBackgroundColor etc.
author phoku@33b003aa-7bff-0310-803a-e67f0ece8222
date Wed, 25 Mar 2009 08:31:04 +0000
parents 99b36f59a5d5
children a822b1a6e3cd
files clients/editor/fonts/FreeSans.ttf clients/editor/fonts/samanata.fontdef clients/editor/fonts/samanata.ttf clients/editor/plugins/layertool.py clients/editor/settings.py
diffstat 5 files changed, 7 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
Binary file clients/editor/fonts/FreeSans.ttf has changed
--- a/clients/editor/fonts/samanata.fontdef	Wed Mar 25 08:04:07 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-[Font/samanata_large]
-
-type: truetype
-source: fonts/samanata.ttf
-size: 30
-
-antialias: 0
-
-color: 255,255,0
-
-[Font/samanata_small]
-
-type: truetype
-source: fonts/samanata.ttf
-size: 8
-
-antialias: 0
-row_spacing: 50
-glyph_spacing: 50
Binary file clients/editor/fonts/samanata.ttf has changed
--- a/clients/editor/plugins/layertool.py	Wed Mar 25 08:04:07 2009 +0000
+++ b/clients/editor/plugins/layertool.py	Wed Mar 25 08:31:04 2009 +0000
@@ -215,16 +215,16 @@
 		if self.previous_active_layer is not None:
 			previous_layer_id = str(self.previous_active_layer)
 			previous_active_widget = self.container.findChild(name="select_" + previous_layer_id)
-			previous_active_widget._setBackgroundColor(_DEFAULT_BACKGROUND_COLOR)
-			previous_active_widget._setForegroundColor(_DEFAULT_BACKGROUND_COLOR)
-			previous_active_widget._setBaseColor(_DEFAULT_BACKGROUND_COLOR)		
+			previous_active_widget.background_color = _DEFAULT_BACKGROUND_COLOR
+			previous_active_widget.foreground_color = _DEFAULT_BACKGROUND_COLOR
+			previous_active_widget.base_color = _DEFAULT_BACKGROUND_COLOR
 			previous_active_widget.text = previous_layer_id
 		
 		layerid = widget.name[7:]	
 		
-		widget._setBackgroundColor(_HIGHLIGHT_BACKGROUND_COLOR)
-		widget._setForegroundColor(_HIGHLIGHT_BACKGROUND_COLOR)
-		widget._setBaseColor(_HIGHLIGHT_BACKGROUND_COLOR)
+		widget.background_color = _HIGHLIGHT_BACKGROUND_COLOR
+		widget.foreground_color = _HIGHLIGHT_BACKGROUND_COLOR
+		widget.base_color = _HIGHLIGHT_BACKGROUND_COLOR
 		widget.text = widget.text + " *"
 		self.previous_active_layer = layerid
 		self.container.adaptLayout()
--- a/clients/editor/settings.py	Wed Mar 25 08:04:07 2009 +0000
+++ b/clients/editor/settings.py	Wed Mar 25 08:31:04 2009 +0000
@@ -7,7 +7,7 @@
 ScreenWidth         = 1024
 ScreenHeight        = 768
 
-Font                = 'fonts/samanata.ttf'
+Font                = 'fonts/FreeSans.ttf'
 FontGlyphs          = " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.,!?-+/():;%&`'*#=[]\""
 
 LogModules          = ['controller']