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

List:       kde-commits
Subject:    [calligra] krita/plugins/extensions/dockers/defaultdockers: fix missing icons "edit-duplicate" & "ed
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2012-07-24 13:32:12
Message-ID: 20120724133212.56DA7A6094 () git ! kde ! org
[Download RAW message or body]

Git commit fa7a3d528f8160e980f01ce566a4e0c64c51ad86 by Friedrich W. H. Kossebau.
Committed on 24/07/2012 at 15:31.
Pushed by kossebau into branch 'master'.

fix missing icons "edit-duplicate" & "edit-merge" with "edit-copy" & no icon (Krita \
context menu on layers)

REVIEW: 105692

thanks boudewijn for review

M  +3    -2    krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp

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

diff --git a/krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp \
b/krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp index \
                61141a3..f3bb5e4 100644
--- a/krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp
+++ b/krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp
@@ -416,8 +416,9 @@ void KisLayerBox::slotContextMenuRequested(const QPoint &pos, \
                const QModelIndex
         menu.addAction(KIcon("document-properties"), i18n("&Properties..."), this, \
SLOT(slotPropertiesClicked()));  menu.addSeparator();
         menu.addAction(KIcon("edit-delete"), i18n("&Remove Layer"), this, \
                SLOT(slotRmClicked()));
-        menu.addAction(KIcon("edit-duplicate"), i18n("&Duplicate Layer or Mask"), \
                this, SLOT(slotDuplicateClicked()));
-        QAction* mergeLayerDown = menu.addAction(KIcon("edit-merge"), i18n("&Merge \
with Layer Below"), this, SLOT(slotMergeLayer())); +        \
menu.addAction(KIcon("edit-copy"), i18n("&Duplicate Layer or Mask"), this, \
SLOT(slotDuplicateClicked())); +        // TODO: missing icon "edit-merge"
+        QAction* mergeLayerDown = menu.addAction(i18n("&Merge with Layer Below"), \
                this, SLOT(slotMergeLayer()));
         if (!index.sibling(index.row() + 1, 0).isValid()) \
mergeLayerDown->setEnabled(false);  menu.addSeparator();
     }


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