Fix 1830670: Use the 'C' locale when loading and saving sketches.

[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 6c487a7..e978dc1 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/about.cpp
+++ b/synfig-studio/trunk/src/gtkmm/about.cpp
@@ -6,6 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -47,6 +48,8 @@
 #include "about.h"
 #include "app.h"
 
+#include "general.h"
+
 #endif
 
 using namespace std;
@@ -158,25 +161,25 @@ public:
 /* === M E T H O D S ======================================================= */
 
 About::About():
-       Gtk::Window(Gtk::WINDOW_POPUP),
+       Gtk::Window(getenv("SYNFIG_DISABLE_POPUP_WINDOWS") ? Gtk::WINDOW_TOPLEVEL : Gtk::WINDOW_POPUP),
        can_self_destruct(true)
 {
        int image_w=300,image_h=350;
 
        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
@@ -203,7 +206,7 @@ About::About():
        Pango::FontDescription fd = Pango::FontDescription("Sans, 11");
        l->set_font_description(fd);
        l->set_justify(Pango::ALIGN_CENTER);
-       fd.set_size(size*Pango::SCALE);
+       fd.set_size(int(size*Pango::SCALE));
        l->set_font_description(fd);
        l->get_pixel_size(width,height);
        while( width >= image_w-6 ){
@@ -215,7 +218,7 @@ About::About():
        CopyrightLabel->modify_font(fd);
 
        // Create the Version information label
-       Gtk::Label *VersionLabel = manage(new class Gtk::Label("Version"));
+       Gtk::Label *VersionLabel = manage(new class Gtk::Label(_("Version")));
        VersionLabel->set_size_request(image_w,80);
        VersionLabel->set_flags(Gtk::CAN_FOCUS);
        VersionLabel->set_alignment(0.5,0.5);
@@ -248,7 +251,7 @@ About::About():
        fd = Pango::FontDescription("Sans, 11");
        l->set_font_description(fd);
        l->set_justify(Pango::ALIGN_CENTER);
-       fd.set_size(size*Pango::SCALE);
+       fd.set_size(int(size*Pango::SCALE));
        l->set_font_description(fd);
        l->get_pixel_size(width,height);
        while( width >= image_w-6 ){
@@ -268,7 +271,7 @@ About::About():
        CloseButton = manage(new class Gtk::Button());
        CloseButton->set_size_request(24,24);
        CloseButton->set_flags(Gtk::CAN_FOCUS);
-       _tooltips.set_tip(*CloseButton, "Close", "");
+       _tooltips.set_tip(*CloseButton, _("Close"), "");
        CloseButton->set_relief(Gtk::RELIEF_NONE);
        CloseButton->add(*image2);