projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add code to output the new time format.
[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
..
5901bcc
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
**
** \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
**
** 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 "ipc.h"
#include <stdexcept>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-55,10
+58,21
@@
using namespace studio;
int main(int argc, char **argv)
{
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)
{
{
SmartFILE file(IPC::make_connection());
if(file)
{
+ cout << endl;
+ cout << " " << _("synfig studio is already running") << endl << endl;
+ cout << " " << _("the existing process will be used") << endl << endl;;
+
fprintf(file.get(),"F\n");
// Hey, another copy of us is open!
fprintf(file.get(),"F\n");
// Hey, another copy of us is open!
@@
-79,17
+93,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();
}
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;
catch(int ret)
{
std::cerr<<"Application shutdown with errors ("<<ret<<')'<<std::endl;
@@
-116,7
+128,7
@@
int main(int argc, char **argv)
throw;
}
throw;
}
- std::cerr<<"Application appears to have terminated successfuly"<<std::endl;
+ std::cerr<<"Application appears to have terminated successful
l
y"<<std::endl;
return 0;
}
return 0;
}