X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Finstance.cpp;h=2d4ecdb918f2a185c136cb14b9f869e5f615efb7;hb=156b5d33e3e6461bdbb0a9d64aba1e447d074e76;hp=8a1addf3b3fdb193add46243e39897ce4601df51;hpb=18cb5645587e00da244d98aca07fe809fd9ed13e;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp index 8a1addf..2d4ecdb 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 #include "toolbox.h" #include "onemoment.h" +#include #include "autorecover.h" #include @@ -54,6 +55,7 @@ #include "iconcontroller.h" #include #include +#include #include "general.h" @@ -203,6 +205,12 @@ studio::Instance::save_as(const synfig::String &file_name) return false; } +void +studio::Instance::open() +{ + App::dialog_open(get_file_name()); +} + Instance::Status studio::Instance::save() { @@ -210,10 +218,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 +235,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 +264,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 +319,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 + "'"); } @@ -369,7 +385,6 @@ Instance::close() studio::App::instance_list.front()->canvas_view_list().front()->present(); } - void Instance::insert_canvas(Gtk::TreeRow row, synfig::Canvas::Handle canvas) { @@ -421,7 +436,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) @@ -685,7 +699,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 { @@ -696,8 +709,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) { @@ -1003,7 +1016,6 @@ 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. @@ -1059,15 +1071,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 ) @@ -1095,15 +1112,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; @@ -1147,7 +1161,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")); @@ -1161,10 +1174,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));