Remove .gitignore do nothing is ignored.

[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 65c63d8..9a247cb 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/instance.cpp
+++ b/synfig-studio/trunk/src/gtkmm/instance.cpp
@@ -7,6 +7,7 @@
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **     Copyright (c) 2007, 2008 Chris Moore
+**  Copyright (c) 2008 Carlos López
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -229,8 +230,8 @@ studio::Instance::save()
                App::add_recent_file(etl::handle<Instance>(this));
                return STATUS_OK;
        }
-
-       App::dialog_error_blocking("Save - Error","Unable to save to '" + get_file_name() + "'");
+       string msg(strprintf(_("Unable to save to '%s'"), get_file_name().c_str()));
+       App::dialog_error_blocking(_("Save - Error"), msg.c_str());
        return STATUS_ERROR;
 }
 
@@ -240,7 +241,7 @@ studio::Instance::save()
 bool
 studio::Instance::has_real_filename()
 {
-       return get_file_name().find(DEFAULT_FILENAME_PREFIX) != 0;
+       return get_file_name().find(App::custom_filename_prefix.c_str()) != 0;
 }
 
 bool
@@ -260,12 +261,11 @@ studio::Instance::dialog_save_as()
                                Layer::Handle parent_layer(dynamic_cast<Layer*>(node));
                                if(parent_layer && parent_layer->get_canvas()->get_root()!=get_canvas())
                                {
-                                       App::dialog_error_blocking("SaveAs - Error",
-                                               "There is currently a bug when using \"SaveAs\"\n"
+                                       string msg(strprintf(_("There is currently a bug when using \"SaveAs\"\n"
                                                "on a composition that is being referenced by other\n"
                                                "files that are currently open. Close these\n"
-                                               "other files first before trying to use \"SaveAs\"."
-                                       );
+                                               "other files first before trying to use \"SaveAs\".")));
+                                       App::dialog_error_blocking(_("SaveAs - Error"), msg.c_str());
 
                                        return false;
                                }
@@ -315,17 +315,16 @@ studio::Instance::dialog_save_as()
                        if (stat_return == -1 && errno != ENOENT)
                        {
                                perror(filename.c_str());
-                               App::dialog_error_blocking("SaveAs - Error","Unable to check whether '" + filename + "' exists.");
+                               string msg(strprintf(_("Unable to check whether '%s' exists."), filename.c_str()));
+                               App::dialog_error_blocking(_("SaveAs - Error"),msg.c_str());
                                continue;
                        }
 
                        // if the file exists and the user doesn't want to overwrite it, keep prompting for a filename
+                       string msg(strprintf(_("A file named '%s' already exists.\n\n"
+                                                                       "Do you want to replace it with the file you are saving?"), filename.c_str()));
                        if ((stat_return == 0) &&
-                               !App::dialog_yes_no("File exists",
-                                                                       "A file named '" +
-                                                                       filename +
-                                                                       "' already exists.\n\n"
-                                                                       "Do you want to replace it with the file you are saving?"))
+                               !App::dialog_yes_no(_("File exists"),msg.c_str()))
                                continue;
                }
 
@@ -334,8 +333,8 @@ studio::Instance::dialog_save_as()
                        synfig::set_file_version(ReleaseVersion(RELEASE_VERSION_END-1));
                        return true;
                }
-
-               App::dialog_error_blocking("SaveAs - Error","Unable to save to '" + filename + "'");
+               string msg(strprintf(_("Unable to save to '%s'"), filename.c_str()));
+               App::dialog_error_blocking(_("SaveAs - Error"),msg.c_str());
        }
 
        return false;
@@ -947,6 +946,9 @@ Instance::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamLis
 void
 Instance::process_action(synfig::String name, synfigapp::Action::ParamList param_list)
 {
+       //// debug actions
+       // synfig::info("%s:%d process_action: '%s'", __FILE__, __LINE__, name.c_str());
+
        assert(synfigapp::Action::book().count(name));
 
        synfigapp::Action::BookEntry entry(synfigapp::Action::book().find(name)->second);
@@ -980,7 +982,7 @@ Instance::process_action(synfig::String name, synfigapp::Action::ParamList param
                        case synfigapp::Action::Param::TYPE_STRING:
                        {
                                String str;
-                               if(!studio::App::dialog_entry(entry.local_name, iter->get_local_name()+":"+iter->get_desc(),str))
+                               if(!studio::App::dialog_entry(entry.local_name, iter->get_local_name()+": "+iter->get_desc(),str))
                                        return;
                                action->set_param(iter->get_name(),str);
                                break;
@@ -1016,6 +1018,7 @@ Instance::make_param_menu(Gtk::Menu *menu,synfig::Canvas::Handle canvas, synfiga
        param_list=canvas_interface->generate_param_list(value_desc);
        param_list.add("origin",location);
 
+#ifdef BLINEPOINT_MENU_IS_VERTEX_MENU
        if(value_desc.get_value_type()==ValueBase::TYPE_BLINEPOINT && value_desc.is_value_node() && ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node()))
        {
                param_list2=canvas_interface->generate_param_list(
@@ -1026,6 +1029,7 @@ Instance::make_param_menu(Gtk::Menu *menu,synfig::Canvas::Handle canvas, synfiga
                );
                param_list2.add("origin",location);
        }
+#endif // BLINEPOINT_MENU_IS_VERTEX_MENU
 
        // Populate the convert menu by looping through
        // the ValueNode book and find the ones that are
@@ -1172,13 +1176,13 @@ edit_several_waypoints(etl::handle<CanvasView> canvas_view, std::list<synfigapp:
 
                        if(!value_desc.is_value_node())
                        {
-                               action=synfigapp::Action::create("value_desc_connect");
+                               action=synfigapp::Action::create("ValueDescConnect");
                                action->set_param("dest",value_desc);
                                action->set_param("src",ValueNode::Handle(value_node));
                        }
                        else
                        {
-                               action=synfigapp::Action::create("value_node_replace");
+                               action=synfigapp::Action::create("ValueNodeReplace");
                                action->set_param("dest",value_desc.get_value_node());
                                action->set_param("src",ValueNode::Handle(value_node));
                        }
@@ -1201,11 +1205,11 @@ edit_several_waypoints(etl::handle<CanvasView> canvas_view, std::list<synfigapp:
 
                if(value_node)
                {
-                       synfigapp::Action::Handle action(synfigapp::Action::create("waypoint_set_smart"));
+                       synfigapp::Action::Handle action(synfigapp::Action::create("WaypointSetSmart"));
 
                        if(!action)
                        {
-                               canvas_view->get_ui_interface()->error(_("Unable to find waypoint_set_smart action"));
+                               canvas_view->get_ui_interface()->error(_("Unable to find WaypointSetSmart action"));
                                group.cancel();
                                return;
                        }