[Pingus-CVS] r3860 - in trunk/pingus: data/images/fonts src src/components

[grumbel at BerliOS]

Author: grumbel
Date: 2008-07-17 23:50:15 +0200 (Thu, 17 Jul 2008)
New Revision: 3860

Removed:
   trunk/pingus/data/images/fonts/pingus-iso-8859-1.font
   trunk/pingus/data/images/fonts/pingus-iso-8859-1.png
   trunk/pingus/data/images/fonts/pingus-iso-8859-2.font
   trunk/pingus/data/images/fonts/pingus-iso-8859-2.png
   trunk/pingus/data/images/fonts/pingus-iso-8859-9.font
   trunk/pingus/data/images/fonts/pingus-iso-8859-9.png
   trunk/pingus/data/images/fonts/pingus_large.font
Modified:
   trunk/pingus/src/components/menu_button.cpp
   trunk/pingus/src/components/menu_button.hpp
   trunk/pingus/src/fonts.cpp
   trunk/pingus/src/fonts.hpp
Log:
Removed unneeded fonts

Deleted: trunk/pingus/data/images/fonts/pingus-iso-8859-1.font
===================================================================
--- trunk/pingus/data/images/fonts/pingus-iso-8859-1.font       2008-07-17 
20:14:03 UTC (rev 3859)
+++ trunk/pingus/data/images/fonts/pingus-iso-8859-1.font       2008-07-17 
21:50:15 UTC (rev 3860)
@@ -1,11 +0,0 @@
-;; -*- scheme -*-
-(pingus-font
- (name "Pingus Small")
- (space-length    8)
- (alpha-threshold  0)
- (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
-             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
-             
"�����������������������������������������������������������������������������������������������")
- (image "images/fonts/pingus-iso-8859-1.png"))
-
-;; EOF ;;

Deleted: trunk/pingus/data/images/fonts/pingus-iso-8859-1.png
===================================================================
(Binary files differ)

Deleted: trunk/pingus/data/images/fonts/pingus-iso-8859-2.font
===================================================================
--- trunk/pingus/data/images/fonts/pingus-iso-8859-2.font       2008-07-17 
20:14:03 UTC (rev 3859)
+++ trunk/pingus/data/images/fonts/pingus-iso-8859-2.font       2008-07-17 
21:50:15 UTC (rev 3860)
@@ -1,11 +0,0 @@
-;; -*- scheme -*-
-(pingus-font
- (name "Pingus Small")
- (space-length    8)
- (alpha-threshold  0)
- (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
-             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
-             
"�����������������������������������������������������������������������������������������������")
- (image "images/fonts/pingus-iso-8859-2.png"))
-
-;; EOF ;;

Deleted: trunk/pingus/data/images/fonts/pingus-iso-8859-2.png
===================================================================
(Binary files differ)

Deleted: trunk/pingus/data/images/fonts/pingus-iso-8859-9.font
===================================================================
--- trunk/pingus/data/images/fonts/pingus-iso-8859-9.font       2008-07-17 
20:14:03 UTC (rev 3859)
+++ trunk/pingus/data/images/fonts/pingus-iso-8859-9.font       2008-07-17 
21:50:15 UTC (rev 3860)
@@ -1,11 +0,0 @@
-;; -*- scheme -*-
-(pingus-font
- (name "Pingus Small")
- (space-length    8)
- (alpha-threshold  0)
- (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
-             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
-             
"�����������������������������������������������������������������������������������������������")
- (image "images/fonts/pingus-iso-8859-9.png"))
-
-;; EOF ;;

Deleted: trunk/pingus/data/images/fonts/pingus-iso-8859-9.png
===================================================================
(Binary files differ)

Deleted: trunk/pingus/data/images/fonts/pingus_large.font
===================================================================
--- trunk/pingus/data/images/fonts/pingus_large.font    2008-07-17 20:14:03 UTC 
(rev 3859)
+++ trunk/pingus/data/images/fonts/pingus_large.font    2008-07-17 21:50:15 UTC 
(rev 3860)
@@ -1,11 +0,0 @@
-;; -*- scheme -*-
-(pingus-font
- (name "Pingus Small")
- (space-length    20)
- (alpha-threshold  0)
- (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
-             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
-             
"���������������������������������������������������������������������������������������������")
- (image "images/fonts/pingus_large.png"))
-
-;; EOF ;;

Modified: trunk/pingus/src/components/menu_button.cpp
===================================================================
--- trunk/pingus/src/components/menu_button.cpp 2008-07-17 20:14:03 UTC (rev 
3859)
+++ trunk/pingus/src/components/menu_button.cpp 2008-07-17 21:50:15 UTC (rev 
3860)
@@ -45,21 +45,6 @@
   pressed    = false;
 }
 
-MenuButton::MenuButton ()
-{
-  font       = Fonts::pingus_small;
-  font_large = Fonts::pingus_large;
-
-  mouse_over = false;
-  pressed = false;
-
-  //std::cout << "Generating font cache: " << std::flush;
-  // We print all available letters, so that they are in the cache
-  //font->print_left (0,0, "!\"#$%&'()*+,-./0123456789:;<=>address@hidden|}~");
-  //font_large->print_left (0,0, 
"!\"#$%&'()*+,-./0123456789:;<=>address@hidden|}~");
-  //std::cout << "done" << std::endl;
-}
-
 MenuButton::~MenuButton ()
 {
 }

Modified: trunk/pingus/src/components/menu_button.hpp
===================================================================
--- trunk/pingus/src/components/menu_button.hpp 2008-07-17 20:14:03 UTC (rev 
3859)
+++ trunk/pingus/src/components/menu_button.hpp 2008-07-17 21:50:15 UTC (rev 
3860)
@@ -47,7 +47,6 @@
 public:
   MenuButton(PingusMenu* menu, const Vector2i& pos, 
              const std::string& text, const std::string& desc);
-  MenuButton();
   virtual ~MenuButton();
 
   void draw(DrawingContext& gc);

Modified: trunk/pingus/src/fonts.cpp
===================================================================
--- trunk/pingus/src/fonts.cpp  2008-07-17 20:14:03 UTC (rev 3859)
+++ trunk/pingus/src/fonts.cpp  2008-07-17 21:50:15 UTC (rev 3860)
@@ -27,7 +27,6 @@
 
 Font pingus_small;
 Font pingus_small_fixnum;
-Font pingus_large;
 
 Font courier_small;
 
@@ -44,7 +43,6 @@
 
   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: trunk/pingus/src/fonts.hpp
===================================================================
--- trunk/pingus/src/fonts.hpp  2008-07-17 20:14:03 UTC (rev 3859)
+++ trunk/pingus/src/fonts.hpp  2008-07-17 21:50:15 UTC (rev 3860)
@@ -32,7 +32,6 @@
 
 extern Font pingus_small;
 extern Font pingus_small_fixnum;
-extern Font pingus_large;
 
 extern Font verdana11;