X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdialog_setup.cpp;h=7e42acb8cd6833d1cff62821776abae20ae2ebf8;hb=4a6b5f2e444558761c4e8afccaa61fb2c58ec593;hp=97fe0b0761480f67a86392b914afcfff5c4f3e70;hpb=6c80475b389b1c07c148566cd015f9efc3a6adaa;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp b/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp
index 97fe0b0..7e42acb 100644
--- a/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp
@@ -77,7 +77,9 @@ Dialog_Setup::Dialog_Setup():
 	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")),
+#ifdef SINGLE_THREADED
 	toggle_single_threaded(_("Use Only a Single Thread")),
+#endif
 	toggle_restrict_radius_ducks(_("Restrict Real-Valued Ducks to Top Right Quadrant"))
 {
 	// Setup the buttons
@@ -159,6 +161,7 @@ Dialog_Setup::Dialog_Setup():
 	ADD_TIMESTAMP("(HHhMMmSSs)FFf",		Time::FORMAT_NORMAL	| Time::FORMAT_NOSPACES	);
 	ADD_TIMESTAMP("HHh MMm SSs FFf",	Time::FORMAT_NORMAL	| Time::FORMAT_FULL		);
 	ADD_TIMESTAMP("HHhMMmSSsFFf",		Time::FORMAT_NORMAL	| Time::FORMAT_NOSPACES	| Time::FORMAT_FULL);
+	ADD_TIMESTAMP("FFf",				Time::FORMAT_FRAMES );
 
 	timestamp_optionmenu.set_menu(*timestamp_menu);
 
@@ -191,15 +194,17 @@ Dialog_Setup::Dialog_Setup():
 	// Misc - use_colorspace_gamma
 	misc_table->attach(toggle_use_colorspace_gamma, 0, 2, 5, 6, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
 
+#ifdef SINGLE_THREADED
 	// Misc - single_threaded
-	misc_table->attach(toggle_single_threaded, 0, 2, 6, 7, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
+	misc_table->attach(toggle_single_threaded, 0, 2, 7, 8, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
+#endif
 
 	// Misc - auto backup interval
 	attach_label(misc_table, _("Auto Backup Interval (0 to disable)"), 3, xpadding, ypadding);
 	misc_table->attach(auto_backup_interval, 1, 2, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
 
 	// Misc - restrict_radius_ducks
-	misc_table->attach(toggle_restrict_radius_ducks, 0, 2, 7, 8, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
+	misc_table->attach(toggle_restrict_radius_ducks, 0, 2, 6, 7, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
 
 	// Misc - browser_command
 	attach_label(misc_table, _("Browser Command"), 4, xpadding, ypadding);
@@ -232,8 +237,10 @@ Dialog_Setup::on_apply_pressed()
 	// Set the use_colorspace_gamma flag
 	App::use_colorspace_gamma=toggle_use_colorspace_gamma.get_active();
 
+#ifdef SINGLE_THREADED
 	// Set the single_threaded flag
 	App::single_threaded=toggle_single_threaded.get_active();
+#endif
 
 	// Set the auto backup interval
 	App::auto_recover->set_timeout(auto_backup_interval.get_value() * 1000);
@@ -319,8 +326,10 @@ Dialog_Setup::refresh()
 	// Refresh the status of the use_colorspace_gamma flag
 	toggle_use_colorspace_gamma.set_active(App::use_colorspace_gamma);
 
+#ifdef SINGLE_THREADED
 	// Refresh the status of the single_threaded flag
 	toggle_single_threaded.set_active(App::single_threaded);
+#endif
 
 	// Refresh the value of the auto backup interval
 	auto_backup_interval.set_value(App::auto_recover->get_timeout() / 1000);
@@ -541,19 +550,20 @@ void
 Dialog_Setup::set_time_format(synfig::Time::Format x)
 {
 	time_format=x;
-	if(x<=Time::FORMAT_VIDEO)
+	if (x <= Time::FORMAT_VIDEO)
 		timestamp_optionmenu.set_history(0);
+	else if (x == (Time::FORMAT_NORMAL))
+		timestamp_optionmenu.set_history(1);
+	else if (x == (Time::FORMAT_NORMAL | Time::FORMAT_NOSPACES))
+		timestamp_optionmenu.set_history(2);
+	else if (x == (Time::FORMAT_NORMAL | Time::FORMAT_FULL))
+		timestamp_optionmenu.set_history(3);
+	else if (x == (Time::FORMAT_NORMAL | Time::FORMAT_NOSPACES | Time::FORMAT_FULL))
+		timestamp_optionmenu.set_history(4);
+	else if (x == (Time::FORMAT_FRAMES))
+		timestamp_optionmenu.set_history(5);
 	else
-	{
-		if(x==(Time::FORMAT_NOSPACES|Time::FORMAT_FULL))
-			timestamp_optionmenu.set_history(4);
-		else if(x==(Time::FORMAT_FULL))
-			timestamp_optionmenu.set_history(3);
-		else if(x==(Time::FORMAT_NOSPACES))
-			timestamp_optionmenu.set_history(2);
-		else
-			timestamp_optionmenu.set_history(1);
-	}
+		timestamp_optionmenu.set_history(1);
 }