![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 99ac56cbd54d76fcd27122983a46db9936f1db03..387510b361473ae64f689d3f17e52d6db555d514 100644 (file)
#endif
#include <gtkmm/stock.h>
+#include <gtkmm/dialog.h>
#include "document.h"
#include "desktop-handles.h"
namespace UI {
namespace Dialog {
-void on_selection_changed(Inkscape::Application *inkscape, Inkscape::Selection *selection, Transformation *daad)
+void on_selection_changed(Inkscape::Application */*inkscape*/, Inkscape::Selection *selection, Transformation *daad)
{
int page = daad->getCurrentPage();
daad->updateSelection((Inkscape::UI::Dialog::Transformation::PageType)page, selection);
}
-void on_selection_modified ( Inkscape::Application *inkscape,
- Inkscape::Selection *selection,
- guint flags,
- Transformation *daad )
+void on_selection_modified( Inkscape::Application */*inkscape*/,
+ Inkscape::Selection *selection,
+ guint /*flags*/,
+ Transformation *daad )
{
int page = daad->getCurrentPage();
daad->updateSelection((Inkscape::UI::Dialog::Transformation::PageType)page, selection);
*
*/
Transformation::Transformation()
- : Dialog ("dialogs.transformation", SP_VERB_DIALOG_TRANSFORM),
+ : UI::Widget::Panel ("", "dialogs.transformation", SP_VERB_DIALOG_TRANSFORM),
_page_move (4, 2),
_page_scale (4, 2),
_page_rotate (4, 2),
_page_skew (4, 2),
_page_transform (3, 3),
- _scalar_move_horizontal (_("_Horizontal"), _("Horizontal displacement (relative) or position (absolute)"), UNIT_TYPE_LINEAR,
+ _scalar_move_horizontal (_("_Horizontal"), _("Horizontal displacement (relative) or position (absolute)"), UNIT_TYPE_LINEAR,
"", "arrows_hor", &_units_move),
- _scalar_move_vertical (_("_Vertical"), _("Vertical displacement (relative) or position (absolute)"), UNIT_TYPE_LINEAR,
+ _scalar_move_vertical (_("_Vertical"), _("Vertical displacement (relative) or position (absolute)"), UNIT_TYPE_LINEAR,
"", "arrows_ver", &_units_move),
- _scalar_scale_horizontal(_("_Width"), _("Horizontal size increment (absolute or percentage)"), UNIT_TYPE_DIMENSIONLESS,
+ _scalar_scale_horizontal(_("_Width"), _("Horizontal size (absolute or percentage of current)"), UNIT_TYPE_DIMENSIONLESS,
"", "transform_scale_hor", &_units_scale),
- _scalar_scale_vertical (_("_Height"), _("Vertical size increment (absolute or percentage)"), UNIT_TYPE_DIMENSIONLESS,
+ _scalar_scale_vertical (_("_Height"), _("Vertical size (absolute or percentage of current)"), UNIT_TYPE_DIMENSIONLESS,
"", "transform_scale_ver", &_units_scale),
- _scalar_rotate (_("A_ngle"), _("Rotation angle (positive = counterclockwise)"), UNIT_TYPE_RADIAL,
+ _scalar_rotate (_("A_ngle"), _("Rotation angle (positive = counterclockwise)"), UNIT_TYPE_RADIAL,
"", "transform_rotate", &_units_rotate),
- _scalar_skew_horizontal (_("_Horizontal"), _("Horizontal skew angle (positive = counterclockwise), or absolute displacement, or percentage displacement"), UNIT_TYPE_LINEAR,
- "", "arrows_hor", &_units_skew),
- _scalar_skew_vertical (_("_Vertical"), _("Vertical skew angle (positive = counterclockwise), or absolute displacement, or percentage displacement"), UNIT_TYPE_LINEAR,
- "", "arrows_ver", &_units_skew),
+ _scalar_skew_horizontal (_("_Horizontal"), _("Horizontal skew angle (positive = counterclockwise), or absolute displacement, or percentage displacement"), UNIT_TYPE_LINEAR,
+ "", "transform_scew_hor", &_units_skew),
+ _scalar_skew_vertical (_("_Vertical"), _("Vertical skew angle (positive = counterclockwise), or absolute displacement, or percentage displacement"), UNIT_TYPE_LINEAR,
+ "", "transform_scew_ver", &_units_skew),
_scalar_transform_a ("_A", _("Transformation matrix element A")),
_scalar_transform_b ("_B", _("Transformation matrix element B")),
_check_replace_matrix (_("Edit c_urrent matrix"), _("Edit the current transform= matrix; otherwise, post-multiply transform= by this matrix"))
{
- // Top level vbox
- Gtk::VBox *vbox = get_vbox();
- vbox->set_spacing(0);
+ Gtk::Box *contents = _getContents();
+
+ contents->set_spacing(0);
// Notebook for individual transformations
- vbox->pack_start(_notebook, true, true);
+ contents->pack_start(_notebook, true, true);
_notebook.append_page(_page_move, _("_Move"), true);
layoutPageMove();
_notebook.signal_switch_page().connect(sigc::mem_fun(*this, &Transformation::onSwitchPage));
// Apply separately
- vbox->pack_start(_check_apply_separately, true, true);
+ contents->pack_start(_check_apply_separately, true, true);
_check_apply_separately.set_active(prefs_get_int_attribute_limited ("dialogs.transformation", "applyseparately", 0, 0, 1));
_check_apply_separately.signal_toggled().connect(sigc::mem_fun(*this, &Transformation::onApplySeparatelyToggled));
updateSelection(PAGE_MOVE, _getSelection());
- resetButton = add_button(Gtk::Stock::CLEAR, 0);
+ resetButton = addResponseButton(Gtk::Stock::CLEAR, 0);
if (resetButton) {
- tooltips.set_tip((*resetButton), _("Reset the values on the current tab to defaults"));
+ _tooltips.set_tip((*resetButton), _("Reset the values on the current tab to defaults"));
resetButton->set_sensitive(true);
resetButton->signal_clicked().connect(sigc::mem_fun(*this, &Transformation::onClear));
}
- applyButton = add_button(Gtk::Stock::APPLY, Gtk::RESPONSE_APPLY);
+ applyButton = addResponseButton(Gtk::Stock::APPLY, Gtk::RESPONSE_APPLY);
if (applyButton) {
- tooltips.set_tip((*applyButton), _("Apply transformation to selection"));
+ _tooltips.set_tip((*applyButton), _("Apply transformation to selection"));
applyButton->set_sensitive(false);
- set_default (*applyButton); // activable by Enter in spinbuttons
}
// Connect to the global selection changed & modified signals
}
-
/*########################################################################
# U T I L I T Y
########################################################################*/
Transformation::presentPage(Transformation::PageType page)
{
_notebook.set_current_page(page);
- Gtk::Dialog::show();
- Gtk::Dialog::present();
+ show();
+ present();
}
_units_scale.setUnitType(UNIT_TYPE_LINEAR);
_scalar_scale_horizontal.initScalar(-1e6, 1e6);
- _scalar_scale_horizontal.setValue(0.0, "%");
+ _scalar_scale_horizontal.setValue(100.0, "%");
_scalar_scale_horizontal.setDigits(3);
_scalar_scale_horizontal.setIncrements(0.1, 1.0);
_scalar_scale_horizontal.setAbsoluteIsIncrement(true);
_scalar_scale_horizontal.setPercentageIsIncrement(true);
_scalar_scale_vertical.initScalar(-1e6, 1e6);
- _scalar_scale_vertical.setValue(0.0, "%");
+ _scalar_scale_vertical.setValue(100.0, "%");
_scalar_scale_vertical.setDigits(3);
_scalar_scale_vertical.setIncrements(0.1, 1.0);
_scalar_scale_vertical.setAbsoluteIsIncrement(true);
@@ -439,15 +438,15 @@ Transformation::updateSelection(PageType page, Inkscape::Selection *selection)
}
}
- set_response_sensitive(Gtk::RESPONSE_APPLY,
- selection && !selection->isEmpty());
+ setResponseSensitive(Gtk::RESPONSE_APPLY,
+ selection && !selection->isEmpty());
}
void
-Transformation::onSwitchPage(GtkNotebookPage *page,
+Transformation::onSwitchPage(GtkNotebookPage */*page*/,
guint pagenum)
{
- updateSelection((PageType)pagenum, sp_desktop_selection(SP_ACTIVE_DESKTOP));
+ updateSelection((PageType)pagenum, sp_desktop_selection(getDesktop()));
}
void
{
if (selection && !selection->isEmpty()) {
if (!_check_move_relative.get_active()) {
+ NR::Maybe<NR::Rect> bbox = selection->bounds();
+ if (bbox) {
+ double x = bbox->min()[NR::X];
+ double y = bbox->min()[NR::Y];
- NR::Rect bbox = selection->bounds();
- double x = bbox.min()[NR::X];
- double y = bbox.min()[NR::Y];
-
- _scalar_move_horizontal.setValue(x, "px");
- _scalar_move_vertical.setValue(y, "px");
+ _scalar_move_horizontal.setValue(x, "px");
+ _scalar_move_vertical.setValue(y, "px");
+ }
} else {
// do nothing, so you can apply the same relative move to many objects in turn
}
Transformation::updatePageScale(Inkscape::Selection *selection)
{
if (selection && !selection->isEmpty()) {
- NR::Rect bbox = selection->bounds();
- double w = bbox.extent(NR::X);
- double h = bbox.extent(NR::Y);
- _scalar_scale_horizontal.setHundredPercent(w);
- _scalar_scale_vertical.setHundredPercent(h);
- onScaleXValueChanged(); // to update x/y proportionality if switch is on
- _page_scale.set_sensitive(true);
+ NR::Maybe<NR::Rect> bbox = selection->bounds();
+ if (bbox) {
+ double w = bbox->extent(NR::X);
+ double h = bbox->extent(NR::Y);
+ _scalar_scale_horizontal.setHundredPercent(w);
+ _scalar_scale_vertical.setHundredPercent(h);
+ onScaleXValueChanged(); // to update x/y proportionality if switch is on
+ _page_scale.set_sensitive(true);
+ } else {
+ _page_scale.set_sensitive(false);
+ }
} else {
_page_scale.set_sensitive(false);
}
}
//Let's play with never turning this off
- //set_response_sensitive(Gtk::RESPONSE_APPLY, false);
+ //setResponseSensitive(Gtk::RESPONSE_APPLY, false);
}
void
if (_check_move_relative.get_active()) {
sp_selection_move_relative(selection, x, y);
} else {
- NR::Rect bbox = selection->bounds();
- sp_selection_move_relative(selection,
- x - bbox.min()[NR::X], y - bbox.min()[NR::Y]);
+ NR::Maybe<NR::Rect> bbox = selection->bounds();
+ if (bbox) {
+ sp_selection_move_relative(selection,
+ x - bbox->min()[NR::X], y - bbox->min()[NR::Y]);
+ }
}
- sp_document_done ( sp_desktop_document (selection->desktop()) , SP_VERB_DIALOG_TRANSFORM,
+ sp_document_done ( sp_desktop_document (selection->desktop()) , SP_VERB_DIALOG_TRANSFORM,
_("Move"));
}
if (prefs_get_int_attribute_limited ("dialogs.transformation", "applyseparately", 0, 0, 1) == 1) {
for (GSList const *l = selection->itemList(); l != NULL; l = l->next) {
SPItem *item = SP_ITEM(l->data);
- NR::Rect bbox (sp_item_bbox_desktop(item));
NR::scale scale (0,0);
- // the values are increments!
+ // the values are increments!
if (_units_scale.isAbsolute()) {
- double new_width = bbox.extent(NR::X) + scaleX;
- if (new_width < 1e-6) new_width = 1e-6; // not 0, as this would result in a nasty no-bbox object
- double new_height = bbox.extent(NR::Y) + scaleY;
- if (new_height < 1e-6) new_height = 1e-6;
- scale = NR::scale(new_width / bbox.extent(NR::X), new_height / bbox.extent(NR::Y));
+ NR::Maybe<NR::Rect> bbox(sp_item_bbox_desktop(item));
+ if (bbox) {
+ double new_width = scaleX;
+ if (fabs(new_width) < 1e-6) new_width = 1e-6; // not 0, as this would result in a nasty no-bbox object
+ double new_height = scaleY;
+ if (fabs(new_height) < 1e-6) new_height = 1e-6;
+ scale = NR::scale(new_width / bbox->extent(NR::X), new_height / bbox->extent(NR::Y));
+ }
} else {
- double new_width = 100 + scaleX;
- if (new_width < 1e-6) new_width = 1e-6;
- double new_height = 100 + scaleY;
- if (new_height < 1e-6) new_height = 1e-6;
+ double new_width = scaleX;
+ if (fabs(new_width) < 1e-6) new_width = 1e-6;
+ double new_height = scaleY;
+ if (fabs(new_height) < 1e-6) new_height = 1e-6;
scale = NR::scale(new_width / 100.0, new_height / 100.0);
}
sp_item_scale_rel (item, scale);
}
} else {
- NR::Rect bbox(selection->bounds());
- NR::Point center(bbox.midpoint()); // use rotation center?
- NR::scale scale (0,0);
- // the values are increments!
- if (_units_scale.isAbsolute()) {
- double new_width = bbox.extent(NR::X) + scaleX;
- if (new_width < 1e-6) new_width = 1e-6;
- double new_height = bbox.extent(NR::Y) + scaleY;
- if (new_height < 1e-6) new_height = 1e-6;
- scale = NR::scale(new_width / bbox.extent(NR::X), new_height / bbox.extent(NR::Y));
- } else {
- double new_width = 100 + scaleX;
- if (new_width < 1e-6) new_width = 1e-6;
- double new_height = 100 + scaleY;
- if (new_height < 1e-6) new_height = 1e-6;
- scale = NR::scale(new_width / 100.0, new_height / 100.0);
+ NR::Maybe<NR::Rect> bbox(selection->bounds());
+ if (bbox) {
+ NR::Point center(bbox->midpoint()); // use rotation center?
+ NR::scale scale (0,0);
+ // the values are increments!
+ if (_units_scale.isAbsolute()) {
+ double new_width = scaleX;
+ if (fabs(new_width) < 1e-6) new_width = 1e-6;
+ double new_height = scaleY;
+ if (fabs(new_height) < 1e-6) new_height = 1e-6;
+ scale = NR::scale(new_width / bbox->extent(NR::X), new_height / bbox->extent(NR::Y));
+ } else {
+ double new_width = scaleX;
+ if (fabs(new_width) < 1e-6) new_width = 1e-6;
+ double new_height = scaleY;
+ if (fabs(new_height) < 1e-6) new_height = 1e-6;
+ scale = NR::scale(new_width / 100.0, new_height / 100.0);
+ }
+ sp_selection_scale_relative(selection, center, scale);
}
- sp_selection_scale_relative(selection, center, scale);
}
- sp_document_done(sp_desktop_document(selection->desktop()), SP_VERB_DIALOG_TRANSFORM,
+ sp_document_done(sp_desktop_document(selection->desktop()), SP_VERB_DIALOG_TRANSFORM,
_("Scale"));
}
sp_item_rotate_rel(item, NR::rotate (angle*M_PI/180.0));
}
} else {
- NR::Point center = selection->center();
- sp_selection_rotate_relative(selection, center, angle);
+ NR::Maybe<NR::Point> center = selection->center();
+ if (center) {
+ sp_selection_rotate_relative(selection, *center, angle);
+ }
}
- sp_document_done(sp_desktop_document(selection->desktop()), SP_VERB_DIALOG_TRANSFORM,
+ sp_document_done(sp_desktop_document(selection->desktop()), SP_VERB_DIALOG_TRANSFORM,
_("Rotate"));
}
} else { // absolute displacement
double skewX = _scalar_skew_horizontal.getValue("px");
double skewY = _scalar_skew_vertical.getValue("px");
- NR::Rect bbox(sp_item_bbox_desktop(item));
- double width = bbox.dimensions()[NR::X];
- double height = bbox.dimensions()[NR::Y];
- sp_item_skew_rel (item, skewX/height, skewY/width);
+ NR::Maybe<NR::Rect> bbox(sp_item_bbox_desktop(item));
+ if (bbox) {
+ double width = bbox->extent(NR::X);
+ double height = bbox->extent(NR::Y);
+ sp_item_skew_rel (item, skewX/height, skewY/width);
+ }
}
}
} else { // transform whole selection
- NR::Rect bbox = selection->bounds();
- double width = bbox.max()[NR::X] - bbox.min()[NR::X];
- double height = bbox.max()[NR::Y] - bbox.min()[NR::Y];
- NR::Point center = selection->center();
-
- if (!_units_skew.isAbsolute()) { // percentage
- double skewX = _scalar_skew_horizontal.getValue("%");
- double skewY = _scalar_skew_vertical.getValue("%");
- sp_selection_skew_relative(selection, center, 0.01*skewX, 0.01*skewY);
- } else if (_units_skew.isRadial()) { //deg or rad
- double angleX = _scalar_skew_horizontal.getValue("rad");
- double angleY = _scalar_skew_vertical.getValue("rad");
- double skewX = tan(-angleX);
- double skewY = tan(angleY);
- sp_selection_skew_relative(selection, center, skewX, skewY);
- } else { // absolute displacement
- double skewX = _scalar_skew_horizontal.getValue("px");
- double skewY = _scalar_skew_vertical.getValue("px");
- sp_selection_skew_relative(selection, center, skewX/height, skewY/width);
+ NR::Maybe<NR::Rect> bbox = selection->bounds();
+ NR::Maybe<NR::Point> center = selection->center();
+
+ if ( bbox && center ) {
+ double width = bbox->extent(NR::X);
+ double height = bbox->extent(NR::Y);
+
+ if (!_units_skew.isAbsolute()) { // percentage
+ double skewX = _scalar_skew_horizontal.getValue("%");
+ double skewY = _scalar_skew_vertical.getValue("%");
+ sp_selection_skew_relative(selection, *center, 0.01*skewX, 0.01*skewY);
+ } else if (_units_skew.isRadial()) { //deg or rad
+ double angleX = _scalar_skew_horizontal.getValue("rad");
+ double angleY = _scalar_skew_vertical.getValue("rad");
+ double skewX = tan(-angleX);
+ double skewY = tan(angleY);
+ sp_selection_skew_relative(selection, *center, skewX, skewY);
+ } else { // absolute displacement
+ double skewX = _scalar_skew_horizontal.getValue("px");
+ double skewY = _scalar_skew_vertical.getValue("px");
+ sp_selection_skew_relative(selection, *center, skewX/height, skewY/width);
+ }
}
}
- sp_document_done(sp_desktop_document(selection->desktop()), SP_VERB_DIALOG_TRANSFORM,
+ sp_document_done(sp_desktop_document(selection->desktop()), SP_VERB_DIALOG_TRANSFORM,
_("Skew"));
}
sp_selection_apply_affine(selection, displayed); // post-multiply each object's transform
}
- sp_document_done(sp_desktop_document(selection->desktop()), SP_VERB_DIALOG_TRANSFORM,
+ sp_document_done(sp_desktop_document(selection->desktop()), SP_VERB_DIALOG_TRANSFORM,
_("Edit transformation matrix"));
}
void
Transformation::onMoveValueChanged()
{
- set_response_sensitive(Gtk::RESPONSE_APPLY, true);
+ setResponseSensitive(Gtk::RESPONSE_APPLY, true);
}
void
//g_message("onMoveRelativeToggled: %f, %f px\n", x, y);
- NR::Rect bbox = selection->bounds();
+ NR::Maybe<NR::Rect> bbox = selection->bounds();
- if (_check_move_relative.get_active()) {
- // From absolute to relative
- _scalar_move_horizontal.setValue(x - bbox.min()[NR::X], "px");
- _scalar_move_vertical.setValue( y - bbox.min()[NR::Y], "px");
- } else {
- // From relative to absolute
- _scalar_move_horizontal.setValue(bbox.min()[NR::X] + x, "px");
- _scalar_move_vertical.setValue( bbox.min()[NR::Y] + y, "px");
+ if (bbox) {
+ if (_check_move_relative.get_active()) {
+ // From absolute to relative
+ _scalar_move_horizontal.setValue(x - bbox->min()[NR::X], "px");
+ _scalar_move_vertical.setValue( y - bbox->min()[NR::Y], "px");
+ } else {
+ // From relative to absolute
+ _scalar_move_horizontal.setValue(bbox->min()[NR::X] + x, "px");
+ _scalar_move_vertical.setValue( bbox->min()[NR::Y] + y, "px");
+ }
}
-
- set_response_sensitive(Gtk::RESPONSE_APPLY, true);
+ setResponseSensitive(Gtk::RESPONSE_APPLY, true);
}
void
return;
}
- set_response_sensitive(Gtk::RESPONSE_APPLY, true);
+ setResponseSensitive(Gtk::RESPONSE_APPLY, true);
if (_check_scale_proportional.get_active()) {
if (!_units_scale.isAbsolute()) { // percentage, just copy over
return;
}
- set_response_sensitive(Gtk::RESPONSE_APPLY, true);
+ setResponseSensitive(Gtk::RESPONSE_APPLY, true);
if (_check_scale_proportional.get_active()) {
if (!_units_scale.isAbsolute()) { // percentage, just copy over
void
Transformation::onRotateValueChanged()
{
- set_response_sensitive(Gtk::RESPONSE_APPLY, true);
+ setResponseSensitive(Gtk::RESPONSE_APPLY, true);
}
void
Transformation::onSkewValueChanged()
{
- set_response_sensitive(Gtk::RESPONSE_APPLY, true);
+ setResponseSensitive(Gtk::RESPONSE_APPLY, true);
}
void
// a, b, c, d, e ,f);
*/
- set_response_sensitive(Gtk::RESPONSE_APPLY, true);
+ setResponseSensitive(Gtk::RESPONSE_APPLY, true);
}
void
_scalar_move_horizontal.setValue(0);
_scalar_move_vertical.setValue(0);
} else {
- NR::Rect bbox = selection->bounds();
- _scalar_move_horizontal.setValue(bbox.min()[NR::X], "px");
- _scalar_move_vertical.setValue(bbox.min()[NR::Y], "px");
+ NR::Maybe<NR::Rect> bbox = selection->bounds();
+ if (bbox) {
+ _scalar_move_horizontal.setValue(bbox->min()[NR::X], "px");
+ _scalar_move_vertical.setValue(bbox->min()[NR::Y], "px");
+ }
}
break;
}
break;
}
case PAGE_SCALE: {
- _scalar_scale_horizontal.setValue(0);
- _scalar_scale_vertical.setValue(0);
+ _scalar_scale_horizontal.setValue(100);
+ _scalar_scale_vertical.setValue(100);
break;
}
case PAGE_SKEW: {