summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--po/inkscape.pot94
-rw-r--r--src/document-undo.cpp6
-rw-r--r--src/live_effects/lpe-angle_bisector.cpp2
-rw-r--r--src/live_effects/lpe-perp_bisector.cpp4
-rw-r--r--src/selection-chemistry.cpp6
-rw-r--r--src/sp-item-transform.cpp3
-rw-r--r--src/ui/dialog/template-widget.cpp2
-rw-r--r--src/ui/tools/tool-base.cpp12
-rw-r--r--src/ui/tools/tool-base.h2
9 files changed, 70 insertions, 61 deletions
diff --git a/po/inkscape.pot b/po/inkscape.pot
index babc68422..e80e0622b 100644
--- a/po/inkscape.pot
+++ b/po/inkscape.pot
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2014-01-17 20:14+0100\n"
+"POT-Creation-Date: 2014-01-19 16:41+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -6329,8 +6329,8 @@ msgstr ""
#: ../src/extension/internal/cairo-ps-out.cpp:333
#: ../src/extension/internal/cairo-ps-out.cpp:372
#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:250
-#: ../src/extension/internal/emf-inout.cpp:3551
-#: ../src/extension/internal/wmf-inout.cpp:3236
+#: ../src/extension/internal/emf-inout.cpp:3520
+#: ../src/extension/internal/wmf-inout.cpp:3088
msgid "Convert texts to paths"
msgstr ""
@@ -6498,70 +6498,74 @@ msgstr ""
msgid "Open presentation exchange files saved in Corel DRAW"
msgstr ""
-#: ../src/extension/internal/emf-inout.cpp:3535
+#: ../src/extension/internal/emf-inout.cpp:3504
msgid "EMF Input"
msgstr ""
-#: ../src/extension/internal/emf-inout.cpp:3540
+#: ../src/extension/internal/emf-inout.cpp:3509
msgid "Enhanced Metafiles (*.emf)"
msgstr ""
-#: ../src/extension/internal/emf-inout.cpp:3541
+#: ../src/extension/internal/emf-inout.cpp:3510
msgid "Enhanced Metafiles"
msgstr ""
-#: ../src/extension/internal/emf-inout.cpp:3549
+#: ../src/extension/internal/emf-inout.cpp:3518
msgid "EMF Output"
msgstr ""
-#: ../src/extension/internal/emf-inout.cpp:3552
-#: ../src/extension/internal/wmf-inout.cpp:3237
+#: ../src/extension/internal/emf-inout.cpp:3521
+#: ../src/extension/internal/wmf-inout.cpp:3089
msgid "Map Unicode to Symbol font"
msgstr ""
-#: ../src/extension/internal/emf-inout.cpp:3553
-#: ../src/extension/internal/wmf-inout.cpp:3238
+#: ../src/extension/internal/emf-inout.cpp:3522
+#: ../src/extension/internal/wmf-inout.cpp:3090
msgid "Map Unicode to Wingdings"
msgstr ""
-#: ../src/extension/internal/emf-inout.cpp:3554
-#: ../src/extension/internal/wmf-inout.cpp:3239
+#: ../src/extension/internal/emf-inout.cpp:3523
+#: ../src/extension/internal/wmf-inout.cpp:3091
msgid "Map Unicode to Zapf Dingbats"
msgstr ""
-#: ../src/extension/internal/emf-inout.cpp:3555
-#: ../src/extension/internal/wmf-inout.cpp:3240
+#: ../src/extension/internal/emf-inout.cpp:3524
+#: ../src/extension/internal/wmf-inout.cpp:3092
msgid "Use MS Unicode PUA (0xF020-0xF0FF) for converted characters"
msgstr ""
-#: ../src/extension/internal/emf-inout.cpp:3556
-#: ../src/extension/internal/wmf-inout.cpp:3241
+#: ../src/extension/internal/emf-inout.cpp:3525
+#: ../src/extension/internal/wmf-inout.cpp:3093
msgid "Compensate for PPT font bug"
msgstr ""
-#: ../src/extension/internal/emf-inout.cpp:3557
-#: ../src/extension/internal/wmf-inout.cpp:3242
+#: ../src/extension/internal/emf-inout.cpp:3526
+#: ../src/extension/internal/wmf-inout.cpp:3094
msgid "Convert dashed/dotted lines to single lines"
msgstr ""
-#: ../src/extension/internal/emf-inout.cpp:3558
-#: ../src/extension/internal/wmf-inout.cpp:3243
+#: ../src/extension/internal/emf-inout.cpp:3527
+#: ../src/extension/internal/wmf-inout.cpp:3095
msgid "Convert gradients to colored polygon series"
msgstr ""
-#: ../src/extension/internal/emf-inout.cpp:3559
+#: ../src/extension/internal/emf-inout.cpp:3528
+msgid "Use native rectangular linear gradients"
+msgstr ""
+
+#: ../src/extension/internal/emf-inout.cpp:3529
msgid "Map all fill patterns to standard EMF hatches"
msgstr ""
-#: ../src/extension/internal/emf-inout.cpp:3560
+#: ../src/extension/internal/emf-inout.cpp:3530
msgid "Ignore image rotations"
msgstr ""
-#: ../src/extension/internal/emf-inout.cpp:3564
+#: ../src/extension/internal/emf-inout.cpp:3534
msgid "Enhanced Metafile (*.emf)"
msgstr ""
-#: ../src/extension/internal/emf-inout.cpp:3565
+#: ../src/extension/internal/emf-inout.cpp:3535
msgid "Enhanced Metafile"
msgstr ""
@@ -7072,7 +7076,7 @@ msgstr ""
#: ../src/extension/internal/filter/bumps.h:322
#: ../src/extension/internal/filter/transparency.h:57
-#: ../src/filter-enums.cpp:29 ../src/sp-image.cpp:632
+#: ../src/filter-enums.cpp:29 ../src/sp-image.cpp:637
msgid "Image"
msgstr ""
@@ -8758,33 +8762,33 @@ msgstr ""
msgid "Microsoft Visio 2013 drawing (*.vsdx)"
msgstr ""
-#: ../src/extension/internal/wmf-inout.cpp:3220
+#: ../src/extension/internal/wmf-inout.cpp:3072
msgid "WMF Input"
msgstr ""
-#: ../src/extension/internal/wmf-inout.cpp:3225
+#: ../src/extension/internal/wmf-inout.cpp:3077
msgid "Windows Metafiles (*.wmf)"
msgstr ""
-#: ../src/extension/internal/wmf-inout.cpp:3226
+#: ../src/extension/internal/wmf-inout.cpp:3078
msgid "Windows Metafiles"
msgstr ""
-#: ../src/extension/internal/wmf-inout.cpp:3234
+#: ../src/extension/internal/wmf-inout.cpp:3086
msgid "WMF Output"
msgstr ""
-#: ../src/extension/internal/wmf-inout.cpp:3244
+#: ../src/extension/internal/wmf-inout.cpp:3096
msgid "Map all fill patterns to standard WMF hatches"
msgstr ""
-#: ../src/extension/internal/wmf-inout.cpp:3248
+#: ../src/extension/internal/wmf-inout.cpp:3100
#: ../share/extensions/wmf_input.inx.h:2
#: ../share/extensions/wmf_output.inx.h:2
msgid "Windows Metafile (*.wmf)"
msgstr ""
-#: ../src/extension/internal/wmf-inout.cpp:3249
+#: ../src/extension/internal/wmf-inout.cpp:3101
msgid "Windows Metafile"
msgstr ""
@@ -10124,11 +10128,13 @@ msgid "Specifies the right end of the bisector"
msgstr ""
#: ../src/live_effects/lpe-angle_bisector.cpp:86
+#: ../src/live_effects/lpe-perp_bisector.cpp:159
msgid "Adjust the \"left\" end of the bisector"
msgstr ""
#: ../src/live_effects/lpe-angle_bisector.cpp:92
-msgid "Adjust the \"right\" of the bisector"
+#: ../src/live_effects/lpe-perp_bisector.cpp:165
+msgid "Adjust the \"right\" end of the bisector"
msgstr ""
#: ../src/live_effects/lpe-bendpath.cpp:53
@@ -10938,14 +10944,6 @@ msgstr ""
msgid "Fuse ends closer than this number. 0 means don't fuse."
msgstr ""
-#: ../src/live_effects/lpe-perp_bisector.cpp:159
-msgid "Adjust the bisector's \"left\" end"
-msgstr ""
-
-#: ../src/live_effects/lpe-perp_bisector.cpp:165
-msgid "Adjust the bisector's \"right\" end"
-msgstr ""
-
#. initialise your parameters here:
#: ../src/live_effects/lpe-perspective_path.cpp:47
msgid "Scale x"
@@ -13171,16 +13169,16 @@ msgstr ""
msgid "at %d degrees, through (%s,%s)"
msgstr ""
-#: ../src/sp-image.cpp:640
+#: ../src/sp-image.cpp:645
msgid "embedded"
msgstr ""
-#: ../src/sp-image.cpp:648
+#: ../src/sp-image.cpp:653
#, c-format
msgid "[bad reference]: %s"
msgstr ""
-#: ../src/sp-image.cpp:649
+#: ../src/sp-image.cpp:654
#, c-format
msgid "%d &#215; %d: %s"
msgstr ""
@@ -20983,10 +20981,6 @@ msgstr ""
msgid "More info"
msgstr ""
-#: ../src/ui/dialog/template-widget.cpp:37
-msgid " "
-msgstr ""
-
#: ../src/ui/dialog/template-widget.cpp:38
msgid "no template selected"
msgstr ""
@@ -22752,7 +22746,7 @@ msgstr[1] ""
msgid "Type text"
msgstr ""
-#: ../src/ui/tools/tool-base.cpp:697
+#: ../src/ui/tools/tool-base.cpp:698
msgid "<b>Space+mouse move</b> to pan canvas"
msgstr ""
diff --git a/src/document-undo.cpp b/src/document-undo.cpp
index 312ccb7f8..39c8a04a0 100644
--- a/src/document-undo.cpp
+++ b/src/document-undo.cpp
@@ -155,7 +155,7 @@ void Inkscape::DocumentUndo::maybeDone(SPDocument *doc, const gchar *key, const
{
g_assert (doc != NULL);
g_assert (doc->priv != NULL);
- g_assert (doc->priv->sensitive);
+ g_assert (doc->priv->sensitive);
if ( key && !*key ) {
g_warning("Blank undo key specified.");
}
@@ -204,7 +204,7 @@ void Inkscape::DocumentUndo::cancel(SPDocument *doc)
{
g_assert (doc != NULL);
g_assert (doc->priv != NULL);
- g_assert (doc->priv->sensitive);
+ g_assert (doc->priv->sensitive);
sp_repr_rollback (doc->rdoc);
@@ -287,7 +287,7 @@ gboolean Inkscape::DocumentUndo::redo(SPDocument *doc)
g_assert (doc != NULL);
g_assert (doc->priv != NULL);
- g_assert (doc->priv->sensitive);
+ g_assert (doc->priv->sensitive);
doc->priv->sensitive = FALSE;
doc->priv->seeking = true;
diff --git a/src/live_effects/lpe-angle_bisector.cpp b/src/live_effects/lpe-angle_bisector.cpp
index 2f57b710b..1acf9605f 100644
--- a/src/live_effects/lpe-angle_bisector.cpp
+++ b/src/live_effects/lpe-angle_bisector.cpp
@@ -89,7 +89,7 @@ LPEAngleBisector::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *deskt
{
KnotHolderEntity *e = new AB::KnotHolderEntityRightEnd(this);
e->create( desktop, item, knotholder, Inkscape::CTRL_TYPE_UNKNOWN,
- _("Adjust the \"right\" of the bisector") );
+ _("Adjust the \"right\" end of the bisector") );
knotholder->add(e);
}
};
diff --git a/src/live_effects/lpe-perp_bisector.cpp b/src/live_effects/lpe-perp_bisector.cpp
index c2a25a187..feed55b26 100644
--- a/src/live_effects/lpe-perp_bisector.cpp
+++ b/src/live_effects/lpe-perp_bisector.cpp
@@ -156,13 +156,13 @@ LPEPerpBisector::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *deskto
{
KnotHolderEntity *e = new PB::KnotHolderEntityLeftEnd(this);
e->create( desktop, item, knotholder, Inkscape::CTRL_TYPE_UNKNOWN,
- _("Adjust the bisector's \"left\" end") );
+ _("Adjust the \"left\" end of the bisector") );
knotholder->add(e);
}
{
KnotHolderEntity *e = new PB::KnotHolderEntityRightEnd(this);
e->create( desktop, item, knotholder, Inkscape::CTRL_TYPE_UNKNOWN,
- _("Adjust the bisector's \"right\" end") );
+ _("Adjust the \"right\" end of the bisector") );
knotholder->add(e);
}
};
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index f9649d62f..1957b9297 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -1083,6 +1083,9 @@ void sp_selection_lower_to_bottom(Inkscape::Selection *selection, SPDesktop *des
void
sp_undo(SPDesktop *desktop, SPDocument *)
{
+ // No re/undo while dragging, too dangerous.
+ if(desktop->getEventContext()->is_dragging) return;
+
if (!DocumentUndo::undo(sp_desktop_document(desktop))) {
desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing to undo."));
}
@@ -1091,6 +1094,9 @@ sp_undo(SPDesktop *desktop, SPDocument *)
void
sp_redo(SPDesktop *desktop, SPDocument *)
{
+ // No re/undo while dragging, too dangerous.
+ if(desktop->getEventContext()->is_dragging) return;
+
if (!DocumentUndo::redo(sp_desktop_document(desktop))) {
desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing to redo."));
}
diff --git a/src/sp-item-transform.cpp b/src/sp-item-transform.cpp
index 9dbe412d7..854fb9cd7 100644
--- a/src/sp-item-transform.cpp
+++ b/src/sp-item-transform.cpp
@@ -110,6 +110,9 @@ Geom::Affine get_scale_transform_for_uniform_stroke(Geom::Rect const &bbox_visua
// -> The width and height of the geometric bounding box will therefore be (w0 - 2*0.5*r0) and (h0 - 2*0.5*r0)
// 4) If preserve transforms is true, then stroke_x != stroke_y, since these are the apparent stroke widths, after transforming
+ if ((stroke_x == Geom::infinity()) || (fabs(stroke_x) < 1e-6)) stroke_x = 0;
+ if ((stroke_y == Geom::infinity()) || (fabs(stroke_y) < 1e-6)) stroke_y = 0;
+
gdouble w0 = bbox_visual.width(); // will return a value >= 0, as required further down the road
gdouble h0 = bbox_visual.height();
gdouble r0 = sqrt(stroke_x*stroke_y); // r0 is redundant, used only for those cases where stroke_x = stroke_y
diff --git a/src/ui/dialog/template-widget.cpp b/src/ui/dialog/template-widget.cpp
index d1697244e..d8e6f9b4f 100644
--- a/src/ui/dialog/template-widget.cpp
+++ b/src/ui/dialog/template-widget.cpp
@@ -34,7 +34,7 @@ namespace UI {
TemplateWidget::TemplateWidget()
: _more_info_button(_("More info"))
- , _short_description_label(_(" "))
+ , _short_description_label(" ")
, _template_name_label(_("no template selected"))
, _effect_prefs(NULL)
{
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 6c7867633..3b51147e0 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -98,6 +98,7 @@ ToolBase::ToolBase() {
this->hot_x = 0;
this->yp = 0;
this->within_tolerance = false;
+ this->is_dragging = false;
this->tolerance = 0;
//this->key = 0;
this->item_to_select = 0;
@@ -977,12 +978,15 @@ gint sp_event_context_root_handler(ToolBase * event_context,
gint sp_event_context_virtual_root_handler(ToolBase * event_context, GdkEvent * event) {
gint ret = false;
- if (event_context) { // If no event-context is available then do nothing, otherwise Inkscape would crash
- // (see the comment in SPDesktop::set_event_context, and bug LP #622350)
- //ret = (SP_EVENT_CONTEXT_CLASS(G_OBJECT_GET_CLASS(event_context)))->root_handler(event_context, event);
- ret = event_context->root_handler(event);
+ if (event_context) {
+ if(event->type == GDK_BUTTON_PRESS)
+ event_context->is_dragging = true;
+ ret = event_context->root_handler(event);
set_event_location(event_context->desktop, event);
+
+ if(event->type == GDK_BUTTON_RELEASE)
+ event_context->is_dragging = false;
}
return ret;
}
diff --git a/src/ui/tools/tool-base.h b/src/ui/tools/tool-base.h
index 7ed5875b1..ab8bd8caa 100644
--- a/src/ui/tools/tool-base.h
+++ b/src/ui/tools/tool-base.h
@@ -118,6 +118,8 @@ public:
gint xp, yp; ///< where drag started
gint tolerance;
+ bool is_dragging; // Is a tool currently dragging something
+
bool within_tolerance; ///< are we still within tolerance of origin
SPItem *item_to_select; ///< the item where mouse_press occurred, to
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-05 12:55:24 +0000