From 4ac445afe7fe5f6019a22a2b5391d6e1469e6a21 Mon Sep 17 00:00:00 2001 From: Kacper Donat Date: Sat, 28 Jun 2025 20:15:43 +0200 Subject: [PATCH] Sketcher: Declare tr function for DrawSketchHandler --- src/Mod/Sketcher/Gui/DrawSketchHandler.h | 7 ++- src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h | 29 ++++++----- .../Gui/DrawSketchHandlerArcOfEllipse.h | 8 +-- .../Gui/DrawSketchHandlerArcOfHyperbola.h | 8 +-- .../Gui/DrawSketchHandlerArcOfParabola.h | 8 +-- .../Sketcher/Gui/DrawSketchHandlerArcSlot.h | 49 +++++++++---------- .../Sketcher/Gui/DrawSketchHandlerBSpline.h | 25 +++++----- .../Gui/DrawSketchHandlerCarbonCopy.h | 6 ++- .../Sketcher/Gui/DrawSketchHandlerCircle.h | 14 +++--- .../Sketcher/Gui/DrawSketchHandlerEllipse.h | 16 +++--- .../Sketcher/Gui/DrawSketchHandlerExtend.h | 6 +-- .../Sketcher/Gui/DrawSketchHandlerExternal.h | 6 ++- .../Sketcher/Gui/DrawSketchHandlerFillet.h | 30 ++++++------ src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h | 29 ++++++----- .../Sketcher/Gui/DrawSketchHandlerLineSet.h | 8 +-- .../Sketcher/Gui/DrawSketchHandlerOffset.h | 7 +-- src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h | 4 +- .../Sketcher/Gui/DrawSketchHandlerPolygon.h | 12 ++--- .../Sketcher/Gui/DrawSketchHandlerRectangle.h | 37 +++++++------- .../Sketcher/Gui/DrawSketchHandlerRotate.h | 10 ++-- src/Mod/Sketcher/Gui/DrawSketchHandlerScale.h | 6 +-- src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h | 6 +-- .../Sketcher/Gui/DrawSketchHandlerSplitting.h | 6 ++- .../Sketcher/Gui/DrawSketchHandlerSymmetry.h | 5 +- .../Sketcher/Gui/DrawSketchHandlerTranslate.h | 12 ++--- .../Sketcher/Gui/DrawSketchHandlerTrimming.h | 6 ++- 26 files changed, 181 insertions(+), 179 deletions(-) diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandler.h b/src/Mod/Sketcher/Gui/DrawSketchHandler.h index ca7ad4e700..7a434e4460 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandler.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.h @@ -23,8 +23,8 @@ #ifndef SKETCHERGUI_DrawSketchHandler_H #define SKETCHERGUI_DrawSketchHandler_H -#include #include +#include #include @@ -142,6 +142,8 @@ private: */ class SketcherGuiExport DrawSketchHandler: public Gui::ToolHandler { + Q_DECLARE_TR_FUNCTIONS(DrawSketchHandler) + public: DrawSketchHandler(); virtual ~DrawSketchHandler(); @@ -162,10 +164,11 @@ public: return false; } - virtual std::list getToolHints() const + std::list getToolHints() const override { return {}; } + void quit() override; friend class ViewProviderSketch; diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h index 69318de64c..7fcb1efbf2 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h @@ -93,8 +93,7 @@ private: using State = std::pair; using enum Gui::InputHint::UserInput; - const auto switchHint = - Gui::InputHint {.message = QObject::tr("%1 switch mode"), .sequences = {KeyM}}; + const Gui::InputHint switchModeHint {tr("%1 switch mode"), {KeyM}}; return Gui::lookupHints( {constructionMethod(), state()}, @@ -103,40 +102,40 @@ private: {.state = {ConstructionMethod::Center, SelectMode::SeekFirst}, .hints = { - {QObject::tr("%1 pick arc center"), {MouseLeft}}, - switchHint, + {tr("%1 pick arc center"), {MouseLeft}}, + switchModeHint, }}, {.state = {ConstructionMethod::Center, SelectMode::SeekSecond}, .hints = { - {QObject::tr("%1 pick arc start point"), {MouseLeft}}, - switchHint, + {tr("%1 pick arc start point"), {MouseLeft}}, + switchModeHint, }}, {.state = {ConstructionMethod::Center, SelectMode::SeekThird}, .hints = { - {QObject::tr("%1 pick arc end point"), {MouseLeft}}, - switchHint, + {tr("%1 pick arc end point"), {MouseLeft}}, + switchModeHint, }}, // ThreeRim method {.state = {ConstructionMethod::ThreeRim, SelectMode::SeekFirst}, .hints = { - {QObject::tr("%1 pick first arc point"), {MouseLeft}}, - switchHint, + {tr("%1 pick first arc point"), {MouseLeft}}, + switchModeHint, }}, {.state = {ConstructionMethod::ThreeRim, SelectMode::SeekSecond}, .hints = { - {QObject::tr("%1 pick second arc point"), {MouseLeft}}, - switchHint, + {tr("%1 pick second arc point"), {MouseLeft}}, + switchModeHint, }}, {.state = {ConstructionMethod::ThreeRim, SelectMode::SeekThird}, .hints = { - {QObject::tr("%1 pick third arc point"), {MouseLeft}}, - switchHint, + {tr("%1 pick third arc point"), {MouseLeft}}, + switchModeHint, }}, }); } @@ -390,7 +389,7 @@ private: QString getToolWidgetText() const override { - return QString(QObject::tr("Arc parameters")); + return QString(tr("Arc parameters")); } bool canGoToNextMode() override diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h index ee681def80..810a3fb748 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h @@ -415,22 +415,22 @@ private: {.state = STATUS_SEEK_First, .hints = { - {QObject::tr("%1 pick ellipse center"), {MouseLeft}}, + {tr("%1 pick ellipse center"), {MouseLeft}}, }}, {.state = STATUS_SEEK_Second, .hints = { - {QObject::tr("%1 pick axis point"), {MouseLeft}}, + {tr("%1 pick axis point"), {MouseLeft}}, }}, {.state = STATUS_SEEK_Third, .hints = { - {QObject::tr("%1 pick arc start point"), {MouseLeft}}, + {tr("%1 pick arc start point"), {MouseLeft}}, }}, {.state = STATUS_SEEK_Fourth, .hints = { - {QObject::tr("%1 pick arc end point"), {MouseLeft}}, + {tr("%1 pick arc end point"), {MouseLeft}}, }}, }); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h index 5ebcd7f4a7..565609b819 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h @@ -414,22 +414,22 @@ private: {.state = STATUS_SEEK_First, .hints = { - {QObject::tr("%1 pick center point"), {MouseLeft}}, + {tr("%1 pick center point"), {MouseLeft}}, }}, {.state = STATUS_SEEK_Second, .hints = { - {QObject::tr("%1 pick axis point"), {MouseLeft}}, + {tr("%1 pick axis point"), {MouseLeft}}, }}, {.state = STATUS_SEEK_Third, .hints = { - {QObject::tr("%1 pick arc start point"), {MouseLeft}}, + {tr("%1 pick arc start point"), {MouseLeft}}, }}, {.state = STATUS_SEEK_Fourth, .hints = { - {QObject::tr("%1 pick arc end point"), {MouseLeft}}, + {tr("%1 pick arc end point"), {MouseLeft}}, }}, }); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h index 0dfe4c4170..b5b273f5b8 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h @@ -344,22 +344,22 @@ private: {.state = STATUS_SEEK_First, .hints = { - {QObject::tr("%1 pick focus point"), {MouseLeft}}, + {tr("%1 pick focus point"), {MouseLeft}}, }}, {.state = STATUS_SEEK_Second, .hints = { - {QObject::tr("%1 pick axis point"), {MouseLeft}}, + {tr("%1 pick axis point"), {MouseLeft}}, }}, {.state = STATUS_SEEK_Third, .hints = { - {QObject::tr("%1 pick starting point"), {MouseLeft}}, + {tr("%1 pick starting point"), {MouseLeft}}, }}, {.state = STATUS_SEEK_Fourth, .hints = { - {QObject::tr("%1 pick end point"), {MouseLeft}}, + {tr("%1 pick end point"), {MouseLeft}}, }}, }); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcSlot.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcSlot.h index 1eda657a69..c683b40db9 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcSlot.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcSlot.h @@ -97,30 +97,29 @@ public: { using enum Gui::InputHint::UserInput; - return Gui::lookupHints( - state(), - { - {.state = SelectMode::SeekFirst, - .hints = - { - {QObject::tr("%1 pick slot center"), {MouseLeft}}, - }}, - {.state = SelectMode::SeekSecond, - .hints = - { - {QObject::tr("%1 pick slot radius"), {MouseLeft}}, - }}, - {.state = SelectMode::SeekThird, - .hints = - { - {QObject::tr("%1 pick slot angle"), {MouseLeft}}, - }}, - {.state = SelectMode::SeekFourth, - .hints = - { - {QObject::tr("%1 pick slot width"), {MouseLeft}}, - }}, - }); + return Gui::lookupHints(state(), + { + {.state = SelectMode::SeekFirst, + .hints = + { + {tr("%1 pick slot center"), {MouseLeft}}, + }}, + {.state = SelectMode::SeekSecond, + .hints = + { + {tr("%1 pick slot radius"), {MouseLeft}}, + }}, + {.state = SelectMode::SeekThird, + .hints = + { + {tr("%1 pick slot angle"), {MouseLeft}}, + }}, + {.state = SelectMode::SeekFourth, + .hints = + { + {tr("%1 pick slot width"), {MouseLeft}}, + }}, + }); } private: @@ -297,7 +296,7 @@ private: QString getToolWidgetText() const override { - return QString(QObject::tr("Arc Slot parameters")); + return QString(tr("Arc Slot parameters")); } bool canGoToNextMode() override diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h index d7e045d4bd..041865e970 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h @@ -409,8 +409,7 @@ private: using State = std::pair; using enum Gui::InputHint::UserInput; - const auto switchHint = - Gui::InputHint {.message = QObject::tr("%1 switch mode"), .sequences = {KeyM}}; + const Gui::InputHint switchModeHint {tr("%1 switch mode"), {KeyM}}; return Gui::lookupHints( {constructionMethod(), state()}, @@ -419,30 +418,30 @@ private: {.state = {ConstructionMethod::ControlPoints, SelectMode::SeekFirst}, .hints = { - {QObject::tr("%1 pick first control point"), {MouseLeft}}, - switchHint, + {tr("%1 pick first control point"), {MouseLeft}}, + switchModeHint, }}, {.state = {ConstructionMethod::ControlPoints, SelectMode::SeekSecond}, .hints = { - {QObject::tr("%1 pick next control point"), {MouseLeft}}, - {QObject::tr("%1 finish B-spline"), {MouseRight}}, - switchHint, + {tr("%1 pick next control point"), {MouseLeft}}, + {tr("%1 finish B-spline"), {MouseRight}}, + switchModeHint, }}, // Knots method {.state = {ConstructionMethod::Knots, SelectMode::SeekFirst}, .hints = { - {QObject::tr("%1 pick first knot"), {MouseLeft}}, - switchHint, + {tr("%1 pick first knot"), {MouseLeft}}, + switchModeHint, }}, {.state = {ConstructionMethod::Knots, SelectMode::SeekSecond}, .hints = { - {QObject::tr("%1 pick next knot"), {MouseLeft}}, - {QObject::tr("%1 finish B-spline"), {MouseRight}}, - switchHint, + {tr("%1 pick next knot"), {MouseLeft}}, + {tr("%1 finish B-spline"), {MouseRight}}, + switchModeHint, }}, }); } @@ -489,7 +488,7 @@ private: QString getToolWidgetText() const override { - return QString(QObject::tr("B-spline parameters")); + return QString(tr("B-spline parameters")); } bool canGoToNextMode() override diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h index ecea388f5c..40e1ec98ba 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h @@ -223,8 +223,10 @@ private: public: std::list getToolHints() const override { - return {{QObject::tr("%1 pick sketch to copy", "Sketcher CarbonCopy: hint"), - {Gui::InputHint::UserInput::MouseLeft}}}; + return { + {tr("%1 pick sketch to copy", "Sketcher CarbonCopy: hint"), + {Gui::InputHint::UserInput::MouseLeft}}, + }; } }; diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h index aa1d7cc1f2..8de2f379c1 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h @@ -83,7 +83,7 @@ private: using State = std::pair; using enum Gui::InputHint::UserInput; - const Gui::InputHint switchModeHint = {QObject::tr("%1 switch mode"), {KeyM}}; + const Gui::InputHint switchModeHint = {tr("%1 switch mode"), {KeyM}}; return Gui::lookupHints( {constructionMethod(), state()}, @@ -92,13 +92,13 @@ private: {.state = {ConstructionMethod::Center, SelectMode::SeekFirst}, .hints = { - {QObject::tr("%1 pick circle center"), {MouseLeft}}, + {tr("%1 pick circle center"), {MouseLeft}}, switchModeHint, }}, {.state = {ConstructionMethod::Center, SelectMode::SeekSecond}, .hints = { - {QObject::tr("%1 pick rim point"), {MouseLeft}}, + {tr("%1 pick rim point"), {MouseLeft}}, switchModeHint, }}, @@ -106,19 +106,19 @@ private: {.state = {ConstructionMethod::ThreeRim, SelectMode::SeekFirst}, .hints = { - {QObject::tr("%1 pick first rim point"), {MouseLeft}}, + {tr("%1 pick first rim point"), {MouseLeft}}, switchModeHint, }}, {.state = {ConstructionMethod::ThreeRim, SelectMode::SeekSecond}, .hints = { - {QObject::tr("%1 pick second rim point"), {MouseLeft}}, + {tr("%1 pick second rim point"), {MouseLeft}}, switchModeHint, }}, {.state = {ConstructionMethod::ThreeRim, SelectMode::SeekThird}, .hints = { - {QObject::tr("%1 pick third rim point"), {MouseLeft}}, + {tr("%1 pick third rim point"), {MouseLeft}}, switchModeHint, }}, }); @@ -307,7 +307,7 @@ private: QString getToolWidgetText() const override { - return QString(QObject::tr("Circle parameters")); + return QString(tr("Circle parameters")); } bool canGoToNextMode() override diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h index 8559a95a41..ebf04f6289 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h @@ -89,7 +89,7 @@ private: using State = std::pair; using enum Gui::InputHint::UserInput; - const Gui::InputHint switchModeHint {QObject::tr("%1 switch mode"), {KeyM}}; + const Gui::InputHint switchModeHint {tr("%1 switch mode"), {KeyM}}; return Gui::lookupHints( {constructionMethod(), state()}, @@ -98,19 +98,19 @@ private: {.state = {ConstructionMethod::Center, SelectMode::SeekFirst}, .hints = { - {QObject::tr("%1 pick ellipse center"), {MouseLeft}}, + {tr("%1 pick ellipse center"), {MouseLeft}}, switchModeHint, }}, {.state = {ConstructionMethod::Center, SelectMode::SeekSecond}, .hints = { - {QObject::tr("%1 pick axis endpoint"), {MouseLeft}}, + {tr("%1 pick axis endpoint"), {MouseLeft}}, switchModeHint, }}, {.state = {ConstructionMethod::Center, SelectMode::SeekThird}, .hints = { - {QObject::tr("%1 pick minor axis endpoint"), {MouseLeft}}, + {tr("%1 pick minor axis endpoint"), {MouseLeft}}, switchModeHint, }}, @@ -118,19 +118,19 @@ private: {.state = {ConstructionMethod::ThreeRim, SelectMode::SeekFirst}, .hints = { - {QObject::tr("%1 pick first rim point"), {MouseLeft}}, + {tr("%1 pick first rim point"), {MouseLeft}}, switchModeHint, }}, {.state = {ConstructionMethod::ThreeRim, SelectMode::SeekSecond}, .hints = { - {QObject::tr("%1 pick second rim point"), {MouseLeft}}, + {tr("%1 pick second rim point"), {MouseLeft}}, switchModeHint, }}, {.state = {ConstructionMethod::ThreeRim, SelectMode::SeekThird}, .hints = { - {QObject::tr("%1 pick third rim point"), {MouseLeft}}, + {tr("%1 pick third rim point"), {MouseLeft}}, switchModeHint, }}, }); @@ -325,7 +325,7 @@ private: QString getToolWidgetText() const override { - return QString(QObject::tr("Ellipse parameters")); + return QString(tr("Ellipse parameters")); } bool canGoToNextMode() override diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h index 5e79f6eb54..e05bd4917a 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h @@ -384,14 +384,12 @@ public: {.state = STATUS_SEEK_First, .hints = { - {QObject::tr("%1 pick edge to extend", "Sketcher Extend: hint"), - {MouseLeft}}, + {tr("%1 pick edge to extend", "Sketcher Extend: hint"), {MouseLeft}}, }}, {.state = STATUS_SEEK_Second, .hints = { - {QObject::tr("%1 set extension length", "Sketcher Extend: hint"), - {MouseLeft}}, + {tr("%1 set extension length", "Sketcher Extend: hint"), {MouseLeft}}, }}, }); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h index 91ee22c2c6..fc3591236b 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h @@ -248,8 +248,10 @@ private: public: std::list getToolHints() const override { - return {{QObject::tr("%1 pick external geometry", "Sketcher External: hint"), - {Gui::InputHint::UserInput::MouseLeft}}}; + return { + {tr("%1 pick external geometry", "Sketcher External: hint"), + {Gui::InputHint::UserInput::MouseLeft}}, + }; } }; diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h index de561bce30..1445b72e86 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h @@ -277,16 +277,14 @@ private: catch (const Base::CADKernelError& e) { if (e.getTranslatable()) { Gui::TranslatedUserError(sketchgui, - QObject::tr("CAD Kernel Error"), - QObject::tr(e.getMessage().c_str())); + tr("CAD Kernel Error"), + tr(e.getMessage().c_str())); } Gui::Selection().clearSelection(); Gui::Command::abortCommand(); } catch (const Base::ValueError& e) { - Gui::TranslatedUserError(sketchgui, - QObject::tr("Value Error"), - QObject::tr(e.getMessage().c_str())); + Gui::TranslatedUserError(sketchgui, tr("Value Error"), tr(e.getMessage().c_str())); Gui::Selection().clearSelection(); Gui::Command::abortCommand(); } @@ -347,7 +345,7 @@ private: QString getToolWidgetText() const override { - return QString(QObject::tr("Fillet/Chamfer parameters")); + return QString(tr("Fillet/Chamfer parameters")); } bool canGoToNextMode() override @@ -418,16 +416,16 @@ public: return Gui::lookupHints( state(), - {{.state = SelectMode::SeekFirst, - .hints = {{QObject::tr("%1 pick first edge or point", - "Sketcher Fillet/Chamfer: hint"), - {MouseLeft}}}}, - {.state = SelectMode::SeekSecond, - .hints = {{QObject::tr("%1 pick second edge", "Sketcher Fillet/Chamfer: hint"), - {MouseLeft}}}}, - {.state = SelectMode::End, - .hints = {{QObject::tr("%1 create fillet", "Sketcher Fillet/Chamfer: hint"), - {MouseLeft}}}}}); + { + {.state = SelectMode::SeekFirst, + .hints = {{tr("%1 pick first edge or point", "Sketcher Fillet/Chamfer: hint"), + {MouseLeft}}}}, + {.state = SelectMode::SeekSecond, + .hints = {{tr("%1 pick second edge", "Sketcher Fillet/Chamfer: hint"), + {MouseLeft}}}}, + {.state = SelectMode::End, + .hints = {{tr("%1 create fillet", "Sketcher Fillet/Chamfer: hint"), {MouseLeft}}}}, + }); } }; diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h index 05d0b1f106..6cb5de45ba 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h @@ -214,7 +214,7 @@ private: QString getToolWidgetText() const override { - return QString(QObject::tr("Line parameters")); + return QString(tr("Line parameters")); } bool canGoToNextMode() override @@ -261,8 +261,7 @@ private: using State = std::pair; using enum Gui::InputHint::UserInput; - const auto switchHint = - Gui::InputHint {.message = QObject::tr("%1 switch mode"), .sequences = {KeyM}}; + const Gui::InputHint switchModeHint {tr("%1 switch mode"), {KeyM}}; return Gui::lookupHints( {constructionMethod(), state()}, @@ -271,42 +270,42 @@ private: {.state = {ConstructionMethod::OnePointLengthAngle, SelectMode::SeekFirst}, .hints = { - {QObject::tr("%1 pick first point"), {MouseLeft}}, - switchHint, + {tr("%1 pick first point"), {MouseLeft}}, + switchModeHint, }}, {.state = {ConstructionMethod::OnePointLengthAngle, SelectMode::SeekSecond}, .hints = { - {QObject::tr("%1 pick second point"), {MouseLeft}}, - switchHint, + {tr("%1 pick second point"), {MouseLeft}}, + switchModeHint, }}, // OnePointWidthHeight method {.state = {ConstructionMethod::OnePointWidthHeight, SelectMode::SeekFirst}, .hints = { - {QObject::tr("%1 pick first point"), {MouseLeft}}, - switchHint, + {tr("%1 pick first point"), {MouseLeft}}, + switchModeHint, }}, {.state = {ConstructionMethod::OnePointWidthHeight, SelectMode::SeekSecond}, .hints = { - {QObject::tr("%1 pick second point"), {MouseLeft}}, - switchHint, + {tr("%1 pick second point"), {MouseLeft}}, + switchModeHint, }}, // TwoPoints method {.state = {ConstructionMethod::TwoPoints, SelectMode::SeekFirst}, .hints = { - {QObject::tr("%1 pick first point"), {MouseLeft}}, - switchHint, + {tr("%1 pick first point"), {MouseLeft}}, + switchModeHint, }}, {.state = {ConstructionMethod::TwoPoints, SelectMode::SeekSecond}, .hints = { - {QObject::tr("%1 pick second point"), {MouseLeft}}, - switchHint, + {tr("%1 pick second point"), {MouseLeft}}, + switchModeHint, }}, }); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h index ff0af0d911..bc4f902921 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h @@ -776,14 +776,14 @@ private: {.state = STATUS_SEEK_First, .hints = { - {QObject::tr("%1 pick first point"), {MouseLeft}}, + {tr("%1 pick first point"), {MouseLeft}}, }}, {.state = STATUS_SEEK_Second, .hints = { - {QObject::tr("%1 pick next point"), {MouseLeft}}, - {QObject::tr("%1 finish"), {MouseRight}}, - {QObject::tr("%1 switch mode"), {KeyM}}, + {tr("%1 pick next point"), {MouseLeft}}, + {tr("%1 finish"), {MouseRight}}, + {tr("%1 switch mode"), {KeyM}}, }}, }); // clang-format on diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerOffset.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerOffset.h index 30ea54eb0e..f7536b5b71 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerOffset.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerOffset.h @@ -179,7 +179,7 @@ private: QString getToolWidgetText() const override { - return QString(QObject::tr("Offset parameters")); + return QString(tr("Offset parameters")); } void activated() override @@ -196,8 +196,9 @@ public: { using enum Gui::InputHint::UserInput; - return {{QObject::tr("%1 set offset direction and distance", "Sketcher Offset: hint"), - {MouseLeft}}}; + return { + {tr("%1 set offset direction and distance", "Sketcher Offset: hint"), {MouseLeft}}, + }; } private: diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h index e28abfb2f8..7c7b5b430f 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h @@ -66,7 +66,9 @@ private: std::list getToolHints() const override { using enum Gui::InputHint::UserInput; - return {{QObject::tr("%1 place a point", "Sketcher Point: hint"), {MouseLeft}}}; + return { + {tr("%1 place a point", "Sketcher Point: hint"), {MouseLeft}}, + }; } void updateDataAndDrawToPosition(Base::Vector2d onSketchPos) override diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h index 7069df34b2..ad44b80942 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h @@ -200,7 +200,7 @@ private: QString getToolWidgetText() const override { - return QString(QObject::tr("Polygon parameters")); + return QString(tr("Polygon parameters")); } bool canGoToNextMode() override @@ -273,15 +273,15 @@ private: {.state = SelectMode::SeekFirst, .hints = { - {QObject::tr("%1 pick polygon center"), {MouseLeft}}, - {QObject::tr("%1/%2 increase / decrease number of sides"), {KeyU, KeyJ}}, + {tr("%1 pick polygon center"), {MouseLeft}}, + {tr("%1/%2 increase / decrease number of sides"), {KeyU, KeyJ}}, }}, {.state = SelectMode::SeekSecond, .hints = { - {QObject::tr("%1 pick rotation and size"), {MouseMove}}, - {QObject::tr("%1 confirm"), {MouseLeft}}, - {QObject::tr("%1/%2 increase / decrease number of sides"), {KeyU, KeyJ}}, + {tr("%1 pick rotation and size"), {MouseMove}}, + {tr("%1 confirm"), {MouseLeft}}, + {tr("%1/%2 increase / decrease number of sides"), {KeyU, KeyJ}}, }}, }); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h index 9accc2e542..8deb5ee289 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h @@ -114,8 +114,7 @@ private: using State = std::pair; using enum Gui::InputHint::UserInput; - const Gui::InputHint switchHint {.message = QObject::tr("%1 switch mode"), - .sequences = {KeyM}}; + const Gui::InputHint switchHint {.message = tr("%1 switch mode"), .sequences = {KeyM}}; return Gui::lookupHints( {constructionMethod(), state()}, @@ -124,25 +123,25 @@ private: {.state = {ConstructionMethod::Diagonal, SelectMode::SeekFirst}, .hints = { - {QObject::tr("%1 pick first corner"), {MouseLeft}}, + {tr("%1 pick first corner"), {MouseLeft}}, switchHint, }}, {.state = {ConstructionMethod::Diagonal, SelectMode::SeekSecond}, .hints = { - {QObject::tr("%1 pick opposite corner"), {MouseLeft}}, + {tr("%1 pick opposite corner"), {MouseLeft}}, switchHint, }}, {.state = {ConstructionMethod::Diagonal, SelectMode::SeekThird}, .hints = { - {QObject::tr("%1 set corner radius or frame thickness"), {MouseMove}}, + {tr("%1 set corner radius or frame thickness"), {MouseMove}}, switchHint, }}, {.state = {ConstructionMethod::Diagonal, SelectMode::SeekFourth}, .hints = { - {QObject::tr("%1 set frame thickness"), {MouseMove}}, + {tr("%1 set frame thickness"), {MouseMove}}, switchHint, }}, @@ -150,25 +149,25 @@ private: {.state = {ConstructionMethod::CenterAndCorner, SelectMode::SeekFirst}, .hints = { - {QObject::tr("%1 pick center"), {MouseLeft}}, + {tr("%1 pick center"), {MouseLeft}}, switchHint, }}, {.state = {ConstructionMethod::CenterAndCorner, SelectMode::SeekSecond}, .hints = { - {QObject::tr("%1 pick corner"), {MouseLeft}}, + {tr("%1 pick corner"), {MouseLeft}}, switchHint, }}, {.state = {ConstructionMethod::CenterAndCorner, SelectMode::SeekThird}, .hints = { - {QObject::tr("%1 set corner radius or frame thickness"), {MouseMove}}, + {tr("%1 set corner radius or frame thickness"), {MouseMove}}, switchHint, }}, {.state = {ConstructionMethod::CenterAndCorner, SelectMode::SeekFourth}, .hints = { - {QObject::tr("%1 set frame thickness"), {MouseMove}}, + {tr("%1 set frame thickness"), {MouseMove}}, switchHint, }}, @@ -176,25 +175,25 @@ private: {.state = {ConstructionMethod::ThreePoints, SelectMode::SeekFirst}, .hints = { - {QObject::tr("%1 pick first corner"), {MouseLeft}}, + {tr("%1 pick first corner"), {MouseLeft}}, switchHint, }}, {.state = {ConstructionMethod::ThreePoints, SelectMode::SeekSecond}, .hints = { - {QObject::tr("%1 pick second corner"), {MouseLeft}}, + {tr("%1 pick second corner"), {MouseLeft}}, switchHint, }}, {.state = {ConstructionMethod::ThreePoints, SelectMode::SeekThird}, .hints = { - {QObject::tr("%1 pick third corner"), {MouseLeft}}, + {tr("%1 pick third corner"), {MouseLeft}}, switchHint, }}, {.state = {ConstructionMethod::ThreePoints, SelectMode::SeekFourth}, .hints = { - {QObject::tr("%1 set corner radius or frame thickness"), {MouseMove}}, + {tr("%1 set corner radius or frame thickness"), {MouseMove}}, switchHint, }}, @@ -202,25 +201,25 @@ private: {.state = {ConstructionMethod::CenterAnd3Points, SelectMode::SeekFirst}, .hints = { - {QObject::tr("%1 pick center"), {MouseLeft}}, + {tr("%1 pick center"), {MouseLeft}}, switchHint, }}, {.state = {ConstructionMethod::CenterAnd3Points, SelectMode::SeekSecond}, .hints = { - {QObject::tr("%1 pick first corner"), {MouseLeft}}, + {tr("%1 pick first corner"), {MouseLeft}}, switchHint, }}, {.state = {ConstructionMethod::CenterAnd3Points, SelectMode::SeekThird}, .hints = { - {QObject::tr("%1 pick second corner"), {MouseLeft}}, + {tr("%1 pick second corner"), {MouseLeft}}, switchHint, }}, {.state = {ConstructionMethod::CenterAnd3Points, SelectMode::SeekFourth}, .hints = { - {QObject::tr("%1 set corner radius or frame thickness"), {MouseMove}}, + {tr("%1 set corner radius or frame thickness"), {MouseMove}}, switchHint, }}, }); @@ -704,7 +703,7 @@ private: QString getToolWidgetText() const override { - return QString(QObject::tr("Rectangle parameters")); + return QString(tr("Rectangle parameters")); } void angleSnappingControl() override diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerRotate.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerRotate.h index bc8998e920..96feda0345 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerRotate.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerRotate.h @@ -93,19 +93,17 @@ public: {.state = SelectMode::SeekFirst, .hints = { - {QObject::tr("%1 pick center point", "Sketcher Rotate: hint"), - {MouseLeft}}, + {tr("%1 pick center point", "Sketcher Rotate: hint"), {MouseLeft}}, }}, {.state = SelectMode::SeekSecond, .hints = { - {QObject::tr("%1 set start angle", "Sketcher Rotate: hint"), {MouseLeft}}, + {tr("%1 set start angle", "Sketcher Rotate: hint"), {MouseLeft}}, }}, {.state = SelectMode::SeekThird, .hints = { - {QObject::tr("%1 set rotation angle", "Sketcher Rotate: hint"), - {MouseLeft}}, + {tr("%1 set rotation angle", "Sketcher Rotate: hint"), {MouseLeft}}, }}, }); } @@ -202,7 +200,7 @@ private: QString getToolWidgetText() const override { - return QString(QObject::tr("Rotate parameters")); + return QString(tr("Rotate parameters")); } void activated() override diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerScale.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerScale.h index 286fc9f040..c2fd018445 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerScale.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerScale.h @@ -143,12 +143,12 @@ public: {.state = SelectMode::SeekFirst, .hints = { - {QObject::tr("%1 pick reference point"), {MouseLeft}}, + {tr("%1 pick reference point"), {MouseLeft}}, }}, {.state = SelectMode::SeekSecond, .hints = { - {QObject::tr("%1 set scale factor"), {MouseLeft}}, + {tr("%1 set scale factor"), {MouseLeft}}, }}, }); } @@ -211,7 +211,7 @@ private: QString getToolWidgetText() const override { - return QString(QObject::tr("Scale parameters")); + return QString(tr("Scale parameters")); } void activated() override diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h index 152446ef9e..f29fc8fff9 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h @@ -91,17 +91,17 @@ private: {.state = SelectMode::SeekFirst, .hints = { - {QObject::tr("%1 pick slot start point"), {MouseLeft}}, + {tr("%1 pick slot start point"), {MouseLeft}}, }}, {.state = SelectMode::SeekSecond, .hints = { - {QObject::tr("%1 pick slot end point"), {MouseLeft}}, + {tr("%1 pick slot end point"), {MouseLeft}}, }}, {.state = SelectMode::SeekThird, .hints = { - {QObject::tr("%1 pick slot width"), {MouseLeft}}, + {tr("%1 pick slot width"), {MouseLeft}}, }}, }); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h index bc1a494018..8eaa2a420c 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h @@ -200,8 +200,10 @@ private: public: std::list getToolHints() const override { - return {{QObject::tr("%1 pick location on edge to split", "Sketcher Splitting: hint"), - {Gui::InputHint::UserInput::MouseLeft}}}; + return { + {tr("%1 pick location on edge to split", "Sketcher Splitting: hint"), + {Gui::InputHint::UserInput::MouseLeft}}, + }; } }; diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerSymmetry.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerSymmetry.h index bb6988c17e..6541efb522 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerSymmetry.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerSymmetry.h @@ -191,7 +191,7 @@ private: QString getToolWidgetText() const override { - return QString(QObject::tr("Symmetry parameters")); + return QString(tr("Symmetry parameters")); } void activated() override @@ -221,7 +221,8 @@ public: using enum Gui::InputHint::UserInput; return { - {QObject::tr("%1 pick axis, edge, or point", "Sketcher Symmetry: hint"), {MouseLeft}}}; + {tr("%1 pick axis, edge, or point", "Sketcher Symmetry: hint"), {MouseLeft}}, + }; } void deleteOriginalGeos() diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerTranslate.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerTranslate.h index dcbba2c15e..ab26da8c6a 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerTranslate.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerTranslate.h @@ -172,7 +172,7 @@ private: QString getToolWidgetText() const override { - return QString(QObject::tr("Translate parameters")); + return QString(tr("Translate parameters")); } void onButtonPressed(Base::Vector2d onSketchPos) override @@ -435,15 +435,13 @@ public: return Gui::lookupHints( state(), {{.state = SelectMode::SeekFirst, - .hints = {{QObject::tr("%1 pick reference point", "Sketcher Translate: hint"), - {MouseLeft}}}}, + .hints = {{tr("%1 pick reference point", "Sketcher Translate: hint"), {MouseLeft}}}}, {.state = SelectMode::SeekSecond, - .hints = {{QObject::tr("%1 set translation vector", "Sketcher Translate: hint"), + .hints = {{tr("%1 set translation vector", "Sketcher Translate: hint"), {MouseLeft}}}}, {.state = SelectMode::SeekThird, - .hints = { - {QObject::tr("%1 set second translation vector", "Sketcher Translate: hint"), - {MouseLeft}}}}}); + .hints = {{tr("%1 set second translation vector", "Sketcher Translate: hint"), + {MouseLeft}}}}}); } }; diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h index 1b66e2856a..d2a359a6b5 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h @@ -212,8 +212,10 @@ private: public: std::list getToolHints() const override { - return {{QObject::tr("%1 pick edge to trim", "Sketcher Trimming: hint"), - {Gui::InputHint::UserInput::MouseLeft}}}; + return { + {tr("%1 pick edge to trim", "Sketcher Trimming: hint"), + {Gui::InputHint::UserInput::MouseLeft}}, + }; } };