projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use Color::is_straight(). Also, re-enable the optimization for straight blending...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
layergrouptreestore.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp
b/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp
index
750d1bb
..
c13bbe2
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp
@@
-30,7
+30,7
@@
#endif
#include "layergrouptreestore.h"
#endif
#include "layergrouptreestore.h"
-#include "iconcontroler.h"
+#include "iconcontrol
l
er.h"
#include <gtkmm/button.h>
#include <synfig/paramdesc.h>
#include <synfigapp/action.h>
#include <gtkmm/button.h>
#include <synfig/paramdesc.h>
#include <synfigapp/action.h>
@@
-40,10
+40,11
@@
#include <synfigapp/action_system.h>
#include "dockmanager.h"
#include "dockable.h"
#include <synfigapp/action_system.h>
#include "dockmanager.h"
#include "dockable.h"
-#include "iconcontroler.h"
#include <gtk/gtkversion.h>
#include <ETL/clock>
#include <gtk/gtkversion.h>
#include <ETL/clock>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-211,11
+212,7
@@
LayerGroupTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int
Glib::Value<Glib::ustring> x;
g_value_init(x.gobj(),x.value_type());
Glib::Value<Glib::ustring> x;
g_value_init(x.gobj(),x.value_type());
-
- if(!layer->get_description().empty())
- x.set(layer->get_description());
- else
- x.set(layer->get_local_name());
+ x.set(layer->get_non_empty_description());
g_value_init(value.gobj(),x.value_type());
//g_value_copy(x.gobj(),value.gobj());
g_value_init(value.gobj(),x.value_type());
//g_value_copy(x.gobj(),value.gobj());
@@
-465,7
+462,7
@@
LayerGroupTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int co
bool
bool
-LayerGroupTreeStore::row_draggable_vfunc (const TreeModel::Path&
path
)const
+LayerGroupTreeStore::row_draggable_vfunc (const TreeModel::Path&
/*path*/
)const
{
//if(!get_iter(path)) return false;
// Gtk::TreeModel::Row row(*get_iter(path));
{
//if(!get_iter(path)) return false;
// Gtk::TreeModel::Row row(*get_iter(path));
@@
-512,7
+509,7
@@
LayerGroupTreeStore::drag_data_get_vfunc (const TreeModel::Path& path, Gtk::Sele
}
bool
}
bool
-LayerGroupTreeStore::drag_data_delete_vfunc (const TreeModel::Path&
path
)
+LayerGroupTreeStore::drag_data_delete_vfunc (const TreeModel::Path&
/*path*/
)
{
return true;
}
{
return true;
}
@@
-670,12
+667,10
@@
LayerGroupTreeStore::drag_data_received_vfunc (const TreeModel::Path& dest, cons
action->set_param("dest_canvas",dest_canvas);
if(canvas_interface()->get_instance()->perform_action(action))
{
action->set_param("dest_canvas",dest_canvas);
if(canvas_interface()->get_instance()->perform_action(action))
{
- DEBUGPOINT();
ret=true;
}
else
{
ret=true;
}
else
{
- DEBUGPOINT();
passive_grouper.cancel();
return false;
}
passive_grouper.cancel();
return false;
}
@@
-683,7
+678,7
@@
LayerGroupTreeStore::drag_data_received_vfunc (const TreeModel::Path& dest, cons
}
}
}
}
}
}
- synfig::info("I sup
osi
dly moved %d layers",i);
+ synfig::info("I sup
pose
dly moved %d layers",i);
// Reselect the previously selected layers
canvas_interface()->get_selection_manager()->set_selected_layers(selected_layer_list);
// Reselect the previously selected layers
canvas_interface()->get_selection_manager()->set_selected_layers(selected_layer_list);
@@
-830,8
+825,6
@@
LayerGroupTreeStore::on_group_added(synfig::String group)
bool
LayerGroupTreeStore::on_group_removed(synfig::String group)
{
bool
LayerGroupTreeStore::on_group_removed(synfig::String group)
{
- //DEBUGPOINT();
-
Gtk::TreeModel::Children::iterator iter;
if(find_group_row(group,iter) && iter->children().size()==0)
erase(iter);
Gtk::TreeModel::Children::iterator iter;
if(find_group_row(group,iter) && iter->children().size()==0)
erase(iter);
@@
-842,18
+835,16
@@
LayerGroupTreeStore::on_group_removed(synfig::String group)
}
bool
}
bool
-LayerGroupTreeStore::on_group_changed(synfig::String
group
)
+LayerGroupTreeStore::on_group_changed(synfig::String
/*group*/
)
{
{
- //DEBUGPOINT();
return true;
}
void
return true;
}
void
-LayerGroupTreeStore::on_group_pair_added(
String group, etl::handle<
Layer> layer)
+LayerGroupTreeStore::on_group_pair_added(
synfig::String group, etl::handle<synfig::
Layer> layer)
{
if(!layer->get_canvas())
return;
{
if(!layer->get_canvas())
return;
- //DEBUGPOINT();
Gtk::TreeModel::Children::iterator iter;
if(!find_group_row(group, iter))
iter=on_group_added(group);
Gtk::TreeModel::Children::iterator iter;
if(!find_group_row(group, iter))
iter=on_group_added(group);
@@
-864,11
+855,10
@@
LayerGroupTreeStore::on_group_pair_added(String group, etl::handle<Layer> layer)
}
void
}
void
-LayerGroupTreeStore::on_group_pair_removed(
String group, etl::handle<
Layer> layer)
+LayerGroupTreeStore::on_group_pair_removed(
synfig::String group, etl::handle<synfig::
Layer> layer)
{
if(!layer->get_canvas())
return;
{
if(!layer->get_canvas())
return;
- //DEBUGPOINT();
Gtk::TreeModel::Children::iterator iter;
if(!find_group_row(group, iter))
return;
Gtk::TreeModel::Children::iterator iter;
if(!find_group_row(group, iter))
return;
@@
-898,7
+888,7
@@
LayerGroupTreeStore::on_activity()
}
void
}
void
-LayerGroupTreeStore::on_layer_status_changed(synfig::Layer::Handle handle,bool
x
)
+LayerGroupTreeStore::on_layer_status_changed(synfig::Layer::Handle handle,bool
/*x*/
)
{
Gtk::TreeModel::Children::iterator iter;
if(find_layer_row(handle,iter))
{
Gtk::TreeModel::Children::iterator iter;
if(find_layer_row(handle,iter))
@@
-951,7
+941,6
@@
LayerGroupTreeStore::find_layer_row_(const synfig::Layer::Handle &layer, synfig:
}
iter=children().end();
}
iter=children().end();
- //DEBUGPOINT();
//return false;
}
//return false;
}
@@
-986,7
+975,7
@@
LayerGroupTreeStore::find_layer_row(const synfig::Layer::Handle &layer, Gtk::Tre
}
bool
}
bool
-LayerGroupTreeStore::find_group_row(const String &group, Gtk::TreeModel::Children::iterator &iter)
+LayerGroupTreeStore::find_group_row(const
synfig::
String &group, Gtk::TreeModel::Children::iterator &iter)
{
Gtk::TreeModel::Children::iterator prev;
return find_group_row_(group,children(),iter,prev);
{
Gtk::TreeModel::Children::iterator prev;
return find_group_row_(group,children(),iter,prev);
@@
-1005,7
+994,6
@@
LayerGroupTreeStore::find_group_row_(const synfig::String &group, Gtk::TreeModel
}
iter=children().end();
}
iter=children().end();
- //DEBUGPOINT();
//return false;
}
//return false;
}