projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Attach the "(Non-static value)" label into the waypoint dialog.
[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
a75348a
..
e148787
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/instance.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/instance.cpp
@@
-54,6
+54,7
@@
#include "iconcontroller.h"
#include <sys/stat.h>
#include <errno.h>
#include "iconcontroller.h"
#include <sys/stat.h>
#include <errno.h>
+#include <ETL/stringf>
#include "general.h"
#include "general.h"
@@
-256,6
+257,9
@@
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(" (") +
// show the canvas' name if it has one, else its ID
while (App::dialog_save_file((_("Choose a Filename to Save As") +
String(" (") +
@@
-698,8
+702,8
@@
Instance::add_actions_to_group(const Glib::RefPtr<Gtk::ActionGroup>& action_grou
candidate_list.sort();
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)
{
for(iter=candidate_list.begin();iter!=candidate_list.end();++iter)
{
@@
-1061,15
+1065,23
@@
Instance::make_param_menu(Gtk::Menu *menu,synfig::Canvas::Handle canvas, synfiga
try
{
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()));
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(
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
),
-1
),
- *iter
+ waypoint_set
),
value_desc
)
),
value_desc
)