From f54eec8d822fbae11b8841d00647dee902df2ac1 Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <>
Date: Sat, 3 Jan 2015 22:01:14 +0100
Subject: Fix for Bug #1407326 (Typo (toogle) in filletchanferpoinarray.cpp).
Fixed bugs:
- https://launchpad.net/bugs/1407326
(bzr r13836)
---
src/live_effects/parameter/filletchamferpointarray.cpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
(limited to 'src/live_effects/parameter/filletchamferpointarray.cpp')
diff --git a/src/live_effects/parameter/filletchamferpointarray.cpp b/src/live_effects/parameter/filletchamferpointarray.cpp
index 7d8c8e9b0..2ebe11b4b 100644
--- a/src/live_effects/parameter/filletchamferpointarray.cpp
+++ b/src/live_effects/parameter/filletchamferpointarray.cpp
@@ -779,19 +779,19 @@ void FilletChamferPointArrayParamKnotHolderEntity::knot_click(guint state)
sp_lpe_item_update_patheffect(SP_LPE_ITEM(item), false, false);
const gchar *tip;
if (type >=3000 && type < 4000){
- tip = _("Chamfer: Ctrl+Click toogle type, "
+ tip = _("Chamfer: Ctrl+Click toggle type, "
"Shift+Click open dialog, "
"Ctrl+Alt+Click reset");
} else if (type >=4000 && type < 5000) {
- tip = _("Inverse Chamfer: Ctrl+Click toogle type, "
+ tip = _("Inverse Chamfer: Ctrl+Click toggle type, "
"Shift+Click open dialog, "
"Ctrl+Alt+Click reset");
} else if (type == 2) {
- tip = _("Inverse Fillet: Ctrl+Click toogle type, "
+ tip = _("Inverse Fillet: Ctrl+Click toggle type, "
"Shift+Click open dialog, "
"Ctrl+Alt+Click reset");
} else {
- tip = _("Fillet: Ctrl+Click toogle type, "
+ tip = _("Fillet: Ctrl+Click toggle type, "
"Shift+Click open dialog, "
"Ctrl+Alt+Click reset");
}
@@ -840,19 +840,19 @@ void FilletChamferPointArrayParam::addKnotHolderEntities(KnotHolder *knotholder,
}
const gchar *tip;
if (_vector[i][Y] >=3000 && _vector[i][Y] < 4000){
- tip = _("Chamfer: Ctrl+Click toogle type, "
+ tip = _("Chamfer: Ctrl+Click toggle type, "
"Shift+Click open dialog, "
"Ctrl+Alt+Click reset");
} else if (_vector[i][Y] >=4000 && _vector[i][Y] < 5000) {
- tip = _("Inverse Chamfer: Ctrl+Click toogle type, "
+ tip = _("Inverse Chamfer: Ctrl+Click toggle type, "
"Shift+Click open dialog, "
"Ctrl+Alt+Click reset");
} else if (_vector[i][Y] == 2) {
- tip = _("Inverse Fillet: Ctrl+Click toogle type, "
+ tip = _("Inverse Fillet: Ctrl+Click toggle type, "
"Shift+Click open dialog, "
"Ctrl+Alt+Click reset");
} else {
- tip = _("Fillet: Ctrl+Click toogle type, "
+ tip = _("Fillet: Ctrl+Click toggle type, "
"Shift+Click open dialog, "
"Ctrl+Alt+Click reset");
}
--
cgit v1.2.3
From 3f5a54f867784d1606ebd21a804c356cfc6ef6a4 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz
Date: Sun, 8 Mar 2015 15:00:33 +0100
Subject: Update simplify and bspline to auto size some helper paths based on
current zoom
(bzr r13974)
---
src/live_effects/parameter/filletchamferpointarray.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src/live_effects/parameter/filletchamferpointarray.cpp')
diff --git a/src/live_effects/parameter/filletchamferpointarray.cpp b/src/live_effects/parameter/filletchamferpointarray.cpp
index 2ebe11b4b..e9d375b93 100644
--- a/src/live_effects/parameter/filletchamferpointarray.cpp
+++ b/src/live_effects/parameter/filletchamferpointarray.cpp
@@ -354,7 +354,7 @@ void FilletChamferPointArrayParam::set_pwd2(
last_pwd2_normal = pwd2_normal_in;
}
-void FilletChamferPointArrayParam::set_document_unit(Glib::ustring const * value_document_unit)
+void FilletChamferPointArrayParam::set_document_unit(Glib::ustring value_document_unit)
{
documentUnit = value_document_unit;
}
--
cgit v1.2.3