[calligra/calligra/2.9] krita/ui: pre-prend add to mask labels for clarity and consistency.

[Dmitry Kazakov]

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 <scottpetrovic at 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  +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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kimageshop/attachments/20150206/69511195/attachment.html>