CorePlugin: Use Tr::tr instead of QCoreApplication::translate("Core"...

Change-Id: Idf0b8e9effedbacda7a4eedb5bf0f78918fce631
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>

src/plugins/coreplugin/CMakeLists.txt

@@ -22,6 +22,7 @@ add_qtc_plugin(Core
     coreicons.cpp coreicons.h
     corejsextensions.cpp corejsextensions.h
     coreplugin.cpp coreplugin.h
+    coreplugintr.h
     designmode.cpp designmode.h
     dialogs/addtovcsdialog.cpp dialogs/addtovcsdialog.h dialogs/addtovcsdialog.ui
     dialogs/codecselector.cpp dialogs/codecselector.h

src/plugins/coreplugin/coreplugin.qbs

@@ -45,6 +45,7 @@ Project {
                 "corejsextensions.h",
                 "coreplugin.cpp",
                 "coreplugin.h",
+                "coreplugintr.h",
                 "designmode.cpp",
                 "designmode.h",
                 "diffservice.cpp",

src/plugins/coreplugin/documentmanager.cpp

@@ -25,10 +25,11 @@
 
 #include "documentmanager.h"
 
+#include "coreconstants.h"
+#include "coreplugintr.h"
 #include "icore.h"
 #include "idocument.h"
 #include "idocumentfactory.h"
-#include "coreconstants.h"
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
@@ -790,7 +791,7 @@ static struct {const char *source; const char *comment; } ALL_FILES_FILTER = QT_
 
 QString DocumentManager::allFilesFilterString()
 {
-    return QCoreApplication::translate("Core", ALL_FILES_FILTER.source, ALL_FILES_FILTER.comment);
+    return Tr::tr(ALL_FILES_FILTER.source, ALL_FILES_FILTER.comment);
 }
 
 QString DocumentManager::allDocumentFactoryFiltersString(QString *allFilesFilter = nullptr)

src/plugins/coreplugin/generalsettings.cpp

@@ -25,6 +25,7 @@
 
 #include "generalsettings.h"
 #include "coreconstants.h"
+#include "coreplugintr.h"
 #include "icore.h"
 
 #include "ui_generalsettings.h"
@@ -256,7 +257,7 @@ GeneralSettings::GeneralSettings()
     setId(Constants::SETTINGS_ID_INTERFACE);
     setDisplayName(GeneralSettingsWidget::tr("Interface"));
     setCategory(Constants::SETTINGS_CATEGORY_CORE);
-    setDisplayCategory(QCoreApplication::translate("Core", "Environment"));
+    setDisplayCategory(Tr::tr("Environment"));
     setCategoryIconPath(":/core/images/settingscategory_core.png");
     setWidgetCreator([this] { return new GeneralSettingsWidget(this); });
 

src/plugins/coreplugin/icore.cpp

@@ -25,8 +25,9 @@
 
 #include "icore.h"
 
-#include "windowsupport.h"
+#include "coreplugintr.h"
 #include "dialogs/settingsdialog.h"
+#include "windowsupport.h"
 
 #include <app/app_version.h>
 #include <extensionsystem/pluginmanager.h>
@@ -306,7 +307,7 @@ bool ICore::showOptionsDialog(const Id page, QWidget *parent)
 */
 QString ICore::msgShowOptionsDialog()
 {
-    return QCoreApplication::translate("Core", "Configure...", "msgShowOptionsDialog");
+    return Tr::tr("Configure...", "msgShowOptionsDialog");
 }
 
 /*!
@@ -318,11 +319,9 @@ QString ICore::msgShowOptionsDialog()
 QString ICore::msgShowOptionsDialogToolTip()
 {
     if (Utils::HostOsInfo::isMacHost())
-        return QCoreApplication::translate("Core", "Open Preferences dialog.",
+        return Tr::tr("Open Preferences dialog.", "msgShowOptionsDialogToolTip (mac version)");
-                                           "msgShowOptionsDialogToolTip (mac version)");
     else
-        return QCoreApplication::translate("Core", "Open Options dialog.",
+        return Tr::tr("Open Options dialog.", "msgShowOptionsDialogToolTip (non-mac version)");
-                                           "msgShowOptionsDialogToolTip (non-mac version)");
 }
 
 /*!

src/plugins/coreplugin/mainwindow.cpp

@@ -25,30 +25,31 @@
 
 #include "mainwindow.h"
 
-#include "icore.h"
+#include "coreicons.h"
-#include "jsexpander.h"
+#include "coreplugintr.h"
-#include "mimetypesettings.h"
-#include "fancytabwidget.h"
 #include "documentmanager.h"
+#include "editormanager/ieditorfactory.h"
+#include "editormanager/systemeditor.h"
+#include "externaltoolmanager.h"
+#include "fancytabwidget.h"
 #include "generalsettings.h"
+#include "icore.h"
 #include "idocumentfactory.h"
+#include "jsexpander.h"
 #include "loggingviewer.h"
+#include "manhattanstyle.h"
 #include "messagemanager.h"
+#include "mimetypesettings.h"
 #include "modemanager.h"
+#include "navigationwidget.h"
 #include "outputpanemanager.h"
 #include "plugindialog.h"
+#include "rightpane.h"
+#include "statusbarmanager.h"
+#include "systemsettings.h"
 #include "vcsmanager.h"
 #include "versiondialog.h"
-#include "statusbarmanager.h"
-#include "manhattanstyle.h"
-#include "navigationwidget.h"
-#include "rightpane.h"
-#include "editormanager/ieditorfactory.h"
-#include "systemsettings.h"
-#include "externaltoolmanager.h"
-#include "editormanager/systemeditor.h"
 #include "windowsupport.h"
-#include "coreicons.h"
 
 #include <app/app_version.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
@@ -775,7 +776,7 @@ void MainWindow::registerDefaultActions()
 
     // Show Left Sidebar Action
     m_toggleLeftSideBarAction = new QAction(Utils::Icons::TOGGLE_LEFT_SIDEBAR.icon(),
-                                            QCoreApplication::translate("Core", Constants::TR_SHOW_LEFT_SIDEBAR),
+                                            Tr::tr(Constants::TR_SHOW_LEFT_SIDEBAR),
                                             this);
     m_toggleLeftSideBarAction->setCheckable(true);
     cmd = ActionManager::registerAction(m_toggleLeftSideBarAction, Constants::TOGGLE_LEFT_SIDEBAR);
@@ -791,7 +792,7 @@ void MainWindow::registerDefaultActions()
 
     // Show Right Sidebar Action
     m_toggleRightSideBarAction = new QAction(Utils::Icons::TOGGLE_RIGHT_SIDEBAR.icon(),
-                                             QCoreApplication::translate("Core", Constants::TR_SHOW_RIGHT_SIDEBAR),
+                                             Tr::tr(Constants::TR_SHOW_RIGHT_SIDEBAR),
                                              this);
     m_toggleRightSideBarAction->setCheckable(true);
     cmd = ActionManager::registerAction(m_toggleRightSideBarAction, Constants::TOGGLE_RIGHT_SIDEBAR);
@@ -1295,8 +1296,7 @@ void MainWindow::aboutToShowRecentFiles()
     // add the Clear Menu item
     if (hasRecentFiles) {
         menu->addSeparator();
-        QAction *action = menu->addAction(QCoreApplication::translate(
+        QAction *action = menu->addAction(Tr::tr(Constants::TR_CLEAR_MENU));
-                                                     "Core", Constants::TR_CLEAR_MENU));
         connect(action, &QAction::triggered,
                 DocumentManager::instance(), &DocumentManager::clearRecentFiles);
     }

src/plugins/coreplugin/navigationwidget.cpp

@@ -24,14 +24,15 @@
 ****************************************************************************/
 
 #include "navigationwidget.h"
-#include "navigationsubwidget.h"
-#include "icontext.h"
-#include "icore.h"
-#include "inavigationwidgetfactory.h"
-#include "modemanager.h"
 #include "actionmanager/actionmanager.h"
 #include "actionmanager/command.h"
+#include "coreplugintr.h"
+#include "icontext.h"
+#include "icore.h"
 #include "imode.h"
+#include "inavigationwidgetfactory.h"
+#include "modemanager.h"
+#include "navigationsubwidget.h"
 
 #include <utils/qtcassert.h>
 #include <utils/utilsicons.h>
@@ -297,7 +298,7 @@ void NavigationWidget::updateToggleText()
                                 ? (isShown() ? Constants::TR_HIDE_LEFT_SIDEBAR : Constants::TR_SHOW_LEFT_SIDEBAR)
                                 : (isShown() ? Constants::TR_HIDE_RIGHT_SIDEBAR : Constants::TR_SHOW_RIGHT_SIDEBAR);
 
-    d->m_toggleSideBarAction->setToolTip(QCoreApplication::translate("Core", trToolTip));
+    d->m_toggleSideBarAction->setToolTip(Tr::tr(trToolTip));
 }
 
 void NavigationWidget::placeHolderChanged(NavigationWidgetPlaceHolder *holder)