Commit 63d20038 authored by Sven Langkamp's avatar Sven Langkamp
Browse files

use flake/always as activation id for a Krita tools (Krita tools are always...

use flake/always as activation id for a Krita tools (Krita tools are always active as they handle locked/visible etc internally), that way we don't confuse the toolmanager with flake/dud

BUG:335660
parent 6f4f54a9
......@@ -124,7 +124,7 @@ public:
setPriority(15);
setIconName(koIconNameCStr("krita_tool_color_picker"));
setShortcut(KShortcut(Qt::Key_P));
setActivationShapeId(KRITA_TOOL_ACTIVATION_ID_ALWAYS_ACTIVE);
setActivationShapeId(KRITA_TOOL_ACTIVATION_ID);
}
virtual ~KisToolColorPickerFactory() {}
......
......@@ -111,7 +111,7 @@ public:
setToolTip(i18n("Measure the distance between two points"));
setIconName(koIconNameCStr("krita_tool_measure"));
setPriority(16);
setActivationShapeId(KRITA_TOOL_ACTIVATION_ID_ALWAYS_ACTIVE);
setActivationShapeId(KRITA_TOOL_ACTIVATION_ID);
}
virtual ~KisToolMeasureFactory() {}
......
......@@ -75,7 +75,7 @@ public:
: KoToolFactoryBase(KoPanTool_ID) {
setToolTip(i18n("Move and rotate your canvas"));
setToolType(navigationToolType());
setActivationShapeId(KRITA_TOOL_ACTIVATION_ID_ALWAYS_ACTIVE);
setActivationShapeId(KRITA_TOOL_ACTIVATION_ID);
setPriority(5);
setIconName(koIconNameCStr("krita_tool_pan"));
//setShortcut( QKeySequence( Qt::SHIFT + Qt::Key_V ) );
......
......@@ -72,7 +72,7 @@ public:
setToolType(TOOL_TYPE_VIEW);
setIconName(koIconNameCStr("krita_tool_grid"));
setPriority(17);
setActivationShapeId(KRITA_TOOL_ACTIVATION_ID_ALWAYS_ACTIVE);
setActivationShapeId(KRITA_TOOL_ACTIVATION_ID);
};
......
......@@ -79,11 +79,8 @@ static const QString TOOL_TYPE_FILL = "3 Krita/Fill"; // Tools th
static const QString TOOL_TYPE_VIEW = "4 Krita/View"; // Tools that affect the canvas: pan, zoom, etc.
static const QString TOOL_TYPE_SELECTED = "5 Krita/Select"; // Tools that select pixels
//these activation ids are kind of a workaround untile the toolbox has a better design and should be set in the tool factory
//activation id for showing tools always, but deactivating if layer is locked
static const QString KRITA_TOOL_ACTIVATION_ID = "flake/dud";
//activation id for showing always and not deactivating
static const QString KRITA_TOOL_ACTIVATION_ID_ALWAYS_ACTIVE = "flake/always";
//activation id for Krita tools, Krita tools are always active and handle locked and invisible layers by themself
static const QString KRITA_TOOL_ACTIVATION_ID = "flake/always";
class KRITAUI_EXPORT KisTool
: public KoToolBase
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment