Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/gtkmm/main.cpp b/synfig-studio/trunk/src/gtkmm/main.cpp
index 0eacd8f..36bf16d 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/main.cpp
+++ b/synfig-studio/trunk/src/gtkmm/main.cpp
@@ -6,6 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007, 2008 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
@@ -34,6 +35,8 @@
 #include "ipc.h"
 #include <stdexcept>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -55,23 +58,31 @@ using namespace studio;
 
 int main(int argc, char **argv)
 {
+
+#ifdef ENABLE_NLS
+       setlocale(LC_ALL, "");
+       bindtextdomain("synfigstudio", LOCALEDIR);
+       bind_textdomain_codeset("synfigstudio", "UTF-8");
+       textdomain("synfigstudio");
+#endif
+
        {
                SmartFILE file(IPC::make_connection());
                if(file)
                {
-                       fprintf(file.get(),"F\n");
+                       cout << endl;
+                       cout << "   " << _("synfig studio is already running") << endl << endl;
+                       cout << "   " << _("the existing process will be used") << endl << endl;;
 
                        // Hey, another copy of us is open!
                        // don't bother opening us, just go ahead and
                        // tell the other copy to load it all up
-                       if(argc>=1)
-                       {
-                               for(;argc>=1;(argc)--)
-                                       if((argv)[argc] && (argv)[argc][0]!='-')
-                                       {
-                                               fprintf(file.get(),"O %s\n",etl::absolute_path((argv)[argc]).c_str());
-                                       }
-                       }
+                       if (argc>1)
+                               fprintf(file.get(),"F\n");
+
+                       while(--argc)
+                               if((argv)[argc] && (argv)[argc][0]!='-')
+                                       fprintf(file.get(),"O %s\n",etl::absolute_path((argv)[argc]).c_str());
 
                        fprintf(file.get(),"F\n");
 
@@ -79,17 +90,15 @@ int main(int argc, char **argv)
                }
        }
 
+       cout << endl;
+       cout << "   " << _("synfig studio -- starting up application...") << endl << endl;
+
        try
        {
                studio::App app(&argc, &argv);
 
                app.run();
        }
-       catch(synfig::SoftwareExpired)
-       {
-               cerr<<"FATAL: Software Expired"<<endl;
-               return 39;
-       }
        catch(int ret)
        {
                std::cerr<<"Application shutdown with errors ("<<ret<<')'<<std::endl;
@@ -116,7 +125,7 @@ int main(int argc, char **argv)
                throw;
        }
 
-       std::cerr<<"Application appears to have terminated successfuly"<<std::endl;
+       std::cerr<<"Application appears to have terminated successfully"<<std::endl;
 
        return 0;
 }