Commented unused variables.

[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 819ed63..eba53e6 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/about.cpp
+++ b/synfig-studio/trunk/src/gtkmm/about.cpp
@@ -1,18 +1,19 @@
 /*! ========================================================================
-** Sinfg
+** Synfig
 ** Template File
 ** $Id: about.cpp,v 1.2 2005/01/13 21:11:16 darco Exp $
 **
-** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+**     This package is free software; you can redistribute it and/or
+**     modify it under the terms of the GNU General Public License as
+**     published by the Free Software Foundation; either version 2 of
+**     the License, or (at your option) any later version.
 **
-** You may not copy, print, publish, or in any
-** other way distribute this software without
-** a prior written agreement with
-** the copyright holder.
+**     This package is distributed in the hope that it will be useful,
+**     but WITHOUT ANY WARRANTY; without even the implied warranty of
+**     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**     General Public License for more details.
 **
 ** === N O T E S ===========================================================
 **
@@ -38,7 +39,7 @@
 #include <gtkmm/label.h>
 #include <gtkmm/fixed.h>
 
-#include <sinfg/general.h>
+#include <synfig/general.h>
 
 #include "about.h"
 #include "app.h"
@@ -53,7 +54,7 @@ using namespace studio;
 
 #ifndef VERSION
 #define VERSION        "unknown"
-#define PACKAGE        "sinfgstudio"
+#define PACKAGE        "synfigstudio"
 #endif
 
 #ifdef WIN32
@@ -80,7 +81,7 @@ extern      const guint gtk_interface_age;
 
 /* === P R O C E D U R E S ================================================= */
 
-class studio::AboutProgress : public sinfg::ProgressCallback
+class studio::AboutProgress : public synfig::ProgressCallback
 {
        About &about;
        
@@ -165,6 +166,13 @@ About::About():
 #else
        imagepath=IMAGE_DIR;
 #endif
+       char* synfig_root=getenv("SYNFIG_ROOT");
+       if(synfig_root) {
+               imagepath=synfig_root;
+               imagepath+=ETL_DIRECTORY_SEPERATOR;
+               
+               imagepath+="share/pixmaps";
+       }
        imagepath+=ETL_DIRECTORY_SEPERATOR;
        
        
@@ -176,7 +184,7 @@ About::About():
        Logo->set_padding(0,0);
        
        // Create the Copyright Label
-       Gtk::Label *CopyrightLabel = manage(new class Gtk::Label(SINFG_COPYRIGHT));
+       Gtk::Label *CopyrightLabel = manage(new class Gtk::Label(SYNFIG_COPYRIGHT));
        CopyrightLabel->set_size_request(image_w,24);
        CopyrightLabel->set_alignment(0.5,0.5);
        CopyrightLabel->set_padding(0,0);
@@ -195,8 +203,8 @@ About::About():
        // Set the version label to contain the correct information
        string ver;
        ver+="Version "VERSION" ("__DATE__" "__TIME__")\n";
-       ver+="Using SINFG ";
-       ver+=sinfg::get_version();
+       ver+="Using SYNFIG ";
+       ver+=synfig::get_version();
        #ifdef __GNUC__
                ver+=strprintf(" and GNU G++ %d.%d.%d",__GNUC__,__GNUC_MINOR__,__GNUC_PATCHLEVEL__);
        #endif
@@ -240,7 +248,7 @@ About::About():
        fixed1->put(*tasklabel, 0, image_h);
 
        // Set up the parameters for this pop-up window
-       set_title("Sinfg Studio "VERSION);
+       set_title("Synfig Studio "VERSION);
        set_modal(false);
        property_window_position().set_value(Gtk::WIN_POS_CENTER);
        set_resizable(false);
@@ -282,7 +290,7 @@ About::set_can_self_destruct(bool x)
                CloseButton->hide();            
 }
 
-sinfg::ProgressCallback *
+synfig::ProgressCallback *
 About::get_callback()
 {
        return cb;