diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 12fcd683b25..d5304ecd54e 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -47917,7 +47917,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e - MesonBuildSettingsWidget + Meson Apply Configuration Changes Konfigurationsänderungen anwenden @@ -47926,9 +47926,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Filter Filter - - - MesonBuildStepConfigWidget Tool arguments: Toolparameter: @@ -48420,7 +48417,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e - MesonProjectManager::Internal::MesonActionsManager + Meson Configure Konfigurieren @@ -48433,24 +48430,15 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Build "%1" "%1" erstellen - - - MesonProjectManager::Internal::MesonBuildSettingsWidget Meson Meson - - - MesonProjectManager::Internal::MesonBuildStepConfigWidget Build MesonProjectManager::MesonBuildStepConfigWidget display name. Erstellen - - - MesonProjectManager::Internal::BuidOptionsModel Key Schlüssel @@ -48459,9 +48447,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Value Wert - - - MesonProjectManager::Internal::MesonProcess Configuring "%1". Konfiguriere "%1" @@ -48502,48 +48487,18 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Executable does not exist: %1 Ausführbare Datei existiert nicht: %1 - - - MesonProjectManager::Internal::MesonProject No compilers set in kit. Im Kit sind keine Compiler eingerichtet. - - - MesonProjectManager::Internal::NinjaBuildStep - - Meson - Meson - - - - MesonProjectManager::Internal::GeneralSettingsPage General Allgemein - - - MesonProjectManager::Internal::MesonToolKitAspect - - Meson - Meson - Unconfigured Nicht konfiguriert - - - MesonProjectManager::Internal::NinjaToolKitAspect - - Unconfigured - Nicht konfiguriert - - - - MesonProjectManager::Internal::ToolsSettingsPage Name Name @@ -48573,13 +48528,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Kopie von %1 - - MesonProjectManager::MesonToolManager - - Meson - Meson - - Nim::NimToolChain diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 3f12196f92b..0333577d9a2 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -45835,7 +45835,7 @@ Output: - MesonProjectManager::Internal::MesonBuildSettingsWidget + Meson Apply Configuration Changes 設定の変更を適用 @@ -45844,9 +45844,6 @@ Output: Filter フィルタ - - - MesonProjectManager::Internal::ToolItemSettings Name: 名前: @@ -45855,9 +45852,6 @@ Output: Path: パス: - - - MesonProjectManager::Internal::ToolsSettingsWidget Clone 複製 @@ -49749,7 +49743,7 @@ Stepping into the module or setting breakpoints by file and line is expected to - MesonProjectManager::Internal::MesonActionsManager + Meson Configure 設定する @@ -49762,16 +49756,10 @@ Stepping into the module or setting breakpoints by file and line is expected to Build "%1" "%1" のビルド - - - MesonProjectManager::Internal::BuidOptionsModel Value 値 - - - MesonProjectManager::Internal::MesonProcess Process timed out. プロセスがタイムアウトしました。 @@ -49780,9 +49768,6 @@ Stepping into the module or setting breakpoints by file and line is expected to Executable does not exist: %1 実行ファイル が存在しません: %1 - - - MesonProjectManager::Internal::NinjaBuildStep Build MesonProjectManager::MesonBuildStepConfigWidget display name. @@ -49796,30 +49781,14 @@ Stepping into the module or setting breakpoints by file and line is expected to Targets: ターゲット: - - - MesonProjectManager::Internal::GeneralSettingsPage General 一般 - - - MesonProjectManager::Internal::MesonToolKitAspect Unconfigured 未設定 - - - MesonProjectManager::Internal::NinjaToolKitAspect - - Unconfigured - 未設定 - - - - MesonProjectManager::Internal::ToolsSettingsPage Name 名前 diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 1e5357c56a2..f96dfc30724 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -26527,7 +26527,7 @@ Error: %5 - MesonBuildStepConfigWidget + Meson Form @@ -26540,9 +26540,6 @@ Error: %5 Targets: Цели: - - - MesonProjectManager::Internal::BuidOptionsModel Key Ключ @@ -26551,20 +26548,10 @@ Error: %5 Value Значение - - - MesonProjectManager::Internal::GeneralSettingsPage General Основное - - - MesonProjectManager::Internal::GeneralSettingsWidget - - Form - - Automatically run Meson when needed. Запускать Meson по необходимости. @@ -26581,9 +26568,6 @@ Error: %5 Ninja verbose mode Ninja в подробном режиме - - - MesonProjectManager::Internal::MesonActionsManager Configure Configure @@ -26596,17 +26580,10 @@ Error: %5 Build "%1" Сборка «%1» - - - MesonProjectManager::Internal::MesonBuildSettingsWidget Meson Meson - - Form - - Apply Configuration Changes Применить изменения @@ -26625,17 +26602,11 @@ Useful if build directory is corrupted or when rebuilding with a newer version o Filter Фильтр - - - MesonProjectManager::Internal::MesonBuildStepConfigWidget Build MesonProjectManager::MesonBuildStepConfigWidget display name. Сборка - - - MesonProjectManager::Internal::MesonProcess Configuring "%1". Настройка «%1». @@ -26680,9 +26651,6 @@ Useful if build directory is corrupted or when rebuilding with a newer version o Command is not executable: %1 Команда не запускается: %1 - - - MesonProjectManager::Internal::MesonProject No Meson tool set. Программа Meson не указана. @@ -26695,9 +26663,6 @@ Useful if build directory is corrupted or when rebuilding with a newer version o No compilers set in kit. У комплекта не заданы компиляторы. - - - MesonProjectManager::Internal::MesonToolKitAspect Meson Tool Утилита Meson @@ -26710,28 +26675,14 @@ Useful if build directory is corrupted or when rebuilding with a newer version o Cannot validate this meson executable. Невозможно проверить эту программу Meson. - - Meson - Meson - Unconfigured Не настроено - - - MesonProjectManager::Internal::NinjaBuildStep Meson Build Сборка Meson - - Meson - Meson - - - - MesonProjectManager::Internal::NinjaToolKitAspect Ninja Tool Утилита Ninja @@ -26748,17 +26699,6 @@ Useful if build directory is corrupted or when rebuilding with a newer version o Ninja Ninja - - Unconfigured - Не настроено - - - - MesonProjectManager::Internal::ToolItemSettings - - Form - - Name: Имя: @@ -26767,9 +26707,6 @@ Useful if build directory is corrupted or when rebuilding with a newer version o Path: Путь: - - - MesonProjectManager::Internal::ToolTreeItem Meson executable path does not exist. Не найден путь к программе Meson. @@ -26782,9 +26719,6 @@ Useful if build directory is corrupted or when rebuilding with a newer version o Meson executable path is not executable. Путь к программе Meson не исполняемый. - - - MesonProjectManager::Internal::ToolsSettingsPage Name Имя @@ -26821,13 +26755,6 @@ Useful if build directory is corrupted or when rebuilding with a newer version o Cannot get tool version. Не удалось получить версию инструмента. - - - MesonProjectManager::Internal::ToolsSettingsWidget - - Form - - Add Добавить @@ -26849,13 +26776,6 @@ Useful if build directory is corrupted or when rebuilding with a newer version o Сделать по умолчанию - - MesonProjectManager::MesonToolManager - - Meson - Meson - - MimeTypeDialog diff --git a/src/plugins/mesonprojectmanager/arrayoptionlineedit.h b/src/plugins/mesonprojectmanager/arrayoptionlineedit.h index c37d0acf268..1915e93b261 100644 --- a/src/plugins/mesonprojectmanager/arrayoptionlineedit.h +++ b/src/plugins/mesonprojectmanager/arrayoptionlineedit.h @@ -13,7 +13,6 @@ namespace Internal { class RegexHighlighter : public QSyntaxHighlighter { - Q_OBJECT const QRegularExpression m_regex{R"('([^']+)'+|([^', ]+)[, ]*)"}; QTextCharFormat m_format; diff --git a/src/plugins/mesonprojectmanager/buildoptionsmodel.h b/src/plugins/mesonprojectmanager/buildoptionsmodel.h index 3b951c65460..189bbca1543 100644 --- a/src/plugins/mesonprojectmanager/buildoptionsmodel.h +++ b/src/plugins/mesonprojectmanager/buildoptionsmodel.h @@ -3,7 +3,7 @@ #pragma once -#include "mesoninfoparser.h" +#include "buildoptions.h" #include #include @@ -66,6 +66,7 @@ public: } inline BuildOption::Type type() { return m_currentValue->type(); } }; + using CancellableOptionsList = std::vector>; class BuidOptionsModel final : public Utils::TreeModel<> { diff --git a/src/plugins/mesonprojectmanager/infoparser.h b/src/plugins/mesonprojectmanager/infoparser.h index 725e31a5e7c..e4feb311c63 100644 --- a/src/plugins/mesonprojectmanager/infoparser.h +++ b/src/plugins/mesonprojectmanager/infoparser.h @@ -3,6 +3,7 @@ #pragma once +#include "common.h" #include "mesoninfo.h" #include "mesonpluginconstants.h" diff --git a/src/plugins/mesonprojectmanager/mesonactionsmanager.h b/src/plugins/mesonprojectmanager/mesonactionsmanager.h index 2e84eaa1011..8cf00599f2c 100644 --- a/src/plugins/mesonprojectmanager/mesonactionsmanager.h +++ b/src/plugins/mesonprojectmanager/mesonactionsmanager.h @@ -3,6 +3,8 @@ #pragma once +#include "mesonprojectmanagertr.h" + #include namespace MesonProjectManager { @@ -12,7 +14,8 @@ class MesonActionsManager : public QObject { Q_OBJECT Utils::ParameterAction buildTargetContextAction{ - tr("Build"), tr("Build \"%1\""), Utils::ParameterAction::AlwaysEnabled /*handled manually*/ + Tr::tr("Build"), Tr::tr("Build \"%1\""), + Utils::ParameterAction::AlwaysEnabled /*handled manually*/ }; QAction configureActionMenu; QAction configureActionContextMenu; diff --git a/src/plugins/mesonprojectmanager/mesonbuildsettingswidget.cpp b/src/plugins/mesonprojectmanager/mesonbuildsettingswidget.cpp index 8bd682a7bc4..9757006d61b 100644 --- a/src/plugins/mesonprojectmanager/mesonbuildsettingswidget.cpp +++ b/src/plugins/mesonprojectmanager/mesonbuildsettingswidget.cpp @@ -5,6 +5,7 @@ #include "mesonbuildconfiguration.h" #include "mesonbuildsystem.h" +#include "mesonprojectmanagertr.h" #include @@ -25,19 +26,19 @@ using namespace Utils; namespace MesonProjectManager::Internal { MesonBuildSettingsWidget::MesonBuildSettingsWidget(MesonBuildConfiguration *buildCfg) - : ProjectExplorer::NamedWidget{tr("Meson")} + : ProjectExplorer::NamedWidget(Tr::tr("Meson")) , m_progressIndicator(ProgressIndicatorSize::Large) { - auto configureButton = new QPushButton(tr("Apply Configuration Changes")); + auto configureButton = new QPushButton(Tr::tr("Apply Configuration Changes")); configureButton->setEnabled(false); configureButton->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred); - auto wipeButton = new QPushButton(tr("Wipe Project")); + auto wipeButton = new QPushButton(Tr::tr("Wipe Project")); wipeButton->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred); wipeButton->setIcon(Utils::Icons::WARNING.icon()); - wipeButton->setToolTip(tr("Wipes build directory and reconfigures using previous command " - "line options.\nUseful if build directory is corrupted or when " - "rebuilding with a newer version of Meson.")); + wipeButton->setToolTip(Tr::tr("Wipes build directory and reconfigures using previous command " + "line options.\nUseful if build directory is corrupted or when " + "rebuilding with a newer version of Meson.")); auto container = new DetailsWidget; @@ -62,7 +63,7 @@ MesonBuildSettingsWidget::MesonBuildSettingsWidget(MesonBuildConfiguration *buil using namespace Layouting; Column { - Form { tr("Parameters"), parametersLineEdit, br, }, + Form { Tr::tr("Parameters"), parametersLineEdit, br, }, buildDirWidget, optionsFilterLineEdit, optionsTreeView, diff --git a/src/plugins/mesonprojectmanager/mesonbuildsystem.cpp b/src/plugins/mesonprojectmanager/mesonbuildsystem.cpp index 5aa27323f9f..0154ee18403 100644 --- a/src/plugins/mesonprojectmanager/mesonbuildsystem.cpp +++ b/src/plugins/mesonprojectmanager/mesonbuildsystem.cpp @@ -6,6 +6,7 @@ #include "kithelper.h" #include "machinefilemanager.h" #include "mesonbuildconfiguration.h" +#include "mesonprojectmanagertr.h" #include "mesontoolkitaspect.h" #include "settings.h" @@ -82,7 +83,7 @@ void MesonBuildSystem::parsingCompleted(bool success) UNLOCK(true); emitBuildSystemUpdated(); } else { - TaskHub::addTask(BuildSystemTask(Task::Error, tr("Meson build: Parsing failed"))); + TaskHub::addTask(BuildSystemTask(Task::Error, Tr::tr("Meson build: Parsing failed"))); UNLOCK(false); emitBuildSystemUpdated(); } diff --git a/src/plugins/mesonprojectmanager/mesonprocess.cpp b/src/plugins/mesonprojectmanager/mesonprocess.cpp index ffd23761b04..b7b40f568ec 100644 --- a/src/plugins/mesonprojectmanager/mesonprocess.cpp +++ b/src/plugins/mesonprojectmanager/mesonprocess.cpp @@ -3,7 +3,7 @@ #include "mesonprocess.h" -#include "mesonoutputparser.h" +#include "mesonprojectmanagertr.h" #include #include @@ -44,7 +44,7 @@ bool MesonProcess::run(const Command &command, setupProcess(command, env, captureStdo); m_future.setProgressRange(0, 1); Core::ProgressManager::addTimedTask(m_future, - tr("Configuring \"%1\".").arg(projectName), + Tr::tr("Configuring \"%1\".").arg(projectName), "Meson.Configure", 10); emit started(); @@ -121,7 +121,7 @@ void MesonProcess::setupProcess(const Command &command, m_process->setWorkingDirectory(command.workDir()); m_process->setEnvironment(env); Core::MessageManager::writeFlashing( - tr("Running %1 in %2.").arg(command.toUserOutput()).arg(command.workDir().toUserOutput())); + Tr::tr("Running %1 in %2.").arg(command.toUserOutput()).arg(command.workDir().toUserOutput())); m_process->setCommand(command.cmdLine()); } @@ -132,15 +132,15 @@ bool MesonProcess::sanityCheck(const Command &command) const //Should only reach this point if Meson exe is removed while a Meson project is opened ProjectExplorer::TaskHub::addTask( ProjectExplorer::BuildSystemTask{ProjectExplorer::Task::TaskType::Error, - tr("Executable does not exist: %1") + Tr::tr("Executable does not exist: %1") .arg(exe.toUserOutput())}); return false; } if (!exe.toFileInfo().isExecutable()) { ProjectExplorer::TaskHub::addTask( ProjectExplorer::BuildSystemTask{ProjectExplorer::Task::TaskType::Error, - tr("Command is not executable: %1") - .arg(exe.toUserOutput())}); + Tr::tr("Command is not executable: %1") + .arg(exe.toUserOutput())}); return false; } return true; diff --git a/src/plugins/mesonprojectmanager/mesonproject.cpp b/src/plugins/mesonprojectmanager/mesonproject.cpp index a8857ba94df..ec007b6ace1 100644 --- a/src/plugins/mesonprojectmanager/mesonproject.cpp +++ b/src/plugins/mesonprojectmanager/mesonproject.cpp @@ -4,6 +4,7 @@ #include "mesonproject.h" #include "mesonpluginconstants.h" +#include "mesonprojectmanagertr.h" #include "mesontoolkitaspect.h" #include "ninjatoolkitaspect.h" @@ -13,11 +14,13 @@ #include #include +using namespace ProjectExplorer; + namespace MesonProjectManager { namespace Internal { MesonProject::MesonProject(const Utils::FilePath &path) - : ProjectExplorer::Project{Constants::Project::MIMETYPE, path} + : Project{Constants::Project::MIMETYPE, path} { setId(Constants::Project::ID); setProjectLanguages(Core::Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID)); @@ -26,33 +29,33 @@ MesonProject::MesonProject(const Utils::FilePath &path) setHasMakeInstallEquivalent(true); } -ProjectExplorer::Tasks MesonProject::projectIssues(const ProjectExplorer::Kit *k) const +Tasks MesonProject::projectIssues(const Kit *k) const { - ProjectExplorer::Tasks result = Project::projectIssues(k); + Tasks result = Project::projectIssues(k); if (!MesonToolKitAspect::isValid(k)) result.append( - createProjectTask(ProjectExplorer::Task::TaskType::Error, tr("No Meson tool set."))); + createProjectTask(Task::TaskType::Error, Tr::tr("No Meson tool set."))); if (!NinjaToolKitAspect::isValid(k)) result.append( - createProjectTask(ProjectExplorer::Task::TaskType::Error, tr("No Ninja tool set."))); - if (ProjectExplorer::ToolChainKitAspect::toolChains(k).isEmpty()) - result.append(createProjectTask(ProjectExplorer::Task::TaskType::Warning, - tr("No compilers set in kit."))); + createProjectTask(Task::TaskType::Error, Tr::tr("No Ninja tool set."))); + if (ToolChainKitAspect::toolChains(k).isEmpty()) + result.append(createProjectTask(Task::TaskType::Warning, + Tr::tr("No compilers set in kit."))); return result; } -ProjectExplorer::ProjectImporter *MesonProject::projectImporter() const +ProjectImporter *MesonProject::projectImporter() const { if (m_projectImporter) m_projectImporter = std::make_unique(projectFilePath()); return m_projectImporter.get(); } -ProjectExplorer::DeploymentKnowledge MesonProject::deploymentKnowledge() const +DeploymentKnowledge MesonProject::deploymentKnowledge() const { // TODO in next releases - return ProjectExplorer::DeploymentKnowledge::Bad; + return DeploymentKnowledge::Bad; } } // namespace Internal diff --git a/src/plugins/mesonprojectmanager/mesonprojectimporter.cpp b/src/plugins/mesonprojectmanager/mesonprojectimporter.cpp index 3fbf32abe25..291ddf8b7b0 100644 --- a/src/plugins/mesonprojectmanager/mesonprojectimporter.cpp +++ b/src/plugins/mesonprojectmanager/mesonprojectimporter.cpp @@ -5,13 +5,11 @@ #include -namespace { -static Q_LOGGING_CATEGORY(mInputLog, "qtc.meson.import", QtWarningMsg); -} - namespace MesonProjectManager { namespace Internal { +static Q_LOGGING_CATEGORY(mInputLog, "qtc.meson.import", QtWarningMsg); + MesonProjectImporter::MesonProjectImporter(const Utils::FilePath &path) : QtSupport::QtProjectImporter{path} {} diff --git a/src/plugins/mesonprojectmanager/mesontoolkitaspect.cpp b/src/plugins/mesonprojectmanager/mesontoolkitaspect.cpp index 41522288b11..69f0fef118f 100644 --- a/src/plugins/mesonprojectmanager/mesontoolkitaspect.cpp +++ b/src/plugins/mesonprojectmanager/mesontoolkitaspect.cpp @@ -3,6 +3,7 @@ #include "mesontoolkitaspect.h" +#include "mesonprojectmanagertr.h" #include "toolkitaspectwidget.h" #include @@ -16,8 +17,8 @@ MesonToolKitAspect::MesonToolKitAspect() { setObjectName(QLatin1String("MesonKitAspect")); setId(TOOL_ID); - setDisplayName(tr("Meson Tool")); - setDescription(tr("The Meson tool to use when building a project with Meson.
" + setDisplayName(Tr::tr("Meson Tool")); + setDescription(Tr::tr("The Meson tool to use when building a project with Meson.
" "This setting is ignored when using other build systems.")); setPriority(9000); } @@ -28,7 +29,7 @@ ProjectExplorer::Tasks MesonToolKitAspect::validate(const ProjectExplorer::Kit * const auto tool = mesonTool(k); if (tool && !tool->isValid()) tasks << ProjectExplorer::BuildSystemTask{ProjectExplorer::Task::Warning, - tr("Cannot validate this meson executable.")}; + Tr::tr("Cannot validate this meson executable.")}; return tasks; } @@ -52,8 +53,8 @@ ProjectExplorer::KitAspect::ItemList MesonToolKitAspect::toUserOutput( { const auto tool = mesonTool(k); if (tool) - return {{tr("Meson"), tool->name()}}; - return {{tr("Meson"), tr("Unconfigured")}}; + return {{Tr::tr("Meson"), tool->name()}}; + return {{Tr::tr("Meson"), Tr::tr("Unconfigured")}}; } ProjectExplorer::KitAspectWidget *MesonToolKitAspect::createConfigWidget(ProjectExplorer::Kit *k) const diff --git a/src/plugins/mesonprojectmanager/mesontoolkitaspect.h b/src/plugins/mesonprojectmanager/mesontoolkitaspect.h index 9f5c37f4bbe..71246b7ee8f 100644 --- a/src/plugins/mesonprojectmanager/mesontoolkitaspect.h +++ b/src/plugins/mesonprojectmanager/mesontoolkitaspect.h @@ -13,8 +13,6 @@ namespace Internal { class MesonToolKitAspect final : public ProjectExplorer::KitAspect { - Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::MesonToolKitAspect) - public: MesonToolKitAspect(); diff --git a/src/plugins/mesonprojectmanager/nativefilegenerator.cpp b/src/plugins/mesonprojectmanager/nativefilegenerator.cpp index d434a07815f..f4e969b99a3 100644 --- a/src/plugins/mesonprojectmanager/nativefilegenerator.cpp +++ b/src/plugins/mesonprojectmanager/nativefilegenerator.cpp @@ -3,8 +3,6 @@ #include "nativefilegenerator.h" -#include "kithelper.h" - #include #include #include diff --git a/src/plugins/mesonprojectmanager/ninjabuildstep.cpp b/src/plugins/mesonprojectmanager/ninjabuildstep.cpp index a09b82c5999..4466106b0f5 100644 --- a/src/plugins/mesonprojectmanager/ninjabuildstep.cpp +++ b/src/plugins/mesonprojectmanager/ninjabuildstep.cpp @@ -6,6 +6,7 @@ #include "mesonbuildconfiguration.h" #include "mesonbuildsystem.h" #include "mesonpluginconstants.h" +#include "mesonprojectmanagertr.h" #include "mesonoutputparser.h" #include "ninjatoolkitaspect.h" #include "settings.h" @@ -32,8 +33,8 @@ namespace Internal { const char TARGETS_KEY[] = "MesonProjectManager.BuildStep.BuildTargets"; const char TOOL_ARGUMENTS_KEY[] = "MesonProjectManager.BuildStep.AdditionalArguments"; -NinjaBuildStep::NinjaBuildStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id) - : ProjectExplorer::AbstractProcessStep{bsl, id} +NinjaBuildStep::NinjaBuildStep(BuildStepList *bsl, Id id) + : AbstractProcessStep{bsl, id} { if (m_targetName.isEmpty()) setBuildTarget(defaultBuildTarget()); @@ -43,16 +44,14 @@ NinjaBuildStep::NinjaBuildStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id setUseEnglishOutput(); connect(target(), &ProjectExplorer::Target::parsingFinished, this, &NinjaBuildStep::update); - connect(&Settings::instance()->verboseNinja, - &BaseAspect::changed, - this, - &NinjaBuildStep::commandChanged); + connect(&Settings::instance()->verboseNinja, &BaseAspect::changed, + this, &NinjaBuildStep::commandChanged); } QWidget *NinjaBuildStep::createConfigWidget() { auto widget = new QWidget; - setDisplayName(tr("Build", "MesonProjectManager::MesonBuildStepConfigWidget display name.")); + setDisplayName(Tr::tr("Build", "MesonProjectManager::MesonBuildStepConfigWidget display name.")); auto buildTargetsList = new QListWidget(widget); buildTargetsList->setMinimumHeight(200); @@ -67,8 +66,8 @@ QWidget *NinjaBuildStep::createConfigWidget() auto formLayout = new QFormLayout(widget); formLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); formLayout->setContentsMargins(0, 0, 0, 0); - formLayout->addRow(tr("Tool arguments:"), toolArguments); - formLayout->addRow(tr("Targets:"), wrapper); + formLayout->addRow(Tr::tr("Tool arguments:"), toolArguments); + formLayout->addRow(Tr::tr("Targets:"), wrapper); auto updateDetails = [this] { ProcessParameters param; @@ -188,7 +187,7 @@ MesonBuildStepFactory::MesonBuildStepFactory() { registerStep(Constants::MESON_BUILD_STEP_ID); setSupportedProjectType(Constants::Project::ID); - setDisplayName(NinjaBuildStep::tr("Meson Build")); + setDisplayName(Tr::tr("Meson Build")); } void MesonProjectManager::Internal::NinjaBuildStep::setBuildTarget(const QString &targetName) diff --git a/src/plugins/mesonprojectmanager/ninjatoolkitaspect.cpp b/src/plugins/mesonprojectmanager/ninjatoolkitaspect.cpp index 1b5bf53ba5b..2bf7551ed80 100644 --- a/src/plugins/mesonprojectmanager/ninjatoolkitaspect.cpp +++ b/src/plugins/mesonprojectmanager/ninjatoolkitaspect.cpp @@ -3,6 +3,7 @@ #include "ninjatoolkitaspect.h" +#include "mesonprojectmanagertr.h" #include "toolkitaspectwidget.h" #include @@ -16,9 +17,9 @@ NinjaToolKitAspect::NinjaToolKitAspect() { setObjectName(QLatin1String("NinjaKitAspect")); setId(TOOL_ID); - setDisplayName(tr("Ninja Tool")); - setDescription(tr("The Ninja tool to use when building a project with Meson.
" - "This setting is ignored when using other build systems.")); + setDisplayName(Tr::tr("Ninja Tool")); + setDescription(Tr::tr("The Ninja tool to use when building a project with Meson.
" + "This setting is ignored when using other build systems.")); setPriority(9000); } @@ -28,7 +29,7 @@ ProjectExplorer::Tasks NinjaToolKitAspect::validate(const ProjectExplorer::Kit * const auto tool = ninjaTool(k); if (tool && !tool->isValid()) tasks << ProjectExplorer::BuildSystemTask{ProjectExplorer::Task::Warning, - tr("Cannot validate this Ninja executable.")}; + Tr::tr("Cannot validate this Ninja executable.")}; return tasks; } @@ -52,8 +53,8 @@ ProjectExplorer::KitAspect::ItemList NinjaToolKitAspect::toUserOutput( { const auto tool = ninjaTool(k); if (tool) - return {{tr("Ninja"), tool->name()}}; - return {{tr("Ninja"), tr("Unconfigured")}}; + return {{Tr::tr("Ninja"), tool->name()}}; + return {{Tr::tr("Ninja"), Tr::tr("Unconfigured")}}; } ProjectExplorer::KitAspectWidget *NinjaToolKitAspect::createConfigWidget(ProjectExplorer::Kit *k) const diff --git a/src/plugins/mesonprojectmanager/ninjatoolkitaspect.h b/src/plugins/mesonprojectmanager/ninjatoolkitaspect.h index 7a4eed9e030..f70ad05363a 100644 --- a/src/plugins/mesonprojectmanager/ninjatoolkitaspect.h +++ b/src/plugins/mesonprojectmanager/ninjatoolkitaspect.h @@ -13,8 +13,6 @@ namespace Internal { class NinjaToolKitAspect final : public ProjectExplorer::KitAspect { - Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::NinjaToolKitAspect) - public: NinjaToolKitAspect(); diff --git a/src/plugins/mesonprojectmanager/settings.cpp b/src/plugins/mesonprojectmanager/settings.cpp index 6a983f194a9..6de23e55542 100644 --- a/src/plugins/mesonprojectmanager/settings.cpp +++ b/src/plugins/mesonprojectmanager/settings.cpp @@ -4,6 +4,7 @@ #include "settings.h" #include "mesonpluginconstants.h" +#include "mesonprojectmanagertr.h" #include @@ -16,12 +17,12 @@ Settings::Settings() setAutoApply(false); autorunMeson.setSettingsKey("meson.autorun"); - autorunMeson.setLabelText(tr("Autorun Meson")); - autorunMeson.setToolTip(tr("Automatically run Meson when needed.")); + autorunMeson.setLabelText(Tr::tr("Autorun Meson")); + autorunMeson.setToolTip(Tr::tr("Automatically run Meson when needed.")); verboseNinja.setSettingsKey("ninja.verbose"); - verboseNinja.setLabelText(tr("Ninja verbose mode")); - verboseNinja.setToolTip(tr("Enables verbose mode by default when invoking Ninja.")); + verboseNinja.setLabelText(Tr::tr("Ninja verbose mode")); + verboseNinja.setToolTip(Tr::tr("Enables verbose mode by default when invoking Ninja.")); registerAspect(&autorunMeson); registerAspect(&verboseNinja); @@ -36,7 +37,7 @@ Settings *Settings::instance() GeneralSettingsPage::GeneralSettingsPage() { setId(Constants::SettingsPage::GENERAL_ID); - setDisplayName(tr("General")); + setDisplayName(Tr::tr("General")); setDisplayCategory("Meson"); setCategory(Constants::SettingsPage::CATEGORY); setCategoryIconPath(Constants::Icons::MESON_BW); diff --git a/src/plugins/mesonprojectmanager/settings.h b/src/plugins/mesonprojectmanager/settings.h index e9c920b382c..4022b6af9f4 100644 --- a/src/plugins/mesonprojectmanager/settings.h +++ b/src/plugins/mesonprojectmanager/settings.h @@ -12,8 +12,6 @@ namespace Internal { class Settings : public Utils::AspectContainer { - Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::Settings) - public: Settings(); @@ -25,8 +23,6 @@ public: class GeneralSettingsPage final : public Core::IOptionsPage { - Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::GeneralSettingsPage) - public: GeneralSettingsPage(); }; diff --git a/src/plugins/mesonprojectmanager/toolitemsettings.cpp b/src/plugins/mesonprojectmanager/toolitemsettings.cpp index 918231b198f..cfb3e13772e 100644 --- a/src/plugins/mesonprojectmanager/toolitemsettings.cpp +++ b/src/plugins/mesonprojectmanager/toolitemsettings.cpp @@ -3,6 +3,7 @@ #include "toolitemsettings.h" +#include "mesonprojectmanagertr.h" #include "tooltreeitem.h" #include @@ -26,8 +27,8 @@ ToolItemSettings::ToolItemSettings(QWidget *parent) using namespace Layouting; Form { - tr("Name:"), m_mesonNameLineEdit, br, - tr("Path:"), m_mesonPathChooser, br, + Tr::tr("Name:"), m_mesonNameLineEdit, br, + Tr::tr("Path:"), m_mesonPathChooser, br, }.attachTo(this, WithoutMargins); connect(m_mesonPathChooser, &PathChooser::rawPathChanged, this, &ToolItemSettings::store); diff --git a/src/plugins/mesonprojectmanager/toolkitaspectwidget.h b/src/plugins/mesonprojectmanager/toolkitaspectwidget.h index 8b389aa0318..818704483c7 100644 --- a/src/plugins/mesonprojectmanager/toolkitaspectwidget.h +++ b/src/plugins/mesonprojectmanager/toolkitaspectwidget.h @@ -3,7 +3,6 @@ #pragma once #include "mesontoolkitaspect.h" -#include "mesonwrapper.h" #include "ninjatoolkitaspect.h" #include @@ -18,7 +17,6 @@ namespace Internal { class ToolKitAspectWidget final : public ProjectExplorer::KitAspectWidget { - Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::ToolKitAspect) public: enum class ToolType { Meson, Ninja }; diff --git a/src/plugins/mesonprojectmanager/toolsmodel.cpp b/src/plugins/mesonprojectmanager/toolsmodel.cpp index 9c1407387ef..d816cd3df17 100644 --- a/src/plugins/mesonprojectmanager/toolsmodel.cpp +++ b/src/plugins/mesonprojectmanager/toolsmodel.cpp @@ -4,6 +4,7 @@ #include "toolsmodel.h" #include "tooltreeitem.h" +#include "mesonprojectmanagertr.h" #include "mesontools.h" #include @@ -15,7 +16,7 @@ namespace Internal { ToolsModel::ToolsModel() { - setHeader({tr("Name"), tr("Location")}); + setHeader({Tr::tr("Name"), Tr::tr("Location")}); rootItem()->appendChild( new Utils::StaticTreeItem({ProjectExplorer::Constants::msgAutoDetected()}, {ProjectExplorer::Constants::msgAutoDetectedToolTip()})); @@ -39,7 +40,7 @@ void ToolsModel::updateItem(const Utils::Id &itemId, const QString &name, const void ToolsModel::addMesonTool() { - manualGroup()->appendChild(new ToolTreeItem{uniqueName(tr("New Meson or Ninja tool"))}); + manualGroup()->appendChild(new ToolTreeItem{uniqueName(Tr::tr("New Meson or Ninja tool"))}); } void ToolsModel::removeMesonTool(ToolTreeItem *item) diff --git a/src/plugins/mesonprojectmanager/toolsmodel.h b/src/plugins/mesonprojectmanager/toolsmodel.h index b37dca1015c..d580b10b1f5 100644 --- a/src/plugins/mesonprojectmanager/toolsmodel.h +++ b/src/plugins/mesonprojectmanager/toolsmodel.h @@ -17,9 +17,9 @@ class ToolTreeItem; class ToolsModel final : public Utils::TreeModel { - Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::ToolsSettingsPage) public: ToolsModel(); + ToolTreeItem *mesoneToolTreeItem(const QModelIndex &index) const; void updateItem(const Utils::Id &itemId, const QString &name, const Utils::FilePath &exe); void addMesonTool(); diff --git a/src/plugins/mesonprojectmanager/toolssettingsaccessor.cpp b/src/plugins/mesonprojectmanager/toolssettingsaccessor.cpp index 54f293f819a..8ee88d64d44 100644 --- a/src/plugins/mesonprojectmanager/toolssettingsaccessor.cpp +++ b/src/plugins/mesonprojectmanager/toolssettingsaccessor.cpp @@ -4,6 +4,7 @@ #include "toolssettingsaccessor.h" #include "mesonpluginconstants.h" +#include "mesonprojectmanagertr.h" #include #include @@ -18,18 +19,15 @@ namespace MesonProjectManager { namespace Internal { -namespace { -inline QString entryName(int index) +static QString entryName(int index) { using namespace Constants; return QString("%1%2").arg(ToolsSettings::ENTRY_KEY).arg(index); } -} // namespace ToolsSettingsAccessor::ToolsSettingsAccessor() : UpgradingSettingsAccessor("QtCreatorMesonTools", - QCoreApplication::translate("MesonProjectManager::MesonToolManager", - "Meson"), + Tr::tr("Meson"), Core::Constants::IDE_DISPLAY_NAME) { setBaseFilePath(Core::ICore::userResourcePath(Constants::ToolsSettings::FILENAME)); diff --git a/src/plugins/mesonprojectmanager/toolssettingspage.cpp b/src/plugins/mesonprojectmanager/toolssettingspage.cpp index 3579dc15fbe..39c60a00fce 100644 --- a/src/plugins/mesonprojectmanager/toolssettingspage.cpp +++ b/src/plugins/mesonprojectmanager/toolssettingspage.cpp @@ -4,6 +4,7 @@ #include "toolssettingspage.h" #include "mesonpluginconstants.h" +#include "mesonprojectmanagertr.h" #include "toolssettingswidget.h" namespace MesonProjectManager { @@ -12,7 +13,7 @@ namespace Internal { ToolsSettingsPage::ToolsSettingsPage() { setId(Constants::SettingsPage::TOOLS_ID); - setDisplayName(tr("Tools")); + setDisplayName(Tr::tr("Tools")); setCategory(Constants::SettingsPage::CATEGORY); setWidgetCreator([]() { return new ToolsSettingsWidget; }); } diff --git a/src/plugins/mesonprojectmanager/toolssettingspage.h b/src/plugins/mesonprojectmanager/toolssettingspage.h index c0f0a11fd84..2bdfce1024b 100644 --- a/src/plugins/mesonprojectmanager/toolssettingspage.h +++ b/src/plugins/mesonprojectmanager/toolssettingspage.h @@ -5,17 +5,11 @@ #include -#include - namespace MesonProjectManager { namespace Internal { -class MesonTools; - class ToolsSettingsPage final : public Core::IOptionsPage { - Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::ToolsSettingsPage) - public: ToolsSettingsPage(); }; diff --git a/src/plugins/mesonprojectmanager/toolssettingswidget.cpp b/src/plugins/mesonprojectmanager/toolssettingswidget.cpp index e7bda909709..2a744db1dbb 100644 --- a/src/plugins/mesonprojectmanager/toolssettingswidget.cpp +++ b/src/plugins/mesonprojectmanager/toolssettingswidget.cpp @@ -3,6 +3,7 @@ #include "toolssettingswidget.h" +#include "mesonprojectmanagertr.h" #include "toolsmodel.h" #include "tooltreeitem.h" @@ -33,19 +34,19 @@ ToolsSettingsWidget::ToolsSettingsWidget() m_mesonDetails->setVisible(false); m_mesonDetails->setWidget(m_itemSettings); - auto addButton = new QPushButton(tr("Add")); + auto addButton = new QPushButton(Tr::tr("Add")); - m_cloneButton = new QPushButton(tr("Clone")); + m_cloneButton = new QPushButton(Tr::tr("Clone")); m_cloneButton->setEnabled(false); - m_removeButton = new QPushButton(tr("Remove")); + m_removeButton = new QPushButton(Tr::tr("Remove")); m_removeButton->setEnabled(false); - auto makeDefaultButton = new QPushButton(tr("Make Default")); + auto makeDefaultButton = new QPushButton(Tr::tr("Make Default")); makeDefaultButton->setEnabled(false); makeDefaultButton->setVisible(false); - makeDefaultButton->setToolTip(tr("Set as the default Meson executable to use " - "when creating a new kit or when no value is set.")); + makeDefaultButton->setToolTip(Tr::tr("Set as the default Meson executable to use " + "when creating a new kit or when no value is set.")); using namespace Layouting; diff --git a/src/plugins/mesonprojectmanager/toolssettingswidget.h b/src/plugins/mesonprojectmanager/toolssettingswidget.h index f6ef2f28d6f..0fd08a8f903 100644 --- a/src/plugins/mesonprojectmanager/toolssettingswidget.h +++ b/src/plugins/mesonprojectmanager/toolssettingswidget.h @@ -8,23 +8,21 @@ #include -#include - namespace Utils { class DetailsWidget; } namespace MesonProjectManager::Internal { class ToolTreeItem; + class ToolsSettingsWidget final : public Core::IOptionsPageWidget { - Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::ToolsSettingsWidget) - void apply() final; - public: explicit ToolsSettingsWidget(); ~ToolsSettingsWidget(); private: + void apply() final; + void cloneMesonTool(); void removeMesonTool(); void currentMesonToolChanged(const QModelIndex &newCurrent); diff --git a/src/plugins/mesonprojectmanager/tooltreeitem.cpp b/src/plugins/mesonprojectmanager/tooltreeitem.cpp index 60f0772592a..8de706d0613 100644 --- a/src/plugins/mesonprojectmanager/tooltreeitem.cpp +++ b/src/plugins/mesonprojectmanager/tooltreeitem.cpp @@ -3,6 +3,8 @@ #include "tooltreeitem.h" +#include "mesonprojectmanagertr.h" + #include #include @@ -27,12 +29,12 @@ ToolTreeItem::ToolTreeItem(const MesonTools::Tool_t &tool) , m_autoDetected{tool->autoDetected()} , m_id{tool->id()} { - m_tooltip = tr("Version: %1").arg(tool->version().toQString()); + m_tooltip = Tr::tr("Version: %1").arg(tool->version().toQString()); self_check(); } ToolTreeItem::ToolTreeItem(const ToolTreeItem &other) - : m_name{tr("Clone of %1").arg(other.m_name)} + : m_name{Tr::tr("Clone of %1").arg(other.m_name)} , m_executable{other.m_executable} , m_autoDetected{false} , m_id{Utils::Id::fromString(QUuid::createUuid().toString())} @@ -63,14 +65,11 @@ QVariant ToolTreeItem::data(int column, int role) const } case Qt::ToolTipRole: { if (!m_pathExists) - return QCoreApplication::translate("MesonProjectManager::Internal::ToolTreeItem", - "Meson executable path does not exist."); + return Tr::tr("Meson executable path does not exist."); if (!m_pathIsFile) - return QCoreApplication::translate("MesonProjectManager::Internal::ToolTreeItem", - "Meson executable path is not a file."); + return Tr::tr("Meson executable path is not a file."); if (!m_pathIsExecutable) - return QCoreApplication::translate("MesonProjectManager::Internal::ToolTreeItem", - "Meson executable path is not executable."); + return Tr::tr("Meson executable path is not executable."); return m_tooltip; } case Qt::DecorationRole: { @@ -103,9 +102,9 @@ void ToolTreeItem::self_check() void ToolTreeItem::update_tooltip(const Version &version) { if (version.isValid) - m_tooltip = tr("Version: %1").arg(version.toQString()); + m_tooltip = Tr::tr("Version: %1").arg(version.toQString()); else - m_tooltip = tr("Cannot get tool version."); + m_tooltip = Tr::tr("Cannot get tool version."); } void ToolTreeItem::update_tooltip() diff --git a/src/plugins/mesonprojectmanager/tooltreeitem.h b/src/plugins/mesonprojectmanager/tooltreeitem.h index 6e8592bf6f2..dded93c061d 100644 --- a/src/plugins/mesonprojectmanager/tooltreeitem.h +++ b/src/plugins/mesonprojectmanager/tooltreeitem.h @@ -4,7 +4,6 @@ #pragma once #include "mesontools.h" -#include "toolssettingspage.h" #include #include @@ -20,11 +19,11 @@ namespace Internal { class ToolTreeItem final : public Utils::TreeItem { - Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::ToolsSettingsPage) public: ToolTreeItem(const QString &name); ToolTreeItem(const MesonTools::Tool_t &tool); ToolTreeItem(const ToolTreeItem &other); + QVariant data(int column, int role) const override; inline bool isAutoDetected() const noexcept { return m_autoDetected; } inline QString name() const noexcept { return m_name; }