X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Finstance.cpp;h=8ac71f28ac9344d5e228dd546369c357159482a1;hb=5e25f87db1014346889c69600fe1f3a01c150dd6;hp=51385a0ab5c29d6f9645a759ca8693df78212fcc;hpb=dcc7b22cb61dd8a94fd6b6da4700d9483574ec34;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp
index 51385a0..8ac71f2 100644
--- a/synfig-studio/trunk/src/gtkmm/instance.cpp
+++ b/synfig-studio/trunk/src/gtkmm/instance.cpp
@@ -48,11 +48,13 @@
 #include <sigc++/retype.h>
 //#include <sigc++/hide.h>
 #include <synfig/valuenode_composite.h>
+#include <synfig/valuenode_duplicate.h>
 #include "widget_waypointmodel.h"
 #include <gtkmm/actiongroup.h>
 #include "iconcontroller.h"
 #include <sys/stat.h>
 #include <errno.h>
+#include <ETL/stringf>
 
 #include "general.h"
 
@@ -209,10 +211,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;
@@ -224,7 +228,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());
 
 	{
@@ -253,17 +257,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) == "")
@@ -695,8 +702,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)
 	{
@@ -1006,6 +1013,18 @@ Instance::make_param_menu(Gtk::Menu *menu,synfig::Canvas::Handle canvas, synfiga
 	// Populate the convert menu by looping through
 	// the ValueNode book and find the ones that are
 	// relevant.
+
+	// show the 'Convert' sub-menu if this valuedesc is anything other than either:
+	//   the 'Index' parameter of a Duplicate layer
+	// or
+	//   a Duplicate ValueNode whose parent is not a (layer or ValueNode)
+	if (!((value_desc.parent_is_layer_param() &&
+		   value_desc.get_layer()->get_name() == "duplicate" &&
+		   value_desc.get_param_name() == "index") ||
+		  (value_desc.is_value_node() &&
+		   ValueNode_Duplicate::Handle::cast_dynamic(value_desc.get_value_node()) &&
+		   !(value_desc.parent_is_layer_param() ||
+			 value_desc.parent_is_value_node()))))
 	{
 		Gtk::Menu *convert_menu=manage(new Gtk::Menu());
 		LinkableValueNode::Book::const_iterator iter;
@@ -1087,10 +1106,8 @@ edit_several_waypoints(etl::handle<CanvasView> canvas_view, std::list<synfigapp:
 	dialog.add_button(Gtk::StockID("gtk-cancel"),0);
 	dialog.show();
 
-	DEBUGPOINT();
 	if(dialog.run()==0 || widget_waypoint_model.get_waypoint_model().is_trivial())
 		return;
-	DEBUGPOINT();
 	synfigapp::Action::PassiveGrouper group(canvas_interface->get_instance().get(),_("Set Waypoints"));
 
 	std::list<synfigapp::ValueDesc>::iterator iter;