projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add an error message explaining why the 'fixed' tests fail.
[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
0c0f7ac
..
839b55e
100644
(file)
--- 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
**
** \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
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-365,10
+366,7
@@
Instance::close()
studio::App::set_selected_instance(0);
}
else
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();
}
}
@@
-699,7
+697,7
@@
Instance::add_actions_to_group(const Glib::RefPtr<Gtk::ActionGroup>& action_grou
candidate_list.sort();
if(candidate_list.empty())
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)
{
for(iter=candidate_list.begin();iter!=candidate_list.end();++iter)
{
@@
-739,7
+737,7
@@
Instance::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamLis
candidate_list.sort();
if(candidate_list.empty())
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)
{
for(iter=candidate_list.begin();iter!=candidate_list.end();++iter)
{
@@
-808,9
+806,9
@@
Instance::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamLis
candidate_list.sort();
if(candidate_list.empty())
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())
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
for(iter=candidate_list.begin();iter!=candidate_list.end();++iter)
// Seperate out the candidate lists so that there are no conflicts
for(iter=candidate_list.begin();iter!=candidate_list.end();++iter)