When doing a 'Save As', default to saving in the same directory that the file was...

[synfig.git] / synfig-studio / trunk / src / gtkmm / instance.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp
index 8a1addf..8ac71f2 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/instance.cpp
+++ b/synfig-studio/trunk/src/gtkmm/instance.cpp
@@ -54,6 +54,7 @@
 #include "iconcontroller.h"
 #include <sys/stat.h>
 #include <errno.h>
+#include <ETL/stringf>
 
 #include "general.h"
 
@@ -210,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;
@@ -225,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());
 
        {
@@ -254,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) == "")
@@ -696,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)
        {
@@ -1100,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;