**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** 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
#include <sigc++/adaptors/hide.h>
#include "toolbox.h"
#include "onemoment.h"
+#include <synfig/savecanvas.h>
#include "autorecover.h"
#include <sigc++/retype_return.h>
#include <sigc++/retype.h>
//#include <sigc++/hide.h>
#include <synfig/valuenode_composite.h>
+#include <synfig/valuenode_duplicate.h>
#include "widget_waypointmodel.h"
#include <gtkmm/actiongroup.h>
-#include "iconcontroler.h"
+#include "iconcontroller.h"
#include <sys/stat.h>
#include <errno.h>
+#include <ETL/stringf>
+
+#include "general.h"
#endif
using namespace etl;
using namespace synfig;
using namespace studio;
-using namespace SigC;
+using namespace sigc;
/* === M A C R O S ========================================================= */
/* === 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()),
}
handle<Instance>
-Instance::create(Canvas::Handle canvas)
+Instance::create(synfig::Canvas::Handle canvas)
{
// Construct a new instance
handle<Instance> instance(new Instance(canvas));
}
handle<CanvasView>
-Instance::find_canvas_view(Canvas::Handle canvas)
+Instance::find_canvas_view(etl::handle<synfig::Canvas> canvas)
{
if(!canvas)
return 0;
}
void
-Instance::focus(Canvas::Handle canvas)
+Instance::focus(etl::handle<synfig::Canvas> canvas)
{
handle<CanvasView> canvas_view=find_canvas_view(canvas);
assert(canvas_view);
// 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;
- else
- return STATUS_ERROR;
+
+ App::dialog_error_blocking("Save - Error","Unable to save to '" + get_file_name() + "'");
+ return STATUS_ERROR;
}
bool
studio::Instance::dialog_save_as()
{
- string filename=basename(get_file_name());
+ string filename = get_file_name();
Canvas::Handle canvas(get_canvas());
{
}
}
+ 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;
- 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(...)
{
{
struct stat s;
- // if stat() succeeds, or it fails with something other than 'file doesn't exist', the file exists
+ int stat_return = stat(filename.c_str(), &s);
+
+ // if stat() fails with something other than 'file doesn't exist', there's been a real
+ // error of some kind. let's give up now and ask for a new path.
+ if (stat_return == -1 && errno != ENOENT)
+ {
+ perror(filename.c_str());
+ App::dialog_error_blocking("SaveAs - Error","Unable to check whether '" + filename + "' exists.");
+ continue;
+ }
+
// if the file exists and the user doesn't want to overwrite it, keep prompting for a filename
- if ((stat(filename.c_str(), &s) != -1 || errno != ENOENT) &&
+ if ((stat_return == 0) &&
!App::dialog_yes_no("File exists",
"A file named '" +
filename +
}
if(save_as(filename))
+ {
+ synfig::set_file_version(ReleaseVersion(RELEASE_VERSION_END-1));
return true;
+ }
- App::dialog_error_blocking("SaveAs - Error","Unable to save file");
+ App::dialog_error_blocking("SaveAs - Error","Unable to save to '" + filename + "'");
}
return false;
studio::App::set_selected_instance(0);
}
else
- {
- studio::App::set_selected_canvas_view(studio::App::instance_list.front()->canvas_view_list().front());
- //studio::App::set_selected_instance(studio::App::instance_list.front());
- }
+ studio::App::instance_list.front()->canvas_view_list().front()->present();
}
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);
}
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();
}
}
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();
}
}
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();
}
}
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();
}
bool
Instance::safe_close()
{
- handle<synfigapp::UIInterface> uim;
- uim=find_canvas_view(get_canvas())->get_ui_interface();
+ handle<CanvasView> canvas_view = find_canvas_view(get_canvas());
+ handle<synfigapp::UIInterface> uim=canvas_view->get_ui_interface();
+ // if the animation is currently playing, closing the window will cause a crash,
+ // so don't allow it
+ if (canvas_view->is_playing())
+ {
+ canvas_view->present();
+ App::dialog_error_blocking("Close Error", "The animation is currently playing so the window cannot be closed.");
+ return false;
+ }
if(get_action_count())
do
{
candidate_list.sort();
- if(candidate_list.empty())
- synfig::warning("Action CandidateList is empty!");
+ // if(candidate_list.empty())
+ // synfig::warning("%s:%d Action CandidateList is empty!", __FILE__, __LINE__);
for(iter=candidate_list.begin();iter!=candidate_list.end();++iter)
{
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)
{
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));
}
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));
// 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;
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<synfig::Waypoint, std::less<UniqueID> > 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::bind(
+ sigc::mem_fun(*find_canvas_view(canvas),&studio::CanvasView::on_waypoint_clicked_canvasview),
+ synfig::Waypoint::SIDE_UNSPECIFIED
+ ),
-1
),
- *iter
+ waypoint_set
),
value_desc
)
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;
projects / synfig.git / blobdiff