projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only initialise threads if they aren't already initialised.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
canvasview.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index
913a903
..
1ab07b1
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/canvasview.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
@@
-446,7
+447,7
@@
public:
{
// assert(view->layer_tree);
{
// assert(view->layer_tree);
- if(!view->layer_tree) { DEBUGPOINT(); synfig::error("
canvas_view.layer_tree not defined!?"
); return LayerList(); }
+ if(!view->layer_tree) { DEBUGPOINT(); synfig::error("
%s:%d canvas_view.layer_tree not defined!?", __FILE__, __LINE__
); return LayerList(); }
return view->layer_tree->get_selected_layers();
}
return view->layer_tree->get_selected_layers();
}
@@
-455,7
+456,7
@@
public:
{
// assert(view->layer_tree);
{
// assert(view->layer_tree);
- if(!view->layer_tree) { DEBUGPOINT(); synfig::error("
canvas_view.layer_tree not defined!?"
); return 0; }
+ if(!view->layer_tree) { DEBUGPOINT(); synfig::error("
%s:%d canvas_view.layer_tree not defined!?", __FILE__, __LINE__
); return 0; }
return view->layer_tree->get_selected_layer();
}
return view->layer_tree->get_selected_layer();
}
@@
-464,7
+465,7
@@
public:
{
// assert(view->layer_tree);
{
// assert(view->layer_tree);
- if(!view->layer_tree) { DEBUGPOINT(); synfig::error("
canvas_view.layer_tree not defined!?"
); return; }
+ if(!view->layer_tree) { DEBUGPOINT(); synfig::error("
%s:%d canvas_view.layer_tree not defined!?", __FILE__, __LINE__
); return; }
view->layer_tree->select_layers(layer_list);
//view->get_smach().process_event(EVENT_REFRESH_DUCKS);
view->layer_tree->select_layers(layer_list);
//view->get_smach().process_event(EVENT_REFRESH_DUCKS);
@@
-1265,7
+1266,10
@@
CanvasView::init_menus()
{
Glib::RefPtr<Gtk::RadioAction> action(Gtk::RadioAction::create(quality_group,strprintf("quality-%02d",i), strprintf("Set Quality to %d",i)));
if(i==10)
{
Glib::RefPtr<Gtk::RadioAction> action(Gtk::RadioAction::create(quality_group,strprintf("quality-%02d",i), strprintf("Set Quality to %d",i)));
if(i==10)
- action->property_value()=10;
+ {
+ action->set_active();
+ work_area->set_quality(i);
+ }
action_group->add( action,
sigc::bind(
sigc::mem_fun(*work_area, &studio::WorkArea::set_quality),
action_group->add( action,
sigc::bind(
sigc::mem_fun(*work_area, &studio::WorkArea::set_quality),
@@
-3415,7
+3419,7
@@
CanvasView::on_audio_offset_notify()
sound_dialog->set_offset(t);
disp_audio->queue_draw();
sound_dialog->set_offset(t);
disp_audio->queue_draw();
- synfig::info("CanvasView::on_audio_offset_notify(): offset time set to %s",t.get_string(get_canvas()->rend_desc().get_frame_rate()).c_str());
+
//
synfig::info("CanvasView::on_audio_offset_notify(): offset time set to %s",t.get_string(get_canvas()->rend_desc().get_frame_rate()).c_str());
}
void
}
void