From e6d2f0e8521fe8ee7eb9a50d34ad1fdf2de3f8ec Mon Sep 17 00:00:00 2001 From: Ronny Standtke Date: Wed, 12 Apr 2023 22:13:58 +0200 Subject: [PATCH 1/3] added i18n for navicube labels --- src/Gui/NaviCube.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Gui/NaviCube.cpp b/src/Gui/NaviCube.cpp index ee93d43116..cdc5da9417 100644 --- a/src/Gui/NaviCube.cpp +++ b/src/Gui/NaviCube.cpp @@ -893,12 +893,12 @@ void NaviCubeImplementation::initNaviCube(QtGLWidget* gl) { labels.clear(); ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath( "User parameter:BaseApp/Preferences/NaviCube"); - labels.push_back(hGrp->GetASCII("TextFront", "FRONT")); - labels.push_back(hGrp->GetASCII("TextRear", "REAR")); - labels.push_back(hGrp->GetASCII("TextTop", "TOP")); - labels.push_back(hGrp->GetASCII("TextBottom", "BOTTOM")); - labels.push_back(hGrp->GetASCII("TextRight", "RIGHT")); - labels.push_back(hGrp->GetASCII("TextLeft", "LEFT")); + labels.push_back(hGrp->GetASCII("TextFront", QT_TR_NOOP("FRONT"))); + labels.push_back(hGrp->GetASCII("TextRear", QT_TR_NOOP("REAR"))); + labels.push_back(hGrp->GetASCII("TextTop", QT_TR_NOOP("TOP"))); + labels.push_back(hGrp->GetASCII("TextBottom", QT_TR_NOOP("BOTTOM"))); + labels.push_back(hGrp->GetASCII("TextRight", QT_TR_NOOP("RIGHT"))); + labels.push_back(hGrp->GetASCII("TextLeft", QT_TR_NOOP("LEFT"))); } // create the main faces m_Textures[TEX_FRONT] = createCubeFaceTex(gl, gap, labels[0].c_str(), SHAPE_SQUARE); From 1b20532595270e6c2892045e069a3c1c46f98190 Mon Sep 17 00:00:00 2001 From: Ronny Standtke Date: Thu, 13 Apr 2023 02:27:16 +0200 Subject: [PATCH 2/3] use tr() instead of QT_TR_NOOP() --- src/Gui/NaviCube.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/Gui/NaviCube.cpp b/src/Gui/NaviCube.cpp index cdc5da9417..f29a7bdd52 100644 --- a/src/Gui/NaviCube.cpp +++ b/src/Gui/NaviCube.cpp @@ -110,6 +110,7 @@ public: }; class NaviCubeImplementation : public ParameterGrp::ObserverType { + Q_DECLARE_TR_FUNCTIONS(NaviCubeImplementation) public: explicit NaviCubeImplementation(Gui::View3DInventorViewer*); ~NaviCubeImplementation() override; @@ -893,12 +894,19 @@ void NaviCubeImplementation::initNaviCube(QtGLWidget* gl) { labels.clear(); ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath( "User parameter:BaseApp/Preferences/NaviCube"); - labels.push_back(hGrp->GetASCII("TextFront", QT_TR_NOOP("FRONT"))); - labels.push_back(hGrp->GetASCII("TextRear", QT_TR_NOOP("REAR"))); - labels.push_back(hGrp->GetASCII("TextTop", QT_TR_NOOP("TOP"))); - labels.push_back(hGrp->GetASCII("TextBottom", QT_TR_NOOP("BOTTOM"))); - labels.push_back(hGrp->GetASCII("TextRight", QT_TR_NOOP("RIGHT"))); - labels.push_back(hGrp->GetASCII("TextLeft", QT_TR_NOOP("LEFT"))); + // see https://wiki.qt.io/Technical_FAQ#How_can_I_convert_a_QString_to_char.2A_and_vice_versa.3F + QByteArray frontByteArray = tr("FRONT").toLocal8Bit(); + labels.push_back(hGrp->GetASCII("TextFront", frontByteArray.constData())); + QByteArray rearByteArray = tr("REAR").toLocal8Bit(); + labels.push_back(hGrp->GetASCII("TextRear", rearByteArray.constData())); + QByteArray topByteArray = tr("TOP").toLocal8Bit(); + labels.push_back(hGrp->GetASCII("TextTop", topByteArray.constData())); + QByteArray bottomByteArray = tr("BOTTOM").toLocal8Bit(); + labels.push_back(hGrp->GetASCII("TextBottom", bottomByteArray.constData())); + QByteArray rightByteArray = tr("RIGHT").toLocal8Bit(); + labels.push_back(hGrp->GetASCII("TextRight", rightByteArray.constData())); + QByteArray leftByteArray = tr("LEFT").toLocal8Bit(); + labels.push_back(hGrp->GetASCII("TextLeft", leftByteArray.constData())); } // create the main faces m_Textures[TEX_FRONT] = createCubeFaceTex(gl, gap, labels[0].c_str(), SHAPE_SQUARE); From e3d47049bf21ceed957ba8b5d4fac1fe2bb35df6 Mon Sep 17 00:00:00 2001 From: Ronny Standtke Date: Thu, 13 Apr 2023 17:29:12 +0200 Subject: [PATCH 3/3] use toUtf8() instead of toLocal8Bit() --- src/Gui/NaviCube.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Gui/NaviCube.cpp b/src/Gui/NaviCube.cpp index f29a7bdd52..82ddae39a4 100644 --- a/src/Gui/NaviCube.cpp +++ b/src/Gui/NaviCube.cpp @@ -895,17 +895,17 @@ void NaviCubeImplementation::initNaviCube(QtGLWidget* gl) { ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath( "User parameter:BaseApp/Preferences/NaviCube"); // see https://wiki.qt.io/Technical_FAQ#How_can_I_convert_a_QString_to_char.2A_and_vice_versa.3F - QByteArray frontByteArray = tr("FRONT").toLocal8Bit(); + QByteArray frontByteArray = tr("FRONT").toUtf8(); labels.push_back(hGrp->GetASCII("TextFront", frontByteArray.constData())); - QByteArray rearByteArray = tr("REAR").toLocal8Bit(); + QByteArray rearByteArray = tr("REAR").toUtf8(); labels.push_back(hGrp->GetASCII("TextRear", rearByteArray.constData())); - QByteArray topByteArray = tr("TOP").toLocal8Bit(); + QByteArray topByteArray = tr("TOP").toUtf8(); labels.push_back(hGrp->GetASCII("TextTop", topByteArray.constData())); - QByteArray bottomByteArray = tr("BOTTOM").toLocal8Bit(); + QByteArray bottomByteArray = tr("BOTTOM").toUtf8(); labels.push_back(hGrp->GetASCII("TextBottom", bottomByteArray.constData())); - QByteArray rightByteArray = tr("RIGHT").toLocal8Bit(); + QByteArray rightByteArray = tr("RIGHT").toUtf8(); labels.push_back(hGrp->GetASCII("TextRight", rightByteArray.constData())); - QByteArray leftByteArray = tr("LEFT").toLocal8Bit(); + QByteArray leftByteArray = tr("LEFT").toUtf8(); labels.push_back(hGrp->GetASCII("TextLeft", leftByteArray.constData())); } // create the main faces