X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdialog_setup.cpp;h=0382ce726f2b7e1353da03fbc3ee120ec6bcbde5;hb=3624aac2a6e2dc3824ae22e99e2608f93f285e61;hp=c22992f183831f4e90f01d058ec287151df88b4a;hpb=79878a57ea933b603eef287adbed4d9b46794009;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp b/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp
index c22992f..0382ce7 100644
--- a/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dialog_setup.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
@@ -40,6 +41,8 @@
 
 #include <ETL/stringf>
 #include <ETL/misc>
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -64,7 +67,8 @@ Dialog_Setup::Dialog_Setup():
 	adj_gamma_b(2.2,0.1,3.0,0.025,0.025,0.025),
 	adj_recent_files(15,1,50,1,1,1),
 	adj_undo_depth(100,10,5000,1,1,1),
-	toggle_use_colorspace_gamma(_("Visually Linear Color Selection"))
+	toggle_use_colorspace_gamma(_("Visually Linear Color Selection")),
+	toggle_single_threaded(_("Use Only a Single Thread"))
 {
 	// Setup the buttons
 
@@ -179,6 +183,9 @@ Dialog_Setup::Dialog_Setup():
 	// Misc - use_colorspace_gamma
 	misc_table->attach(toggle_use_colorspace_gamma, 0, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
 
+	// Misc - single_threaded
+	misc_table->attach(toggle_single_threaded, 0, 2, 4, 5, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
+
 	show_all_children();
 }
 
@@ -206,6 +213,9 @@ Dialog_Setup::on_apply_pressed()
 	// Set the use_colorspace_gamma flag
 	App::use_colorspace_gamma=toggle_use_colorspace_gamma.get_active();
 
+	// Set the single_threaded flag
+	App::single_threaded=toggle_single_threaded.get_active();
+
 	App::distance_system=Distance::System(widget_enum->get_value());
 
 	App::save_settings();
@@ -256,7 +266,7 @@ void
 Dialog_Setup::refresh()
 {
 	// Refresh the temporary gamma; do this before adjusting the sliders,
-	// or variables will be used before their initialisation.
+	// or variables will be used before their initialization.
 	gamma_pattern.set_gamma_r(App::gamma.get_gamma_r());
 	gamma_pattern.set_gamma_g(App::gamma.get_gamma_g());
 	gamma_pattern.set_gamma_b(App::gamma.get_gamma_b());
@@ -280,6 +290,9 @@ Dialog_Setup::refresh()
 
 	// Refresh the status of the use_colorspace_gamma flag
 	toggle_use_colorspace_gamma.set_active(App::use_colorspace_gamma);
+
+	// Refresh the status of the single_threaded flag
+	toggle_single_threaded.set_active(App::single_threaded);
 }
 
 GammaPattern::GammaPattern():
@@ -488,7 +501,7 @@ BlackLevelSelector::on_event(GdkEvent *event)
 
 
 void
-Dialog_Setup::set_time_format(Time::Format x)
+Dialog_Setup::set_time_format(synfig::Time::Format x)
 {
 	time_format=x;
 	if(x<=Time::FORMAT_VIDEO)