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

List:       kde-commits
Subject:    [calligra/calligra/2.9] krita/plugins/extensions/dockers/defaultdockers: use the same activation
From:       Sven Langkamp <sven.langkamp () gmail ! com>
Date:       2015-05-10 12:16:47
Message-ID: E1YrQA3-0007UA-DW () scm ! kde ! org
[Download RAW message or body]

Git commit cbc342c6e2552b17ac290c09085afdcc37970ca8 by Sven Langkamp.
Committed on 10/05/2015 at 12:16.
Pushed by langkamp into branch 'calligra/2.9'.

use the same activation flags for select opaque in the layer box as in the main menu
BUG:347500

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

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

diff --git a/krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp \
b/krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp index \
                e132239..61b94c3 100644
--- a/krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp
+++ b/krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp
@@ -238,7 +238,8 @@ KisLayerBox::KisLayerBox()
     connect(m_wdgLayerBox->cmbComposite, SIGNAL(activated(int)), \
SLOT(slotCompositeOpChanged(int)));  
     m_selectOpaque = new KisAction(i18n("&Select Opaque"), this);
-    m_selectOpaque->setActivationFlags(KisAction::ACTIVE_LAYER);
+    m_selectOpaque->setActivationFlags(KisAction::ACTIVE_DEVICE);
+    m_selectOpaque->setActivationConditions(KisAction::SELECTION_EDITABLE);
     m_selectOpaque->setObjectName("select_opaque");
     connect(m_selectOpaque, SIGNAL(triggered(bool)), this, \
SLOT(slotSelectOpaque()));  m_actions.append(m_selectOpaque);


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