X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdialog_gradient.cpp;h=fff92e030c338c17adad7410f5a6ac22e787f134;hb=02252941b29de64037116f4d37991a38d9ff0d94;hp=5a3b0a7f2ee5e6184fc44e1e3a7b186ae5b4b026;hpb=34f6fabfcefdc878ba3c08b82358ae4aef439e99;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp b/synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp index 5a3b0a7..fff92e0 100644 --- a/synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp +++ b/synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file dialog_gradient.cpp ** \brief Template File ** @@ -33,10 +33,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "widget_color.h" #include #include "app.h" @@ -47,7 +47,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ @@ -121,7 +121,7 @@ Dialog_Gradient::~Dialog_Gradient() } void -Dialog_Gradient::set_gradient(const sinfg::Gradient& x) +Dialog_Gradient::set_gradient(const synfig::Gradient& x) { widget_gradient->set_value(x); } @@ -136,7 +136,7 @@ Dialog_Gradient::reset() void Dialog_Gradient::on_grab_pressed() { - sinfgapp::Main::set_gradient(get_gradient()); + synfigapp::Main::set_gradient(get_gradient()); // signal_edited_(get_gradient()); // reset(); // hide(); @@ -155,7 +155,7 @@ Dialog_Gradient::on_changed() } void -Dialog_Gradient::on_cpoint_selected(sinfg::Gradient::CPoint x) +Dialog_Gradient::on_cpoint_selected(synfig::Gradient::CPoint x) { widget_color->set_value(x.color); adjustment_pos.set_value(x.pos); @@ -164,20 +164,20 @@ Dialog_Gradient::on_cpoint_selected(sinfg::Gradient::CPoint x) void Dialog_Gradient::on_values_adjusted() { - sinfg::Gradient::CPoint x(widget_gradient->get_selected_cpoint()); + synfig::Gradient::CPoint x(widget_gradient->get_selected_cpoint()); x.color=widget_color->get_value(); x.pos=adjustment_pos.get_value(); widget_gradient->update_cpoint(x); } static void -dialog_gradient_value_desc_edit(sinfg::Gradient g,sinfgapp::ValueDesc x,handle canvas_interface) +dialog_gradient_value_desc_edit(synfig::Gradient g,synfigapp::ValueDesc x,handle canvas_interface) { // canvas_interface->connect_value(x,ValueBase(g)); } void -Dialog_Gradient::edit(const sinfgapp::ValueDesc &x, etl::handle canvas_interface, sinfg::Time time) +Dialog_Gradient::edit(const synfigapp::ValueDesc &x, etl::handle canvas_interface, synfig::Time time) { reset(); if(x.is_const())