projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump the required versions of ETL and synfig.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
childrentree.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/childrentree.cpp
b/synfig-studio/trunk/src/gtkmm/childrentree.cpp
index
82a675c
..
a4e736c
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/childrentree.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/childrentree.cpp
@@
-1,20
+1,21
@@
-/* === S
I N F G ==
========================================================= */
+/* === S
Y N F I G
========================================================= */
/*! \file childrentree.cpp
** \brief Template File
**
/*! \file childrentree.cpp
** \brief Template File
**
-** $Id
: childrentree.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp
$
+** $Id$
**
** \legal
**
** \legal
-** Copyright (c) 2002
Robert B. Quattlebaum Jr.
+** Copyright (c) 2002
-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
**
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+** This package is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License as
+** published by the Free Software Foundation; either version 2 of
+** the License, or (at your option) any later version.
**
**
-**
You may not copy, print, publish, or in any
-**
other way distribute this software without
-**
a prior written agreement with
-**
the copyright holder
.
+**
This package is distributed in the hope that it will be useful,
+**
but WITHOUT ANY WARRANTY; without even the implied warranty of
+**
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**
General Public License for more details
.
** \endlegal
*/
/* ========================================================================= */
** \endlegal
*/
/* ========================================================================= */
@@
-31,8
+32,8
@@
#include "childrentree.h"
#include "cellrenderer_value.h"
#include "cellrenderer_timetrack.h"
#include "childrentree.h"
#include "cellrenderer_value.h"
#include "cellrenderer_timetrack.h"
-#include <s
inf
gapp/action.h>
-#include <s
inf
gapp/instance.h>
+#include <s
ynfi
gapp/action.h>
+#include <s
ynfi
gapp/instance.h>
#include <gtkmm/scrolledwindow.h>
#endif
#include <gtkmm/scrolledwindow.h>
#endif
@@
-41,7
+42,7
@@
using namespace std;
using namespace etl;
using namespace std;
using namespace etl;
-using namespace s
inf
g;
+using namespace s
ynfi
g;
using namespace studio;
/* === M A C R O S ========================================================= */
using namespace studio;
/* === M A C R O S ========================================================= */
@@
-95,14
+96,14
@@
ChildrenTree::ChildrenTree()
// Pack the label into the column
column->pack_start(model.label,true);
// Pack the label into the column
column->pack_start(model.label,true);
- // Finish setting up the column
+ // Finish setting up the column
column->set_reorderable();
column->set_resizable();
column->set_clickable();
column->set_min_width(150);
column->set_sort_column_id(model.label);
tree_view.append_column(*column);
column->set_reorderable();
column->set_resizable();
column->set_clickable();
column->set_min_width(150);
column->set_sort_column_id(model.label);
tree_view.append_column(*column);
-
+
}
{ // --- T Y P E --------------------------------------------------------
int cols_count = tree_view.append_column(_("Type"),model.type);
}
{ // --- T Y P E --------------------------------------------------------
int cols_count = tree_view.append_column(_("Type"),model.type);
@@
-117,11
+118,11
@@
ChildrenTree::ChildrenTree()
}
{ // --- V A L U E -----------------------------------------------------
Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("ValueBase")) );
}
{ // --- V A L U E -----------------------------------------------------
Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("ValueBase")) );
-
+
// Set up the value cell-renderer
cellrenderer_value=ChildrenTreeStore::add_cell_renderer_value(column);
cellrenderer_value->signal_edited().connect(sigc::mem_fun(*this, &studio::ChildrenTree::on_edited_value));
// Set up the value cell-renderer
cellrenderer_value=ChildrenTreeStore::add_cell_renderer_value(column);
cellrenderer_value->signal_edited().connect(sigc::mem_fun(*this, &studio::ChildrenTree::on_edited_value));
- cellrenderer_value->property_value()=s
inf
g::ValueBase();
+ cellrenderer_value->property_value()=s
ynfi
g::ValueBase();
// Finish setting up the column
tree_view.append_column(*column);
// Finish setting up the column
tree_view.append_column(*column);
@@
-134,7
+135,7
@@
ChildrenTree::ChildrenTree()
{ // --- T I M E T R A C K --------------------------------------------
Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Time Track")) );
column_time_track=column;
{ // --- T I M E T R A C K --------------------------------------------
Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Time Track")) );
column_time_track=column;
-
+
// Set up the value-node cell-renderer
cellrenderer_time_track=ChildrenTreeStore::add_cell_renderer_value_node(column);
cellrenderer_time_track->property_mode()=Gtk::CELL_RENDERER_MODE_ACTIVATABLE;
// Set up the value-node cell-renderer
cellrenderer_time_track=ChildrenTreeStore::add_cell_renderer_value_node(column);
cellrenderer_time_track->property_mode()=Gtk::CELL_RENDERER_MODE_ACTIVATABLE;
@@
-143,7
+144,7
@@
ChildrenTree::ChildrenTree()
column->add_attribute(cellrenderer_time_track->property_canvas(), model.canvas);
//column->pack_start(*cellrenderer_time_track);
column->add_attribute(cellrenderer_time_track->property_canvas(), model.canvas);
//column->pack_start(*cellrenderer_time_track);
-
+
// Finish setting up the column
column->set_reorderable();
column->set_resizable();
// Finish setting up the column
column->set_reorderable();
column->set_resizable();
@@
-152,10
+153,10
@@
ChildrenTree::ChildrenTree()
// This makes things easier to read.
tree_view.set_rules_hint();
// This makes things easier to read.
tree_view.set_rules_hint();
-
+
// Make us more sensitive to several events
tree_view.add_events(Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::BUTTON1_MOTION_MASK | Gdk::BUTTON2_MOTION_MASK|Gdk::POINTER_MOTION_MASK);
// Make us more sensitive to several events
tree_view.add_events(Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::BUTTON1_MOTION_MASK | Gdk::BUTTON2_MOTION_MASK|Gdk::POINTER_MOTION_MASK);
-
+
tree_view.signal_event().connect(sigc::mem_fun(*this, &studio::ChildrenTree::on_tree_event));
// Create a scrolled window for that tree
tree_view.signal_event().connect(sigc::mem_fun(*this, &studio::ChildrenTree::on_tree_event));
// Create a scrolled window for that tree
@@
-169,25
+170,25
@@
ChildrenTree::ChildrenTree()
attach(*scroll_children_tree, 0, 3, 0, 1, Gtk::EXPAND|Gtk::FILL,Gtk::EXPAND|Gtk::FILL, 0, 0);
hbox=manage(new Gtk::HBox());
attach(*scroll_children_tree, 0, 3, 0, 1, Gtk::EXPAND|Gtk::FILL,Gtk::EXPAND|Gtk::FILL, 0, 0);
hbox=manage(new Gtk::HBox());
-
+
attach(*hbox, 0, 1, 1, 2, Gtk::FILL|Gtk::SHRINK, Gtk::SHRINK, 0, 0);
attach(*hbox, 0, 1, 1, 2, Gtk::FILL|Gtk::SHRINK, Gtk::SHRINK, 0, 0);
-
-
+
+
tree_view.set_enable_search(true);
tree_view.set_search_column(model.label);
tree_view.set_enable_search(true);
tree_view.set_search_column(model.label);
-
-
+
+
/*
Gtk::Image *icon;
/*
Gtk::Image *icon;
- //Gtk::IconSize iconsize(Gtk::IconSize::from_name("s
inf
g-small_icon"));
+ //Gtk::IconSize iconsize(Gtk::IconSize::from_name("s
ynfi
g-small_icon"));
Gtk::IconSize iconsize(Gtk::ICON_SIZE_SMALL_TOOLBAR);
SMALL_BUTTON(button_raise,"gtk-go-up","Raise");
SMALL_BUTTON(button_lower,"gtk-go-down","Lower");
Gtk::IconSize iconsize(Gtk::ICON_SIZE_SMALL_TOOLBAR);
SMALL_BUTTON(button_raise,"gtk-go-up","Raise");
SMALL_BUTTON(button_lower,"gtk-go-down","Lower");
- SMALL_BUTTON(button_duplicate,"s
inf
g-duplicate","Duplicate");
+ SMALL_BUTTON(button_duplicate,"s
ynfi
g-duplicate","Duplicate");
SMALL_BUTTON(button_delete,"gtk-delete","Delete");
SMALL_BUTTON(button_delete,"gtk-delete","Delete");
-
+
hbox->pack_start(*button_raise,Gtk::PACK_SHRINK);
hbox->pack_start(*button_lower,Gtk::PACK_SHRINK);
hbox->pack_start(*button_duplicate,Gtk::PACK_SHRINK);
hbox->pack_start(*button_raise,Gtk::PACK_SHRINK);
hbox->pack_start(*button_lower,Gtk::PACK_SHRINK);
hbox->pack_start(*button_duplicate,Gtk::PACK_SHRINK);
@@
-251,7
+252,7
@@
ChildrenTree::on_dirty_preview()
void
ChildrenTree::on_selection_changed()
void
ChildrenTree::on_selection_changed()
-{
+{
if(0)
{
button_raise->set_sensitive(false);
if(0)
{
button_raise->set_sensitive(false);
@@
-264,10
+265,10
@@
ChildrenTree::on_selection_changed()
void
void
-ChildrenTree::on_edited_value(const Glib::ustring&path_string,s
inf
g::ValueBase value)
+ChildrenTree::on_edited_value(const Glib::ustring&path_string,s
ynfi
g::ValueBase value)
{
Gtk::TreePath path(path_string);
{
Gtk::TreePath path(path_string);
-
+
const Gtk::TreeRow row = *(tree_view.get_model()->get_iter(path));
row[model.value]=value;
const Gtk::TreeRow row = *(tree_view.get_model()->get_iter(path));
row[model.value]=value;
@@
-275,13
+276,13
@@
ChildrenTree::on_edited_value(const Glib::ustring&path_string,sinfg::ValueBase v
}
void
}
void
-ChildrenTree::on_waypoint_clicked(const Glib::ustring &path_string, s
inf
g::Waypoint waypoint,int button)
+ChildrenTree::on_waypoint_clicked(const Glib::ustring &path_string, s
ynfi
g::Waypoint waypoint,int button)
{
Gtk::TreePath path(path_string);
{
Gtk::TreePath path(path_string);
-
+
const Gtk::TreeRow row = *(tree_view.get_model()->get_iter(path));
const Gtk::TreeRow row = *(tree_view.get_model()->get_iter(path));
-
- signal_waypoint_clicked()(static_cast<s
inf
gapp::ValueDesc>(row[model.value_desc]),waypoint,button);
+
+ signal_waypoint_clicked()(static_cast<s
ynfi
gapp::ValueDesc>(row[model.value_desc]),waypoint,button);
}
bool
}
bool
@@
-302,7
+303,7
@@
ChildrenTree::on_tree_event(GdkEvent *event)
)
) break;
const Gtk::TreeRow row = *(tree_view.get_model()->get_iter(path));
)
) break;
const Gtk::TreeRow row = *(tree_view.get_model()->get_iter(path));
-
+
if(column->get_first_cell_renderer()==cellrenderer_time_track)
{
return signal_user_click()(event->button.button,row,COLUMNID_TIME_TRACK);
if(column->get_first_cell_renderer()==cellrenderer_time_track)
{
return signal_user_click()(event->button.button,row,COLUMNID_TIME_TRACK);
@@
-311,10
+312,10
@@
ChildrenTree::on_tree_event(GdkEvent *event)
return signal_user_click()(event->button.button,row,COLUMNID_VALUE);
else
return signal_user_click()(event->button.button,row,COLUMNID_ID);
return signal_user_click()(event->button.button,row,COLUMNID_VALUE);
else
return signal_user_click()(event->button.button,row,COLUMNID_ID);
-
+
}
break;
}
break;
-
+
case GDK_MOTION_NOTIFY:
{
Gtk::TreeModel::Path path;
case GDK_MOTION_NOTIFY:
{
Gtk::TreeModel::Path path;
@@
-327,12
+328,12
@@
ChildrenTree::on_tree_event(GdkEvent *event)
cell_x,cell_y //int&cell_x,int&cell_y
)
) break;
cell_x,cell_y //int&cell_x,int&cell_y
)
) break;
-
+
if(!tree_view.get_model()->get_iter(path))
break;
if(!tree_view.get_model()->get_iter(path))
break;
-
+
Gtk::TreeRow row = *(tree_view.get_model()->get_iter(path));
Gtk::TreeRow row = *(tree_view.get_model()->get_iter(path));
-
+
if(cellrenderer_time_track==column->get_first_cell_renderer())
{
// Movement on TimeLine
if(cellrenderer_time_track==column->get_first_cell_renderer())
{
// Movement on TimeLine