Since the last change will require a recompilation of pretty much everything, I took...

[synfig.git] / synfig-studio / trunk / src / gtkmm / about.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/about.cpp b/synfig-studio/trunk/src/gtkmm/about.cpp
index aae2422..67d0c76 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/about.cpp
+++ b/synfig-studio/trunk/src/gtkmm/about.cpp
@@ -2,6 +2,8 @@
 /*!    \file about.cpp
 **     \brief writeme
 **
+**     $Id$
+**
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
@@ -163,18 +165,18 @@ About::About():
 
        std::string imagepath;
 #ifdef WIN32
-       imagepath=App::get_base_path()+ETL_DIRECTORY_SEPERATOR+IMAGE_DIR;
+       imagepath=App::get_base_path()+ETL_DIRECTORY_SEPARATOR+IMAGE_DIR;
 #else
        imagepath=IMAGE_DIR;
 #endif
        char* synfig_root=getenv("SYNFIG_ROOT");
        if(synfig_root) {
                imagepath=synfig_root;
-               imagepath+=ETL_DIRECTORY_SEPERATOR;
+               imagepath+=ETL_DIRECTORY_SEPARATOR;
 
                imagepath+="share/pixmaps";
        }
-       imagepath+=ETL_DIRECTORY_SEPERATOR;
+       imagepath+=ETL_DIRECTORY_SEPARATOR;
 
 
        // Create the Logo
@@ -191,6 +193,26 @@ About::About():
        CopyrightLabel->set_padding(0,0);
        CopyrightLabel->set_justify(Gtk::JUSTIFY_CENTER);
        CopyrightLabel->set_line_wrap(false);
+       CopyrightLabel->modify_fg(Gtk::STATE_NORMAL,Gdk::Color("black"));
+
+       /* Scale the text to fit */
+       int width = 0;
+       int height = 0;
+       float size=11;
+       Glib::RefPtr<Pango::Layout> l = CopyrightLabel->get_layout();
+       Pango::FontDescription fd = Pango::FontDescription("Sans, 11");
+       l->set_font_description(fd);
+       l->set_justify(Pango::ALIGN_CENTER);
+       fd.set_size(int(size*Pango::SCALE));
+       l->set_font_description(fd);
+       l->get_pixel_size(width,height);
+       while( width >= image_w-6 ){
+               size-=0.5;
+               fd.set_size((int)(size*Pango::SCALE));
+               l->set_font_description(fd);
+               l->get_pixel_size(width,height);
+       }
+       CopyrightLabel->modify_font(fd);
 
        // Create the Version information label
        Gtk::Label *VersionLabel = manage(new class Gtk::Label("Version"));
@@ -200,6 +222,7 @@ About::About():
        VersionLabel->set_padding(0,0);
        VersionLabel->set_justify(Gtk::JUSTIFY_CENTER);
        VersionLabel->set_line_wrap(false);
+       VersionLabel->modify_fg(Gtk::STATE_NORMAL,Gdk::Color("black"));
 
        // Set the version label to contain the correct information
        string ver;
@@ -217,6 +240,25 @@ About::About():
        #endif
        VersionLabel->set_text(ver);
 
+       /* Scale the text to fit */
+       width = 0;
+       height = 0;
+       size=11;
+       l = VersionLabel->get_layout();
+       fd = Pango::FontDescription("Sans, 11");
+       l->set_font_description(fd);
+       l->set_justify(Pango::ALIGN_CENTER);
+       fd.set_size(int(size*Pango::SCALE));
+       l->set_font_description(fd);
+       l->get_pixel_size(width,height);
+       while( width >= image_w-6 ){
+               size-=0.5;
+               fd.set_size((int)(size*Pango::SCALE));
+               l->set_font_description(fd);
+               l->get_pixel_size(width,height);
+       }
+       VersionLabel->modify_font(fd);
+
        // Create the image that will be used on the close button
        Gtk::Image *image2 = manage(new class Gtk::Image(Gtk::StockID("gtk-close"), Gtk::IconSize(4)));
        image2->set_alignment(0.5,0.5);