X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fapp.cpp;h=871ac9a23dccca5ca4b219a49ef63abbd2357353;hb=59fbbc9b2d99809f56f9812c07fadf395efbba82;hp=6cd9715dfd0fdc55c41518dd941d56fa8ede4736;hpb=08ab7aa8bdce33bf2b54423871daaa87cf037cef;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp
index 6cd9715..871ac9a 100644
--- a/synfig-studio/trunk/src/gtkmm/app.cpp
+++ b/synfig-studio/trunk/src/gtkmm/app.cpp
@@ -6,7 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2007 Chris Moore
+**	Copyright (c) 2007, 2008 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
@@ -52,6 +52,7 @@
 #include <gtk/gtk.h>
 
 #include <synfig/loadcanvas.h>
+#include <synfig/savecanvas.h>
 
 #include "app.h"
 #include "about.h"
@@ -85,6 +86,7 @@
 
 #include "devicetracker.h"
 #include "dialog_tooloptions.h"
+#include "widget_enum.h"
 
 #include "autorecover.h"
 
@@ -260,6 +262,7 @@ std::list< etl::handle< studio::Module > > module_list_;
 
 bool studio::App::use_colorspace_gamma=true;
 bool studio::App::single_threaded=false;
+bool studio::App::restrict_radius_ducks=false;
 
 static int max_recent_files_=25;
 int studio::App::get_max_recent_files() { return max_recent_files_; }
@@ -480,6 +483,11 @@ public:
 			value=strprintf("%i",App::auto_recover->get_timeout());
 			return true;
 		}
+		if(key=="restrict_radius_ducks")
+		{
+			value=strprintf("%i",(int)App::restrict_radius_ducks);
+			return true;
+		}
 
 		return synfigapp::Settings::get_value(key,value);
 	}
@@ -536,6 +544,12 @@ public:
 			App::single_threaded=i;
 			return true;
 		}
+		if(key=="restrict_radius_ducks")
+		{
+			int i(atoi(value.c_str()));
+			App::restrict_radius_ducks=i;
+			return true;
+		}
 
 		return synfigapp::Settings::set_value(key,value);
 	}
@@ -550,6 +564,7 @@ public:
 		ret.push_back("use_colorspace_gamma");
 		ret.push_back("single_threaded");
 		ret.push_back("auto_recover_backup_interval");
+		ret.push_back("restrict_radius_ducks");
 		return ret;
 	}
 };
@@ -1450,6 +1465,7 @@ App::reset_initial_window_configuration()
 	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("pref.restrict_radius_ducks","0");
 	synfigapp::Main::settings().set_value("window.toolbox.pos","4 4");
 }
 
@@ -1750,6 +1766,24 @@ App::dialog_save_file(const std::string &title, std::string &filename, std::stri
     dialog->add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
     dialog->add_button(Gtk::Stock::SAVE,   Gtk::RESPONSE_ACCEPT);
 
+	Widget_Enum *file_type_enum = 0;
+	if (preference == ANIMATION_DIR_PREFERENCE)
+	{
+		file_type_enum = manage(new Widget_Enum());
+		file_type_enum->set_param_desc(ParamDesc().set_hint("enum")
+									   .add_enum_value(synfig::RELEASE_VERSION_0_61_08, "0.61.08", strprintf("0.61.08 (%s)", _("current")))
+									   .add_enum_value(synfig::RELEASE_VERSION_0_61_07, "0.61.07", "0.61.07")
+									   .add_enum_value(synfig::RELEASE_VERSION_0_61_06, "0.61.06", strprintf("0.61.06 %s", _("and older"))));
+		file_type_enum->set_value(RELEASE_VERSION_END-1); // default to the most recent version
+
+		Gtk::HBox *hbox = manage(new Gtk::HBox);
+		hbox->pack_start(*manage(new Gtk::Label(_("File Format Version: "))),Gtk::PACK_SHRINK,0);
+		hbox->pack_start(*file_type_enum,Gtk::PACK_EXPAND_WIDGET,0);
+		hbox->show_all();
+
+		dialog->set_extra_widget(*hbox);
+	}
+
     if (filename.empty())
 		dialog->set_filename(prev_path);
     else
@@ -1770,6 +1804,8 @@ App::dialog_save_file(const std::string &title, std::string &filename, std::stri
 	}
 
     if(dialog->run() == GTK_RESPONSE_ACCEPT) {
+		if (preference == ANIMATION_DIR_PREFERENCE)
+			set_file_version(synfig::ReleaseVersion(file_type_enum->get_value()));
         filename = dialog->get_filename();
 		info("Saving preference %s = '%s' in App::dialog_save_file()", preference.c_str(), dirname(filename).c_str());
 		_preferences.set_value(preference, dirname(filename));
@@ -1906,22 +1942,26 @@ App::open_as(std::string filename,std::string as)
 		if(canvas && get_instance(canvas))
 		{
 			get_instance(canvas)->find_canvas_view(canvas)->present();
-			throw (String)strprintf(_("\"%s\" appears to already be open!"),filename.c_str());
+			info("%s is already open", filename.c_str());
+			// throw (String)strprintf(_("\"%s\" appears to already be open!"),filename.c_str());
 		}
-		if(!canvas)
-			throw (String)strprintf(_("Unable to open file \"%s\""),filename.c_str());
+		else
+		{
+			if(!canvas)
+				throw (String)strprintf(_("Unable to open file \"%s\""),filename.c_str());
 
-		add_recent_file(as);
+			add_recent_file(as);
 
-		handle<Instance> instance(Instance::create(canvas));
+			handle<Instance> instance(Instance::create(canvas));
 
-		if(!instance)
-			throw (String)strprintf(_("Unable to create instance for \"%s\""),filename.c_str());
+			if(!instance)
+				throw (String)strprintf(_("Unable to create instance for \"%s\""),filename.c_str());
 
-		one_moment.hide();
+			one_moment.hide();
 
-		if(instance->is_updated() && App::dialog_yes_no(_("CVS Update"), _("There appears to be a newer version of this file available on the CVS repository.\nWould you like to update now? (It would probably be a good idea)")))
-			instance->dialog_cvs_update();
+			if(instance->is_updated() && App::dialog_yes_no(_("CVS Update"), _("There appears to be a newer version of this file available on the CVS repository.\nWould you like to update now? (It would probably be a good idea)")))
+				instance->dialog_cvs_update();
+		}
 	}
 	catch(String x)
 	{