From 93e7ad6d79a54aa65a24371b6a817652dd77b6a6 Mon Sep 17 00:00:00 2001 From: Max Wilfinger Date: Sun, 29 Jun 2025 16:19:26 +0200 Subject: [PATCH] Robot: Update UI strings for consistency --- src/Mod/Robot/App/AppRobot.cpp | 2 +- src/Mod/Robot/Gui/AppRobotGui.cpp | 2 +- src/Mod/Robot/Gui/Command.cpp | 16 ++++----- src/Mod/Robot/Gui/CommandExport.cpp | 8 ++--- src/Mod/Robot/Gui/CommandInsertRobot.cpp | 12 +++---- src/Mod/Robot/Gui/CommandTrajectory.cpp | 30 ++++++++--------- src/Mod/Robot/Gui/TaskEdge2TracParameter.ui | 4 +-- src/Mod/Robot/Gui/TaskRobot6Axis.ui | 2 +- src/Mod/Robot/Gui/TaskRobotMessages.ui | 2 +- .../Gui/TaskTrajectoryDressUpParameter.ui | 20 +++++------ src/Mod/Robot/Gui/Workbench.cpp | 33 +++++++++---------- 11 files changed, 65 insertions(+), 66 deletions(-) diff --git a/src/Mod/Robot/App/AppRobot.cpp b/src/Mod/Robot/App/AppRobot.cpp index 03f15bb67a..c6e286fdac 100644 --- a/src/Mod/Robot/App/AppRobot.cpp +++ b/src/Mod/Robot/App/AppRobot.cpp @@ -109,7 +109,7 @@ PyMOD_INIT_FUNC(Robot) } PyObject* robotModule = Robot::initModule(); - Base::Console().log("Loading Robot module... done\n"); + Base::Console().log("Loading Robot module… done\n"); // Add Types to module Base::Interpreter().addType(&Robot::Robot6AxisPy ::Type,robotModule,"Robot6Axis"); diff --git a/src/Mod/Robot/Gui/AppRobotGui.cpp b/src/Mod/Robot/Gui/AppRobotGui.cpp index b7609b0fd3..5e53149020 100644 --- a/src/Mod/Robot/Gui/AppRobotGui.cpp +++ b/src/Mod/Robot/Gui/AppRobotGui.cpp @@ -100,7 +100,7 @@ PyMOD_INIT_FUNC(RobotGui) PyMOD_Return(nullptr); } PyObject* mod = RobotGui::initModule(); - Base::Console().log("Loading GUI of Robot module... done\n"); + Base::Console().log("Loading GUI of Robot module… done\n"); // instantiating the commands CreateRobotCommands(); diff --git a/src/Mod/Robot/Gui/Command.cpp b/src/Mod/Robot/Gui/Command.cpp index 3f12910daa..562db41fcf 100644 --- a/src/Mod/Robot/Gui/Command.cpp +++ b/src/Mod/Robot/Gui/Command.cpp @@ -49,8 +49,8 @@ CmdRobotSetHomePos::CmdRobotSetHomePos() { sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); - sMenuText = QT_TR_NOOP("Set the home position"); - sToolTipText = QT_TR_NOOP("Set the home position"); + sMenuText = QT_TR_NOOP("Set Home Position"); + sToolTipText = QT_TR_NOOP("Sets the home position"); sWhatsThis = "Robot_SetHomePos"; sStatusTip = sToolTipText; sPixmap = "Robot_SetHomePos"; @@ -108,8 +108,8 @@ CmdRobotRestoreHomePos::CmdRobotRestoreHomePos() { sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); - sMenuText = QT_TR_NOOP("Move to home"); - sToolTipText = QT_TR_NOOP("Move to home"); + sMenuText = QT_TR_NOOP("Move to Home"); + sToolTipText = QT_TR_NOOP("Moves to home"); sWhatsThis = "Robot_RestoreHomePos"; sStatusTip = sToolTipText; sPixmap = "Robot_RestoreHomePos"; @@ -161,8 +161,8 @@ CmdRobotConstraintAxle::CmdRobotConstraintAxle() { sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); - sMenuText = QT_TR_NOOP("Place robot..."); - sToolTipText = QT_TR_NOOP("Place a robot (experimental!)"); + sMenuText = QT_TR_NOOP("Place Robot…"); + sToolTipText = QT_TR_NOOP("Places a robot"); sWhatsThis = "Robot_Create"; sStatusTip = sToolTipText; sPixmap = "Robot_CreateRobot"; @@ -209,8 +209,8 @@ CmdRobotSimulate::CmdRobotSimulate() { sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); - sMenuText = QT_TR_NOOP("Simulate a trajectory"); - sToolTipText = QT_TR_NOOP("Run a simulation on a trajectory"); + sMenuText = QT_TR_NOOP("Simulate Trajectory"); + sToolTipText = QT_TR_NOOP("Runs a simulation on a trajectory"); sWhatsThis = "Robot_Simulate"; sStatusTip = sToolTipText; sPixmap = "Robot_Simulate"; diff --git a/src/Mod/Robot/Gui/CommandExport.cpp b/src/Mod/Robot/Gui/CommandExport.cpp index 567482260f..8597a0247c 100644 --- a/src/Mod/Robot/Gui/CommandExport.cpp +++ b/src/Mod/Robot/Gui/CommandExport.cpp @@ -44,8 +44,8 @@ CmdRobotExportKukaCompact::CmdRobotExportKukaCompact() { sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); - sMenuText = QT_TR_NOOP("Kuka compact subroutine..."); - sToolTipText = QT_TR_NOOP("Export the trajectory as a compact KRL subroutine."); + sMenuText = QT_TR_NOOP("Kuka Compact Subroutine…"); + sToolTipText = QT_TR_NOOP("Exports the trajectory as a compact KRL subroutine"); sWhatsThis = "Robot_ExportKukaCompact"; sStatusTip = sToolTipText; sPixmap = "Robot_Export"; @@ -119,8 +119,8 @@ CmdRobotExportKukaFull::CmdRobotExportKukaFull() { sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); - sMenuText = QT_TR_NOOP("Kuka full subroutine..."); - sToolTipText = QT_TR_NOOP("Export the trajectory as a full KRL subroutine."); + sMenuText = QT_TR_NOOP("Kuka Full Subroutine…"); + sToolTipText = QT_TR_NOOP("Exports the trajectory as a full KRL subroutine"); sWhatsThis = "Robot_ExportKukaFull"; sStatusTip = sToolTipText; sPixmap = "Robot_Export"; diff --git a/src/Mod/Robot/Gui/CommandInsertRobot.cpp b/src/Mod/Robot/Gui/CommandInsertRobot.cpp index d4d9de09d4..163c433ac0 100644 --- a/src/Mod/Robot/Gui/CommandInsertRobot.cpp +++ b/src/Mod/Robot/Gui/CommandInsertRobot.cpp @@ -45,7 +45,7 @@ CmdRobotInsertKukaIR500::CmdRobotInsertKukaIR500() sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); sMenuText = QT_TR_NOOP("Kuka IR500"); - sToolTipText = QT_TR_NOOP("Insert a Kuka IR500 into the document."); + sToolTipText = QT_TR_NOOP("Inserts a Kuka IR500 into the document"); sWhatsThis = "Robot_InsertKukaIR500"; sStatusTip = sToolTipText; sPixmap = "Robot_CreateRobot"; @@ -96,7 +96,7 @@ CmdRobotInsertKukaIR16::CmdRobotInsertKukaIR16() sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); sMenuText = QT_TR_NOOP("Kuka IR16"); - sToolTipText = QT_TR_NOOP("Insert a Kuka IR16 into the document."); + sToolTipText = QT_TR_NOOP("Inserts a Kuka IR16 into the document"); sWhatsThis = "Robot_InsertKukaIR16"; sStatusTip = sToolTipText; sPixmap = "Robot_CreateRobot"; @@ -144,7 +144,7 @@ CmdRobotInsertKukaIR210::CmdRobotInsertKukaIR210() sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); sMenuText = QT_TR_NOOP("Kuka IR210"); - sToolTipText = QT_TR_NOOP("Insert a Kuka IR210 into the document."); + sToolTipText = QT_TR_NOOP("Inserts a Kuka IR210 into the document"); sWhatsThis = "Robot_InsertKukaIR210"; sStatusTip = sToolTipText; sPixmap = "Robot_CreateRobot"; @@ -191,7 +191,7 @@ CmdRobotInsertKukaIR125::CmdRobotInsertKukaIR125() sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); sMenuText = QT_TR_NOOP("Kuka IR125"); - sToolTipText = QT_TR_NOOP("Insert a Kuka IR125 into the document."); + sToolTipText = QT_TR_NOOP("Inserts a Kuka IR125 into the document"); sWhatsThis = "Robot_InsertKukaIR125"; sStatusTip = sToolTipText; sPixmap = "Robot_CreateRobot"; @@ -238,8 +238,8 @@ CmdRobotAddToolShape::CmdRobotAddToolShape() { sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); - sMenuText = QT_TR_NOOP("Add tool"); - sToolTipText = QT_TR_NOOP("Add a tool shape to the robot"); + sMenuText = QT_TR_NOOP("Tool"); + sToolTipText = QT_TR_NOOP("Adds a tool shape to the robot"); sWhatsThis = "Robot_AddToolShape"; sStatusTip = sToolTipText; sPixmap = "Robot_CreateRobot"; diff --git a/src/Mod/Robot/Gui/CommandTrajectory.cpp b/src/Mod/Robot/Gui/CommandTrajectory.cpp index 5a60f1884d..f678258fd4 100644 --- a/src/Mod/Robot/Gui/CommandTrajectory.cpp +++ b/src/Mod/Robot/Gui/CommandTrajectory.cpp @@ -53,8 +53,8 @@ CmdRobotCreateTrajectory::CmdRobotCreateTrajectory() { sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); - sMenuText = QT_TR_NOOP("Create trajectory"); - sToolTipText = QT_TR_NOOP("Create a new empty trajectory"); + sMenuText = QT_TR_NOOP("Trajectory"); + sToolTipText = QT_TR_NOOP("Creates a new empty trajectory"); sWhatsThis = "Robot_CreateTrajectory"; sStatusTip = sToolTipText; sPixmap = "Robot_CreateTrajectory"; @@ -88,7 +88,7 @@ CmdRobotInsertWaypoint::CmdRobotInsertWaypoint() sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); sMenuText = QT_TR_NOOP("Insert in trajectory"); - sToolTipText = QT_TR_NOOP("Insert robot Tool location into trajectory"); + sToolTipText = QT_TR_NOOP("Insert robot tool location into the trajectory"); sWhatsThis = "Robot_InsertWaypoint"; sStatusTip = sToolTipText; sPixmap = "Robot_InsertWaypoint"; @@ -156,8 +156,8 @@ CmdRobotInsertWaypointPreselect::CmdRobotInsertWaypointPreselect() { sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); - sMenuText = QT_TR_NOOP("Insert in trajectory"); - sToolTipText = QT_TR_NOOP("Insert preselection position into trajectory (W)"); + sMenuText = QT_TR_NOOP("Insert in Trajectory"); + sToolTipText = QT_TR_NOOP("Inserts the preselection position into the trajectory (W)"); sWhatsThis = "Robot_InsertWaypointPreselect"; sStatusTip = sToolTipText; sPixmap = "Robot_InsertWaypointPre"; @@ -233,9 +233,9 @@ CmdRobotSetDefaultOrientation::CmdRobotSetDefaultOrientation() { sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); - sMenuText = QT_TR_NOOP("Set default orientation"); + sMenuText = QT_TR_NOOP("Set Default Orientation"); sToolTipText = - QT_TR_NOOP("Set the default orientation for subsequent commands for waypoint creation"); + QT_TR_NOOP("Sets the default orientation for subsequent commands for waypoint creation"); sWhatsThis = "Robot_SetDefaultOrientation"; sStatusTip = sToolTipText; sPixmap = nullptr; @@ -277,8 +277,8 @@ CmdRobotSetDefaultValues::CmdRobotSetDefaultValues() { sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); - sMenuText = QT_TR_NOOP("Set default values"); - sToolTipText = QT_TR_NOOP("Set the default values for speed, acceleration and continuity for " + sMenuText = QT_TR_NOOP("Set Default Values"); + sToolTipText = QT_TR_NOOP("Sets the default values for speed, acceleration, and continuity for " "subsequent commands of waypoint creation"); sWhatsThis = "Robot_SetDefaultValues"; sStatusTip = sToolTipText; @@ -358,8 +358,8 @@ CmdRobotEdge2Trac::CmdRobotEdge2Trac() { sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); - sMenuText = QT_TR_NOOP("Edge to Trajectory..."); - sToolTipText = QT_TR_NOOP("Generate a Trajectory from a set of edges"); + sMenuText = QT_TR_NOOP("Edge to Trajectory…"); + sToolTipText = QT_TR_NOOP("Generates a trajectory from a set of edges"); sWhatsThis = "Robot_Edge2Trac"; sStatusTip = sToolTipText; sPixmap = "Robot_Edge2Trac"; @@ -424,9 +424,9 @@ CmdRobotTrajectoryDressUp::CmdRobotTrajectoryDressUp() { sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); - sMenuText = QT_TR_NOOP("Dress-up trajectory..."); + sMenuText = QT_TR_NOOP("Dress-Up Trajectory…"); sToolTipText = - QT_TR_NOOP("Create a dress-up object which overrides some aspects of a trajectory"); + QT_TR_NOOP("Creates a dress-up object which overrides some aspects of a trajectory"); sWhatsThis = "Robot_TrajectoryDressUp"; sStatusTip = sToolTipText; sPixmap = "Robot_TrajectoryDressUp"; @@ -481,8 +481,8 @@ CmdRobotTrajectoryCompound::CmdRobotTrajectoryCompound() { sAppModule = "Robot"; sGroup = QT_TR_NOOP("Robot"); - sMenuText = QT_TR_NOOP("Trajectory compound..."); - sToolTipText = QT_TR_NOOP("Group and connect some trajectories to one"); + sMenuText = QT_TR_NOOP("Trajectory Compound…"); + sToolTipText = QT_TR_NOOP("Groups and connects some trajectories to one"); sWhatsThis = "Robot_TrajectoryCompound"; sStatusTip = sToolTipText; sPixmap = "Robot_TrajectoryCompound"; diff --git a/src/Mod/Robot/Gui/TaskEdge2TracParameter.ui b/src/Mod/Robot/Gui/TaskEdge2TracParameter.ui index 5b9ce5fbb1..07e7e28c2c 100644 --- a/src/Mod/Robot/Gui/TaskEdge2TracParameter.ui +++ b/src/Mod/Robot/Gui/TaskEdge2TracParameter.ui @@ -26,7 +26,7 @@ - Hide / Show + Hide/Show @@ -69,7 +69,7 @@ - Sizing Value: + Sizing Value diff --git a/src/Mod/Robot/Gui/TaskRobot6Axis.ui b/src/Mod/Robot/Gui/TaskRobot6Axis.ui index 479ed81eba..30e333b2b8 100644 --- a/src/Mod/Robot/Gui/TaskRobot6Axis.ui +++ b/src/Mod/Robot/Gui/TaskRobot6Axis.ui @@ -342,7 +342,7 @@ - ... + … diff --git a/src/Mod/Robot/Gui/TaskRobotMessages.ui b/src/Mod/Robot/Gui/TaskRobotMessages.ui index 4370dac0b8..cbb9e9b06a 100644 --- a/src/Mod/Robot/Gui/TaskRobotMessages.ui +++ b/src/Mod/Robot/Gui/TaskRobotMessages.ui @@ -17,7 +17,7 @@ - clear + Clear diff --git a/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.ui b/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.ui index ec2be73fe0..6395b02fd5 100644 --- a/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.ui +++ b/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.ui @@ -17,7 +17,7 @@ - Speed & Acceleration: + Speed & acceleration @@ -26,7 +26,7 @@ - Speed: + Speed @@ -63,7 +63,7 @@ - Accel: + Acceleration @@ -99,7 +99,7 @@ - Don't change Cont + Do not change Cont @@ -124,7 +124,7 @@ - Position and Orientation: + Position and orientation @@ -146,7 +146,7 @@ false - ... + … @@ -156,22 +156,22 @@ - Don't change Position & Orientation + Don not change position & orientation - Use Orientation + Use orientation - Add Position + Add position - Add Orientation + Add orientation diff --git a/src/Mod/Robot/Gui/Workbench.cpp b/src/Mod/Robot/Gui/Workbench.cpp index 8b7bfb6ced..d38510dbf0 100644 --- a/src/Mod/Robot/Gui/Workbench.cpp +++ b/src/Mod/Robot/Gui/Workbench.cpp @@ -45,11 +45,11 @@ using namespace RobotGui; #if 0 // needed for Qt's lupdate utility qApp->translate("Workbench", "Robot"); - qApp->translate("Workbench", "Insert Robots"); + qApp->translate("Workbench", "Insert Robot"); qApp->translate("Workbench", "&Robot"); - qApp->translate("Workbench", "Export trajectory"); - qApp->translate("Gui::TaskView::TaskWatcherCommands", "Trajectory tools"); - qApp->translate("Gui::TaskView::TaskWatcherCommands", "Robot tools"); + qApp->translate("Workbench", "Export Trajectory"); + qApp->translate("Gui::TaskView::TaskWatcherCommands", "Trajectory Tools"); + qApp->translate("Gui::TaskView::TaskWatcherCommands", "Robot Tools"); qApp->translate("Gui::TaskView::TaskWatcherCommands", "Insert Robot"); #endif @@ -69,13 +69,12 @@ void Workbench::activated() if (!fi.exists()) { Gui::WaitCursor wc; wc.restoreCursor(); - QMessageBox::warning( - Gui::getMainWindow(), - QObject::tr("No robot files installed"), - QObject::tr("Please visit %1 and copy the files to %2") - .arg(QStringLiteral("https://github.com/FreeCAD/FreeCAD/tree/master" - "/src/Mod/Robot/Lib/Kuka"), - dir)); + QMessageBox::warning(Gui::getMainWindow(), + QObject::tr("No robot files installed"), + QObject::tr("Visit %1 and copy the files to %2") + .arg(QStringLiteral("https://github.com/FreeCAD/FreeCAD/tree/main" + "/src/Mod/Robot/Lib/Kuka"), + dir)); wc.setWaitCursor(); } @@ -104,26 +103,26 @@ void Workbench::activated() new Gui::TaskView::TaskWatcherCommands("SELECT Robot::TrajectoryObject COUNT 1" "SELECT Robot::RobotObject COUNT 1", RobotAndTrac, - "Trajectory tools", + "Trajectory Tools", "Robot_InsertWaypoint")); Watcher.push_back(new TaskWatcherRobot); Watcher.push_back(new Gui::TaskView::TaskWatcherCommands("SELECT Robot::RobotObject COUNT 1", Robot, - "Robot tools", + "Robot Tools", "Robot_CreateRobot")); Watcher.push_back( new Gui::TaskView::TaskWatcherCommands("SELECT Robot::TrajectoryObject COUNT 1", TracSingle, - "Trajectory tools", + "Trajectory Tools", "Robot_CreateRobot")); Watcher.push_back( new Gui::TaskView::TaskWatcherCommands("SELECT Robot::TrajectoryObject COUNT 2..", TracMore, - "Trajectory tools", + "Trajectory Tools", "Robot_CreateRobot")); Watcher.push_back( @@ -173,7 +172,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const // analyze Gui::MenuItem* insertRobots = new Gui::MenuItem; - insertRobots->setCommand("Insert Robots"); + insertRobots->setCommand("Insert Robot"); *insertRobots << "Robot_InsertKukaIR500" << "Robot_InsertKukaIR210" << "Robot_InsertKukaIR125" @@ -183,7 +182,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const // boolean Gui::MenuItem* exportM = new Gui::MenuItem; - exportM->setCommand("Export trajectory"); + exportM->setCommand("Export Trajectory"); *exportM << "Robot_ExportKukaCompact" << "Robot_ExportKukaFull";