kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

use tr() instead of QT_TR_NOOP()

Browse Source
This commit is contained in:
Ronny Standtke
2023-04-13 02:27:16 +02:00
parent 69dd7f2949
commit 9e46e4a7d1
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Gui/NaviCube.cpp
View File

@@ -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);