X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fmain.cpp;h=5e34cfab135ed496ee38ddfd2605d3467e59be35;hb=2a17bcdb8f6b5293b59cb3b6e3fcd818c6ff0e7d;hp=6a77699aa66e372acbe608070e30f4b7626536db;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/main.cpp b/synfig-studio/trunk/src/gtkmm/main.cpp
index 6a77699..5e34cfa 100644
--- a/synfig-studio/trunk/src/gtkmm/main.cpp
+++ b/synfig-studio/trunk/src/gtkmm/main.cpp
@@ -1,20 +1,22 @@
 /* === S Y N F I G ========================================================= */
-/*!	\file main.cpp
+/*!	\file gtkmm/main.cpp
 **	\brief Synfig Studio Entrypoint
 **
-**	$Id: main.cpp,v 1.2 2005/01/13 18:37:30 darco Exp $
+**	$Id$
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
 **
-**	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.
 **	\endlegal
 */
 /* ========================================================================= */
@@ -33,6 +35,8 @@
 #include "ipc.h"
 #include <stdexcept>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -54,41 +58,46 @@ using namespace studio;
 
 int main(int argc, char **argv)
 {
+
+#ifdef ENABLE_NLS
+	setlocale(LC_ALL, "");
+	bindtextdomain("synfigstudio", LOCALEDIR);
+	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");
 
 			return 0;
 		}
 	}
 
+	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;
@@ -115,7 +124,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;
 }