X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fapp.cpp;h=bd35bc87d177f6a0e6cba2f76d4f8265f6b719a9;hb=08a26403c9dd95f1ea17b28aa44f89fe5110f8a9;hp=e99a21d152a77f07f17fc035f06462b9f4e9a171;hpb=2609f3f9572f7beaeaf35c2bd4b021b0d96fce1d;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp
index e99a21d..bd35bc8 100644
--- a/synfig-studio/trunk/src/gtkmm/app.cpp
+++ b/synfig-studio/trunk/src/gtkmm/app.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
@@ -252,6 +253,7 @@ studio::Dock_Curves* dock_curves;
 std::list< etl::handle< studio::Module > > module_list_;
 
 bool studio::App::use_colorspace_gamma=true;
+bool studio::App::single_threaded=false;
 
 static int max_recent_files_=25;
 int studio::App::get_max_recent_files() { return max_recent_files_; }
@@ -600,6 +602,11 @@ public:
 			value=strprintf("%s",Distance::system_name(App::distance_system).c_str());
 			return true;
 		}
+		if(key=="single_threaded")
+		{
+			value=strprintf("%i",(int)App::single_threaded);
+			return true;
+		}
 		if(key=="auto_recover_backup_interval")
 		{
 			value=strprintf("%i",App::auto_recover->get_timeout());
@@ -655,6 +662,12 @@ public:
 			App::distance_system=Distance::ident_system(value);;
 			return true;
 		}
+		if(key=="single_threaded")
+		{
+			int i(atoi(value.c_str()));
+			App::single_threaded=i;
+			return true;
+		}
 
 		return synfigapp::Settings::set_value(key,value);
 	}
@@ -667,6 +680,7 @@ public:
 		ret.push_back("distance_system");
 		ret.push_back("file_history.size");
 		ret.push_back("use_colorspace_gamma");
+		ret.push_back("single_threaded");
 		ret.push_back("auto_recover_backup_interval");
 		return ret;
 	}
@@ -727,7 +741,8 @@ init_ui_manager()
 	DEFINE_ACTION("dialog-flipbook", _("Preview Dialog"));
 	DEFINE_ACTION("sound", _("Sound File"));
 	DEFINE_ACTION("options", _("Options"));
-	DEFINE_ACTION("close", _("Close"));
+	DEFINE_ACTION("close", _("Close View"));
+	DEFINE_ACTION("close-document", _("Close Document"));
 
 
 	DEFINE_ACTION("undo", Gtk::StockID("gtk-undo"));
@@ -847,6 +862,7 @@ init_ui_manager()
 "		<separator name='bleh04'/>"
 "		<menuitem action='options' />"
 "		<menuitem action='close' />"
+"		<menuitem action='close-document' />"
 "	</menu>"
 "	<menu action='menu-edit'>"
 "		<menuitem action='undo'/>"
@@ -1089,7 +1105,10 @@ App::App(int *argc, char ***argv):
 
 	gdk_rgb_init();
 
-	Glib::thread_init();
+	// don't call thread_init() if threads are already initialised
+	// on some machines bonobo_init() initialised threads before we get here
+	if (!g_thread_supported())
+		Glib::thread_init();
 
 	distance_system=Distance::SYSTEM_UNITS;
 
@@ -1545,6 +1564,7 @@ App::reset_initial_window_configuration()
 	synfigapp::Main::settings().set_value("dock.dialog.2.size","1045 235");
 	synfigapp::Main::settings().set_value("pref.distance_system","pt");
 	synfigapp::Main::settings().set_value("pref.use_colorspace_gamma","1");
+	synfigapp::Main::settings().set_value("pref.single_threaded","0");
 	synfigapp::Main::settings().set_value("window.toolbox.pos","4 4");
 }