[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/krita-testing-kazakov] krita: Rename "Generator Layer" into "Fill Layer"
From:       Dmitry Kazakov <dimula73 () gmail ! com>
Date:       2014-05-25 10:40:48
Message-ID: E1WoVrE-0006i5-6t () scm ! kde ! org
[Download RAW message or body]

Git commit dacfe208633efcaf369f4e6a6f0bcb1bd6267edb by Dmitry Kazakov.
Committed on 25/05/2014 at 09:06.
Pushed by dkazakov into branch 'krita-testing-kazakov'.

Rename "Generator Layer" into "Fill Layer"

Also change its icon into the Paint Bucket tool icon

M  +1    -1    krita/image/generator/kis_generator_layer.cpp
M  +1    -1    krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp
M  +1    -1    krita/plugins/formats/ora/ora_export.cc
M  +1    -1    krita/ui/kis_layer_manager.cc
M  +2    -2    krita/ui/kis_node_manager.cpp

http://commits.kde.org/calligra/dacfe208633efcaf369f4e6a6f0bcb1bd6267edb

diff --git a/krita/image/generator/kis_generator_layer.cpp \
b/krita/image/generator/kis_generator_layer.cpp index de37f70..9f8f794 100644
--- a/krita/image/generator/kis_generator_layer.cpp
+++ b/krita/image/generator/kis_generator_layer.cpp
@@ -93,7 +93,7 @@ void KisGeneratorLayer::accept(KisProcessingVisitor &visitor, \
KisUndoAdapter *un  
 QIcon KisGeneratorLayer::icon() const
 {
-    return koIcon("view-filter");
+    return koIcon("krita_tool_color_fill");
 }
 
 KoDocumentSectionModel::PropertyList KisGeneratorLayer::sectionModelProperties() \
                const
diff --git a/krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp \
b/krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp index \
                ef13ea4..8d7202f 100644
--- a/krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp
+++ b/krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp
@@ -346,7 +346,7 @@ void KisLayerBox::setCanvas(KoCanvasBase *canvas)
         addActionToMenu(m_newLayerMenu, "add_new_clone_layer");
         addActionToMenu(m_newLayerMenu, "add_new_shape_layer");
         addActionToMenu(m_newLayerMenu, "add_new_adjustment_layer");
-        addActionToMenu(m_newLayerMenu, "add_new_generator_layer");
+        addActionToMenu(m_newLayerMenu, "add_new_fill_layer");
         addActionToMenu(m_newLayerMenu, "add_new_file_layer");
         m_newLayerMenu->addSeparator();
         addActionToMenu(m_newLayerMenu, "add_new_transparency_mask");
diff --git a/krita/plugins/formats/ora/ora_export.cc \
b/krita/plugins/formats/ora/ora_export.cc index 2316574..43cbb8f 100644
--- a/krita/plugins/formats/ora/ora_export.cc
+++ b/krita/plugins/formats/ora/ora_export.cc
@@ -97,7 +97,7 @@ KoFilter::ConversionStatus OraExport::convert(const QByteArray& \
from, const QByt  
     if (hasShapeLayerChild(image->root()) && !m_chain->manager()->getBatchMode()) {
         KMessageBox::information(0,
-                                 i18n("This image contains vector, clone or \
generated layers..\nThese layers will be saved as raster layers."), +                 \
i18n("This image contains vector, clone or fill layers..\nThese layers will be saved \
as raster layers."),  i18n("Warning"),
                                  "krita/ora/vector");
     }
diff --git a/krita/ui/kis_layer_manager.cc b/krita/ui/kis_layer_manager.cc
index db2aa2f..83f1432 100644
--- a/krita/ui/kis_layer_manager.cc
+++ b/krita/ui/kis_layer_manager.cc
@@ -401,7 +401,7 @@ void KisLayerManager::layerProperties()
     else if (KisGeneratorLayerSP alayer = \
KisGeneratorLayerSP(dynamic_cast<KisGeneratorLayer*>(layer.data()))) {  
         KisDlgGeneratorLayer dlg(alayer->name(), m_view);
-        dlg.setCaption(i18n("Generator Layer Properties"));
+        dlg.setCaption(i18n("Fill Layer Properties"));
 
         KisSafeFilterConfigurationSP configBefore(alayer->filter());
         Q_ASSERT(configBefore);
diff --git a/krita/ui/kis_node_manager.cpp b/krita/ui/kis_node_manager.cpp
index 0a7d118..62449bb 100644
--- a/krita/ui/kis_node_manager.cpp
+++ b/krita/ui/kis_node_manager.cpp
@@ -242,8 +242,8 @@ void KisNodeManager::setup(KActionCollection * actionCollection, \
                KisActionManage
     NEW_LAYER_ACTION("add_new_adjustment_layer", i18n("&Filter Layer..."),
                      "KisAdjustmentLayer", koIcon("view-filter"));
 
-    NEW_LAYER_ACTION("add_new_generator_layer", i18n("&Generated Layer..."),
-                     "KisGeneratorLayer", koIcon("view-filter"));
+    NEW_LAYER_ACTION("add_new_fill_layer", i18n("&Fill Layer..."),
+                     "KisGeneratorLayer", koIcon("krita_tool_color_fill"));
 
     NEW_LAYER_ACTION("add_new_file_layer", i18n("&File Layer..."),
                      "KisFileLayer", koIcon("document-open"));


[prev in list] [next in list] [prev in thread] [next in thread]