**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2008 Chris Moore
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
#include <ETL/clock>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
//Toolbox display
Gtk::Table options_table;
- //Gtk::Entry entry_id; //what to name the layer
-
Gtk::Adjustment adj_delta;
Gtk::SpinButton spin_delta;
void save_settings();
void reset();
-}; // END of class StateGradient_Context
+}; // END of class StateWidth_Context
/* === M E T H O D S ======================================================= */
else
set_radius(15);
- //defaults to true
- if(settings.get_value("width.relative",value) && value == "0")
- set_relative(false);
- else
+ //defaults to false
+ if(settings.get_value("width.relative",value) && value == "1")
set_relative(true);
+ else
+ set_relative(false);
}
void
StateWidth_Context::StateWidth_Context(CanvasView* canvas_view):
canvas_view_(canvas_view),
is_working(*canvas_view),
- prev_workarea_layer_clicking(get_work_area()->allow_layer_clicks),
- prev_workarea_duck_clicking(get_work_area()->allow_duck_clicks),
+ prev_workarea_layer_clicking(get_work_area()->get_allow_layer_clicks()),
+ prev_workarea_duck_clicking(get_work_area()->get_allow_duck_clicks()),
old_duckmask(get_work_area()->get_type_mask()),
settings(synfigapp::Main::get_selected_input_device()->settings()),
- adj_delta(6,0,1,0.001,0.01),
+ adj_delta(6,0,20,0.01,0.1),
spin_delta(adj_delta,0.01,3),
- adj_radius(0,0,1e50,1,10),
+ adj_radius(200,0,1e50,1,10),
spin_radius(adj_radius,1,1),
check_relative(_("Relative Growth"))
load_settings();
// Set up the tool options dialog
- //options_table.attach(*manage(new Gtk::Label(_("Width Tool"))), 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- //options_table.attach(entry_id, 0, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(*manage(new Gtk::Label(_("Width Tool"))), 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
//expand stuff
- options_table.attach(*manage(new Gtk::Label(_("Growth:"))), 0, 1, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(spin_delta, 1, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(*manage(new Gtk::Label(_("Growth:"))), 0, 1, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(spin_delta, 1, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(*manage(new Gtk::Label(_("Radius:"))), 0, 1, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(spin_radius, 1, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(*manage(new Gtk::Label(_("Radius:"))), 0, 1, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(spin_radius, 1, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(check_relative, 0, 2, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(check_relative, 0, 2, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
options_table.show_all();
App::dialog_tool_options->present();
// Turn off layer clicking
- get_work_area()->allow_layer_clicks=false;
+ get_work_area()->set_allow_layer_clicks(false);
// clear out the ducks
//get_work_area()->clear_ducks();
}
//Disable duck clicking for the maximum coolness :)
- get_work_area()->allow_duck_clicks = false;
+ get_work_area()->set_allow_duck_clicks(false);
get_work_area()->set_type_mask((Duck::Type)((int)Duck::TYPE_WIDTH + (int)Duck::TYPE_RADIUS));
// Turn the mouse pointer to crosshairs
}
// Restore Duck clicking
- get_work_area()->allow_duck_clicks = prev_workarea_duck_clicking;
+ get_work_area()->set_allow_duck_clicks(prev_workarea_duck_clicking);
// Restore layer clicking
- get_work_area()->allow_layer_clicks = prev_workarea_layer_clicking;
+ get_work_area()->set_allow_layer_clicks(prev_workarea_layer_clicking);
// Restore the mouse pointer
get_work_area()->reset_cursor();
{
const EventMouse& event(*reinterpret_cast<const EventMouse*>(&x));
- //handle ze click
+ //handle the click
if( (event.key == EVENT_WORKAREA_MOUSE_BUTTON_DOWN || event.key == EVENT_WORKAREA_MOUSE_BUTTON_DRAG)
&& event.button == BUTTON_LEFT )
{
if( desc.get_value_type() == ValueBase::TYPE_REAL )
{
- Action::Handle action(Action::create("value_desc_set"));
+ Action::Handle action(Action::create("ValueDescSet"));
assert(action);
action->set_param("canvas",get_canvas());