From 50c1511c5721029101e0e69a48401adfba104f6f Mon Sep 17 00:00:00 2001 From: "Liam P. White" Date: Fri, 18 Jul 2014 21:53:39 -0400 Subject: Fix build (bzr r13341.1.89) --- src/live_effects/lpe-simplify.cpp | 6 +++--- src/live_effects/parameter/togglebutton.cpp | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/live_effects/lpe-simplify.cpp b/src/live_effects/lpe-simplify.cpp index 104cbde98..17b97eda9 100644 --- a/src/live_effects/lpe-simplify.cpp +++ b/src/live_effects/lpe-simplify.cpp @@ -1,9 +1,9 @@ -#define INKSCAPE_LPE_SIMPLIFY_C /* * Released under GNU GPL, read the file 'COPYING' for more information */ -#include -#include + +#include + #include "live_effects/lpe-simplify.h" #include "display/curve.h" #include "live_effects/parameter/parameter.h" diff --git a/src/live_effects/parameter/togglebutton.cpp b/src/live_effects/parameter/togglebutton.cpp index d92b9836f..ceb4f98ff 100644 --- a/src/live_effects/parameter/togglebutton.cpp +++ b/src/live_effects/parameter/togglebutton.cpp @@ -5,9 +5,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include -#include -#include +#include #include #include "ui/widget/registered-widget.h" -- cgit v1.2.3 From 94d507366a97e2d5fbfb7d2b2c32f69830844a13 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Mon, 21 Jul 2014 17:05:54 +0200 Subject: Add icons on/off to use in simplify LPE toggle buttons (bzr r13341.1.90) --- src/live_effects/lpe-simplify.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/live_effects/lpe-simplify.cpp b/src/live_effects/lpe-simplify.cpp index 17b97eda9..1a02375cd 100644 --- a/src/live_effects/lpe-simplify.cpp +++ b/src/live_effects/lpe-simplify.cpp @@ -30,13 +30,13 @@ LPESimplify::LPESimplify(LivePathEffectObject *lpeobject) threshold(_("Roughly threshold:"), _("Roughly threshold:"), "threshold", &wr, this, 0.003), helper_size(_("Helper size:"), _("Helper size"), "helper_size", &wr, this, 2.), nodes(_("Helper nodes"), _("Show helper nodes"), "nodes", &wr, this, false, - "", INKSCAPE_ICON("system-run"), INKSCAPE_ICON("process-stop")), + "", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")), handles(_("Helper handles"), _("Show helper handles"), "handles", &wr, this, false, - "", INKSCAPE_ICON("system-run"), INKSCAPE_ICON("process-stop")), + "", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")), simplifyindividualpaths(_("Paths separately"), _("Simplifying paths (separately)"), "simplifyindividualpaths", &wr, this, false, - "", INKSCAPE_ICON("system-run"), INKSCAPE_ICON("process-stop")), + "", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")), simplifyJustCoalesce(_("Just coalesce"), _("Simplify just coalesce"), "simplifyJustCoalesce", &wr, this, false, - "", INKSCAPE_ICON("system-run"), INKSCAPE_ICON("process-stop")) + "", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")) { registerParameter(dynamic_cast(&steps)); registerParameter(dynamic_cast(&threshold)); -- cgit v1.2.3 From 9b1d9867e9cfbf56b44e8a996a4ccf2e7f288b87 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Tue, 22 Jul 2014 02:29:52 +0200 Subject: fix bug pointed by LiamW in Spirolive (bzr r13341.1.94) --- src/ui/tools/pen-tool.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp index aead3ebc0..56bcbef0d 100644 --- a/src/ui/tools/pen-tool.cpp +++ b/src/ui/tools/pen-tool.cpp @@ -1611,7 +1611,6 @@ void PenTool::_bspline_spiro_motion(bool shift){ this->p[2] = this->p[3]; }else{ this->p[1] = (*cubic)[3] + ((*cubic)[3] - (*cubic)[2] ); - this->p[1] = Geom::Point(this->p[1][X] + 0.005,this->p[1][Y] + 0.005); } }else{ this->p[1] = this->p[0]; -- cgit v1.2.3 From db11af074f242faa77a1763efc54d26752fa6d93 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Tue, 22 Jul 2014 18:55:10 +0200 Subject: Fixed alignaments of toggle buttons (bzr r13341.1.95) --- src/live_effects/parameter/togglebutton.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/live_effects/parameter/togglebutton.cpp b/src/live_effects/parameter/togglebutton.cpp index ceb4f98ff..5658d238f 100644 --- a/src/live_effects/parameter/togglebutton.cpp +++ b/src/live_effects/parameter/togglebutton.cpp @@ -95,12 +95,12 @@ ToggleButtonParam::param_newWidget() iconButton = sp_icon_new(iconSize, iconInactive); } gtk_widget_show(iconButton); - gtk_box_pack_start (GTK_BOX(boxButton), iconButton, true, true, 2); + gtk_box_pack_start (GTK_BOX(boxButton), iconButton, false, false, 1); if (!param_label.empty()) { - gtk_box_pack_start (GTK_BOX(boxButton), labelButton, true, true, 2); + gtk_box_pack_start (GTK_BOX(boxButton), labelButton, false, false, 1); } }else{ - gtk_box_pack_start (GTK_BOX(boxButton), labelButton, true, true, 2); + gtk_box_pack_start (GTK_BOX(boxButton), labelButton, false, false, 1); } checkwdg->add(*Gtk::manage(Glib::wrap(boxButton))); checkwdg->setActive(value); -- cgit v1.2.3