X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Finstance.cpp;h=65c63d8f4fa3eba10079c9f60bcb2d481b394cb4;hb=1f453e8ab546a357781372fe98aa1d004387d4b1;hp=470e067c3259afa1a141da6a56f8747d68ec2cbf;hpb=84e10c854009f0d795f8a10825cd3da07f2e59b2;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp index 470e067..65c63d8 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,17 +42,21 @@ #include #include "toolbox.h" #include "onemoment.h" +#include #include "autorecover.h" #include #include //#include #include +#include #include "widget_waypointmodel.h" #include #include "iconcontroller.h" +#include "workarea.h" #include #include +#include #include "general.h" @@ -196,35 +200,53 @@ studio::Instance::save_as(const synfig::String &file_name) list >::iterator iter; for(iter=canvas_view_list().begin();iter!=canvas_view_list().end();iter++) (*iter)->render_settings.set_entry_filename(); - App::add_recent_file(file_name); + App::add_recent_file(etl::handle(this)); return true; } return false; } +void +studio::Instance::open() +{ + App::dialog_open(get_file_name()); +} + Instance::Status studio::Instance::save() { - // the filename will be set to "Synfig Animation 1" or some such when first created - // 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 we don't have a real filename yet then we need to ask where to save it + if (!has_real_filename()) + { if (dialog_save_as()) return STATUS_OK; else return STATUS_CANCEL; + } if (synfigapp::Instance::save()) + { + App::add_recent_file(etl::handle(this)); return STATUS_OK; + } App::dialog_error_blocking("Save - Error","Unable to save to '" + get_file_name() + "'"); return STATUS_ERROR; } +// the filename will be set to "Synfig Animation 1" or some such when first created +// and will be changed to an absolute path once it has been saved +// so if it still begins with "Synfig Animation " then we don't have a real filename yet +bool +studio::Instance::has_real_filename() +{ + return get_file_name().find(DEFAULT_FILENAME_PREFIX) != 0; +} + bool studio::Instance::dialog_save_as() { - string filename=basename(get_file_name()); + string filename = get_file_name(); Canvas::Handle canvas(get_canvas()); { @@ -253,17 +275,20 @@ studio::Instance::dialog_save_as() } } + if (has_real_filename()) + 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) == "") @@ -305,7 +330,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 + "'"); } @@ -368,7 +396,6 @@ Instance::close() studio::App::instance_list.front()->canvas_view_list().front()->present(); } - void Instance::insert_canvas(Gtk::TreeRow row, synfig::Canvas::Handle canvas) { @@ -420,7 +447,6 @@ Instance::insert_canvas(Gtk::TreeRow row, synfig::Canvas::Handle canvas) */ } - /* void Instance::insert_value_node(Gtk::TreeRow row,Canvas::Handle canvas,etl::handle value_node) @@ -684,7 +710,6 @@ Instance::safe_close() return true; } - void Instance::add_actions_to_group(const Glib::RefPtr& action_group, synfig::String& ui_info, const synfigapp::Action::ParamList ¶m_list, synfigapp::Action::Category category)const { @@ -695,8 +720,8 @@ Instance::add_actions_to_group(const Glib::RefPtr& 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) { @@ -978,7 +1003,7 @@ Instance::process_action(synfig::String name, synfigapp::Action::ParamList param } void -Instance::make_param_menu(Gtk::Menu *menu,synfig::Canvas::Handle canvas, synfigapp::ValueDesc value_desc, float location) +Instance::make_param_menu(Gtk::Menu *menu,synfig::Canvas::Handle canvas, synfigapp::ValueDesc value_desc, float location, bool bezier) { Gtk::Menu& parammenu(*menu); @@ -1002,12 +1027,21 @@ Instance::make_param_menu(Gtk::Menu *menu,synfig::Canvas::Handle canvas, synfiga param_list2.add("origin",location); } - // Populate the convert menu by looping through // the ValueNode book and find the ones that are // relevant. - // don't allow the Index parameter of the Duplicate layer to be converted - if (!value_desc.parent_is_layer_param() || value_desc.get_layer()->get_name() != "duplicate" || value_desc.get_param_name() != "index") + + // 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; @@ -1032,10 +1066,24 @@ Instance::make_param_menu(Gtk::Menu *menu,synfig::Canvas::Handle canvas, synfiga parammenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::Stock::CONVERT,*convert_menu)); } + synfigapp::Action::Category categories = synfigapp::Action::CATEGORY_VALUEDESC|synfigapp::Action::CATEGORY_VALUENODE; + if (bezier) + { + categories = categories|synfigapp::Action::CATEGORY_BEZIER; + + const DuckList selected_ducks(find_canvas_view(canvas)->get_work_area()->get_selected_ducks()); + for(DuckList::const_iterator iter=selected_ducks.begin();iter!=selected_ducks.end();++iter) + { + synfigapp::ValueDesc value_desc((*iter)->get_value_desc()); + if(value_desc.is_valid()) + param_list.add("selected_value_desc",value_desc); + } + } + if(param_list2.empty()) - add_actions_to_menu(¶mmenu, param_list,synfigapp::Action::CATEGORY_VALUEDESC|synfigapp::Action::CATEGORY_VALUENODE); + add_actions_to_menu(¶mmenu, param_list,categories); else - add_actions_to_menu(¶mmenu, param_list2,param_list,synfigapp::Action::CATEGORY_VALUEDESC|synfigapp::Action::CATEGORY_VALUENODE); + add_actions_to_menu(¶mmenu, param_list2,param_list,categories); if(value_desc.get_value_type()==ValueBase::TYPE_BLINEPOINT && value_desc.is_value_node() && ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node())) { @@ -1048,15 +1096,20 @@ 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 > 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::mem_fun(*find_canvas_view(canvas),&studio::CanvasView::on_waypoint_clicked_canvasview), -1 ), - *iter + waypoint_set ), value_desc ) @@ -1084,15 +1137,12 @@ edit_several_waypoints(etl::handle canvas_view, std::listpack_start(widget_waypoint_model); - dialog.add_button(Gtk::StockID("gtk-apply"),1); 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::iterator iter; @@ -1136,7 +1186,6 @@ edit_several_waypoints(etl::handle canvas_view, std::listset_param("canvas",canvas_view->get_canvas()); action->set_param("canvas_interface",canvas_interface); - if(!canvas_interface->get_instance()->perform_action(action)) { canvas_view->get_ui_interface()->error(_("Unable to convert to animated waypoint")); @@ -1150,10 +1199,8 @@ edit_several_waypoints(etl::handle canvas_view, std::list canvas_view, std::listset_param("canvas",canvas_view->get_canvas()); action->set_param("canvas_interface",canvas_interface); action->set_param("value_node",ValueNode::Handle(value_node));