X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Finstance.cpp;h=bb37c173c0ba3e98303826dcf1a8730c427212b0;hb=1b138b535876987c79453888f370d71910d975ed;hp=2c6349654681b8060f788879dd5350879422a210;hpb=2cc368cc2c990b39089a8898f6dc03e07970ba36;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp index 2c63496..bb37c17 100644 --- a/synfig-studio/trunk/src/gtkmm/instance.cpp +++ b/synfig-studio/trunk/src/gtkmm/instance.cpp @@ -6,6 +6,7 @@ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007 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 @@ -47,19 +48,22 @@ #include //#include #include +#include #include "widget_waypointmodel.h" #include -#include "iconcontroler.h" +#include "iconcontroller.h" #include #include +#include "general.h" + #endif using namespace std; using namespace etl; using namespace synfig; using namespace studio; -using namespace SigC; +using namespace sigc; /* === M A C R O S ========================================================= */ @@ -71,7 +75,7 @@ int studio::Instance::instance_count_=0; /* === M E T H O D S ======================================================= */ -Instance::Instance(Canvas::Handle canvas): +Instance::Instance(synfig::Canvas::Handle canvas): synfigapp::Instance (canvas), // canvas_tree_store_ (Gtk::TreeStore::create(CanvasTreeModel())), // canvas_tree_store_ (Gtk::TreeStore::create()), @@ -119,7 +123,7 @@ Instance::get_visible_canvases()const } handle -Instance::create(Canvas::Handle canvas) +Instance::create(synfig::Canvas::Handle canvas) { // Construct a new instance handle instance(new Instance(canvas)); @@ -143,7 +147,7 @@ Instance::create(Canvas::Handle canvas) } handle -Instance::find_canvas_view(Canvas::Handle canvas) +Instance::find_canvas_view(etl::handle canvas) { if(!canvas) return 0; @@ -161,7 +165,7 @@ Instance::find_canvas_view(Canvas::Handle canvas) } void -Instance::focus(Canvas::Handle canvas) +Instance::focus(etl::handle canvas) { handle canvas_view=find_canvas_view(canvas); assert(canvas_view); @@ -263,18 +267,15 @@ studio::Instance::dialog_save_as() if(find(filename.begin(),filename.end(),'*')!=filename.end()) continue; - std::string base = basename(filename); - if(find(base.begin(),base.end(),'.')==base.end()) + if (filename_extension(filename) == "") filename+=".sifz"; try { - String ext(String(filename.begin()+filename.find_last_of('.')+1,filename.end())); - if(ext!="sif" && ext!="sifz" && !App::dialog_yes_no(_("Unknown extension"), - _("You have given the file name an extension\nwhich I do not recognise. Are you sure this is what you want?"))) - { + String ext(filename_extension(filename)); + if(ext!=".sif" && ext!=".sifz" && !App::dialog_yes_no(_("Unknown extension"), + _("You have given the file name an extension\nwhich I do not recognize. Are you sure this is what you want?"))) continue; - } } catch(...) { @@ -370,7 +371,7 @@ Instance::close() void -Instance::insert_canvas(Gtk::TreeRow row,Canvas::Handle canvas) +Instance::insert_canvas(Gtk::TreeRow row, synfig::Canvas::Handle canvas) { CanvasTreeModel canvas_tree_model; assert(canvas); @@ -482,7 +483,7 @@ Instance::dialog_cvs_commit() } catch(...) { - App::dialog_error_blocking(_("Error"),_("An error has occured when trying to COMMIT")); + App::dialog_error_blocking(_("Error"),_("An error has occurred when trying to COMMIT")); } update_all_titles(); } @@ -507,7 +508,7 @@ Instance::dialog_cvs_add() } catch(...) { - App::dialog_error_blocking(_("Error"),_("An error has occured when trying to ADD")); + App::dialog_error_blocking(_("Error"),_("An error has occurred when trying to ADD")); } update_all_titles(); } @@ -548,7 +549,7 @@ Instance::dialog_cvs_update() } catch(...) { - App::dialog_error_blocking(_("Error"),_("An error has occured when trying to UPDATE")); + App::dialog_error_blocking(_("Error"),_("An error has occurred when trying to UPDATE")); } //update_all_titles(); } @@ -584,7 +585,7 @@ Instance::dialog_cvs_revert() } catch(...) { - App::dialog_error_blocking(_("Error"),_("An error has occured when trying to UPDATE")); + App::dialog_error_blocking(_("Error"),_("An error has occurred when trying to UPDATE")); } //update_all_titles(); } @@ -696,7 +697,7 @@ Instance::add_actions_to_group(const Glib::RefPtr& action_grou candidate_list.sort(); if(candidate_list.empty()) - synfig::warning("Action CandidateList is empty!"); + synfig::warning("%s:%d Action CandidateList is empty!", __FILE__, __LINE__); for(iter=candidate_list.begin();iter!=candidate_list.end();++iter) { @@ -736,7 +737,7 @@ Instance::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamLis candidate_list.sort(); if(candidate_list.empty()) - synfig::warning("Action CandidateList is empty!"); + synfig::warning("%s:%d Action CandidateList is empty!", __FILE__, __LINE__); for(iter=candidate_list.begin();iter!=candidate_list.end();++iter) { @@ -805,11 +806,11 @@ Instance::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamLis candidate_list.sort(); if(candidate_list.empty()) - synfig::warning("Action CandidateList is empty!"); + synfig::warning("%s:%d Action CandidateList is empty!", __FILE__, __LINE__); if(candidate_list2.empty()) - synfig::warning("Action CandidateList2 is empty!"); + synfig::warning("%s:%d Action CandidateList2 is empty!", __FILE__, __LINE__); - // Seperate out the candidate lists so that there are no conflicts + // Separate out the candidate lists so that there are no conflicts for(iter=candidate_list.begin();iter!=candidate_list.end();++iter) { synfigapp::Action::CandidateList::iterator iter2(candidate_list2.find(iter->name)); @@ -920,7 +921,7 @@ Instance::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamLis } void -Instance::process_action(String name, synfigapp::Action::ParamList param_list) +Instance::process_action(synfig::String name, synfigapp::Action::ParamList param_list) { assert(synfigapp::Action::book().count(name)); @@ -1006,6 +1007,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 +1100,8 @@ edit_several_waypoints(etl::handle canvas_view, std::listget_instance().get(),_("Set Waypoints")); std::list::iterator iter;