X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Finstance.cpp;h=61dbabc3ffbb7f37e3bb37268b9300c053f43561;hb=047740653043b7fa79a042152a70e158f4d3ab97;hp=9ac76fbe1631a4418dc3362139024249bbd8419a;hpb=f1ca5b422d1978374ea49b1d66dd060724065b1a;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp
index 9ac76fb..61dbabc 100644
--- a/synfig-studio/trunk/src/gtkmm/instance.cpp
+++ b/synfig-studio/trunk/src/gtkmm/instance.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
@@ -49,10 +50,12 @@
 #include <synfig/valuenode_composite.h>
 #include "widget_waypointmodel.h"
 #include <gtkmm/actiongroup.h>
-#include "iconcontroler.h"
+#include "iconcontroller.h"
 #include <sys/stat.h>
 #include <errno.h>
 
+#include "general.h"
+
 #endif
 
 using namespace std;
@@ -263,18 +266,15 @@ studio::Instance::dialog_save_as()
 		if(find(filename.begin(),filename.end(),'*')!=filename.end())
 			continue;
 
-		std::string base = basename(filename);
-		if(find(base.begin(),base.end(),'.')==base.end())
+		if (filename_extension(filename) == "")
 			filename+=".sifz";
 
 		try
 		{
-			String ext(String(filename.begin()+filename.find_last_of('.')+1,filename.end()));
-			if(ext!="sif" && ext!="sifz" && !App::dialog_yes_no(_("Unknown extension"),
-				_("You have given the file name an extension\nwhich I do not recognise. Are you sure this is what you want?")))
-			{
+			String ext(filename_extension(filename));
+			if(ext!=".sif" && ext!=".sifz" && !App::dialog_yes_no(_("Unknown extension"),
+				_("You have given the file name an extension\nwhich I do not recognize. Are you sure this is what you want?")))
 				continue;
-			}
 		}
 		catch(...)
 		{
@@ -365,10 +365,7 @@ Instance::close()
 		studio::App::set_selected_instance(0);
 	}
 	else
-	{
-		studio::App::set_selected_canvas_view(studio::App::instance_list.front()->canvas_view_list().front());
-		//studio::App::set_selected_instance(studio::App::instance_list.front());
-	}
+		studio::App::instance_list.front()->canvas_view_list().front()->present();
 }
 
 
@@ -485,7 +482,7 @@ Instance::dialog_cvs_commit()
 	}
 	catch(...)
 	{
-		App::dialog_error_blocking(_("Error"),_("An error has occured when trying to COMMIT"));
+		App::dialog_error_blocking(_("Error"),_("An error has occurred when trying to COMMIT"));
 	}
 	update_all_titles();
 }
@@ -510,7 +507,7 @@ Instance::dialog_cvs_add()
 	}
 	catch(...)
 	{
-		App::dialog_error_blocking(_("Error"),_("An error has occured when trying to ADD"));
+		App::dialog_error_blocking(_("Error"),_("An error has occurred when trying to ADD"));
 	}
 	update_all_titles();
 }
@@ -551,7 +548,7 @@ Instance::dialog_cvs_update()
 	}
 	catch(...)
 	{
-		App::dialog_error_blocking(_("Error"),_("An error has occured when trying to UPDATE"));
+		App::dialog_error_blocking(_("Error"),_("An error has occurred when trying to UPDATE"));
 	}
 	//update_all_titles();
 }
@@ -587,7 +584,7 @@ Instance::dialog_cvs_revert()
 	}
 	catch(...)
 	{
-		App::dialog_error_blocking(_("Error"),_("An error has occured when trying to UPDATE"));
+		App::dialog_error_blocking(_("Error"),_("An error has occurred when trying to UPDATE"));
 	}
 	//update_all_titles();
 }
@@ -643,9 +640,17 @@ Instance::safe_revert()
 bool
 Instance::safe_close()
 {
-	handle<synfigapp::UIInterface> uim;
-	uim=find_canvas_view(get_canvas())->get_ui_interface();
+	handle<CanvasView> canvas_view = find_canvas_view(get_canvas());
+	handle<synfigapp::UIInterface> uim=canvas_view->get_ui_interface();
 
+	// if the animation is currently playing, closing the window will cause a crash,
+	// so don't allow it
+	if (canvas_view->is_playing())
+	{
+		canvas_view->present();
+		App::dialog_error_blocking("Close Error", "The animation is currently playing so the window cannot be closed.");
+		return false;
+	}
 	if(get_action_count())
 		do
 		{
@@ -691,7 +696,7 @@ Instance::add_actions_to_group(const Glib::RefPtr<Gtk::ActionGroup>& action_grou
 	candidate_list.sort();
 
 	if(candidate_list.empty())
-		synfig::warning("Action CandidateList is empty!");
+		synfig::warning("%s:%d Action CandidateList is empty!", __FILE__, __LINE__);
 
 	for(iter=candidate_list.begin();iter!=candidate_list.end();++iter)
 	{
@@ -731,7 +736,7 @@ Instance::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamLis
 	candidate_list.sort();
 
 	if(candidate_list.empty())
-		synfig::warning("Action CandidateList is empty!");
+		synfig::warning("%s:%d Action CandidateList is empty!", __FILE__, __LINE__);
 
 	for(iter=candidate_list.begin();iter!=candidate_list.end();++iter)
 	{
@@ -800,11 +805,11 @@ Instance::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamLis
 	candidate_list.sort();
 
 	if(candidate_list.empty())
-		synfig::warning("Action CandidateList is empty!");
+		synfig::warning("%s:%d Action CandidateList is empty!", __FILE__, __LINE__);
 	if(candidate_list2.empty())
-		synfig::warning("Action CandidateList2 is empty!");
+		synfig::warning("%s:%d Action CandidateList2 is empty!", __FILE__, __LINE__);
 
-	// Seperate out the candidate lists so that there are no conflicts
+	// Separate out the candidate lists so that there are no conflicts
 	for(iter=candidate_list.begin();iter!=candidate_list.end();++iter)
 	{
 		synfigapp::Action::CandidateList::iterator iter2(candidate_list2.find(iter->name));