From 238975a45540b332bde70d963e1f7c9199620c47 Mon Sep 17 00:00:00 2001 From: Kacper Donat Date: Mon, 11 Aug 2025 17:23:23 +0200 Subject: [PATCH] Gui: Restore proper object names for panels --- src/Gui/DockWindowManager.cpp | 5 +---- src/Gui/MainWindow.cpp | 30 ++++++++++++++++++------------ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/Gui/DockWindowManager.cpp b/src/Gui/DockWindowManager.cpp index 9a65987ec6..590044801c 100644 --- a/src/Gui/DockWindowManager.cpp +++ b/src/Gui/DockWindowManager.cpp @@ -276,10 +276,7 @@ QDockWidget* DockWindowManager::addDockWindow(const char* name, QWidget* widget, // set object name and window title needed for i18n stuff dw->setObjectName(QString::fromUtf8(name)); - QString title = widget->windowTitle(); - if (title.isEmpty()) - title = QDockWidget::tr(name); - dw->setWindowTitle(title); + dw->setWindowTitle(widget->windowTitle()); dw->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable); diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp index 914d3b692a..9b9fe72aae 100644 --- a/src/Gui/MainWindow.cpp +++ b/src/Gui/MainWindow.cpp @@ -555,7 +555,8 @@ bool MainWindow::setupTaskView() auto taskView = new Gui::TaskView::TaskView(this); bool restore = group->GetBool("RestoreWidth", taskView->shouldRestoreWidth()); taskView->setRestoreWidth(restore); - taskView->setObjectName(QString::fromLatin1(QT_TRANSLATE_NOOP("QDockWidget","Tasks"))); + taskView->setObjectName(QStringLiteral("Tasks")); + taskView->setWindowTitle(QDockWidget::tr("Tasks")); taskView->setMinimumWidth(210); DockWindowManager* pDockMgr = DockWindowManager::instance(); @@ -571,8 +572,8 @@ bool MainWindow::setupSelectionView() // Selection view if (d->hiddenDockWindows.find("Std_SelectionView") == std::string::npos) { auto pcSelectionView = new SelectionView(nullptr, this); - pcSelectionView->setObjectName - (QString::fromLatin1(QT_TRANSLATE_NOOP("QDockWidget","Selection view"))); + pcSelectionView->setObjectName(QStringLiteral("Selection view")); + pcSelectionView->setWindowTitle(QDockWidget::tr("Selection View")); pcSelectionView->setMinimumWidth(210); DockWindowManager* pDockMgr = DockWindowManager::instance(); @@ -589,8 +590,8 @@ bool MainWindow::setupReportView() if (d->hiddenDockWindows.find("Std_ReportView") == std::string::npos) { auto pcReport = new ReportOutput(this); pcReport->setWindowIcon(BitmapFactory().pixmap("MacroEditor")); - pcReport->setObjectName - (QString::fromLatin1(QT_TRANSLATE_NOOP("QDockWidget","Report View"))); + pcReport->setObjectName(QStringLiteral("Report view")); + pcReport->setWindowTitle(QDockWidget::tr("Report View")); DockWindowManager* pDockMgr = DockWindowManager::instance(); pDockMgr->registerDockWindow("Std_ReportView", pcReport); @@ -609,8 +610,8 @@ bool MainWindow::setupPythonConsole() if (d->hiddenDockWindows.find("Std_PythonView") == std::string::npos) { auto pcPython = new PythonConsole(this); pcPython->setWindowIcon(Gui::BitmapFactory().iconFromTheme("applications-python")); - pcPython->setObjectName - (QString::fromLatin1(QT_TRANSLATE_NOOP("QDockWidget","Python Console"))); + pcPython->setObjectName(QStringLiteral("Python console")); + pcPython->setWindowTitle(QDockWidget::tr("Python Console")); DockWindowManager* pDockMgr = DockWindowManager::instance(); pDockMgr->registerDockWindow("Std_PythonView", pcPython); @@ -633,7 +634,8 @@ bool MainWindow::updateTreeView(bool show) } auto tree = new TreeDockWidget(0,getMainWindow()); - tree->setObjectName(QStringLiteral(QT_TRANSLATE_NOOP("QDockWidget","Tree view"))); + tree->setObjectName(QStringLiteral("Tree view")); + tree->setWindowTitle(QDockWidget::tr("Tree View")); tree->setMinimumWidth(210); widget = tree; return widget; @@ -659,7 +661,8 @@ bool MainWindow::updatePropertyView(bool show) } auto pcPropView = new PropertyDockView(0, getMainWindow()); - pcPropView->setObjectName(QStringLiteral(QT_TRANSLATE_NOOP("QDockWidget","Property view"))); + pcPropView->setObjectName(QStringLiteral("Property view")); + pcPropView->setWindowTitle(QDockWidget::tr("Property View")); pcPropView->setMinimumWidth(210); widget = pcPropView; return widget; @@ -687,7 +690,8 @@ bool MainWindow::updateTaskView(bool show) } widget = new TaskView::TaskView(getMainWindow()); - widget->setObjectName(QStringLiteral(QT_TRANSLATE_NOOP("QDockWidget","Task List"))); + widget->setObjectName(QStringLiteral("Task List")); + widget->setWindowTitle(QDockWidget::tr("Task List")); return widget; }); @@ -712,7 +716,8 @@ bool MainWindow::updateComboView(bool show) } pcComboView = new ComboView(nullptr, getMainWindow()); - pcComboView->setObjectName(QStringLiteral(QT_TRANSLATE_NOOP("QDockWidget", "Model"))); + pcComboView->setObjectName(QStringLiteral("Model")); + pcComboView->setWindowTitle(QDockWidget::tr("Model")); pcComboView->setMinimumWidth(150); widget = pcComboView; return widget; @@ -738,7 +743,8 @@ bool MainWindow::updateDAGView(bool show) } auto dagDockWindow = new DAG::DockWindow(nullptr, getMainWindow()); - dagDockWindow->setObjectName(QStringLiteral(QT_TRANSLATE_NOOP("QDockWidget","DAG View"))); + dagDockWindow->setObjectName(QStringLiteral("DAG View")); + dagDockWindow->setWindowTitle(QDockWidget::tr("DAG View")); widget = dagDockWindow; return widget; });