X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdialog_setup.cpp;h=dfe377eb69103924b69ab3d0fcafb8286372e099;hb=e41a7cf093a3518d7cbb5919698a5a67b60fc900;hp=9f849b031da76b10e02432bcf98590738431b3af;hpb=4ba22fb51d97f1ecce04dcc5e40569a4354c1bae;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp b/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp
index 9f849b0..dfe377e 100644
--- a/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp
@@ -37,7 +37,6 @@
 #include <gtkmm/table.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/notebook.h>
-#include <gtkmm/spinbutton.h>
 #include "widget_enum.h"
 #include "autorecover.h"
 
@@ -84,7 +83,8 @@ Dialog_Setup::Dialog_Setup():
 	toggle_restrict_radius_ducks(_("Restrict Real-Valued Ducks to Top Right Quadrant")),
 	toggle_resize_imported_images(_("Scale New Imported Images to Fit Canvas")),
 	adj_pref_x_size(480,1,10000,1,10,0),
-	adj_pref_y_size(270,1,10000,1,10,0)
+	adj_pref_y_size(270,1,10000,1,10,0),
+	adj_pref_fps(24.0,1.0,100,0.1,1,0)
 
 	{
 	// Setup the buttons
@@ -228,13 +228,13 @@ Dialog_Setup::Dialog_Setup():
 	tooltips_.set_tip(textbox_custom_filename_prefix,_("File name prefix for the new created document"));
 
 	// Document - New Document X size
-	Gtk::SpinButton* pref_x_size_spinbutton(manage(new Gtk::SpinButton(adj_pref_x_size,1,0)));
+	pref_x_size_spinbutton=Gtk::manage(new Gtk::SpinButton(adj_pref_x_size,1,0));
 	attach_label(document_table,_("New Document X size"),1, xpadding, ypadding);
 	document_table->attach(*pref_x_size_spinbutton, 1, 2, 1, 2,Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
 	tooltips_.set_tip(*pref_x_size_spinbutton,_("Width in pixels of the new created document"));
 
 	// Document - New Document Y size
-	Gtk::SpinButton* pref_y_size_spinbutton(manage(new Gtk::SpinButton(adj_pref_y_size,1,0)));
+	pref_y_size_spinbutton=Gtk::manage(new Gtk::SpinButton(adj_pref_y_size,1,0));
 	attach_label(document_table,_("New Document Y size"),2, xpadding, ypadding);
 	document_table->attach(*pref_y_size_spinbutton, 1, 2, 2, 3,Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
 	tooltips_.set_tip(*pref_y_size_spinbutton,_("High in pixels of the new created document"));
@@ -262,6 +262,29 @@ Dialog_Setup::Dialog_Setup():
 	size_template_combo->prepend_text(_("360x203   Web 360x HD"));
 	size_template_combo->prepend_text(DEFAULT_PREDEFINED_SIZE);
 
+	//Document - Template for predefined fps
+	fps_template_combo=Gtk::manage(new Gtk::ComboBoxText());
+	Gtk::Label* label1(manage(new Gtk::Label(_("Predefined FPS:"))));
+	label1->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
+	document_table->attach(*label1, 2, 3, 3, 4, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
+	document_table->attach(*fps_template_combo,2, 3, 4, 5, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
+	fps_template_combo->signal_changed().connect(sigc::mem_fun(*this,&studio::Dialog_Setup::on_fps_template_combo_change));
+	fps_template_combo->prepend_text("60,0"); // It seems that the period is a ',' instead of a '.' for GTK.
+	fps_template_combo->prepend_text("50,0");
+	fps_template_combo->prepend_text("30,0");
+	fps_template_combo->prepend_text("25,0");
+	fps_template_combo->prepend_text("24,976");
+	fps_template_combo->prepend_text("24,0");
+	fps_template_combo->prepend_text("15,0");
+	fps_template_combo->prepend_text("12,0");
+	fps_template_combo->prepend_text(DEFAULT_PREDEFINED_FPS);
+
+	// Document - New Document FPS
+	pref_fps_spinbutton=Gtk::manage(new Gtk::SpinButton(adj_pref_fps,1,3));
+	attach_label(document_table,_("New Document FPS"),4, xpadding, ypadding);
+	document_table->attach(*pref_fps_spinbutton, 1, 2, 4, 5,Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
+	tooltips_.set_tip(*pref_fps_spinbutton,_("Frames per second of the new created document"));
+
 	show_all_children();
 }
 
@@ -320,6 +343,12 @@ Dialog_Setup::on_apply_pressed()
 	// Set the preferred Predefined size
 	App::predefined_size=size_template_combo->get_active_text();
 
+	// Set the preferred Predefined fps
+	App::predefined_fps=fps_template_combo->get_active_text();
+
+	// Set the preferred FPS
+	App::preferred_fps=Real(adj_pref_fps.get_value());
+
 	App::save_settings();
 }
 
@@ -369,6 +398,8 @@ Dialog_Setup::on_size_template_combo_change()
 	String selection(size_template_combo->get_active_text());
 	if(selection==DEFAULT_PREDEFINED_SIZE)
 	{
+		pref_y_size_spinbutton->set_sensitive(true);
+		pref_x_size_spinbutton->set_sensitive(true);
 		return;
 	}
 	String::size_type locx=selection.find_first_of("x"); // here should be some comparison with string::npos
@@ -379,6 +410,23 @@ Dialog_Setup::on_size_template_combo_change()
 	int y=atoi(y_size.c_str());
 	adj_pref_x_size.set_value(x);
 	adj_pref_y_size.set_value(y);
+	pref_y_size_spinbutton->set_sensitive(false);
+	pref_x_size_spinbutton->set_sensitive(false);
+
+	return;
+}
+
+void
+Dialog_Setup::on_fps_template_combo_change()
+{
+	String selection(fps_template_combo->get_active_text());
+	if(selection==DEFAULT_PREDEFINED_FPS)
+	{
+		pref_fps_spinbutton->set_sensitive(true);
+		return;
+	}
+	adj_pref_fps.set_value(atof(selection.c_str()));
+	pref_fps_spinbutton->set_sensitive(false);
 	return;
 }
 
@@ -439,6 +487,12 @@ Dialog_Setup::refresh()
 
 	// Refresh the preferred Predefined size
 	size_template_combo->set_active_text(App::predefined_size);
+
+	//Refresh the preferred FPS
+	adj_pref_fps.set_value(App::preferred_fps);
+
+	//Refresh the predefined FPS
+	fps_template_combo->set_active_text(App::predefined_fps);
 }
 
 GammaPattern::GammaPattern():