X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdialog_gradient.cpp;h=5a3edca12869f96b78fecc4907632c29495a8db5;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=86bcf9afdcfb99f7019c774951e1dbb4e44f8cd8;hpb=7dd8043ef6511adc0eadcd9f011da4cdfdb7536b;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp b/synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp
index 86bcf9a..5a3edca 100644
--- a/synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp
@@ -2,7 +2,7 @@
 /*!	\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-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -42,6 +42,8 @@
 #include <gtkmm/spinbutton.h>
 #include "app.h"
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -62,15 +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_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();
@@ -171,7 +173,7 @@ Dialog_Gradient::on_values_adjusted()
 }
 
 static void
-dialog_gradient_value_desc_edit(synfig::Gradient g,synfigapp::ValueDesc x,handle<synfigapp::CanvasInterface> canvas_interface)
+dialog_gradient_value_desc_edit(synfig::Gradient /*g*/,synfigapp::ValueDesc /*x*/,handle<synfigapp::CanvasInterface> /*canvas_interface*/)
 {
 //	canvas_interface->connect_value(x,ValueBase(g));
 }
@@ -184,7 +186,7 @@ Dialog_Gradient::edit(const synfigapp::ValueDesc &x, etl::handle<synfigapp::Canv
 		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 synfigapp::ValueDesc &x, etl::handle<synfigapp::Canv
 			x
 		)
 	);
-		
+
 	present();
 }