diff --git a/krita/data/actions/ArtisticTextToolFactoryID.action b/krita/data/actions/ArtisticTextTool.action rename from krita/data/actions/ArtisticTextToolFactoryID.action rename to krita/data/actions/ArtisticTextTool.action --- a/krita/data/actions/ArtisticTextToolFactoryID.action +++ b/krita/data/actions/ArtisticTextTool.action @@ -1,5 +1,5 @@ - + Subscript diff --git a/krita/data/actions/CMakeLists.txt b/krita/data/actions/CMakeLists.txt --- a/krita/data/actions/CMakeLists.txt +++ b/krita/data/actions/CMakeLists.txt @@ -1,6 +1,6 @@ install( FILES - ArtisticTextToolFactoryID.action + ArtisticTextTool.action InteractionTool.action - PathToolFactoryId.action - TextToolFactory_ID.action + PathTool.action + TextTool.action DESTINATION ${DATA_INSTALL_DIR}/krita/actions) diff --git a/krita/data/actions/PathToolFactoryId.action b/krita/data/actions/PathTool.action rename from krita/data/actions/PathToolFactoryId.action rename to krita/data/actions/PathTool.action --- a/krita/data/actions/PathToolFactoryId.action +++ b/krita/data/actions/PathTool.action @@ -1,5 +1,5 @@ - + To Path P diff --git a/krita/data/actions/TextToolFactory_ID.action b/krita/data/actions/TextTool.action rename from krita/data/actions/TextToolFactory_ID.action rename to krita/data/actions/TextTool.action diff --git a/krita/krita.action b/krita/krita.action --- a/krita/krita.action +++ b/krita/krita.action @@ -3036,7 +3036,7 @@ false - + References @@ -3091,7 +3091,7 @@ false - + Text editing @@ -3113,7 +3113,7 @@ false - + Artistic text editing @@ -3256,7 +3256,7 @@ false - + Review @@ -3333,7 +3333,7 @@ false - + Vector Image (EMF/WMF/SVM/SVG) tool @@ -3355,7 +3355,7 @@ false - + Path editing diff --git a/krita/ui/canvas/kis_canvas_widget_base.cpp b/krita/ui/canvas/kis_canvas_widget_base.cpp --- a/krita/ui/canvas/kis_canvas_widget_base.cpp +++ b/krita/ui/canvas/kis_canvas_widget_base.cpp @@ -117,7 +117,7 @@ // Draw text shape over canvas while editing it, that's needs to show the text selection correctly QString toolId = KoToolManager::instance()->activeToolId(); - if (toolId == "ArtisticTextToolFactoryID" || toolId == "TextToolFactory_ID") { + if (toolId == "ArtisticTextTool" || toolId == "TextTool") { gc.save(); gc.setPen(Qt::NoPen); gc.setBrush(Qt::NoBrush); diff --git a/krita/ui/input/kis_input_manager.cpp b/krita/ui/input/kis_input_manager.cpp --- a/krita/ui/input/kis_input_manager.cpp +++ b/krita/ui/input/kis_input_manager.cpp @@ -456,7 +456,7 @@ void KisInputManager::slotToolChanged() { QString toolId = KoToolManager::instance()->activeToolId(); - if (toolId == "ArtisticTextToolFactoryID" || toolId == "TextToolFactory_ID") { + if (toolId == "ArtisticTextTool" || toolId == "TextTool") { d->forwardAllEventsToTool = true; d->matcher.suppressAllActions(true); } else { diff --git a/krita/ui/kis_node_manager.cpp b/krita/ui/kis_node_manager.cpp --- a/krita/ui/kis_node_manager.cpp +++ b/krita/ui/kis_node_manager.cpp @@ -572,7 +572,7 @@ << "KarbonGradientTool" << "KarbonCalligraphyTool" << "CreateShapesTool" - << "PathToolFactoryId"; + << "PathTool"; QStringList pixelTools = QStringList() << "KritaShape/KisToolBrush" diff --git a/libs/flake/tools/KoPathToolFactory.cpp b/libs/flake/tools/KoPathToolFactory.cpp --- a/libs/flake/tools/KoPathToolFactory.cpp +++ b/libs/flake/tools/KoPathToolFactory.cpp @@ -25,7 +25,7 @@ #include KoPathToolFactory::KoPathToolFactory() - : KoToolFactoryBase("PathToolFactoryId") + : KoToolFactoryBase("PathTool") { setToolTip(i18n("Path editing")); setToolType(dynamicToolType()); diff --git a/libs/flake/tools/KoZoomToolFactory.cpp b/libs/flake/tools/KoZoomToolFactory.cpp --- a/libs/flake/tools/KoZoomToolFactory.cpp +++ b/libs/flake/tools/KoZoomToolFactory.cpp @@ -25,7 +25,7 @@ #include KoZoomToolFactory::KoZoomToolFactory() - : KoToolFactoryBase("KoZoomToolId") + : KoToolFactoryBase("ZoomTool") { setToolTip(i18n("Zoom")); setToolType(navigationToolType()); diff --git a/libs/widgets/KoRuler.cpp b/libs/widgets/KoRuler.cpp --- a/libs/widgets/KoRuler.cpp +++ b/libs/widgets/KoRuler.cpp @@ -1330,7 +1330,7 @@ void KoRuler::createGuideToolConnection(KoCanvasBase *canvas) { Q_ASSERT(canvas); - KoToolBase *tool = KoToolManager::instance()->toolById(canvas, QLatin1String("GuidesTool_ID")); + KoToolBase *tool = KoToolManager::instance()->toolById(canvas, QLatin1String("GuidesTool")); if (!tool) return; // It's perfectly fine to have no guides tool, we don't have to warn the user about it connect(this, SIGNAL(guideLineCreated(Qt::Orientation,qreal)), tool, SLOT(createGuideLine(Qt::Orientation,qreal))); diff --git a/plugins/artistictextshape/ArtisticTextToolFactory.cpp b/plugins/artistictextshape/ArtisticTextToolFactory.cpp --- a/plugins/artistictextshape/ArtisticTextToolFactory.cpp +++ b/plugins/artistictextshape/ArtisticTextToolFactory.cpp @@ -25,7 +25,7 @@ #include ArtisticTextToolFactory::ArtisticTextToolFactory() - : KoToolFactoryBase("ArtisticTextToolFactoryID") + : KoToolFactoryBase("ArtisticTextTool") { setToolTip( i18n("Artistic text editing") ); setToolType( dynamicToolType() ); diff --git a/plugins/defaultTools/defaulttool/DefaultTool.cpp b/plugins/defaultTools/defaulttool/DefaultTool.cpp --- a/plugins/defaultTools/defaulttool/DefaultTool.cpp +++ b/plugins/defaultTools/defaulttool/DefaultTool.cpp @@ -548,7 +548,7 @@ m_mouseWasInsideHandles = false; if (m_guideLine->isSelected()) { - GuidesTool *guidesTool = dynamic_cast(KoToolManager::instance()->toolById(canvas(), GuidesToolId)); + GuidesTool *guidesTool = dynamic_cast(KoToolManager::instance()->toolById(canvas(), GuidesTool_ID)); if (guidesTool) { guidesTool->moveGuideLine(m_guideLine->orientation(), m_guideLine->index()); activateTemporary(guidesTool->toolId()); @@ -559,7 +559,7 @@ } } else { if (m_guideLine->isSelected()) { - GuidesTool *guidesTool = dynamic_cast(KoToolManager::instance()->toolById(canvas(), GuidesToolId)); + GuidesTool *guidesTool = dynamic_cast(KoToolManager::instance()->toolById(canvas(), GuidesTool_ID)); if (guidesTool) { guidesTool->moveGuideLine(m_guideLine->orientation(), m_guideLine->index()); activateTemporary(guidesTool->toolId()); @@ -641,7 +641,7 @@ if (shape) { shapes.append(shape); } else if (m_guideLine->isSelected()) { - GuidesTool *guidesTool = dynamic_cast(KoToolManager::instance()->toolById(canvas(), GuidesToolId)); + GuidesTool *guidesTool = dynamic_cast(KoToolManager::instance()->toolById(canvas(), GuidesTool_ID)); if (guidesTool) { guidesTool->editGuideLine(m_guideLine->orientation(), m_guideLine->index()); activateTool(guidesTool->toolId()); diff --git a/plugins/defaultTools/guidestool/GuidesTool.cpp b/plugins/defaultTools/guidestool/GuidesTool.cpp --- a/plugins/defaultTools/guidestool/GuidesTool.cpp +++ b/plugins/defaultTools/guidestool/GuidesTool.cpp @@ -240,7 +240,7 @@ m_position = position; m_mode = AddGuide; - KoToolManager::instance()->switchToolRequested(GuidesToolId); + KoToolManager::instance()->switchToolRequested(GuidesTool_ID); // grab the mouse so we get mouse events as the dragging started on a ruler canvas()->canvasWidget()->grabMouse(); diff --git a/plugins/defaultTools/guidestool/GuidesToolFactory.h b/plugins/defaultTools/guidestool/GuidesToolFactory.h --- a/plugins/defaultTools/guidestool/GuidesToolFactory.h +++ b/plugins/defaultTools/guidestool/GuidesToolFactory.h @@ -23,7 +23,7 @@ #include // Warn; used in KoRuler.cpp too, keep in sync. -#define GuidesToolId "GuidesTool_ID" +#define GuidesTool_ID "GuidesTool" /// The factory for the KoGuidesTool class GuidesToolFactory : public KoToolFactoryBase diff --git a/plugins/defaultTools/guidestool/GuidesToolFactory.cpp b/plugins/defaultTools/guidestool/GuidesToolFactory.cpp --- a/plugins/defaultTools/guidestool/GuidesToolFactory.cpp +++ b/plugins/defaultTools/guidestool/GuidesToolFactory.cpp @@ -22,7 +22,7 @@ #include GuidesToolFactory::GuidesToolFactory() - : KoToolFactoryBase(GuidesToolId) + : KoToolFactoryBase(GuidesTool_ID) { setToolTip(i18n("Edit guidelines")); setToolType("never"); diff --git a/plugins/textshape/ReferencesToolFactory.cpp b/plugins/textshape/ReferencesToolFactory.cpp --- a/plugins/textshape/ReferencesToolFactory.cpp +++ b/plugins/textshape/ReferencesToolFactory.cpp @@ -27,7 +27,7 @@ #include ReferencesToolFactory::ReferencesToolFactory() - : KoToolFactoryBase("ReferencesToolFactory_ID") + : KoToolFactoryBase("ReferencesTool") { setToolTip(i18n("References")); setToolType("calligrawords,calligraauthor"); diff --git a/plugins/textshape/ReviewToolFactory.cpp b/plugins/textshape/ReviewToolFactory.cpp --- a/plugins/textshape/ReviewToolFactory.cpp +++ b/plugins/textshape/ReviewToolFactory.cpp @@ -32,7 +32,7 @@ #include ReviewToolFactory::ReviewToolFactory() - : KoToolFactoryBase("ReviewToolFactory_ID") + : KoToolFactoryBase("ReviewTool") { setToolTip(i18n("Review")); setToolType(dynamicToolType()+",calligrawords,calligraauthor"); diff --git a/plugins/textshape/TextToolFactory.cpp b/plugins/textshape/TextToolFactory.cpp --- a/plugins/textshape/TextToolFactory.cpp +++ b/plugins/textshape/TextToolFactory.cpp @@ -26,7 +26,7 @@ #include TextToolFactory::TextToolFactory() - : KoToolFactoryBase("TextToolFactory_ID") + : KoToolFactoryBase("TextTool") { setToolTip(i18n("Text editing")); setToolType(dynamicToolType()+",calligrawords,calligraauthor"); diff --git a/plugins/vectorshape/VectorToolFactory.cpp b/plugins/vectorshape/VectorToolFactory.cpp --- a/plugins/vectorshape/VectorToolFactory.cpp +++ b/plugins/vectorshape/VectorToolFactory.cpp @@ -28,7 +28,7 @@ VectorToolFactory::VectorToolFactory() - : KoToolFactoryBase("VectorToolFactoryId") + : KoToolFactoryBase("VectorTool") { setToolTip(i18n("Vector Image (EMF/WMF/SVM/SVG) tool")); setIconName(koIconNameCStrNeededWithSubs("a generic vector image icon", "x-shape-vectorimage", "application-x-wmf"));