[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-kimageshop
Subject: Re: [calligra/calligra/2.9] krita/ui: pre-prend add to mask labels for clarity and consistency.
From: Dmitry Kazakov <dimula73 () gmail ! com>
Date: 2015-02-06 7:02:14
Message-ID: CAEkBSfXCf0zVkVwSAVZc3dZokm_QY6Ofj0-iWwgJrLS79GCikw () mail ! gmail ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
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@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
[Attachment #5 (text/html)]
<div dir="ltr"><div><div><div>Hi, Scott!<br><br></div>I feel that we must revert this \
change. There are two reasons:<br><br></div>1) It makes the UI inconsistent, because \
the same action is used in various contexts. See the screenshot: <a \
href="http://pbrd.co/1Dlcg2e">http://pbrd.co/1Dlcg2e</a><br></div>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.<br><br><div><br><br></div></div><div class="gmail_extra"><br><div \
class="gmail_quote">On Fri, Feb 6, 2015 at 8:09 AM, Scott Petrovic <span \
dir="ltr"><<a href="mailto:scottpetrovic@gmail.com" \
target="_blank">scottpetrovic@gmail.com</a>></span> wrote:<br><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex">Git commit e789a717650da2eda8f53790838834a58bf6b3c2 by Scott \
Petrovic.<br> Committed on 06/02/2015 at 05:09.<br>
Pushed by scottpetrovic into branch 'calligra/2.9'.<br>
<br>
pre-prend add to mask labels for clarity and consistency.<br>
<br>
M +4 -4 krita/ui/kis_mask_manager.cc<br>
M +4 -4 krita/ui/kis_node_manager.cpp<br>
<br>
<a href="http://commits.kde.org/calligra/e789a717650da2eda8f53790838834a58bf6b3c2" \
target="_blank">http://commits.kde.org/calligra/e789a717650da2eda8f53790838834a58bf6b3c2</a><br>
<br>
diff --git a/krita/ui/kis_mask_manager.cc b/krita/ui/kis_mask_manager.cc<br>
index 0fd82e5..e146295 100644<br>
--- a/krita/ui/kis_mask_manager.cc<br>
+++ b/krita/ui/kis_mask_manager.cc<br>
@@ -185,20 +185,20 @@ void KisMaskManager::createMaskCommon(KisMaskSP mask, KisNodeSP \
activeNode, KisP<br> void KisMaskManager::createSelectionMask(KisNodeSP activeNode, \
KisPaintDeviceSP copyFrom, bool avoidActiveNode)<br> {<br>
KisSelectionMaskSP mask = new KisSelectionMask(m_view->image());<br>
- createMaskCommon(mask, activeNode, copyFrom, kundo2_i18n("Add Selection \
Mask"), "KisSelectionMask", i18n("Selection"), false, \
avoidActiveNode);<br> + createMaskCommon(mask, activeNode, copyFrom, \
kundo2_i18n("Add Selection Mask"), "KisSelectionMask", \
i18n("Add Selection Mask"), false, avoidActiveNode);<br> \
mask->setActive(true);<br> }<br>
<br>
void KisMaskManager::createTransparencyMask(KisNodeSP activeNode, KisPaintDeviceSP \
copyFrom, bool avoidActiveNode)<br> {<br>
KisMaskSP mask = new KisTransparencyMask();<br>
- createMaskCommon(mask, activeNode, copyFrom, kundo2_i18n("Add \
Transparency Mask"), "KisTransparencyMask", i18n("Transparency \
Mask"), false, avoidActiveNode);<br> + createMaskCommon(mask, activeNode, \
copyFrom, kundo2_i18n("Add Transparency Mask"), \
"KisTransparencyMask", i18n("Add Transparency Mask"), false, \
avoidActiveNode);<br> }<br>
<br>
void KisMaskManager::createFilterMask(KisNodeSP activeNode, KisPaintDeviceSP \
copyFrom, bool quiet, bool avoidActiveNode)<br> {<br>
KisFilterMaskSP mask = new KisFilterMask();<br>
- createMaskCommon(mask, activeNode, copyFrom, kundo2_i18n("Add Filter \
Mask"), "KisFilterMask", i18n("Filter Mask"), false, \
avoidActiveNode);<br> + createMaskCommon(mask, activeNode, copyFrom, \
kundo2_i18n("Add Filter Mask"), "KisFilterMask", i18n("Add \
Filter Mask"), false, avoidActiveNode);<br> <br>
/**<br>
* FIXME: We'll use layer's original for creation of a thumbnail.<br>
@@ -238,7 +238,7 @@ void KisMaskManager::createFilterMask(KisNodeSP activeNode, \
KisPaintDeviceSP cop<br> void KisMaskManager::createTransformMask(KisNodeSP \
activeNode)<br> {<br>
KisTransformMaskSP mask = new KisTransformMask();<br>
- createMaskCommon(mask, activeNode, 0, kundo2_i18n("Add Transform \
Mask"), "KisTransformMask", i18n("Transform Mask"), true, \
false);<br> + createMaskCommon(mask, activeNode, 0, kundo2_i18n("Add \
Transform Mask"), "KisTransformMask", i18n("Add Transform \
Mask"), true, false);<br> }<br>
<br>
void KisMaskManager::duplicateMask()<br>
diff --git a/krita/ui/kis_node_manager.cpp b/krita/ui/kis_node_manager.cpp<br>
index 916b0ab..62ed889 100644<br>
--- a/krita/ui/kis_node_manager.cpp<br>
+++ b/krita/ui/kis_node_manager.cpp<br>
@@ -305,16 +305,16 @@ void KisNodeManager::setup(KActionCollection * \
actionCollection, KisActionManage<br>
NEW_LAYER_ACTION("add_new_file_layer", i18n("&File \
Layer..."),<br>
"KisFileLayer", \
koIcon("document-open"));<br> <br>
- NEW_MASK_ACTION("add_new_transparency_mask", \
i18n("&Transparency Mask"),<br> + \
NEW_MASK_ACTION("add_new_transparency_mask", i18n("Add \
&Transparency Mask"),<br>
"KisTransparencyMask", \
koIcon("edit-copy"));<br> <br>
- NEW_MASK_ACTION("add_new_filter_mask", i18n("&Filter \
Mask..."),<br> + NEW_MASK_ACTION("add_new_filter_mask", \
i18n("Add &Filter Mask..."),<br>
"KisFilterMask", \
koIcon("bookmarks"));<br> <br>
- NEW_MASK_ACTION("add_new_transform_mask", i18n("&Transform \
Mask..."),<br> + NEW_MASK_ACTION("add_new_transform_mask", \
i18n("Add &Transform Mask..."),<br>
"KisTransformMask", \
koIcon("bookmarks"));<br> <br>
- NEW_MASK_ACTION("add_new_selection_mask", i18n("&Local \
Selection"),<br> + NEW_MASK_ACTION("add_new_selection_mask", \
i18n("Add &Local Selection"),<br>
"KisSelectionMask", \
koIcon("edit-paste"));<br> <br>
connect(&m_d->nodeCreationSignalMapper, SIGNAL(mapped(const QString \
&)),<br> <br>
</blockquote></div><br><br clear="all"><br>-- <br><div class="gmail_signature">Dmitry \
Kazakov</div> </div>
_______________________________________________
Krita mailing list
kimageshop@kde.org
https://mail.kde.org/mailman/listinfo/kimageshop
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic