X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdialog_gradient.cpp;h=5a3edca12869f96b78fecc4907632c29495a8db5;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=5a3b0a7f2ee5e6184fc44e1e3a7b186ae5b4b026;hpb=2c43cbfff01496919316f600ee76112be551392d;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..5a3edca 100644 --- a/synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp +++ b/synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp @@ -1,20 +1,21 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file dialog_gradient.cpp ** \brief Template File ** -** $Id: dialog_gradient.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $ +** $Id$ ** ** \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 */ /* ========================================================================= */ @@ -33,21 +34,23 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "widget_color.h" #include #include "app.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ @@ -61,16 +64,15 @@ using namespace studio; Dialog_Gradient::Dialog_Gradient(): Dialog(_("Gradient Editor"),false,true), dialog_settings(this,"gradient"), - adjustment_pos(0,0.0,1.0,0.001,0.001,0.001) + adjustment_pos(0,0.0,1.0,0.001,0.001,0) { set_type_hint(Gdk::WINDOW_TYPE_HINT_DIALOG); - set_keep_below(true); set_keep_above(false); set_role("gradient_editor"); - + // Setup the buttons - Gtk::Button *grab_button(manage(new class Gtk::Button(Gtk::StockID("Grab")))); + 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)); @@ -81,36 +83,36 @@ Dialog_Gradient::Dialog_Gradient(): add_action_widget(*apply_button,1); apply_button->signal_clicked().connect(sigc::mem_fun(*this, &Dialog_Gradient::on_apply_pressed)); */ - + Gtk::Button *cancel_button(manage(new class Gtk::Button(Gtk::StockID("gtk-close")))); cancel_button->show(); add_action_widget(*cancel_button,0); - cancel_button->signal_clicked().connect(sigc::mem_fun(*this, &Dialog_Gradient::hide)); + cancel_button->signal_clicked().connect(sigc::mem_fun(*this, &Dialog_Gradient::hide)); Gtk::Table* table(manage(new Gtk::Table(2,2,false))); get_vbox()->pack_start(*table); widget_gradient=manage(new Widget_Gradient()); widget_gradient->set_editable(); - widget_gradient->signal_cpoint_selected().connect(sigc::mem_fun(*this,&studio::Dialog_Gradient::on_cpoint_selected)); + widget_gradient->signal_cpoint_selected().connect(sigc::mem_fun(*this,&studio::Dialog_Gradient::on_cpoint_selected)); widget_gradient->signal_value_changed().connect(sigc::mem_fun(*this,&studio::Dialog_Gradient::on_changed)); - //table->attach(*manage(new Gtk::Label(_("Not yet fully implemented"))), 0, 1, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); - table->attach(*widget_gradient, 0, 1, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + //table->attach(*manage(new Gtk::Label(_("Not yet fully implemented"))), 0, 1, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + table->attach(*widget_gradient, 0, 1, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); widget_color=manage(new Widget_ColorEdit()); widget_color->signal_value_changed().connect(sigc::mem_fun(*this,&studio::Dialog_Gradient::on_values_adjusted)); widget_color->signal_value_changed().connect(sigc::mem_fun(*this,&studio::Dialog_Gradient::on_changed)); widget_color->signal_activated().connect(sigc::mem_fun(*this,&studio::Dialog_Gradient::on_values_adjusted)); - table->attach(*widget_color, 0, 1, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + table->attach(*widget_color, 0, 1, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); spinbutton_pos=manage(new class Gtk::SpinButton(adjustment_pos,0.0001,4)); spinbutton_pos->set_update_policy(Gtk::UPDATE_ALWAYS); adjustment_pos.signal_value_changed().connect(sigc::mem_fun(*this,&studio::Dialog_Gradient::on_values_adjusted)); adjustment_pos.signal_value_changed().connect(sigc::mem_fun(*this,&studio::Dialog_Gradient::on_changed)); - table->attach(*spinbutton_pos, 0, 1, 1, 2, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0); + table->attach(*spinbutton_pos, 0, 1, 1, 2, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0); + - add_accel_group(App::ui_manager()->get_accel_group()); show_all_children(); @@ -121,7 +123,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 +138,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 +157,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,27 +166,27 @@ 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()) set_gradient(x.get_value().get(Gradient())); else if(x.is_value_node()) set_gradient((*x.get_value_node())(time).get(Gradient())); - + signal_edited().connect( sigc::bind( sigc::bind( @@ -194,6 +196,6 @@ Dialog_Gradient::edit(const sinfgapp::ValueDesc &x, etl::handle