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

diff --git a/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp b/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp
index 0899732..9f849b0 100644
--- a/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp
@@ -7,6 +7,7 @@
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **	Copyright (c) 2007, 2008 Chris Moore
+**  Copyright (c) 2008 Carlos López
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -74,16 +75,17 @@ Dialog_Setup::Dialog_Setup():
 	adj_gamma_r(2.2,0.1,3.0,0.025,0.025,0.025),
 	adj_gamma_g(2.2,0.1,3.0,0.025,0.025,0.025),
 	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_recent_files(15,1,50,1,1,0),
 	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")),
-	adj_pref_x_size(480,1,10000,1,10,10),
-	adj_pref_y_size(270,1,10000,1,10,10)
-	
+	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)
+
 	{
 	// Setup the buttons
 
@@ -209,6 +211,9 @@ Dialog_Setup::Dialog_Setup():
 	// Misc - restrict_radius_ducks
 	misc_table->attach(toggle_restrict_radius_ducks, 0, 2, 8, 9, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
 
+	// Misc - resize_imported_images
+	misc_table->attach(toggle_resize_imported_images, 0, 2, 9, 10, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
+
 	// Misc - browser_command
 	attach_label(misc_table, _("Browser Command"), 4, xpadding, ypadding);
 	misc_table->attach(textbox_browser_command, 1, 2, 4, 5, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding);
@@ -225,13 +230,13 @@ Dialog_Setup::Dialog_Setup():
 	// Document - New Document X size
 	Gtk::SpinButton* pref_x_size_spinbutton(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); 
+	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)));
 	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); 
+	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"));
 
 	//Document - Template for predefined sizes of canvases.
@@ -297,6 +302,9 @@ Dialog_Setup::on_apply_pressed()
 	// Set the restrict_radius_ducks flag
 	App::restrict_radius_ducks=toggle_restrict_radius_ducks.get_active();
 
+	// Set the resize_imported_images flag
+	App::resize_imported_images=toggle_resize_imported_images.get_active();
+
 	// Set the browser_command textbox
 	App::browser_command=textbox_browser_command.get_text();
 
@@ -308,7 +316,7 @@ Dialog_Setup::on_apply_pressed()
 
 	// Set the preferred new Document Y dimension
 	App::preferred_y_size=int(adj_pref_y_size.get_value());
-	
+
 	// Set the preferred Predefined size
 	App::predefined_size=size_template_combo->get_active_text();
 
@@ -359,7 +367,7 @@ void
 Dialog_Setup::on_size_template_combo_change()
 {
 	String selection(size_template_combo->get_active_text());
-	if(selection==DEFAULT_PREDEFINED_SIZE) 
+	if(selection==DEFAULT_PREDEFINED_SIZE)
 	{
 		return;
 	}
@@ -414,6 +422,9 @@ Dialog_Setup::refresh()
 	// Refresh the status of the restrict_radius_ducks flag
 	toggle_restrict_radius_ducks.set_active(App::restrict_radius_ducks);
 
+	// Refresh the status of the resize_imported_images flag
+	toggle_resize_imported_images.set_active(App::resize_imported_images);
+
 	// Refresh the browser_command textbox
 	textbox_browser_command.set_text(App::browser_command);
 
@@ -422,10 +433,10 @@ Dialog_Setup::refresh()
 
 	// Refresh the preferred new Document X dimension
 	adj_pref_x_size.set_value(App::preferred_x_size);
-	
+
 	// Refresh the preferred new Document Y dimension
 	adj_pref_y_size.set_value(App::preferred_y_size);
-	
+
 	// Refresh the preferred Predefined size
 	size_template_combo->set_active_text(App::predefined_size);
 }