default:
throw Exception::BadType(ValueBase::type_local_name(get_type()));
}
-
- DCAST_HACK_ENABLE();
}
LinkableValueNode*
/* === M A C R O S ========================================================= */
-// This is a hack for GCC 3.0.4... which has a broken dynamic_cast<>
-// It is deprecated, and will be removed soon.
-#if ( __GNUC__ == 3 ) && ( __GNUC__MINOR__ == 0 )
-# define DCAST_HACK_BASECLASS() int cast__
-# define DCAST_HACK_ID(x) static const int my_cast__(void) { return x; }
-# define DCAST_HACK_ENABLE() cast__=my_cast__()
-#else
-# define DCAST_HACK_BASECLASS()
-# define DCAST_HACK_ID(x)
-# define DCAST_HACK_ENABLE()
-#endif
-
#define CHECK_TYPE_AND_SET_VALUE(variable, type) \
/* I don't think this ever happens - maybe remove this code? */ \
if (get_type() == ValueBase::TYPE_NIL) { \
void set_type(ValueBase::Type t) { type=t; }
virtual void on_changed();
-
-public:
- DCAST_HACK_BASECLASS();
- DCAST_HACK_ID(0);
}; // END of class ValueNode
/*! \class PlaceholderValueNode
default:
throw Exception::BadType(ValueBase::type_local_name(value.get_type()));
}
-
- DCAST_HACK_ENABLE();
}
LinkableValueNode*
ValueNode_Animated::ValueNode_Animated()
{
- DCAST_HACK_ENABLE();
}
int
void set_type(ValueBase::Type t);
virtual void get_times_vfunc(Node::time_set &set) const;
-public:
- DCAST_HACK_ID(4);
};
}; // END of namespace synfig
default:
throw Exception::BadType(ValueBase::type_local_name(value.get_type()));
}
-
- DCAST_HACK_ENABLE();
}
LinkableValueNode*
ValueNode_Const::ValueNode_Const()
{
- DCAST_HACK_ENABLE();
}
ValueNode (x.get_type()),
value (x)
{
- DCAST_HACK_ENABLE();
}
default:
throw Exception::BadType(ValueBase::type_local_name(value.get_type()));
}
-
- DCAST_HACK_ENABLE();
}
LinkableValueNode*
default:
throw Exception::BadType(ValueBase::type_local_name(value.get_type()));
}
-
- DCAST_HACK_ENABLE();
}
LinkableValueNode*
container_type (container_type),
loop_(false)
{
- DCAST_HACK_ENABLE();
}
ValueNode_DynamicList::Handle
default:
throw Exception::BadType(ValueBase::type_local_name(value.get_type()));
}
-
- DCAST_HACK_ENABLE();
}
LinkableValueNode*
default:
throw Exception::BadType(ValueBase::type_local_name(value.get_type()));
}
-
- DCAST_HACK_ENABLE();
}
LinkableValueNode*
{
set_link("gradient",ValueNode_Const::create(x));
set_link("offset",ValueNode_Const::create(Real(0)));
- DCAST_HACK_ENABLE();
}
LinkableValueNode*
default:
throw Exception::BadType(ValueBase::type_local_name(value.get_type()));
}
-
- DCAST_HACK_ENABLE();
}
LinkableValueNode*
default:
throw Exception::BadType(ValueBase::type_local_name(value.get_type()));
}
-
- DCAST_HACK_ENABLE();
}
LinkableValueNode*
default:
throw Exception::BadType(ValueBase::type_local_name(get_type()));
}
-
- DCAST_HACK_ENABLE();
}
LinkableValueNode*
assert(max_->get_type()==id);
assert(link_->get_type()==id);
assert(get_type()==id);
-
- DCAST_HACK_ENABLE();
}
LinkableValueNode*
default:
throw Exception::BadType(ValueBase::type_local_name(value.get_type()));
}
-
- DCAST_HACK_ENABLE();
}
LinkableValueNode*
default:
throw Exception::BadType(ValueBase::type_local_name(value.get_type()));
}
-
- DCAST_HACK_ENABLE();
}
LinkableValueNode*
default:
throw Exception::BadType(ValueBase::type_local_name(get_type()));
}
-
- DCAST_HACK_ENABLE();
}
LinkableValueNode*
assert(ref_a->get_type()==id);
assert(ref_b->get_type()==id);
assert(get_type()==id);
-
- DCAST_HACK_ENABLE();
}
LinkableValueNode*
set_link("time",ValueNode_Const::create(Time(2)));
set_link("length",ValueNode_Const::create(Time(1)));
-
- DCAST_HACK_ENABLE();
}
ValueNode_TimedSwap*
default:
throw Exception::BadType(ValueBase::type_local_name(value.get_type()));
}
-
- DCAST_HACK_ENABLE();
}
LinkableValueNode*
default:
throw Exception::BadType(ValueBase::type_local_name(value.get_type()));
}
-
- DCAST_HACK_ENABLE();
}
LinkableValueNode*
default:
throw Exception::BadType(ValueBase::type_local_name(value.get_type()));
}
-
- DCAST_HACK_ENABLE();
}
LinkableValueNode*
default:
throw Exception::BadType(ValueBase::type_local_name(value.get_type()));
}
-
- DCAST_HACK_ENABLE();
}
LinkableValueNode*
default:
throw Exception::BadType(ValueBase::type_local_name(value.get_type()));
}
-
- DCAST_HACK_ENABLE();
}
LinkableValueNode*
default:
throw Exception::BadType(ValueBase::type_local_name(value.get_type()));
}
-
- DCAST_HACK_ENABLE();
}
LinkableValueNode*
#include "dialog_gradient.h"
#include "dialog_color.h"
#include "toolbox.h"
-#include "compview.h"
#include "onemoment.h"
#include "dockmanager.h"
));
}
-#define DEFINE_ACTION(x,stock) { Glib::RefPtr<Gtk::Action> action( Gtk::Action::create(x, stock) ); /*action->set_sensitive(false);*/ actions_action_group->add(action); }
-#define DEFINE_ACTION2(x,stock,label) { Glib::RefPtr<Gtk::Action> action( Gtk::Action::create(x, stock,label,label) ); /*action->set_sensitive(false);*/ actions_action_group->add(action); }
-#define DEFINE_ACTION_SIG(group,x,stock,sig) { Glib::RefPtr<Gtk::Action> action( Gtk::Action::create(x, stock) ); /*action->set_sensitive(false);*/ group->add(action,sig); }
+#define DEFINE_ACTION(x,stock) { Glib::RefPtr<Gtk::Action> action( Gtk::Action::create(x, stock) ); actions_action_group->add(action); }
+#define DEFINE_ACTION2(x,stock,label) { Glib::RefPtr<Gtk::Action> action( Gtk::Action::create(x, stock,label,label) ); actions_action_group->add(action); }
+#define DEFINE_ACTION_SIG(group,x,stock,sig) { Glib::RefPtr<Gtk::Action> action( Gtk::Action::create(x, stock) ); group->add(action,sig); }
DEFINE_ACTION2("keyframe-properties", Gtk::StockID("gtk-properties"), _("Keyframe Properties"));
DEFINE_ACTION("about", Gtk::StockID("synfig-about"));
DEFINE_ACTION("amount-dec", _("Decrease Amount"));
#undef DEFINE_ACTION
-
-
-// Set up synfigapp actions
- /*{
- synfigapp::Action::Book::iterator iter;
-
- for(iter=synfigapp::Action::book().begin();iter!=synfigapp::Action::book().end();++iter)
- {
- Gtk::StockID stock_id;
-
- if(!(iter->second.category&synfigapp::Action::CATEGORY_HIDDEN))
- {
- //Gtk::Image* image(manage(new Gtk::Image()));
- if(iter->second.task=="raise") stock_id=Gtk::Stock::GO_UP;
- else if(iter->second.task=="lower") stock_id=Gtk::Stock::GO_DOWN;
- else if(iter->second.task=="move_top") stock_id=Gtk::Stock::GOTO_TOP;
- else if(iter->second.task=="move_bottom") stock_id=Gtk::Stock::GOTO_BOTTOM;
- else if(iter->second.task=="remove") stock_id=Gtk::Stock::DELETE;
- else if(iter->second.task=="set_on") stock_id=Gtk::Stock::YES;
- else if(iter->second.task=="set_off") stock_id=Gtk::Stock::NO;
- //else if(iter->second.task=="duplicate") stock_id=Gtk::Stock::COPY;
- else if(iter->second.task=="remove") stock_id=Gtk::Stock::DELETE;
- else stock_id=Gtk::StockID("synfig-"+iter->second.task);
-
- actions_action_group->add(Gtk::Action::create(
- "action-"+iter->second.name,
- stock_id,
- iter->second.local_name,iter->second.local_name
- ));
- }
- }
- }
-*/
-
+#undef DEFINE_ACTION_2
+#undef DEFINE_ACTION_SIG
Glib::ustring ui_info =
"<ui>"
ACCEL("End", "<Actions>/canvasview/seek-end" );
#undef ACCEL
+#undef ACCEL2
}
#ifdef _WIN32
toolbox->hide();
-// studio::App::iteration(false);
-
delete toolbox;
-// studio::App::iteration(false);
-
-// studio::App::iteration(false);
-
delete dialog_setup;
delete dialog_gradient;
delete dock_manager;
instance_list.clear();
-
-// studio::App::iteration(false);
}
String
}
return false;
-#else
+#else // not USE_WIN32_FILE_DIALOGS
synfig::String prev_path;
if(!_preferences.get_value(preference, prev_path))
delete dialog;
return false;
-
- /*
-
- GtkWidget *ok;
- GtkWidget *cancel;
- int val=0;
-
- GtkWidget *fileselection;
- fileselection = gtk_file_selection_new(title.c_str());
-
-
- if(basename(filename)==filename)
- {
- gtk_file_selection_set_filename(GTK_FILE_SELECTION(fileselection),(prev_path+ETL_DIRECTORY_SEPARATOR).c_str());
- }
- else
- gtk_file_selection_set_filename(GTK_FILE_SELECTION(fileselection),dirname(filename).c_str());
-
- gtk_file_selection_complete(GTK_FILE_SELECTION(fileselection),basename(filename).c_str());
-
- ok=GTK_FILE_SELECTION(fileselection)->ok_button;
- cancel=GTK_FILE_SELECTION(fileselection)->cancel_button;
-
- gtk_signal_connect(GTK_OBJECT(ok),"clicked",GTK_SIGNAL_FUNC(Signal_Open_Ok),&val);
- gtk_signal_connect(GTK_OBJECT(cancel),"clicked",GTK_SIGNAL_FUNC(Signal_Open_Cancel),&val);
-
- gtk_widget_show(fileselection);
-
- while(!val)
- iteration();
-
-
- if(val==1)
- {
- filename=gtk_file_selection_get_filename(GTK_FILE_SELECTION(fileselection));
- _preferences.set_value(preference,dirname(filename));
- }
- else
- {
- gtk_widget_destroy(fileselection);
- return false;
- }
- gtk_widget_destroy(fileselection);
- return true;
- */
-#endif
+#endif // not USE_WIN32_FILE_DIALOGS
}
bool
//static etl::handle<synfigapp::UIInterface> ui_interface_;
//static int max_recent_files;
-/*
+/* //declated as globals in app.cpp
static Dock_Keyframes *dock_keyframes;
static Dock_Layers *dock_layers;
static Dock_Params *dock_params;
/*
-- ** -- S I G N A L S -------------------------------------------------------
*/
-/*
+/* //declated as globals in app.cpp
static sigc::signal<
void,
etl::loose_handle<CanvasView>
auto_backup_connect.disconnect();
if(timeout)
auto_backup_connect=Glib::signal_timeout().connect(sigc::ptr_fun(&AutoRecover::auto_backup),timeout);
-// auto_backup_connect=App::main.get_context()->signal_timeout().connect(sigc::mem_fun(&AutoRecover::auto_backup),timeout);
}
synfig::String
Gtk::CellRendererText (),
property_gradient_(*this,"gradient",synfig::Gradient())
{
+ assert(0); //CHECK: This class does not appear to be used.
//CellRendererText::signal_edited().connect(sigc::mem_fun(*this,&studio::CellRenderer_Gradient::string_edited_));
}
path
)
);
- App::dialog_gradient->grab_button_set_sensitive(true);
+ App::dialog_gradient->set_default_button_set_sensitive(true);
App::dialog_gradient->present();
return NULL;
tree_view.set_enable_search(true);
tree_view.set_search_column(model.label);
-/*
+/* // Buttons to raise/lower/duplicate/delete children valuenodes
+ // Commented out because these functions are not implemented
+ // and children sort themselves alphabetically
+
Gtk::Image *icon;
//Gtk::IconSize iconsize(Gtk::IconSize::from_name("synfig-small_icon"));
Gtk::IconSize iconsize(Gtk::ICON_SIZE_SMALL_TOOLBAR);
void on_dirty_preview();
+ //! \todo Implement raise/lower/duplicate/delete functions
void on_raise_pressed();
void on_lower_pressed();
Gtk::Window(Gtk::WINDOW_TOPLEVEL),
dialog_settings(this,"compview")
{
+ assert(0); //CHECK: This class does not appear to be used.
init_menu();
set_type_hint(Gdk::WINDOW_TYPE_HINT_UTILITY);
set_role("gradient_editor");
// Setup the buttons
- grab_button = manage(new class Gtk::Button(Gtk::StockID(_("Set as Default"))));
- grab_button->show();
- add_action_widget(*grab_button,2);
- grab_button->signal_clicked().connect(sigc::mem_fun(*this, &Dialog_Gradient::on_grab_pressed));
-
- /*
- Gtk::Button *apply_button(manage(new class Gtk::Button(Gtk::StockID("gtk-apply"))));
- apply_button->show();
- add_action_widget(*apply_button,1);
- apply_button->signal_clicked().connect(sigc::mem_fun(*this, &Dialog_Gradient::on_apply_pressed));
- */
+ set_default_button = manage(new class Gtk::Button(Gtk::StockID(_("Set as Default"))));
+ set_default_button->show();
+ add_action_widget(*set_default_button,2);
+ set_default_button->signal_clicked().connect(sigc::mem_fun(*this, &Dialog_Gradient::on_set_default_pressed));
Gtk::Button *cancel_button(manage(new class Gtk::Button(Gtk::StockID("gtk-close"))));
cancel_button->show();
}
void
-Dialog_Gradient::on_grab_pressed()
+Dialog_Gradient::on_set_default_pressed()
{
synfigapp::Main::set_gradient(get_gradient());
-// signal_edited_(get_gradient());
-// reset();
-// hide();
-}
-
-void
-Dialog_Gradient::on_apply_pressed()
-{
- signal_edited_(get_gradient());
}
void
sigc::connection value_changed_connection;
- void on_ok_pressed();
- void on_apply_pressed();
- void on_grab_pressed();
+ void on_set_default_pressed();
void on_cpoint_selected(synfig::Gradient::CPoint x);
void on_values_adjusted();
Widget_Gradient* widget_gradient;
Widget_ColorEdit* widget_color;
- Gtk::Button *grab_button;
+ Gtk::Button *set_default_button;
void on_changed();
const synfig::Gradient& get_gradient()const { return widget_gradient->get_value(); }
- void grab_button_set_sensitive(bool sensitive) { grab_button->set_sensitive(sensitive); }
+ void set_default_button_set_sensitive(bool sensitive) { set_default_button->set_sensitive(sensitive); }
void reset();
Dialog_Gradient();
~Dialog_Gradient();
- //! Inerface to external calls to fill in the Gradient Editor Dialog
+ //! Interface to external calls to fill in the Gradient Editor Dialog
//! when a Constant ValueNode or a Animated ValueNode is double cliked.
void edit(const synfigapp::ValueDesc &x, etl::handle<synfigapp::CanvasInterface> canvas_interface, synfig::Time time=0);
}; // END of Dialog_Gradient
add_action_widget(*ok_button,2);
ok_button->signal_clicked().connect(sigc::mem_fun(*this, &Dialog_Keyframe::on_ok_pressed));
-/* Gtk::Button *apply_button(manage(new class Gtk::Button(Gtk::StockID("gtk-apply"))));
+ Gtk::Button *apply_button(manage(new class Gtk::Button(Gtk::StockID("gtk-apply"))));
apply_button->show();
add_action_widget(*apply_button,1);
apply_button->signal_clicked().connect(sigc::mem_fun(*this, &Dialog_Keyframe::on_apply_pressed));
-*/
+
Gtk::Button *delete_button(manage(new class Gtk::Button(Gtk::StockID("gtk-delete"))));
delete_button->show();
add_action_widget(*delete_button,3);
get_vbox()->pack_start(*table);
+/* // \todo Allow setting descriptions for keyframes
+
entry_description.set_text(_("Not yet implemented"));
- //table->attach(*manage(new Gtk::Label(_("Description"))), 0, 1, 0, 1, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
- //table->attach(entry_description, 1, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
+ table->attach(*manage(new Gtk::Label(_("Description"))), 0, 1, 0, 1, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
+ table->attach(entry_description, 1, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
+*/
table->show_all();
void
Dialog_Keyframe::on_ok_pressed()
{
- if(widget_waypoint_model->get_waypoint_model().is_trivial())
- return;
+ on_apply_pressed();
+ hide();
+}
- synfigapp::Action::Handle action(synfigapp::Action::create("KeyframeWaypointSet"));
+
+void
+Dialog_Keyframe::on_delete_pressed()
+{
+ synfigapp::Action::Handle action(synfigapp::Action::create("KeyframeRemove"));
assert(action);
action->set_param("keyframe",keyframe_);
action->set_param("model",widget_waypoint_model->get_waypoint_model());
- if(!canvas_interface->get_instance()->perform_action(action))
+ if(canvas_interface->get_instance()->perform_action(action))
{
+ hide();
}
}
void
-Dialog_Keyframe::on_delete_pressed()
+Dialog_Keyframe::on_apply_pressed()
{
-}
+ if(widget_waypoint_model->get_waypoint_model().is_trivial())
+ return;
+ synfigapp::Action::Handle action(synfigapp::Action::create("KeyframeWaypointSet"));
-void
-Dialog_Keyframe::on_apply_pressed()
-{
+ assert(action);
+
+ action->set_param("canvas",canvas_interface->get_canvas());
+ action->set_param("canvas_interface",canvas_interface);
+ action->set_param("keyframe",keyframe_);
+ action->set_param("model",widget_waypoint_model->get_waypoint_model());
+
+ if(!canvas_interface->get_instance()->perform_action(action))
+ {
+ }
}
// Gamma
Gtk::Table *gamma_table=manage(new Gtk::Table(2,2,false));
notebook->append_page(*gamma_table,_("Gamma"));
- //gamma_frame->add(*gamma_table);
gamma_table->attach(gamma_pattern, 0, 2, 0, 1, Gtk::EXPAND, Gtk::SHRINK|Gtk::FILL, 0, 0);
Dockable("tool_options",_("Tool Options"),Gtk::StockID("synfig-about")),
empty_label(_("This tool has no options"))
{
- //scrolled_.add(sub_vbox_);
- //scrolled_.set_policy(Gtk::POLICY_AUTOMATIC,Gtk::POLICY_AUTOMATIC);
- //scrolled_.show();
- //get_vbox()->pack_start(scrolled_);
-
add(sub_vbox_);
set_widget(empty_label);
class Dialog_ToolOptions : public Dockable
{
Gtk::Label empty_label;
- Gtk::ScrolledWindow scrolled_;
Gtk::VBox sub_vbox_;
public:
add(*create_canvas_tree());
-/*
+/* // \todo Implement canvas management in canvas browser
add_button(
Gtk::StockID("synfig-canvas_new"),
_("Insert a new canvas")
&Dock_Canvases::menu_rename
)
);
- */
+*/
}
Dock_Canvases::~Dock_Canvases()
//! Dockable::prev_widget_ is left referencing a
//! ChildrenTree that has already been destroyed.
// set_use_scrolled(false);
-/*
- add(*create_action_tree());
-
- add_button(
- Gtk::StockID("synfig-clear_redo"),
- _("Clear the REDO Stack")
- )->signal_clicked().connect(
- sigc::mem_fun(
- *this,
- &Dock_Children::clear_redo
- )
- );
-*/
}
Dock_Children::~Dock_Children()
std::list<synfigapp::ValueDesc> value_descs;
- //std::list<Gtk::TreePath> path_list(
- //param_tree_view->get_selection()->selected_foreach_iter(tmp);
iter=param_tree_view->get_selection()->get_selected();
-
value_descs.push_back((*iter)[model.value_desc]);
curves->set_value_descs(value_descs);
-
- //curves->set_value_descs(tmp.value_descs);
}
void
set_toolbar(*dynamic_cast<Gtk::Toolbar*>(App::ui_manager()->get_widget("/toolbar-history")));
add(*create_action_tree());
-
- /*
- add_button(
- Gtk::StockID("synfig-clear_undo"),
- _("Clear the UNDO Stack")
- )->signal_clicked().connect(
- sigc::mem_fun(
- *this,
- &Dock_History::clear_undo
- )
- );
- add_button(
- Gtk::StockID("synfig-clear_redo"),
- _("Clear the REDO Stack")
- )->signal_clicked().connect(
- sigc::mem_fun(
- *this,
- &Dock_History::clear_redo
- )
- );
- */
}
Dock_History::~Dock_History()
class Dock_Info : public Dock_CanvasSpecific
{
- //bool valid;
- //synfig::Point pos;
-
Gtk::Label r,g,b,a;
Gtk::Label x,y;
keyframe_action_manager->signal_show_keyframe_properties().connect(
sigc::mem_fun(*this,&Dock_Keyframes::show_keyframe_properties)
);
-/* add_button(
- Gtk::StockID("gtk-add"),
- _("Inserts a Keyframe at the current time")
- )->signal_clicked().connect(
- sigc::mem_fun(
- *this,
- &Dock_Keyframes::add_keyframe_pressed
- )
- );
-
- add_button(
- Gtk::StockID("synfig-duplicate"),
- _("Duplicates the selected keyframe at the current time")
- )->signal_clicked().connect(
- sigc::mem_fun(
- *this,
- &Dock_Keyframes::duplicate_keyframe_pressed
- )
- );
- add_button(
- Gtk::StockID("gtk-delete"),
- _("Deletes the selected Keyframe")
- )->signal_clicked().connect(
- sigc::mem_fun(
- *this,
- &Dock_Keyframes::delete_keyframe_pressed
- )
- );
-*/
Glib::ustring ui_info =
"<ui>"
" <toolbar action='toolbar-keyframe'>"
get_canvas_view()->show_keyframe_dialog();
}
-/*
-void
-Dock_Keyframes::add_keyframe_pressed()
-{
- if(get_canvas_view())
- get_canvas_view()->on_keyframe_add_pressed();
-}
-
-void
-Dock_Keyframes::duplicate_keyframe_pressed()
-{
- if(get_canvas_view())
- get_canvas_view()->on_keyframe_duplicate_pressed();
-}
-
-void
-Dock_Keyframes::delete_keyframe_pressed()
-{
- if(get_canvas_view())
- get_canvas_view()->on_keyframe_remove_pressed();
-}
-*/
-
void
Dock_Keyframes::init_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_view)
{
Dock_Layers::Dock_Layers():
Dock_CanvasSpecific("layers",_("Layers"),Gtk::StockID("synfig-layer")),
-// layer_action_manager(0)
layer_action_manager(new LayerActionManager)
{
if(layer_action_manager)layer_action_manager->set_ui_manager(App::ui_manager());
//get the pw and ph
//float pw = r.get_pw();
//float ph = r.get_ph();
-
//synfig::warning("Nav: pixel size is %f x %f", pw,ph);
//this renders that single frame
Dock_CanvasSpecific("params",_("Params"),Gtk::Stock::INDEX/*Gtk::StockID("synfig-params")*/),
action_group(Gtk::ActionGroup::create("action_group_dock_params"))
{
-/*
- App::ui_manager()->insert_action_group(action_group_layer_ops);
-
- Glib::ustring ui_info =
- "<ui>"
- " <toolbar action='toolbar-palette'>"
- " <toolitem action='amount-increase' />"
- " <toolitem action='amount-decrease' />"
- " </toolbar>"
- "</ui>"
- ;
-
- App::ui_manager()->add_ui_from_string(ui_info);
- */
}
Dock_Params::~Dock_Params()
return true;
//return signal_param_user_click()(event->button.button,row,COLUMNID_TIME_TRACK);
}
-/* else
- {
- if(event->button.button==3)
- {
- LayerList layer_list(get_selected_layers());
- if(layer_list.size()<=1)
- {
- synfigapp::ValueDesc value_desc(row[model.value_desc]);
- Gtk::Menu* menu(manage(new Gtk::Menu()));
- menu->signal_hide().connect(sigc::bind(sigc::ptr_fun(&delete_widget), menu));
- App::get_instance(param_tree_store_->canvas_interface()->get_canvas())->make_param_menu(menu,param_tree_store_->canvas_interface()->get_canvas(),value_desc,0.5f);
- menu->popup(event->button.button,gtk_get_current_event_time());
- return true;
- }
- Gtk::Menu* menu(manage(new Gtk::Menu()));
- menu->signal_hide().connect(sigc::bind(sigc::ptr_fun(&delete_widget), menu));
- std::list<synfigapp::ValueDesc> value_desc_list;
- ParamDesc param_desc(row[model.param_desc]);
- for(;!layer_list.empty();layer_list.pop_back())
- value_desc_list.push_back(synfigapp::ValueDesc(layer_list.back(),param_desc.get_name()));
- App::get_instance(param_tree_store_->canvas_interface()->get_canvas())->make_param_menu(menu,param_tree_store_->canvas_interface()->get_canvas(),value_desc_list);
- menu->popup(event->button.button,gtk_get_current_event_time());
- return true;
- }
- else
- {
- if(column->get_first_cell_renderer()==cellrenderer_value)
- return signal_param_user_click()(event->button.button,row,COLUMNID_VALUE);
- else
- return signal_param_user_click()(event->button.button,row,COLUMNID_NAME);
- }
- }
- */
}
break;
void
on_waypoint_changed( synfig::Waypoint waypoint , synfig::ValueNode::Handle value_node)
{
- // is this code used?
+ // \todo is this code used?
assert(0);
synfigapp::Action::ParamList param_list;
use_scrolled_=true;
- //set_title(local_name);
- //set_type_hint(Gdk::WINDOW_TYPE_HINT_UTILITY);
-
-
- title_label_.show();
-
attach_dnd_to(title_label_);
- //scrolled_.set_policy(Gtk::POLICY_AUTOMATIC,Gtk::POLICY_AUTOMATIC);
- //scrolled_.show();
- //scrolled_.set_shadow_type(Gtk::SHADOW_NONE);
-
toolbar_=0;
//button_box_.show();
{
title_label_.set_padding(0,0);
+ //title_label_.show();
Gtk::EventBox* event_box(manage(new Gtk::EventBox()));
event_box->set_border_width(0);
event_box->add(title_label_);
prev_widget_->show();
set_size_request(175,120);
- //scrolled_.set_shadow_type(Gtk::SHADOW_NONE);
}
delete scrolled_;
scrolled_=0;
}
-
- /*if(App::dock_manager)try{
- App::dock_manager->unregister_dockable(*this);
- std::list<Dockable*>::iterator iter;
- for(iter=App::dock_manager->dockable_list_.begin();iter!=App::dock_manager->dockable_list_.end();++iter)
- if(*iter==this)
- {
- App::dock_manager->dockable_list_.erase(iter);
- return;
- }
- } catch(...) { }
-*/
- //if(App::dock_manager)
- // App::dock_manager->dockable_list_.erase(this);
}
void
if(prev_widget_)
{
remove(*prev_widget_);
- //prev_widget_=0;
clear_previous();
}
{
DockDialog* dock_dialog(new DockDialog());
dock_dialog->get_dock_book().add(*this);
- //if(get_name()=="canvases")
- // dock_dialog->set_composition_selector(true);
+/* //hack: always display composition selector on top of canvas browser
+ if(get_name()=="canvases")
+ dock_dialog->set_composition_selector(true);
+*/
dock_dialog->present();
}
}
Gtk::Label title_label_;
//Gtk::HBox button_box_;
Gtk::HBox header_box_;
- //Gtk::VBox vbox_;
//Gtk::HandleBox handle_box_;
Gtk::ScrolledWindow *scrolled_;
bool dnd_success_;
public:
- //Gtk::VBox* get_vbox() { return &vbox_; }
void set_toolbar(Gtk::Toolbar& toolbar);
dockable.show();
- //set_current_page(get_n_pages()-1);
-
signal_changed_();
}
synfig::warning("Unable to open "+path_to_icons+"synfig_icon."+IMAGE_EXT);
}
-/*
-#define INIT_STOCK_ICON(name,iconfile,desc) \
- stock_##name=Gtk::StockItem(Gtk::StockID("synfig-" #name),desc); \
- Gtk::Stock::add(stock_##name); \
- icon_source.set_filename(path_to_icons+iconfile); \
- icon_##name.add_source(icon_source); \
- icon_factory->add(stock_##name.get_stock_id(),icon_##name)
-*/
#define INIT_STOCK_ICON(name,iconfile,desc){ \
Gtk::StockItem stockitem(Gtk::StockID("synfig-" #name),desc); \
Gtk::Stock::add(stockitem); \
INIT_STOCK_ICON(gradient,"gradient_icon."IMAGE_EXT,_("Gradient Tool"));
INIT_STOCK_ICON(star,"star_icon."IMAGE_EXT,_("Star Tool"));
+#undef INIT_STOCK_ICON
+#undef INIT_STOCK_ICON
+
icon_factory->add_default();
Gtk::IconSize::register_new("synfig-small_icon",12,12);
Gdk::Cursor
IconController::get_tool_cursor(const Glib::ustring& name,const Glib::RefPtr<Gdk::Window>& window)
{
+ //this function is never called
+ //it is commented out in WorkArea::refresh_cursor()
+ assert(0);
+ // \todo Do we still need it?
+
Glib::RefPtr<Gdk::Pixmap> pixmap;
pixmap=Gdk::Pixmap::create(window, 64, 64, 8);
pixmap->set_colormap(window->get_colormap());
Instance::Instance(synfig::Canvas::Handle canvas):
synfigapp::Instance (canvas),
-// canvas_tree_store_ (Gtk::TreeStore::create(CanvasTreeModel())),
-// canvas_tree_store_ (Gtk::TreeStore::create()),
+ canvas_tree_store_ (Gtk::TreeStore::create(canvas_tree_model)),
history_tree_store_ (HistoryTreeStore::create(this)),
undo_status_(false),
redo_status_(false)
{
- CanvasTreeModel model;
- canvas_tree_store_=Gtk::TreeStore::create(model);
-
id_=instance_count_++;
// Connect up all the signals
)
);
- canvas_tree_store_=Gtk::TreeStore::create(canvas_tree_model);
-
refresh_canvas_tree();
}
Layer::Handle parent_layer(dynamic_cast<Layer*>(node));
if(parent_layer && parent_layer->get_canvas()->get_root()!=get_canvas())
{
+ //! \todo Fix big involving "Save As" with referenced compositions
string msg(strprintf(_("There is currently a bug when using \"SaveAs\"\n"
"on a composition that is being referenced by other\n"
"files that are currently open. Close these\n"
for(iter=children.begin();iter!=children.end();iter++)
insert_canvas(*(canvas_tree_store()->append(row.children())),*iter);
- }
-
- /*
- if(!canvas->value_node_list().empty())
- {
- Gtk::TreeRow valuenode_row = *(canvas_tree_store()->append(row.children()));
-
- valuenode_row[canvas_tree_model.label] = "<defs>";
- valuenode_row[canvas_tree_model.canvas] = canvas;
- valuenode_row[canvas_tree_model.is_canvas] = false;
- valuenode_row[canvas_tree_model.is_value_node] = false;
-
- synfig::ValueNodeList::iterator iter;
- synfig::ValueNodeList &value_node_list(canvas->value_node_list());
-
- for(iter=value_node_list.begin();iter!=value_node_list.end();iter++)
- insert_value_node(*(canvas_tree_store()->append(valuenode_row.children())),canvas,*iter);
- }
- */
-}
-
-/*
-void
-Instance::insert_value_node(Gtk::TreeRow row,Canvas::Handle canvas,etl::handle<synfig::ValueNode> value_node)
-{
- CanvasTreeModel canvas_tree_model;
- assert(value_node);
- assert(canvas);
-
- row[canvas_tree_model.id] = value_node->get_id();
- row[canvas_tree_model.name] = value_node->get_id();
- row[canvas_tree_model.label] = value_node->get_id();
- row[canvas_tree_model.canvas] = canvas;
- row[canvas_tree_model.value_node] = value_node;
- row[canvas_tree_model.is_canvas] = false;
- row[canvas_tree_model.is_value_node] = true;
- row[canvas_tree_model.icon] = Gtk::Button().render_icon(valuenode_icon(value_node),Gtk::ICON_SIZE_SMALL_TOOLBAR);
+ }
}
-*/
void
Instance::refresh_canvas_tree()
Gtk::Image* image(manage(new Gtk::Image()));
Gtk::Stock::lookup(get_action_stock_id(*iter),Gtk::ICON_SIZE_MENU,*image);
- /*
- if(iter->task=="raise")
- Gtk::Stock::lookup(Gtk::Stock::GO_UP,Gtk::ICON_SIZE_MENU,*image);
- else if(iter->task=="lower")
- Gtk::Stock::lookup(Gtk::Stock::GO_DOWN,Gtk::ICON_SIZE_MENU,*image);
- else if(iter->task=="move_top")
- Gtk::Stock::lookup(Gtk::Stock::GOTO_TOP,Gtk::ICON_SIZE_MENU,*image);
- else if(iter->task=="move_bottom")
- Gtk::Stock::lookup(Gtk::Stock::GOTO_BOTTOM,Gtk::ICON_SIZE_MENU,*image);
- else if(iter->task=="remove")
- Gtk::Stock::lookup(Gtk::Stock::DELETE,Gtk::ICON_SIZE_MENU,*image);
- else if(iter->task=="set_on")
- Gtk::Stock::lookup(Gtk::Stock::YES,Gtk::ICON_SIZE_MENU,*image);
- else if(iter->task=="set_off")
- Gtk::Stock::lookup(Gtk::Stock::NO,Gtk::ICON_SIZE_MENU,*image);
- else if(iter->task=="duplicate")
- Gtk::Stock::lookup(Gtk::Stock::COPY,Gtk::ICON_SIZE_MENU,*image);
- else if(iter->task=="remove")
- Gtk::Stock::lookup(Gtk::Stock::DELETE,Gtk::ICON_SIZE_MENU,*image);
- else
- {
- Gtk::Stock::lookup(Gtk::StockID("synfig-"+iter->name),Gtk::ICON_SIZE_MENU,*image) ||
- Gtk::Stock::lookup(Gtk::StockID("gtk-"+iter->task),Gtk::ICON_SIZE_MENU,*image) ||
- Gtk::Stock::lookup(Gtk::StockID("synfig-"+iter->task),Gtk::ICON_SIZE_MENU,*image);
- }
- */
menu->items().push_back(
Gtk::Menu_Helpers::ImageMenuElem(
iter->local_name,
Gtk::Image* image(manage(new Gtk::Image()));
Gtk::Stock::lookup(get_action_stock_id(*iter),Gtk::ICON_SIZE_MENU,*image);
-/* if(iter->task=="raise")
- Gtk::Stock::lookup(Gtk::Stock::GO_UP,Gtk::ICON_SIZE_MENU,*image);
- else if(iter->task=="lower")
- Gtk::Stock::lookup(Gtk::Stock::GO_DOWN,Gtk::ICON_SIZE_MENU,*image);
- else if(iter->task=="move_top")
- Gtk::Stock::lookup(Gtk::Stock::GOTO_TOP,Gtk::ICON_SIZE_MENU,*image);
- else if(iter->task=="move_bottom")
- Gtk::Stock::lookup(Gtk::Stock::GOTO_BOTTOM,Gtk::ICON_SIZE_MENU,*image);
- else if(iter->task=="remove")
- Gtk::Stock::lookup(Gtk::Stock::DELETE,Gtk::ICON_SIZE_MENU,*image);
- else if(iter->task=="set_on")
- Gtk::Stock::lookup(Gtk::Stock::YES,Gtk::ICON_SIZE_MENU,*image);
- else if(iter->task=="set_off")
- Gtk::Stock::lookup(Gtk::Stock::NO,Gtk::ICON_SIZE_MENU,*image);
- else if(iter->task=="duplicate")
- Gtk::Stock::lookup(Gtk::Stock::COPY,Gtk::ICON_SIZE_MENU,*image);
- else if(iter->task=="remove")
- Gtk::Stock::lookup(Gtk::Stock::DELETE,Gtk::ICON_SIZE_MENU,*image);
- else
- {
- Gtk::Stock::lookup(Gtk::StockID("synfig-"+iter->name),Gtk::ICON_SIZE_MENU,*image) ||
- Gtk::Stock::lookup(Gtk::StockID("gtk-"+iter->task),Gtk::ICON_SIZE_MENU,*image) ||
- Gtk::Stock::lookup(Gtk::StockID("synfig-"+iter->task),Gtk::ICON_SIZE_MENU,*image);
- }
-*/
menu->items().push_back(
Gtk::Menu_Helpers::ImageMenuElem(
iter->local_name,
{
Gtk::Image* image(manage(new Gtk::Image()));
Gtk::Stock::lookup(get_action_stock_id(*iter),Gtk::ICON_SIZE_MENU,*image);
-/* if(iter->task=="raise")
- Gtk::Stock::lookup(Gtk::Stock::GO_UP,Gtk::ICON_SIZE_MENU,*image);
- else if(iter->task=="lower")
- Gtk::Stock::lookup(Gtk::Stock::GO_DOWN,Gtk::ICON_SIZE_MENU,*image);
- else if(iter->task=="move_top")
- Gtk::Stock::lookup(Gtk::Stock::GOTO_TOP,Gtk::ICON_SIZE_MENU,*image);
- else if(iter->task=="move_bottom")
- Gtk::Stock::lookup(Gtk::Stock::GOTO_BOTTOM,Gtk::ICON_SIZE_MENU,*image);
- else if(iter->task=="remove")
- Gtk::Stock::lookup(Gtk::Stock::DELETE,Gtk::ICON_SIZE_MENU,*image);
- else if(iter->task=="set_on")
- Gtk::Stock::lookup(Gtk::Stock::YES,Gtk::ICON_SIZE_MENU,*image);
- else if(iter->task=="set_off")
- Gtk::Stock::lookup(Gtk::Stock::NO,Gtk::ICON_SIZE_MENU,*image);
- else if(iter->task=="duplicate")
- Gtk::Stock::lookup(Gtk::Stock::COPY,Gtk::ICON_SIZE_MENU,*image);
- else if(iter->task=="remove")
- Gtk::Stock::lookup(Gtk::Stock::DELETE,Gtk::ICON_SIZE_MENU,*image);
- else
- {
- Gtk::Stock::lookup(Gtk::StockID("synfig-"+iter->name),Gtk::ICON_SIZE_MENU,*image) ||
- Gtk::Stock::lookup(Gtk::StockID("gtk-"+iter->task),Gtk::ICON_SIZE_MENU,*image) ||
- Gtk::Stock::lookup(Gtk::StockID("synfig-"+iter->task),Gtk::ICON_SIZE_MENU,*image);
- }
-*/
+
menu->items().push_back(
Gtk::Menu_Helpers::ImageMenuElem(
iter->local_name,
append_column(*column);
}
- // append_column_editable(_("Description"),model.description);
{
Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Description")) );
// Gtk::TreeModel::Row row(*get_iter(path));
return true;
-// return (bool)true;
}
bool
{
if(column>=get_n_columns_vfunc())
{
- g_warning("KeyframeTreeStore::set_value_impl: Bad column (%d)",column);
+ g_warning("MetaDataTreeStore::set_value_impl: Bad column (%d)",column);
return;
}
{
if(column>=get_n_columns_vfunc())
{
- g_warning("KeyframeTreeStore::set_value_impl: Bad column (%d)",column);
+ g_warning("MetaDataTreeStore::set_value_impl: Bad column (%d)",column);
return;
}
if(!g_value_type_compatible(G_VALUE_TYPE(value.gobj()),get_column_type_vfunc(column)))
{
- g_warning("KeyframeTreeStore::set_value_impl: Bad value type");
+ g_warning("MetaDataTreeStore::set_value_impl: Bad value type");
return;
}
OneMoment::OneMoment():
Gtk::Window(getenv("SYNFIG_DISABLE_POPUP_WINDOWS") ? Gtk::WINDOW_TOPLEVEL : Gtk::WINDOW_POPUP)
{
- // Create the Copyright Label
+ // Create the Label
Gtk::Label *label = manage(new class Gtk::Label(_("One Moment, Please...")));
set_title(_("One Moment, Please..."));
filemenu->items().push_back(Gtk::Menu_Helpers::SeparatorElem());
filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Panels"),*dock_dialogs));
- //filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Canvas Browser..."),
- // sigc::mem_fun(studio::App::show_comp_view)));
- //filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Gradient Editor..."),
- // sigc::mem_fun(show_dialog_gradient)));
- //filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Tool Options"),
- // sigc::mem_fun(show_dialog_tool_options)));
- //filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Colors..."),
- // sigc::mem_fun(show_dialog_color)));
- //filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Color Palette..."),
- // sigc::mem_fun(show_dialog_palette)));
filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Input Devices..."),
sigc::ptr_fun(&show_dialog_input)));
filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Setup..."),
table1->set_col_spacings(0);
table1->attach(*menubar1, 0,1, 0,1, Gtk::FILL|Gtk::EXPAND, Gtk::SHRINK, 0, 0);
table1->attach(*file_buttons, 0,1, 1,2, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0);
- //table1->attach(*manage(new Gtk::Label(_("Tools"))), 0, 1, 2, 3, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0);
- table1->attach(*handle_tools, 0,1, 3,4, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0);
- table1->attach(*handle_defaults, 0,1, 4,5, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0);
+ table1->attach(*handle_tools, 0,1, 2,3, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0);
+ table1->attach(*handle_defaults, 0,1, 3,4, Gtk::FILL|Gtk::EXPAND,Gtk::EXPAND|Gtk::FILL, 0, 0);
table1->show_all();
//structors
ValueBaseLink::ValueBaseLink()
{
+ assert(0); //CHECK: This class does not appear to be used.
}
ValueBaseLink::~ValueBaseLink()
App::dialog_gradient->set_gradient(synfigapp::Main::get_gradient());
App::dialog_gradient->reset();
App::dialog_gradient->signal_edited().connect(sigc::ptr_fun(synfigapp::Main::set_gradient));
- App::dialog_gradient->grab_button_set_sensitive(false);
+ App::dialog_gradient->set_default_button_set_sensitive(false);
App::dialog_gradient->present();
}
{
spinbutton_x->hide();
spinbutton_y->hide();
-// delete spinbutton_x;
-// delete spinbutton_y;
}
distance_x->show();
distance_y->show();
drawing_area->get_window()->set_cursor(Gdk::Cursor(x));
}
-#include "iconcontroller.h"
-
+//#include "iconcontroller.h"
void
studio::WorkArea::refresh_cursor()
{
projects / synfig.git / commitdiff