[Pingus-CVS] r2996 - in branches/pingus_sdl: . data/images/fonts src src/components

[grumbel at BerliOS]

Author: grumbel
Date: 2007-08-17 22:21:47 +0200 (Fri, 17 Aug 2007)
New Revision: 2996

Added:
   branches/pingus_sdl/data/images/fonts/pingus_small_fixnum-iso-8859-1.font
   branches/pingus_sdl/data/images/fonts/pingus_small_fixnum-iso-8859-2.font
   branches/pingus_sdl/data/images/fonts/pingus_small_fixnum-iso-8859-9.font
Modified:
   branches/pingus_sdl/TODO
   branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-1.font
   branches/pingus_sdl/src/components/pingus_counter.cpp
   branches/pingus_sdl/src/components/time_display.cpp
   branches/pingus_sdl/src/fonts.cpp
   branches/pingus_sdl/src/fonts.hpp
Log:
- added seperate fixnum font back, since using fixnum breaks the main menu

Modified: branches/pingus_sdl/TODO
===================================================================
--- branches/pingus_sdl/TODO    2007-08-17 20:09:11 UTC (rev 2995)
+++ branches/pingus_sdl/TODO    2007-08-17 20:21:47 UTC (rev 2996)
@@ -62,6 +62,8 @@
 
 - forgein languages break many parts of the GUI (font align, mostly worldmap)
 
+- white-line in top-right worldmap button
+
 Nice to Have:
 =============
 

Modified: branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-1.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-1.font  
2007-08-17 20:09:11 UTC (rev 2995)
+++ branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-1.font  
2007-08-17 20:21:47 UTC (rev 2996)
@@ -1,7 +1,7 @@
 ;; -*- scheme -*-
 (pingus-font
  (name "Pingus Small")
- (space-length    13)
+ (space-length    8)
  (char-spacing 0)
  (vertical-spacing 23)
  (alpha-threshold  0)

Added: branches/pingus_sdl/data/images/fonts/pingus_small_fixnum-iso-8859-1.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus_small_fixnum-iso-8859-1.font   
2007-08-17 20:09:11 UTC (rev 2995)
+++ branches/pingus_sdl/data/images/fonts/pingus_small_fixnum-iso-8859-1.font   
2007-08-17 20:21:47 UTC (rev 2996)
@@ -0,0 +1,13 @@
+;; -*- scheme -*-
+(pingus-font
+ (name "Pingus Small")
+ (space-length    13)
+ (char-spacing 0)
+ (vertical-spacing 23)
+ (alpha-threshold  0)
+ (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
+             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+             
"�����������������������������������������������������������������������������������������������")
+ (image "data/images/fonts/pingus_small-iso-8859-1.png"))
+
+;; EOF ;;

Added: branches/pingus_sdl/data/images/fonts/pingus_small_fixnum-iso-8859-2.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus_small_fixnum-iso-8859-2.font   
2007-08-17 20:09:11 UTC (rev 2995)
+++ branches/pingus_sdl/data/images/fonts/pingus_small_fixnum-iso-8859-2.font   
2007-08-17 20:21:47 UTC (rev 2996)
@@ -0,0 +1,11 @@
+;; -*- scheme -*-
+(pingus-font
+ (name "Pingus Small")
+ (space-length    8)
+ (alpha-threshold  0)
+ (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
+             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+             
"�����������������������������������������������������������������������������������������������")
+ (image "data/images/fonts/pingus_small-iso-8859-2.png"))
+
+;; EOF ;;

Added: branches/pingus_sdl/data/images/fonts/pingus_small_fixnum-iso-8859-9.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus_small_fixnum-iso-8859-9.font   
2007-08-17 20:09:11 UTC (rev 2995)
+++ branches/pingus_sdl/data/images/fonts/pingus_small_fixnum-iso-8859-9.font   
2007-08-17 20:21:47 UTC (rev 2996)
@@ -0,0 +1,11 @@
+;; -*- scheme -*-
+(pingus-font
+ (name "Pingus Small")
+ (space-length    8)
+ (alpha-threshold  0)
+ (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
+             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+             
"�����������������������������������������������������������������������������������������������")
+ (image "data/images/fonts/pingus_small-iso-8859-9.png"))
+
+;; EOF ;;

Modified: branches/pingus_sdl/src/components/pingus_counter.cpp
===================================================================
--- branches/pingus_sdl/src/components/pingus_counter.cpp       2007-08-17 
20:09:11 UTC (rev 2995)
+++ branches/pingus_sdl/src/components/pingus_counter.cpp       2007-08-17 
20:21:47 UTC (rev 2996)
@@ -33,7 +33,7 @@
   : server(s),
     background(Resource::load_sprite("core/buttons/info"))
 {
-  font = Fonts::pingus_small;
+  font = Fonts::pingus_small_fixnum;
 }
 
 void

Modified: branches/pingus_sdl/src/components/time_display.cpp
===================================================================
--- branches/pingus_sdl/src/components/time_display.cpp 2007-08-17 20:09:11 UTC 
(rev 2995)
+++ branches/pingus_sdl/src/components/time_display.cpp 2007-08-17 20:21:47 UTC 
(rev 2996)
@@ -37,7 +37,7 @@
   : server(c->get_server()),
     infinity_symbol(Resource::load_sprite("core/misc/infinity"))
 {
-  font = Fonts::pingus_small;
+  font = Fonts::pingus_small_fixnum;
 }
 
 void

Modified: branches/pingus_sdl/src/fonts.cpp
===================================================================
--- branches/pingus_sdl/src/fonts.cpp   2007-08-17 20:09:11 UTC (rev 2995)
+++ branches/pingus_sdl/src/fonts.cpp   2007-08-17 20:21:47 UTC (rev 2996)
@@ -29,6 +29,7 @@
 Font chalk_small;
 
 Font pingus_small;
+Font pingus_small_fixnum;
 Font pingus_large;
 
 Font courier_small;
@@ -43,6 +44,7 @@
   chalk_small  = Resource::load_font("fonts/chalk_small"  + std::string("-") + 
encoding);
 
   pingus_small = Resource::load_font("fonts/pingus_small" + std::string("-") + 
encoding);
+  pingus_small_fixnum = Resource::load_font("fonts/pingus_small_fixnum" + 
std::string("-") + encoding);
   pingus_large = Resource::load_font("fonts/pingus"       + std::string("-") + 
encoding);
 
   courier_small = Resource::load_font("fonts/courier_small" + std::string("-") 
+ encoding);

Modified: branches/pingus_sdl/src/fonts.hpp
===================================================================
--- branches/pingus_sdl/src/fonts.hpp   2007-08-17 20:09:11 UTC (rev 2995)
+++ branches/pingus_sdl/src/fonts.hpp   2007-08-17 20:21:47 UTC (rev 2996)
@@ -34,6 +34,7 @@
 extern Font courier_small;
 
 extern Font pingus_small;
+extern Font pingus_small_fixnum;
 extern Font pingus_large;
 
 extern Font lcd;