From kde-kimageshop Fri Feb 06 07:02:14 2015 From: Dmitry Kazakov Date: Fri, 06 Feb 2015 07:02:14 +0000 To: kde-kimageshop Subject: Re: [calligra/calligra/2.9] krita/ui: pre-prend add to mask labels for clarity and consistency. Message-Id: X-MARC-Message: https://marc.info/?l=kde-kimageshop&m=142320615612069 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--===============6402578923869699569==" --===============6402578923869699569== Content-Type: multipart/alternative; boundary=089e0158c3ae1655ad050e6600d8 --089e0158c3ae1655ad050e6600d8 Content-Type: text/plain; charset=UTF-8 Hi, Scott! I feel that we must revert this change. There are two reasons: 1) It makes the UI inconsistent, because the same action is used in various contexts. See the screenshot: http://pbrd.co/1Dlcg2e 2) Technically, we are under string freeze now, so the changes to strings should be done only when they are really needed to not disturb the work of translators. On Fri, Feb 6, 2015 at 8:09 AM, Scott Petrovic wrote: > Git commit e789a717650da2eda8f53790838834a58bf6b3c2 by Scott Petrovic. > Committed on 06/02/2015 at 05:09. > Pushed by scottpetrovic into branch 'calligra/2.9'. > > pre-prend add to mask labels for clarity and consistency. > > M +4 -4 krita/ui/kis_mask_manager.cc > M +4 -4 krita/ui/kis_node_manager.cpp > > http://commits.kde.org/calligra/e789a717650da2eda8f53790838834a58bf6b3c2 > > diff --git a/krita/ui/kis_mask_manager.cc b/krita/ui/kis_mask_manager.cc > index 0fd82e5..e146295 100644 > --- a/krita/ui/kis_mask_manager.cc > +++ b/krita/ui/kis_mask_manager.cc > @@ -185,20 +185,20 @@ void KisMaskManager::createMaskCommon(KisMaskSP > mask, KisNodeSP activeNode, KisP > void KisMaskManager::createSelectionMask(KisNodeSP activeNode, > KisPaintDeviceSP copyFrom, bool avoidActiveNode) > { > KisSelectionMaskSP mask = new KisSelectionMask(m_view->image()); > - createMaskCommon(mask, activeNode, copyFrom, kundo2_i18n("Add > Selection Mask"), "KisSelectionMask", i18n("Selection"), false, > avoidActiveNode); > + createMaskCommon(mask, activeNode, copyFrom, kundo2_i18n("Add > Selection Mask"), "KisSelectionMask", i18n("Add Selection Mask"), false, > avoidActiveNode); > mask->setActive(true); > } > > void KisMaskManager::createTransparencyMask(KisNodeSP activeNode, > KisPaintDeviceSP copyFrom, bool avoidActiveNode) > { > KisMaskSP mask = new KisTransparencyMask(); > - createMaskCommon(mask, activeNode, copyFrom, kundo2_i18n("Add > Transparency Mask"), "KisTransparencyMask", i18n("Transparency Mask"), > false, avoidActiveNode); > + createMaskCommon(mask, activeNode, copyFrom, kundo2_i18n("Add > Transparency Mask"), "KisTransparencyMask", i18n("Add Transparency Mask"), > false, avoidActiveNode); > } > > void KisMaskManager::createFilterMask(KisNodeSP activeNode, > KisPaintDeviceSP copyFrom, bool quiet, bool avoidActiveNode) > { > KisFilterMaskSP mask = new KisFilterMask(); > - createMaskCommon(mask, activeNode, copyFrom, kundo2_i18n("Add Filter > Mask"), "KisFilterMask", i18n("Filter Mask"), false, avoidActiveNode); > + createMaskCommon(mask, activeNode, copyFrom, kundo2_i18n("Add Filter > Mask"), "KisFilterMask", i18n("Add Filter Mask"), false, avoidActiveNode); > > /** > * FIXME: We'll use layer's original for creation of a thumbnail. > @@ -238,7 +238,7 @@ void KisMaskManager::createFilterMask(KisNodeSP > activeNode, KisPaintDeviceSP cop > void KisMaskManager::createTransformMask(KisNodeSP activeNode) > { > KisTransformMaskSP mask = new KisTransformMask(); > - createMaskCommon(mask, activeNode, 0, kundo2_i18n("Add Transform > Mask"), "KisTransformMask", i18n("Transform Mask"), true, false); > + createMaskCommon(mask, activeNode, 0, kundo2_i18n("Add Transform > Mask"), "KisTransformMask", i18n("Add Transform Mask"), true, false); > } > > void KisMaskManager::duplicateMask() > diff --git a/krita/ui/kis_node_manager.cpp b/krita/ui/kis_node_manager.cpp > index 916b0ab..62ed889 100644 > --- a/krita/ui/kis_node_manager.cpp > +++ b/krita/ui/kis_node_manager.cpp > @@ -305,16 +305,16 @@ void KisNodeManager::setup(KActionCollection * > actionCollection, KisActionManage > NEW_LAYER_ACTION("add_new_file_layer", i18n("&File Layer..."), > "KisFileLayer", koIcon("document-open")); > > - NEW_MASK_ACTION("add_new_transparency_mask", i18n("&Transparency > Mask"), > + NEW_MASK_ACTION("add_new_transparency_mask", i18n("Add &Transparency > Mask"), > "KisTransparencyMask", koIcon("edit-copy")); > > - NEW_MASK_ACTION("add_new_filter_mask", i18n("&Filter Mask..."), > + NEW_MASK_ACTION("add_new_filter_mask", i18n("Add &Filter Mask..."), > "KisFilterMask", koIcon("bookmarks")); > > - NEW_MASK_ACTION("add_new_transform_mask", i18n("&Transform Mask..."), > + NEW_MASK_ACTION("add_new_transform_mask", i18n("Add &Transform > Mask..."), > "KisTransformMask", koIcon("bookmarks")); > > - NEW_MASK_ACTION("add_new_selection_mask", i18n("&Local Selection"), > + NEW_MASK_ACTION("add_new_selection_mask", i18n("Add &Local > Selection"), > "KisSelectionMask", koIcon("edit-paste")); > > connect(&m_d->nodeCreationSignalMapper, SIGNAL(mapped(const QString > &)), > > -- Dmitry Kazakov --089e0158c3ae1655ad050e6600d8 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi, Scott!

I feel that we must= revert this change. There are two reasons:

1) It makes the UI= inconsistent, because the same action is used in various contexts. See the= screenshot: http://pbrd.co/1Dlcg2e<= br>
2) Technically, we are under string freeze now, so the changes to = strings should be done only when they are really needed to not disturb the = work of translators.




On Fri, Feb 6, 2015 at 8:09 AM, Scott P= etrovic <scottpetrovic@gmail.com> wrote:
Git commit e789a717650da2eda8f53790838834a58bf6b3c2 by= Scott Petrovic.
Committed on 06/02/2015 at 05:09.
Pushed by scottpetrovic into branch 'calligra/2.9'.

pre-prend add to mask labels for clarity and consistency.

M=C2=A0 +4=C2=A0 =C2=A0 -4=C2=A0 =C2=A0 krita/ui/kis_mask_manager.cc
M=C2=A0 +4=C2=A0 =C2=A0 -4=C2=A0 =C2=A0 krita/ui/kis_node_manager.cpp

http://commits.kde.org/calligra/e789a717650da2e= da8f53790838834a58bf6b3c2

diff --git a/krita/ui/kis_mask_manager.cc b/krita/ui/kis_mask_manager.cc index 0fd82e5..e146295 100644
--- a/krita/ui/kis_mask_manager.cc
+++ b/krita/ui/kis_mask_manager.cc
@@ -185,20 +185,20 @@ void KisMaskManager::createMaskCommon(KisMaskSP mask,= KisNodeSP activeNode, KisP
=C2=A0void KisMaskManager::createSelectionMask(KisNodeSP activeNode, KisPai= ntDeviceSP copyFrom, bool avoidActiveNode)
=C2=A0{
=C2=A0 =C2=A0 =C2=A0KisSelectionMaskSP mask =3D new KisSelectionMask(m_view= ->image());
-=C2=A0 =C2=A0 createMaskCommon(mask, activeNode, copyFrom, kundo2_i18n(&qu= ot;Add Selection Mask"), "KisSelectionMask", i18n("Sele= ction"), false, avoidActiveNode);
+=C2=A0 =C2=A0 createMaskCommon(mask, activeNode, copyFrom, kundo2_i18n(&qu= ot;Add Selection Mask"), "KisSelectionMask", i18n("Add = Selection Mask"), false, avoidActiveNode);
=C2=A0 =C2=A0 =C2=A0mask->setActive(true);
=C2=A0}

=C2=A0void KisMaskManager::createTransparencyMask(KisNodeSP activeNode, Kis= PaintDeviceSP copyFrom, bool avoidActiveNode)
=C2=A0{
=C2=A0 =C2=A0 =C2=A0KisMaskSP mask =3D new KisTransparencyMask();
-=C2=A0 =C2=A0 createMaskCommon(mask, activeNode, copyFrom, kundo2_i18n(&qu= ot;Add Transparency Mask"), "KisTransparencyMask", i18n(&quo= t;Transparency Mask"), false, avoidActiveNode);
+=C2=A0 =C2=A0 createMaskCommon(mask, activeNode, copyFrom, kundo2_i18n(&qu= ot;Add Transparency Mask"), "KisTransparencyMask", i18n(&quo= t;Add Transparency Mask"), false, avoidActiveNode);
=C2=A0}

=C2=A0void KisMaskManager::createFilterMask(KisNodeSP activeNode, KisPaintD= eviceSP copyFrom, bool quiet, bool avoidActiveNode)
=C2=A0{
=C2=A0 =C2=A0 =C2=A0KisFilterMaskSP mask =3D new KisFilterMask();
-=C2=A0 =C2=A0 createMaskCommon(mask, activeNode, copyFrom, kundo2_i18n(&qu= ot;Add Filter Mask"), "KisFilterMask", i18n("Filter Mas= k"), false, avoidActiveNode);
+=C2=A0 =C2=A0 createMaskCommon(mask, activeNode, copyFrom, kundo2_i18n(&qu= ot;Add Filter Mask"), "KisFilterMask", i18n("Add Filter= Mask"), false, avoidActiveNode);

=C2=A0 =C2=A0 =C2=A0/**
=C2=A0 =C2=A0 =C2=A0 * FIXME: We'll use layer's original for creati= on of a thumbnail.
@@ -238,7 +238,7 @@ void KisMaskManager::createFilterMask(KisNodeSP activeN= ode, KisPaintDeviceSP cop
=C2=A0void KisMaskManager::createTransformMask(KisNodeSP activeNode)
=C2=A0{
=C2=A0 =C2=A0 =C2=A0KisTransformMaskSP mask =3D new KisTransformMask();
-=C2=A0 =C2=A0 createMaskCommon(mask, activeNode, 0, kundo2_i18n("Add = Transform Mask"), "KisTransformMask", i18n("Transform M= ask"), true, false);
+=C2=A0 =C2=A0 createMaskCommon(mask, activeNode, 0, kundo2_i18n("Add = Transform Mask"), "KisTransformMask", i18n("Add Transfo= rm Mask"), true, false);
=C2=A0}

=C2=A0void KisMaskManager::duplicateMask()
diff --git a/krita/ui/kis_node_manager.cpp b/krita/ui/kis_node_manager.cpp<= br> index 916b0ab..62ed889 100644
--- a/krita/ui/kis_node_manager.cpp
+++ b/krita/ui/kis_node_manager.cpp
@@ -305,16 +305,16 @@ void KisNodeManager::setup(KActionCollection * action= Collection, KisActionManage
=C2=A0 =C2=A0 =C2=A0NEW_LAYER_ACTION("add_new_file_layer", i18n(&= quot;&File Layer..."),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 "KisFileLayer", koIcon("document-open"));

-=C2=A0 =C2=A0 NEW_MASK_ACTION("add_new_transparency_mask", i18n(= "&Transparency Mask"),
+=C2=A0 =C2=A0 NEW_MASK_ACTION("add_new_transparency_mask", i18n(= "Add &Transparency Mask"),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0"KisTransparencyMask", koIcon("edit-copy"));

-=C2=A0 =C2=A0 NEW_MASK_ACTION("add_new_filter_mask", i18n("= &Filter Mask..."),
+=C2=A0 =C2=A0 NEW_MASK_ACTION("add_new_filter_mask", i18n("= Add &Filter Mask..."),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0"KisFilterMask", koIcon("bookmarks"));

-=C2=A0 =C2=A0 NEW_MASK_ACTION("add_new_transform_mask", i18n(&qu= ot;&Transform Mask..."),
+=C2=A0 =C2=A0 NEW_MASK_ACTION("add_new_transform_mask", i18n(&qu= ot;Add &Transform Mask..."),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0"KisTransformMask", koIcon("bookmarks"));

-=C2=A0 =C2=A0 NEW_MASK_ACTION("add_new_selection_mask", i18n(&qu= ot;&Local Selection"),
+=C2=A0 =C2=A0 NEW_MASK_ACTION("add_new_selection_mask", i18n(&qu= ot;Add &Local Selection"),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0"KisSelectionMask", koIcon("edit-paste"));

=C2=A0 =C2=A0 =C2=A0connect(&m_d->nodeCreationSignalMapper, SIGNAL(m= apped(const QString &)),




--
Dmitry Kazakov
--089e0158c3ae1655ad050e6600d8-- --===============6402578923869699569== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Krita mailing list kimageshop@kde.org https://mail.kde.org/mailman/listinfo/kimageshop --===============6402578923869699569==--