X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Finstance.cpp;h=c921c3f2bfb89bc5b8e82ed3d46702b0c5fed642;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=bb37c173c0ba3e98303826dcf1a8730c427212b0;hpb=63e709f66d50c124cc0ece2325f4773ac4ae7b20;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp
index bb37c17..c921c3f 100644
--- a/synfig-studio/trunk/src/gtkmm/instance.cpp
+++ b/synfig-studio/trunk/src/gtkmm/instance.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
@@ -42,6 +42,7 @@
 #include <sigc++/adaptors/hide.h>
 #include "toolbox.h"
 #include "onemoment.h"
+#include <synfig/savecanvas.h>
 
 #include "autorecover.h"
 #include <sigc++/retype_return.h>
@@ -54,6 +55,7 @@
 #include "iconcontroller.h"
 #include <sys/stat.h>
 #include <errno.h>
+#include <ETL/stringf>
 
 #include "general.h"
 
@@ -210,10 +212,12 @@ studio::Instance::save()
 	// and will be changed to an absolute path once it has been saved
 	// so if it still begins with "Synfig Animation " then we need to ask where to save it
 	if(get_file_name().find(DEFAULT_FILENAME_PREFIX)==0)
+	{
 		if (dialog_save_as())
 			return STATUS_OK;
 		else
 			return STATUS_CANCEL;
+	}
 
 	if (synfigapp::Instance::save())
 		return STATUS_OK;
@@ -225,7 +229,7 @@ studio::Instance::save()
 bool
 studio::Instance::dialog_save_as()
 {
-	string filename=basename(get_file_name());
+	string filename = get_file_name();
 	Canvas::Handle canvas(get_canvas());
 
 	{
@@ -254,17 +258,20 @@ studio::Instance::dialog_save_as()
 		}
 	}
 
+	if (get_file_name().find(DEFAULT_FILENAME_PREFIX) != 0)
+		filename = absolute_path(filename);
+
 	// show the canvas' name if it has one, else its ID
-	while(App::dialog_save_file(_("Choose a Filename to Save As") +
-								String(" (") +
-								(canvas->get_name().empty()
-								 ? canvas->get_id()
-								 : canvas->get_name()) +
-								") ...", filename))
+	while (App::dialog_save_file((_("Choose a Filename to Save As") +
+								  String(" (") +
+								  (canvas->get_name().empty() ? canvas->get_id() : canvas->get_name()) +
+								  ") ..."),
+								 filename, ANIMATION_DIR_PREFERENCE))
 	{
 		// If the filename still has wildcards, then we should
 		// continue looking for the file we want
-		if(find(filename.begin(),filename.end(),'*')!=filename.end())
+		string base_filename = basename(filename);
+		if (find(base_filename.begin(),base_filename.end(),'*')!=base_filename.end())
 			continue;
 
 		if (filename_extension(filename) == "")
@@ -306,7 +313,10 @@ studio::Instance::dialog_save_as()
 		}
 
 		if(save_as(filename))
+		{
+			synfig::set_file_version(ReleaseVersion(RELEASE_VERSION_END-1));
 			return true;
+		}
 
 		App::dialog_error_blocking("SaveAs - Error","Unable to save to '" + filename + "'");
 	}
@@ -696,8 +706,8 @@ Instance::add_actions_to_group(const Glib::RefPtr<Gtk::ActionGroup>& action_grou
 
 	candidate_list.sort();
 
-	if(candidate_list.empty())
-		synfig::warning("%s:%d Action CandidateList is empty!", __FILE__, __LINE__);
+	// if(candidate_list.empty())
+	// 	synfig::warning("%s:%d Action CandidateList is empty!", __FILE__, __LINE__);
 
 	for(iter=candidate_list.begin();iter!=candidate_list.end();++iter)
 	{
@@ -1059,15 +1069,23 @@ Instance::make_param_menu(Gtk::Menu *menu,synfig::Canvas::Handle canvas, synfiga
 
 		try
 		{
+			// try to find a waypoint at the current time - if we
+			// can't, we don't want the menu entry - an exception is thrown
 			WaypointList::iterator iter(value_node->find(canvas->get_time()));
+			std::set<synfig::Waypoint, std::less<UniqueID> > waypoint_set;
+			waypoint_set.insert(*iter);
+
 			parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Edit Waypoint"),
 				sigc::bind(
 					sigc::bind(
 						sigc::bind(
-							sigc::mem_fun(*find_canvas_view(canvas),&studio::CanvasView::on_waypoint_clicked),
+							sigc::bind(
+								sigc::mem_fun(*find_canvas_view(canvas),&studio::CanvasView::on_waypoint_clicked_canvasview),
+								synfig::Waypoint::SIDE_UNSPECIFIED
+							),
 							-1
 						),
-						*iter
+						waypoint_set
 					),
 					value_desc
 				)