From 59343a1974d120021b245886af766997e42fc270 Mon Sep 17 00:00:00 2001 From: Aman Gupta Date: Sun, 12 Jan 2025 21:39:46 +0530 Subject: [PATCH 1/2] Fix locked objects modification --- src/desktop-style.cpp | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index 74008e627f..5b2cb8cf42 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -229,21 +229,17 @@ sp_desktop_set_style(Inkscape::ObjectSet *set, SPDesktop *desktop, SPCSSAttr *cs auto itemlist = set->items(); for (auto i = itemlist.begin(); i!= itemlist.end(); ++i) { SPItem *item = *i; - if (item->isLocked()) { - // If locked, don't apply style - desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Locked object(s) cannot be modified.")); - } else { - // If not text, don't apply text attributes (can a group have text attributes? Yes! FIXME) - if (isTextualItem(item)) { - // If any font property has changed, then we have written out the font - // properties in longhand and we need to remove the 'font' shorthand. - if (!sp_repr_css_property_is_unset(css, "font-family")) { - sp_repr_css_unset_property(css, "font"); - } - sp_desktop_apply_css_recursive(item, css, true); - } else { - sp_desktop_apply_css_recursive(item, css_no_text, true); + + // If not text, don't apply text attributes (can a group have text attributes? Yes! FIXME) + if (isTextualItem(item)) { + // If any font property has changed, then we have written out the font + // properties in longhand and we need to remove the 'font' shorthand. + if (!sp_repr_css_property_is_unset(css, "font-family")) { + sp_repr_css_unset_property(css, "font"); } + sp_desktop_apply_css_recursive(item, css, true); + } else { + sp_desktop_apply_css_recursive(item, css_no_text, true); } } sp_repr_css_attr_unref(css_no_text); -- GitLab From fc82ae61e3ed9daf514b8ff1d8ee26b0cc1b4b3b Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Sat, 18 Jan 2025 17:58:59 -0500 Subject: [PATCH 2/2] Fix CI translations --- po/POTFILES.src.in | 1 - 1 file changed, 1 deletion(-) diff --git a/po/POTFILES.src.in b/po/POTFILES.src.in index 60cb9cd47f..4465cb0a97 100644 --- a/po/POTFILES.src.in +++ b/po/POTFILES.src.in @@ -44,7 +44,6 @@ ${_build_dir}/share/templates/templates.h ../src/colors/spaces/components.cpp ../src/context-fns.cpp ../src/desktop-events.cpp -../src/desktop-style.cpp ../src/desktop.cpp ../src/display/control/canvas-item-text.cpp ../src/display/control/ctrl-handle-manager.cpp -- GitLab