From 4edba0539a1b7a456459b7c06aa0c8b6bda3f4f5 Mon Sep 17 00:00:00 2001 From: Max Wilfinger Date: Sun, 29 Jun 2025 13:24:54 +0200 Subject: [PATCH] Points: Update UI strings for consistency --- src/Mod/Points/App/AppPoints.cpp | 2 +- src/Mod/Points/App/PointsAlgos.cpp | 2 +- src/Mod/Points/Gui/AppPointsGui.cpp | 2 +- src/Mod/Points/Gui/Command.cpp | 34 +++++++++++++------------- src/Mod/Points/Gui/DlgPointsRead.ui | 38 ++++++++++++++--------------- src/Mod/Points/Gui/Workbench.cpp | 6 ++--- 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/Mod/Points/App/AppPoints.cpp b/src/Mod/Points/App/AppPoints.cpp index b367009ac0..06c29385b0 100644 --- a/src/Mod/Points/App/AppPoints.cpp +++ b/src/Mod/Points/App/AppPoints.cpp @@ -42,7 +42,7 @@ PyMOD_INIT_FUNC(Points) { // clang-format off PyObject* pointsModule = Points::initModule(); - Base::Console().log("Loading Points module... done\n"); + Base::Console().log("Loading Points module… done\n"); // add python types Base::Interpreter().addType(&Points::PointsPy::Type, pointsModule, "Points"); diff --git a/src/Mod/Points/App/PointsAlgos.cpp b/src/Mod/Points/App/PointsAlgos.cpp index 9ef92cb80a..b09781805d 100644 --- a/src/Mod/Points/App/PointsAlgos.cpp +++ b/src/Mod/Points/App/PointsAlgos.cpp @@ -89,7 +89,7 @@ void PointsAlgos::LoadAscii(PointKernel& points, const char* FileName) // resize the PointKernel points.resize(LineCnt); - Base::SequencerLauncher seq("Loading points...", LineCnt); + Base::SequencerLauncher seq("Loading points…", LineCnt); // again to the beginning Base::ifstream file(fi, std::ios::in); diff --git a/src/Mod/Points/Gui/AppPointsGui.cpp b/src/Mod/Points/Gui/AppPointsGui.cpp index 303ec357c9..359430780f 100644 --- a/src/Mod/Points/Gui/AppPointsGui.cpp +++ b/src/Mod/Points/Gui/AppPointsGui.cpp @@ -81,7 +81,7 @@ PyMOD_INIT_FUNC(PointsGui) PyMOD_Return(nullptr); } - Base::Console().log("Loading GUI of Points module... done\n"); + Base::Console().log("Loading GUI of Points module… done\n"); PyObject* mod = PointsGui::initModule(); // instantiating the commands diff --git a/src/Mod/Points/Gui/Command.cpp b/src/Mod/Points/Gui/Command.cpp index 3250fb6e35..d35a23b0d4 100644 --- a/src/Mod/Points/Gui/Command.cpp +++ b/src/Mod/Points/Gui/Command.cpp @@ -66,10 +66,10 @@ CmdPointsImport::CmdPointsImport() { sAppModule = "Points"; sGroup = QT_TR_NOOP("Points"); - sMenuText = QT_TR_NOOP("Import points..."); + sMenuText = QT_TR_NOOP("Import Points…"); sToolTipText = QT_TR_NOOP("Imports a point cloud"); sWhatsThis = "Points_Import"; - sStatusTip = QT_TR_NOOP("Imports a point cloud"); + sStatusTip = sToolTipText; sPixmap = "Points_Import_Point_cloud"; } @@ -117,7 +117,7 @@ void CmdPointsImport::activated(int iMsg) msgBox.setWindowTitle(QObject::tr("Points not at Origin")); msgBox.setText(QObject::tr( "The Bounding Box of the imported points does not contain the origin. " - "Do you want to translate it to the origin?")); + "Translate it to the origin?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setDefaultButton(QMessageBox::Yes); auto ret = msgBox.exec(); @@ -151,7 +151,7 @@ CmdPointsExport::CmdPointsExport() { sAppModule = "Points"; sGroup = QT_TR_NOOP("Points"); - sMenuText = QT_TR_NOOP("Export points..."); + sMenuText = QT_TR_NOOP("Export Points…"); sToolTipText = QT_TR_NOOP("Exports a point cloud"); sWhatsThis = "Points_Export"; sStatusTip = QT_TR_NOOP("Exports a point cloud"); @@ -199,9 +199,9 @@ CmdPointsTransform::CmdPointsTransform() sAppModule = "Points"; sGroup = QT_TR_NOOP("Points"); sMenuText = QT_TR_NOOP("Transform Points"); - sToolTipText = QT_TR_NOOP("Test to transform a point cloud"); + sToolTipText = QT_TR_NOOP("Tests to transform a point cloud"); sWhatsThis = "Points_Transform"; - sStatusTip = QT_TR_NOOP("Test to transform a point cloud"); + sStatusTip = sToolTipText; sPixmap = "Test1"; } @@ -237,10 +237,10 @@ CmdPointsConvert::CmdPointsConvert() { sAppModule = "Points"; sGroup = QT_TR_NOOP("Points"); - sMenuText = QT_TR_NOOP("Convert to points..."); - sToolTipText = QT_TR_NOOP("Convert to points"); + sMenuText = QT_TR_NOOP("Convert to Points…"); + sToolTipText = QT_TR_NOOP("Converts to points"); sWhatsThis = "Points_Convert"; - sStatusTip = QT_TR_NOOP("Convert to points"); + sStatusTip = sToolTipText; sPixmap = "Points_Convert"; } @@ -325,10 +325,10 @@ CmdPointsPolyCut::CmdPointsPolyCut() { sAppModule = "Points"; sGroup = QT_TR_NOOP("Points"); - sMenuText = QT_TR_NOOP("Cut point cloud"); + sMenuText = QT_TR_NOOP("Cut Point Cloud"); sToolTipText = QT_TR_NOOP("Cuts a point cloud with a picked polygon"); sWhatsThis = "Points_PolyCut"; - sStatusTip = QT_TR_NOOP("Cuts a point cloud with a picked polygon"); + sStatusTip = sToolTipText; sPixmap = "PolygonPick"; } @@ -373,10 +373,10 @@ CmdPointsMerge::CmdPointsMerge() { sAppModule = "Points"; sGroup = QT_TR_NOOP("Points"); - sMenuText = QT_TR_NOOP("Merge point clouds"); - sToolTipText = QT_TR_NOOP("Merge several point clouds into one"); + sMenuText = QT_TR_NOOP("Merge Point Clouds"); + sToolTipText = QT_TR_NOOP("Merges several point clouds into one"); sWhatsThis = "Points_Merge"; - sStatusTip = QT_TR_NOOP("Merge several point clouds into one"); + sStatusTip = sToolTipText; sPixmap = "Points_Merge"; } @@ -435,10 +435,10 @@ CmdPointsStructure::CmdPointsStructure() { sAppModule = "Points"; sGroup = QT_TR_NOOP("Points"); - sMenuText = QT_TR_NOOP("Structured point cloud"); - sToolTipText = QT_TR_NOOP("Convert points to structured point cloud"); + sMenuText = QT_TR_NOOP("Structured Point Cloud"); + sToolTipText = QT_TR_NOOP("Convert points to a structured point cloud"); sWhatsThis = "Points_Structure"; - sStatusTip = QT_TR_NOOP("Convert points to structured point cloud"); + sStatusTip = sToolTipText; sPixmap = "Points_Structure"; } diff --git a/src/Mod/Points/Gui/DlgPointsRead.ui b/src/Mod/Points/Gui/DlgPointsRead.ui index 72c1aaac35..5818037d06 100644 --- a/src/Mod/Points/Gui/DlgPointsRead.ui +++ b/src/Mod/Points/Gui/DlgPointsRead.ui @@ -11,7 +11,7 @@ - ASCII points import + ASCII Points Import @@ -31,7 +31,7 @@ - Template: + Template @@ -43,7 +43,7 @@ - Special lines + Special Lines @@ -55,7 +55,7 @@ - First line: + First Line @@ -98,7 +98,7 @@ - Cluster by lines starting with: + Cluster by lines starting with @@ -108,7 +108,7 @@ - Ignore lines starting with: + Ignore lines starting with @@ -123,7 +123,7 @@ - Point format + Point Format @@ -143,7 +143,7 @@ - Number separator: + Number separator @@ -177,7 +177,7 @@ - Points format: + Points format @@ -198,7 +198,7 @@ - Next block: + Next block @@ -206,7 +206,7 @@ - none + None @@ -226,7 +226,7 @@ - I (Gray value) + I (gray value) @@ -234,7 +234,7 @@ - Next block: + Next block @@ -242,7 +242,7 @@ - none + None @@ -262,7 +262,7 @@ - I (Gray value) + I (gray value) @@ -270,7 +270,7 @@ - Next block: + Next block @@ -278,7 +278,7 @@ - none + None @@ -298,7 +298,7 @@ - I (Gray value) + I (gray value) @@ -338,7 +338,7 @@ - Number of previewed lines: + Number of previewed lines diff --git a/src/Mod/Points/Gui/Workbench.cpp b/src/Mod/Points/Gui/Workbench.cpp index 61b420c97c..1b16f7b273 100644 --- a/src/Mod/Points/Gui/Workbench.cpp +++ b/src/Mod/Points/Gui/Workbench.cpp @@ -31,7 +31,7 @@ using namespace PointsGui; #if 0 // needed for Qt's lupdate utility - qApp->translate("Workbench", "Points tools"); + qApp->translate("Workbench", "Points Tools"); qApp->translate("Workbench", "&Points"); #endif @@ -46,7 +46,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const { Gui::ToolBarItem* root = StdWorkbench::setupToolBars(); Gui::ToolBarItem* pnt = new Gui::ToolBarItem(root); - pnt->setCommand("Points tools"); + pnt->setCommand("Points Tools"); *pnt << "Points_Import" << "Points_Export" << "Separator" @@ -62,7 +62,7 @@ Gui::ToolBarItem* Workbench::setupCommandBars() const // point tools Gui::ToolBarItem* root = new Gui::ToolBarItem; Gui::ToolBarItem* pnt = new Gui::ToolBarItem(root); - pnt->setCommand("Points tools"); + pnt->setCommand("Points Tools"); *pnt << "Points_Import" << "Points_Export" << "Points_Convert"