From ab4c9b9679f378426f5167bcaad462c0dc09ec7b Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 29 Sep 2022 15:26:31 +0200 Subject: [PATCH] CMake: Move to Tr::tr Change-Id: I169da93b5184351cb915d4c198fd33318fcfe06f Reviewed-by: hjk Reviewed-by: Alessandro Portale --- share/qtcreator/translations/qtcreator_cs.ts | 121 +------- share/qtcreator/translations/qtcreator_da.ts | 145 +-------- share/qtcreator/translations/qtcreator_de.ts | 116 +------- share/qtcreator/translations/qtcreator_es.ts | 32 +- share/qtcreator/translations/qtcreator_fr.ts | 136 +-------- share/qtcreator/translations/qtcreator_hr.ts | 144 +-------- share/qtcreator/translations/qtcreator_hu.ts | 36 +-- share/qtcreator/translations/qtcreator_it.ts | 32 +- share/qtcreator/translations/qtcreator_ja.ts | 274 +----------------- share/qtcreator/translations/qtcreator_pl.ts | 116 +------- share/qtcreator/translations/qtcreator_ru.ts | 133 --------- share/qtcreator/translations/qtcreator_sl.ts | 64 +--- share/qtcreator/translations/qtcreator_uk.ts | 175 +---------- .../qtcreator/translations/qtcreator_zh_CN.ts | 104 +------ .../qtcreator/translations/qtcreator_zh_TW.ts | 91 +----- .../builddirparameters.cpp | 6 +- .../cmakeprojectmanager/builddirparameters.h | 6 +- .../cmakeautocompleter.cpp | 6 +- .../cmakeprojectmanager/cmakeautocompleter.h | 6 +- .../cmakebuildconfiguration.cpp | 127 ++++---- .../cmakeprojectmanager/cmakebuildstep.cpp | 47 ++- .../cmakeprojectmanager/cmakebuildstep.h | 6 +- .../cmakeprojectmanager/cmakebuildsystem.cpp | 29 +- .../cmakeprojectmanager/cmakeconfigitem.cpp | 5 +- .../cmakeprojectmanager/cmakeconfigitem.h | 1 - .../cmakeprojectmanager/cmakeeditor.cpp | 12 +- src/plugins/cmakeprojectmanager/cmakeeditor.h | 18 +- .../cmakefilecompletionassist.cpp | 21 +- .../cmakefilecompletionassist.h | 19 +- .../cmakeprojectmanager/cmakeindenter.cpp | 8 +- .../cmakeprojectmanager/cmakeindenter.h | 6 +- .../cmakekitinformation.cpp | 99 +++---- .../cmakeprojectmanager/cmakekitinformation.h | 6 +- .../cmakelocatorfilter.cpp | 16 +- .../cmakeprojectmanager/cmakelocatorfilter.h | 12 +- .../cmakeprojectmanager/cmakeprocess.cpp | 36 +-- .../cmakeprojectmanager/cmakeprocess.h | 6 +- .../cmakeprojectmanager/cmakeproject.cpp | 14 +- .../cmakeprojectimporter.cpp | 3 +- .../cmakeprojectimporter.h | 2 - .../cmakeprojectmanager.cpp | 19 +- .../cmakeprojectmanager/cmakeprojectnodes.cpp | 42 +-- .../cmakeprojectmanager/cmakeprojectnodes.h | 6 +- .../cmakeprojectplugin.cpp | 15 +- .../cmakeprojectmanager/cmakeprojectplugin.h | 6 +- .../cmakeprojectmanager/cmakesettingspage.cpp | 67 ++--- .../cmakespecificsettings.cpp | 31 +- .../cmakespecificsettings.h | 8 +- src/plugins/cmakeprojectmanager/cmaketool.cpp | 3 +- .../cmakeprojectmanager/cmaketoolmanager.cpp | 23 +- .../cmaketoolsettingsaccessor.cpp | 9 +- .../cmakeprojectmanager/configmodel.cpp | 27 +- src/plugins/cmakeprojectmanager/configmodel.h | 8 +- .../configmodelitemdelegate.cpp | 28 +- .../configmodelitemdelegate.h | 8 +- .../fileapidataextractor.cpp | 22 +- .../fileapidataextractor.h | 8 +- .../cmakeprojectmanager/fileapiparser.cpp | 73 ++--- .../cmakeprojectmanager/fileapiparser.h | 7 +- .../cmakeprojectmanager/fileapireader.cpp | 13 +- .../cmakeprojectmanager/fileapireader.h | 10 +- .../cmakeprojectmanager/presetsparser.cpp | 29 +- .../cmakeprojectmanager/presetsparser.h | 11 +- .../cmakeprojectmanager/projecttreehelper.cpp | 19 +- .../cmakeprojectmanager/projecttreehelper.h | 9 +- 65 files changed, 509 insertions(+), 2228 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index 0332a839896..ee2b5662bc7 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -278,7 +278,7 @@ - CMakeProjectManager::Internal::CMakeBuildEnvironmentWidget + CMakeProjectManager Clear system environment Vyprázdnit prostředí systému @@ -287,9 +287,6 @@ Build Environment Prostředí pro sestavování - - - CMakeProjectManager::Internal::CMakeBuildSettingsWidget Run cmake Provést cmake @@ -310,16 +307,10 @@ CMake CMake - - - CMakeProjectManager::Internal::CMakeOpenProjectWizard CMake Wizard Průvodce CMake - - - CMakeProjectManager::Internal::CMakeRunConfigurationWidget Arguments: Argumenty: @@ -372,17 +363,10 @@ System Environment Prostředí systému - - Build Environment - Prostředí pro sestavování - Running executable: <b>%1</b> %2 Spouští se spustitelný soubor: <b>%1</b> %2 - - - CMakeProjectManager::Internal::CMakeRunPage Please specify the path to the cmake executable. No cmake executable was found in the path. Zadejte, prosím, cestu ke spustitelnému souboru cmake. V cestě nebyl nalezen žádný spustitelný soubor cmake. @@ -399,10 +383,6 @@ The path %1 is not a valid cmake. Cesta '%1' není platným cmake. - - Arguments: - Argumenty: - Generator: Generátor: @@ -439,14 +419,6 @@ Refreshing cbp file in %1. Soubor cpb ve složce %1 se vytváří znovu. - - MinGW Generator (%1) - Generátor MinGW (%1) - - - Unix Generator (%1) - Generátor Unix (%1) - No generator selected. Nevybrán žádný generátor. @@ -479,14 +451,6 @@ The directory %1 specified in a build-configuration, does not contain a cbp file. Qt Creator needs to recreate this file, by running cmake. Some projects require command line arguments to the initial cmake call. Note that cmake remembers command line arguments from the previous runs. Adresář %1, který byl zadán v nastavení sestavování, neobsahuje soubor cbp. Qt Creator musí soubor vytvořit pomocí vyvolání cmake. U některých projektů jsou k tomu vyžadovány argumenty příkazového řádku. Všimněte si, že cmake ukládá argumenty příkazového řádku z předchozího vyvolání. - - NMake Generator - Tvůrce NMake - - - NMake Generator (%1) - Generátor NMake (%1) - MinGW Generator Tvůrce MinGW @@ -499,13 +463,6 @@ Qt Creator needs to run cmake in the new build directory. Some projects require command line arguments to the initial cmake call. Qt Creator musí vyvolat cmake v novém adresáři pro sestavování. U některých projektů jsou k tomu vyžadovány argumenty příkazového řádku. - - - CMakeProjectManager::Internal::CMakeSettingsPage - - CMake - CMake - Executable: Spustitelný soubor: @@ -518,9 +475,6 @@ CMake executable Spustitelný soubor CMake - - - CMakeProjectManager::Internal::InSourceBuildPage Qt Creator has detected an <b>in-source-build in %1</b> which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project. Bylo zjištěno <b>sestavování ve zdrojovém adresáři v %1</b>, které zabraňuje stínovým sestavováním. Adresář se sestavováním nelze v Qt Creatoru změnit. Pokud chcete stínové sestavování, vyčistěte, prosím, svůj zdrojový adresář a otevřte projekt znovu ještě jednou. @@ -529,9 +483,6 @@ Build Location Umístění sestavování - - - CMakeProjectManager::Internal::MakeStepConfigWidget Additional arguments: Dodatečné argumenty: @@ -565,9 +516,6 @@ <b>Unknown Toolchain</b> <b>Neznámá sada nástrojů</b> - - - CMakeProjectManager::Internal::ShadowBuildPage Please enter the directory in which you want to build your project. Zadejte, prosím, adresář, ve kterém chcete vytvořit svůj projekt. @@ -580,14 +528,6 @@ Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings. Zadejte, prosím, adresář, ve kterém chcete vytvořit svůj projekt.. Doporučuje se, nepoužívat pro vytvoření projektu zdrojový adresář. Tím se zajistí, že zdrojový adresář zůstane volný, a umožní různá sestavení s rozdílnými nastaveními. - - Build directory: - Adresář pro sestavování: - - - Build Location - Umístění sestavování - CPlusPlus::OverviewModel @@ -18430,7 +18370,7 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás - CMakeProjectManager::Internal::CMakeBuildConfigurationFactory + CMakeProjectManager Create Vytvořit @@ -24033,7 +23973,7 @@ Desetinná hodnota se znaménkem (velký endian): %4 - CMakeProjectManager::Internal::CMakeRunConfiguration + CMakeProjectManager Run CMake target CMake-Ziel ausführen @@ -24046,18 +23986,6 @@ Desetinná hodnota se znaménkem (velký endian): %4 (disabled) (vypnuto) - - Clean Environment - Smazat prostředí - - - System Environment - Prostředí systému - - - Build Environment - Prostředí pro sestavování - The executable is not built by the current build configuration Spustitelný soubor není sestaven současným nastavením pro sestavování @@ -24070,17 +23998,11 @@ Desetinná hodnota se znaménkem (velký endian): %4 (disabled) (zakázáno) - - - CMakeProjectManager::Internal::CMakeTarget Desktop CMake Default target display name Stolní počítač - - - CMakeProjectManager::Internal::MakeStep Make CMakeProjectManager::MakeStep display name. @@ -24099,9 +24021,6 @@ Desetinná hodnota se znaménkem (velký endian): %4 Configuration is faulty. Check the Issues view for details. Nastavení je chybné. Prověřte, prosím, pohled na potíže kvůli podrobnostem. - - - CMakeProjectManager::Internal::MakeStepFactory Make Display name for CMakeProjectManager::MakeStep id. @@ -33291,7 +33210,7 @@ Server: %2. - CMakeProjectManager::Internal::CMakeEditor + CMakeProjectManager Changes to cmake files are shown in the project tree after building. Změny v souborech cmake budou ukázány po vytvoření projektového stromu. @@ -33300,13 +33219,6 @@ Server: %2. Build now Sestavit nyní - - - CMakeProjectManager::Internal::CMakeManager - - Run CMake - Provést CMake - Failed opening project '%1': Project is not a file Projekt '%1' se nepodařil otevřít: Daný projektový soubor není soubor @@ -47822,7 +47734,7 @@ Nainstalujte, prosím, alespoň jedno SDK. - CMakeProjectManager::Internal::CMakeLocatorFilter + CMakeProjectManager Build CMake target Sestavit cíl CMake @@ -50979,7 +50891,7 @@ Nainstalujte, prosím, alespoň jedno SDK. - CMakeProjectManager::Internal::ChooseCMakePage + CMakeProjectManager Choose Cmake Executable Vybrat spustitelný soubor Cmake @@ -50988,22 +50900,6 @@ Nainstalujte, prosím, alespoň jedno SDK. The cmake executable is valid. Spustitelný soubor cmake je platný. - - Please specify the path to the cmake executable. No cmake executable was found in the path. - Zadejte, prosím, cestu ke spustitelnému souboru cmake. V cestě nebyl nalezen žádný spustitelný soubor cmake. - - - The cmake executable (%1) does not exist. - Spustitelný soubor cmake (%1) neexistuje. - - - The path %1 is not a executable. - Cesta '%1' není spustitelným souborem. - - - The path %1 is not a valid cmake. - Cesta '%1' není platným cmake. - CMake Executable: Spustitelný soubor CMake: @@ -54348,7 +54244,7 @@ nelze najít v cestě. - CMakeProjectManager::Internal::GeneratorInfo + CMakeProjectManager Ninja (%1) Ninja (%1) @@ -54365,9 +54261,6 @@ nelze najít v cestě. Unix Generator (%1) Generátor Unix (%1) - - - CMakeProjectManager::Internal::NoKitPage Show Options Ukázat volby diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index 93ae3e91015..78f1eabde99 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -4302,23 +4302,14 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.Value requested by kit: %1 Værdi anmodet af kit: %1 - - - CMakeProjectManager::CMakeBuildStep The build configuration is currently disabled. Byggekonfigurationen er deaktiveret på nuværende tidspunkt. - - - CMakeProjectManager::CMakeConfigItem Failed to open %1 for reading. Kunne ikke åbne %1 til læsning. - - - CMakeProjectManager::CMakeConfigurationKitInformation CMake configuration has no path to qmake binary set, even though the kit has a valid Qt version. CMake-konfigurationen har ikke sat nogen sti til en qmake-binær, selvom kittet har en gyldig Qt version. @@ -4363,9 +4354,6 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.CMake Configuration CMake-konfiguration - - - CMakeProjectManager::CMakeGeneratorKitInformation CMake Tool is unconfigured, CMake generator will be ignored. CMake-værktøj er ikke konfigureret, CMake-generator ignoreres. @@ -4406,9 +4394,6 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.<Use Default Generator> <brug standard generator> - - - CMakeProjectManager::CMakeKitInformation CMake version %1 is unsupported. Please update to version 3.0 or later. CMake-version %1 understøttes ikke. Opdater venligst til version 3.0 eller senere. @@ -4425,9 +4410,6 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.Path to the cmake executable Sti til cmake-eksekverbaren - - - CMakeProjectManager::CMakeProject No cmake tool set. Intet cmake-værktøj sat. @@ -4440,9 +4422,6 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.Scan "%1" project tree Skan "%1" projekttræ - - - CMakeProjectManager::CMakeSettingsPage (Default) (standard) @@ -4487,9 +4466,6 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.Path: Sti: - - - CMakeProjectManager::CMakeToolManager CMake at %1 CMake ved %1 @@ -4498,9 +4474,6 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.System CMake at %1 Systemets CMake ved %1 - - - CMakeProjectManager::ConfigModel Key Nøgle @@ -4521,9 +4494,6 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.Value Værdi - - - CMakeProjectManager::ConfigModelItemDelegate Select a file for %1 Vælg en fil for %1 @@ -4532,9 +4502,6 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.Select a directory for %1 Vælg en mappe for %1 - - - CMakeProjectManager::Internal::BuildDirManager Failed to create build directory "%1". Kunne ikke oprette bygmappe "%1". @@ -4555,14 +4522,6 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.<removed> <fjernet> - - Key - Nøgle - - - CMake - CMake - Project Projekt @@ -4579,16 +4538,10 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.Apply Changes to Project Anvend ændringer til projekt - - - CMakeProjectManager::Internal::CMakeBuildConfiguration CMake configuration set by the kit was overridden in the project. CMake-konfiguration sat af kittet blev tilsidesat af projektet. - - - CMakeProjectManager::Internal::CMakeBuildConfigurationFactory Default The name of the build configuration created by default for a cmake project. @@ -4614,13 +4567,6 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.Release with Debug Information Udgivelse med fejlretinformation - - - CMakeProjectManager::Internal::CMakeBuildSettingsWidget - - CMake - CMake - Build directory: Bygmappe: @@ -4685,10 +4631,6 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.Apply Configuration Changes Anvend konfigurationsændringer - - <UNSET> - <AFSÆT> - bool display string for cmake type BOOLEAN @@ -4713,9 +4655,6 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.Force to %1 Tving til %1 - - - CMakeProjectManager::Internal::CMakeBuildStep CMake Build Default display name for the cmake make step. @@ -4741,9 +4680,6 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.Project did not parse successfully, cannot build. Projekt blev ikke parset, kan ikke bygge. - - - CMakeProjectManager::Internal::CMakeBuildStepConfigWidget Tool arguments: Værktøjsargumenter: @@ -4761,25 +4697,15 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.<b>No build configuration found on this kit.</b> <b>Ingen byggekonfiguration fundet i dette kit.</b> - - - CMakeProjectManager::Internal::CMakeBuildStepFactory Build Display name for CMakeProjectManager::CMakeBuildStep id. Byg - - - CMakeProjectManager::Internal::CMakeConfigurationKitConfigWidget Change... Skift... - - CMake Configuration - CMake-konfiguration - Default configuration passed to CMake when setting up a project. Standard konfiguration videregivet til CMake når et projekt sættes op. @@ -4792,20 +4718,10 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.Enter one variable per line with the variable name separated from the variable value by "=".<br>You may provide a type hint by adding ":TYPE" before the "=". Indtast én variabel pr. linje med variabelnavnet separeret fra variablens værdi med "=".<br>Du kan give et tip om type ved at tilføje ":TYPE" før "=". - - - CMakeProjectManager::Internal::CMakeEditorFactory CMake Editor CMake-redigering - - - CMakeProjectManager::Internal::CMakeGeneratorKitConfigWidget - - Change... - Skift... - CMake generator: CMake-generator: @@ -4822,10 +4738,6 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.CMake generator defines how a project is built when using CMake.<br>This setting is ignored when using other build systems. CMake-generator definerer hvordan et projekt bygges ved brug af CMake.<br>Denne indstilling ignoreres når andre byggesystemer bruges. - - CMake Generator - CMake-generator - Generator: Generator: @@ -4842,9 +4754,6 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.Toolset: Værktøjssæt: - - - CMakeProjectManager::Internal::CMakeKitConfigWidget CMake Tool: CMake-værktøj: @@ -4857,16 +4766,10 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.<No CMake Tool available> <Intet tilgængeligt CMake-værktøj> - - - CMakeProjectManager::Internal::CMakeLocatorFilter Build CMake target Byg CMake-mål - - - CMakeProjectManager::Internal::CMakeManager Run CMake Kør CMake @@ -4879,47 +4782,24 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.Rescan Project Genskan projekt - - - CMakeProjectManager::Internal::CMakeProjectPlugin CMake SnippetProvider CMake - - Build - Byg - Build "%1" Byg "%1" - - - CMakeProjectManager::Internal::CMakeRunConfiguration The project no longer builds the target associated with this run configuration. Projektet bygger ikke længere målet tilknyttet med denne kør-konfiguration. - - - CMakeProjectManager::Internal::CMakeSettingsPage - - CMake - CMake - - - - CMakeProjectManager::Internal::CMakeTarget Desktop CMake Default target display name Desktop - - - CMakeProjectManager::Internal::CMakeToolConfigWidget Add Tilføj @@ -4948,9 +4828,6 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.New CMake Ny CMake - - - CMakeProjectManager::Internal::ServerMode Running "%1 %2" in %3. Kører "%1 %2" i %3. @@ -5035,9 +4912,6 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.Received a signal in reply to a request. Modtog et signal som svar til en anmodning. - - - CMakeProjectManager::Internal::ServerModeReader Parsing of CMake project failed: Connection to CMake server lost. Parsing af CMake-projekt mislykkedes: Forbindelse til CMake-server tabt. @@ -5094,21 +4968,10 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.<Headers> <headere> - - - CMakeProjectManager::Internal::TeaLeafReader The build directory is not for %1 but for %2 Bygmappen er ikke til %1 men til %2 - - Running "%1 %2" in %3. - Kører "%1 %2" i %3. - - - Configuring "%1" - Konfigurerer "%1" - *** cmake process crashed. *** cmake-proces holdt op med at virke. @@ -42843,7 +42706,7 @@ skal være et repository krævet SSH-autentifikation (se dokumentation på SSH o - CMakeProjectManager::Internal::CMakeSpecificSettingForm + CMakeProjectManager Determines whether file paths are copied to the clipboard for pasting to the CMakeLists.txt file when you add new files to CMake projects. Beslutter om filstier kopieres til udklipsholderen til indsættelse i CMakeLists.txt-filen, når du tilføjer nye filer til CMake-projekter. @@ -43479,11 +43342,7 @@ Kopiér stien til kildefilerne til udklipsholderen? - CMakeProjectManager::Internal::CMakeSpecificSettingsPage - - CMake - CMake - + CMakeProjectManager Core::HelpManager diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index fae9b53b67b..1a9217ee998 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -197,7 +197,7 @@ - CMakeProjectManager::Internal::CMakeBuildSettingsWidget + CMakeProjectManager Filter Filter @@ -13548,7 +13548,7 @@ Lokale Pull-Operationen werden nicht auf den Master-Branch angewandt. - CMakeProjectManager::Internal::CMakeManager + CMakeProjectManager Run CMake CMake ausführen @@ -31899,7 +31899,7 @@ Senden selbst auch Zeit benötigt. - CMakeProjectManager::CMakeProject + CMakeProjectManager No cmake tool set. Keine CMake Anwendung konfiguriert. @@ -31908,9 +31908,6 @@ Senden selbst auch Zeit benötigt. No compilers set in kit. Im Kit sind keine Compiler eingerichtet. - - - CMakeProjectManager::CMakeSettingsPage Version: %1<br>Supports fileApi: %2 Version: %1<br>Unterstützt fileApi: %2 @@ -31975,9 +31972,6 @@ Senden selbst auch Zeit benötigt. Help file: Hilfedatei: - - - CMakeProjectManager::Internal::CMakeToolConfigWidget Add Hinzufügen @@ -32006,21 +32000,10 @@ Senden selbst auch Zeit benötigt. New CMake Neues CMake - - CMake - CMake - - - - CMakeProjectManager::CMakeToolManager System CMake at %1 System-CMake in %1 - - CMake - CMake - Core::BaseFileWizard @@ -34923,7 +34906,7 @@ Dies könnte Probleme während der Ausführung verursachen. - CMakeProjectManager::Internal::CMakeBuildStep + CMakeProjectManager CMake Build Default display name for the cmake make step. @@ -34958,9 +34941,6 @@ Dies könnte Probleme während der Ausführung verursachen. Display name for CMakeProjectManager::CMakeBuildStep id. Erstellen - - - CMakeProjectManager::Internal::CMakeBuildStepConfigWidget CMake arguments: Kommandozeilenargumente für CMake: @@ -34978,9 +34958,6 @@ Dies könnte Probleme während der Ausführung verursachen. CMakeProjectManager::CMakeBuildStepConfigWidget display name. Build - - - CMakeProjectManager::ConfigModel Key Schlüssel @@ -34993,10 +34970,6 @@ Dies könnte Probleme während der Ausführung verursachen. Current kit: %1 Aktuelles Kit: %1 - - <UNSET> - <UNGESETZT> - Value Wert @@ -36081,7 +36054,7 @@ Siehe auch die Einstellungen für Google Test. - CMakeProjectManager::Internal::CMakeBuildConfiguration + CMakeProjectManager Changing Build Directory Build-Verzeichnis ändern @@ -37677,7 +37650,7 @@ Fehler: %5 - CMakeProjectManager::CMakeConfigItem + CMakeProjectManager Failed to open %1 for reading. Die Datei %1 konnte nicht zum Lesen geöffnet werden. @@ -37706,23 +37679,16 @@ Fehler: %5 - CMakeProjectManager::Internal::CMakeProjectPlugin + CMakeProjectManager CMake SnippetProvider CMake - - Build - Erstellen - Build "%1" "%1" erstellen - - - CMakeProjectManager Current CMake: %1 Aktuelles CMake: %1 @@ -40352,7 +40318,7 @@ Breche ausstehende Operationen ab... - CMakeProjectManager::ConfigModelItemDelegate + CMakeProjectManager Select a file for %1 Wählen Sie eine Datei für %1 @@ -40870,7 +40836,7 @@ Breche ausstehende Operationen ab... - CMakeProjectManager::Internal::CMakeSpecificSettingForm + CMakeProjectManager Determines whether file paths are copied to the clipboard for pasting to the CMakeLists.txt file when you add new files to CMake projects. Legt fest, ob beim Hinzufügen von neuen Dateien zu CMake-Projekten deren Dateipfade in die Zwischenablage kopiert werden, um sie in die CMakeLists.txt-Datei einzufügen. @@ -45786,7 +45752,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e - CMakeProjectManager::Internal::CMakeBuildSystem + CMakeProjectManager Scan "%1" project tree Durchsuche "%1"-Projektbaum @@ -45811,16 +45777,10 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e CMakeCache.txt file not found. Datei CMakeCache.txt nicht gefunden. - - - CMakeProjectManager::Internal::CMakeKitAspect <No CMake Tool available> <Kein CMake-Werkzeug verfügbar> - - - CMakeProjectManager::CMakeKitAspect CMake Tool CMake-Werkzeug @@ -45829,10 +45789,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e The CMake Tool to use when building a project with CMake.<br>This setting is ignored when using other build systems. Das zum Erstellen eines Projektes mit CMake zu verwendende CMake-Werkzeug.<br>Diese Einstellung wird bei der Verwendung anderer Build-Systeme ignoriert. - - CMake - CMake - Unconfigured Nicht konfiguriert @@ -45841,9 +45797,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Path to the cmake executable Pfad zur ausführbaren Datei von cmake - - - CMakeProjectManager::Internal::CMakeGeneratorKitAspect Change... Ändern... @@ -45876,9 +45829,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Toolset: Toolset: - - - CMakeProjectManager::CMakeGeneratorKitAspect CMake generator CMake-Generator @@ -45919,17 +45869,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Toolset: %1 Toolset: %1 - - CMake Generator - CMake-Generator - - - - CMakeProjectManager::Internal::CMakeConfigurationKitAspect - - Change... - Ändern... - Edit CMake Configuration CMake-Konfiguration bearbeiten @@ -45938,9 +45877,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Enter one variable per line with the variable name separated from the variable value by "=".<br>You may provide a type hint by adding ":TYPE" before the "=". Eine Variable pro Zeile eingeben, Name und Wert durch "=" trennen.<br>Ein Typhinweis kann mit ":TYPE" vor dem "=" angegeben werden. - - - CMakeProjectManager::CMakeConfigurationKitAspect CMake Configuration CMake-Konfiguration @@ -45989,23 +45925,14 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e CMake configuration has a path to a C++ compiler set that does not match the compiler path configured in the tool chain of the kit. Die CMake-Konfiguration hat einen C++-Compiler gesetzt, der nicht mit dem Compiler der Toolchain übereinstimmt, die vom Kit verwendet wird. - - - CMakeProjectManager::Internal::BuildCMakeTargetLocatorFilter Build CMake target CMake-Ziel erstellen - - - CMakeProjectManager::Internal::OpenCMakeTargetLocatorFilter Open CMake target CMake-Ziel öffnen - - - CMakeProjectManager::Internal::CMakeProcess Running %1 in %2. Führe %1 in %2 aus. @@ -46014,16 +45941,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Configuring "%1" Konfiguriere "%1" - - - CMakeProjectManager::Internal::CMakeSpecificSettingWidget - - CMake - CMake - - - - CMakeProjectManager::Internal::FileApi <Build Directory> <Build-Verzeichnis> @@ -48863,22 +48780,11 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e - CMakeProjectManager::Internal::FileApiReader + CMakeProjectManager Parsing has been canceled. Auswertung wurde abgebrochen. - - - CMakeProjectManager::Internal::ProjectTreeHelper - - <Build Directory> - <Build-Verzeichnis> - - - <Other Locations> - <Andere Orte> - <Headers> <Header-Dateien> diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts index eb41320cd28..fd0f5a18bfc 100644 --- a/share/qtcreator/translations/qtcreator_es.ts +++ b/share/qtcreator/translations/qtcreator_es.ts @@ -271,7 +271,7 @@ - CMakeProjectManager::Internal::CMakeBuildEnvironmentWidget + CMakeProjectManager Clear system environment @@ -280,9 +280,6 @@ Build Environment Entorno de construcción - - - CMakeProjectManager::Internal::CMakeBuildConfigurationFactory Create @@ -295,23 +292,14 @@ New Configuration Name: Nombre para nueva configuración: - - - CMakeProjectManager::Internal::CMakeBuildSettingsWidget &Change &Cambiar - - - CMakeProjectManager::Internal::CMakeOpenProjectWizard CMake Wizard Asistente CMake - - - CMakeProjectManager::Internal::CMakeRunConfigurationWidget Arguments: Argumentos: @@ -356,9 +344,6 @@ Base environment for this runconfiguration: Entorno base para éste ajuste de ejecución: - - - CMakeProjectManager::Internal::InSourceBuildPage Qt Creator has detected an <b>in-source-build in %1</b> which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project. @@ -368,9 +353,6 @@ shadow build ¿? en la sombra? Qt Creator ha detectado un entorno de construcción entremezclado con las fuentes, lo que impide la construcción en un directorio separado. Qt Creator no le permitirá alterar el directorio de construcción. Si quiere construir en un directorio separado, limpie el directorio de los fuentes y abra nuevamente el proyecto. - - - CMakeProjectManager::Internal::CMakeRunPage Please specify the path to the cmake executable. No cmake executable was found in the path. @@ -431,9 +413,6 @@ No valid cmake executable specified. - - - CMakeProjectManager::Internal::CMakeSettingsPage CMake @@ -442,9 +421,6 @@ CMake executable Ejecutable CMake - - - CMakeProjectManager::Internal::MakeStepConfigWidget Additional arguments: Argumentos adicionales: @@ -457,9 +433,6 @@ <b>Make:</b> %1 %2 - - - CMakeProjectManager::Internal::ShadowBuildPage Please enter the directory in which you want to build your project. Por favor, ingrese el directorio en el que quiere construir el proyecto. @@ -472,9 +445,6 @@ Build directory: Directorio de construcción: - - - CMakeProjectManager::Internal::XmlFileUpToDatePage Qt Creator has found a recent cbp file, which Qt Creator will parse to gather information about the project. You can change the command line arguments used to create this file in the project mode. Click finish to load the project. Qt Creator ha encontrado un archivo cbp reciente, el mismo será interpretado para recopilar información acerca del proyecto. Puede cambiar los argumentos de línea de comandos usados para crear este archivo en el proyecto. Responda Finalizar para cargar el proyecto. diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index 48f51966394..5bfe46aed94 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -275,7 +275,7 @@ - CMakeProjectManager::Internal::CMakeBuildEnvironmentWidget + CMakeProjectManager Clear system environment Nettoyer l'environnement système @@ -284,9 +284,6 @@ Build Environment Environnement de compilation - - - CMakeProjectManager::Internal::CMakeBuildConfigurationFactory Create Créer @@ -316,9 +313,6 @@ New Configuration Name: Nom de la nouvelle configuration : - - - CMakeProjectManager::Internal::CMakeBuildSettingsWidget Run cmake Exécuter CMake @@ -339,16 +333,10 @@ CMake CMake - - - CMakeProjectManager::Internal::CMakeOpenProjectWizard CMake Wizard Assistant CMake - - - CMakeProjectManager::Internal::CMakeRunConfigurationWidget Arguments: Arguments : @@ -393,10 +381,6 @@ System Environment Environnement système - - Build Environment - Environnement de compilation - Running executable: <b>%1</b> %2 Exécution en cours : <b>%1</b> %2 @@ -409,9 +393,6 @@ Base environment for this runconfiguration: Environnement de base pour cette configuration d'éxecution : - - - CMakeProjectManager::Internal::InSourceBuildPage Qt Creator has detected an <b>in-source-build in %1</b> which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project. Qt Creator a détecté une <b>compilation dans les sources de %1</b> qui empêche les shadow builds. Qt Creator ne permettra pas de changer le répertoire de compilation. Si vous voulez effectuer un "shadow build", nettoyez le répertoire source et rouvrez le projet. @@ -424,29 +405,6 @@ Qt Creator has detected an in-source-build which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project. Qt Creator a détecté une compilation dans les sources qui empêche les shadow builds. Qt Creator ne permettra pas de changer le répertoire de compilation. Si vous voulez effectuer un "shadow build", nettoyez le répertoire source et rouvrez le projet. - - - CMakeProjectManager::Internal::CMakeRunPage - - Please specify the path to the cmake executable. No cmake executable was found in the path. - Veuillez spécifier l'emplacement de l'exécutable cmake. Aucun exécutable cmake n'a été trouvé dans le path. - - - The cmake executable (%1) does not exist. - L'exécutable cmake (%1) n'existe pas. - - - The path %1 is not a executable. - %1 n'est pas le chemin d'un exécutable. - - - The path %1 is not a valid cmake. - %1 n'est pas une installation valide de cmake. - - - Arguments: - Arguments : - Generator: Générateur : @@ -485,14 +443,6 @@ capitalisation de CMake, contenu inchangé (cmake -> CMake) Veuillez spécifier l'emplacement de l'exécutable CMake. Aucun exécutable CMake n'a été trouvé dans la liste de répertoires standards. - - The CMake executable (%1) does not exist. - L'exécutable CMake (%1) n'existe pas. - - - The path %1 is not a valid CMake. - %1 n'est pas un CMake valide. - The directory %1 already contains a cbp file, which is recent enough. You can pass special arguments or change the used toolchain here and rerun CMake. Or simply finish the wizard directly. Le répertoire %1 contient déjà un fichier cbp qui est assez récent. Vous pouvez passer des arguments spéciaux ou changer la chaîne de compilation utilisée ici et réexécuter CMake. Vous pouvez aussi terminer l'assistant directement. @@ -525,14 +475,6 @@ Refreshing cbp file in %1. Rafraîchissement du fichier cbp dans %1 en cours. - - MinGW Generator (%1) - Générateur MinGW (%1) - - - Unix Generator (%1) - Générateur UNIX (%1) - No generator selected. Pas de générateur sélectionné. @@ -549,14 +491,6 @@ NMake Generator Générateur NMake - - NMake Generator (%1) - Générateur NMake (%1) - - - MinGW Generator - Générateur MinGW - No valid CMake executable specified. L'exécutable CMake spécifié est invalide. @@ -565,13 +499,6 @@ No valid cmake executable specified. L'exécutable CMake spécifié est invalide. - - - CMakeProjectManager::Internal::CMakeSettingsPage - - CMake - CMake - Executable: Exécutable : @@ -584,9 +511,6 @@ CMake executable Exécutable CMake - - - CMakeProjectManager::Internal::MakeStepConfigWidget Additional arguments: Arguments supplémentaires : @@ -620,9 +544,6 @@ <b>Unknown Toolchain</b> <b>Chaîne de compilation inconnue</b> - - - CMakeProjectManager::Internal::ShadowBuildPage Please enter the directory in which you want to build your project. Veuillez spécifier le répertoire où vous voulez compiler votre projet. @@ -635,17 +556,6 @@ Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings. Veuillez spécifier le répertoire où vous voulez compiler votre projet. Qt Creator recommande de ne pas utiliser le répertoire source pour la compilation. Cela garantit que le répertoire source reste propre et permet des compilations multiples avec différents paramètres. - - Build directory: - Répertoire de compilation : - - - Build Location - Emplacement de compilation - - - - CMakeProjectManager::Internal::XmlFileUpToDatePage Qt Creator has found a recent cbp file, which Qt Creator will parse to gather information about the project. You can change the command line arguments used to create this file in the project mode. Click finish to load the project. Qt Creator a trouvé un fichier cbp récent, Qt Creator va maintenant l'analyser pour rassembler des informations sur le projet. Vous pouvez changer les arguments de ligne de commande utilisés pour la création de ce fichier depuis le mode "projet". Cliquer sur Terminer pour charger le projet. @@ -24246,7 +24156,7 @@ Valeur précédente au format décimal signé (gros-boutiste) : %4 - CMakeProjectManager::Internal::CMakeRunConfiguration + CMakeProjectManager Run CMake target Exécuter la cible CMake @@ -24259,18 +24169,6 @@ Valeur précédente au format décimal signé (gros-boutiste) : %4 (disabled) (désactivé) - - Clean Environment - Environnement de nettoyage - - - System Environment - Environnement système - - - Build Environment - Environnement de compilation - The executable is not built by the current build configuration L'exécutable n'est pas compilé pour la configuration de compilation courante @@ -24283,17 +24181,11 @@ Valeur précédente au format décimal signé (gros-boutiste) : %4 (disabled) (Désactivé) - - - CMakeProjectManager::Internal::CMakeTarget Desktop CMake Default target display name Desktop - - - CMakeProjectManager::Internal::MakeStep Make CMakeProjectManager::MakeStep display name. @@ -24312,9 +24204,6 @@ Valeur précédente au format décimal signé (gros-boutiste) : %4 Configuration is faulty. Check the Issues view for details. La configuration est défectueuse, veuillez vérifier la vue des problèmes pour les détails. - - - CMakeProjectManager::Internal::MakeStepFactory Make Display name for CMakeProjectManager::MakeStep id. @@ -36858,11 +36747,7 @@ Voys pouvez compiler l'application et la déployer sur desktop et mobile. P - CMakeProjectManager::Internal::CMakeManager - - Run CMake - Exécuter CMake - + CMakeProjectManager Failed opening project '%1': Project is not a file Échec de l'ouverture du projet "%1" : le projet n'est pas un fichier @@ -38882,7 +38767,7 @@ Avec la simulation de cache, d'autres compteurs d'événements sont ac - CMakeProjectManager::Internal::CMakeEditor + CMakeProjectManager Changes to cmake files are shown in the project tree after building. Les changements aux fichiers CMake sont montrés dans l'arbre du projet après la compilation. @@ -45512,7 +45397,7 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e - CMakeProjectManager::Internal::CMakeLocatorFilter + CMakeProjectManager Build CMake target Compiler la cible CMake @@ -48641,7 +48526,7 @@ Oui :) - CMakeProjectManager::Internal::ChooseCMakePage + CMakeProjectManager cmake Executable: Exécutable CMake : @@ -48662,10 +48547,6 @@ Oui :) The cmake executable (%1) does not exist. L'exécutable CMake (%1) n'existe pas. - - The path %1 is not a executable. - %1 n'est pas le chemin d'un exécutable. - The path %1 is not a valid cmake. %1 n'est pas une installation valide de CMake. @@ -53501,7 +53382,7 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües. - CMakeProjectManager::Internal::GeneratorInfo + CMakeProjectManager Ninja (%1) Ninja (%1) @@ -53518,9 +53399,6 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües.Unix Generator (%1) Générateur UNIX (%1) - - - CMakeProjectManager::Internal::NoKitPage Show Options Afficher les options diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index 98cebebd327..52b30f02fc8 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -2076,7 +2076,7 @@ Međutim, korištenje opuštenih i proširenih pravila također znači da nije m - CMakeProjectManager::Internal::CMakeSpecificSettingForm + CMakeProjectManager Determines whether file paths are copied to the clipboard for pasting to the CMakeLists.txt file when you add new files to CMake projects. Određuje, da li se staze datoteke kopiraju u međuspremnik za lijepljenje u datoteku CMakeLists.txt, kad dodaješ nove datoteke CMake projektima. @@ -17689,7 +17689,7 @@ Izlaz: - CMakeProjectManager::Internal::BuildDirManager + CMakeProjectManager Failed to create build directory "%1". Neupjelo stvaranje direktorija za gradnju "%1". @@ -17734,16 +17734,10 @@ Izlaz: Apply Changes to Project Primijeni promjene u CMake - - - CMakeProjectManager::Internal::CMakeBuildConfiguration CMake configuration set by the kit was overridden in the project. CMake konfiguracija postavljena od kompleta je prepisana u ovom projektu. - - - CMakeProjectManager::Internal::CMakeBuildConfigurationFactory Default The name of the build configuration created by default for a cmake project. @@ -17769,13 +17763,6 @@ Izlaz: Release with Debug Information Izdaj s podacima o ispravkama - - - CMakeProjectManager::Internal::CMakeBuildSettingsWidget - - CMake - CMake - Build directory: Direktorij izgradnje: @@ -17868,9 +17855,6 @@ Izlaz: Force to %1 Prisili na %1 - - - CMakeProjectManager::Internal::CMakeBuildStep CMake Build Default display name for the cmake make step. @@ -17901,9 +17885,6 @@ Izlaz: Display name for CMakeProjectManager::CMakeBuildStep id. Gradnja - - - CMakeProjectManager::CMakeBuildStep The build configuration is currently disabled. Konfiguracija za gradnju je trenutačno onemogućena. @@ -17925,7 +17906,7 @@ Izlaz: - CMakeProjectManager::Internal::CMakeBuildStepConfigWidget + CMakeProjectManager Build CMakeProjectManager::CMakeBuildStepConfigWidget display name. @@ -17943,16 +17924,10 @@ Izlaz: <b>No build configuration found on this kit.</b> <b>U ovom kompletu nije nađena konfiguracija gradnje.</b> - - - CMakeProjectManager::CMakeConfigItem Failed to open %1 for reading. Neuspjelo otvaranje od %1 za čitanje. - - - CMakeProjectManager::Internal::CMakeKitConfigWidget CMake Tool CMake alat @@ -17965,9 +17940,6 @@ Izlaz: <No CMake Tool available> <Nema dostupnog CMake alata> - - - CMakeProjectManager::Internal::CMakeGeneratorKitConfigWidget Change... Promijeni … @@ -18008,13 +17980,6 @@ Izlaz: Toolset: Skup alata: - - - CMakeProjectManager::Internal::CMakeConfigurationKitConfigWidget - - Change... - Promijeni … - CMake Configuration CMake konfiguracija @@ -18031,17 +17996,10 @@ Izlaz: Enter one variable per line with the variable name separated from the variable value by "=".<br>You may provide a type hint by adding ":TYPE" before the "=". Upiši jednu varijablu po retku, a naziv varijable odvoji od vrijednosti varijable s "=". <br> Možeš navesti vrstu savjeta dodavanjem ": TYPE" prije "=". - - - CMakeProjectManager::CMakeKitInformation CMake version %1 is unsupported. Please update to version 3.0 or later. CMake verzija %1 nije podržana. Aktualiziraj na verziju 3.0 ili noviju. - - CMake - CMake - Unconfigured Nekonfigurirano @@ -18050,9 +18008,6 @@ Izlaz: Path to the cmake executable Staza do izvršne cmake - - - CMakeProjectManager::CMakeGeneratorKitInformation CMake Tool is unconfigured, CMake generator will be ignored. CMake alat nije konfiguriran, zanemarit će se CMake generator. @@ -18089,13 +18044,6 @@ Izlaz: Toolset: %1 Skup alata: %1 - - CMake Generator - CMake generator - - - - CMakeProjectManager::CMakeConfigurationKitInformation CMake configuration has no path to qmake binary set, even though the kit has a valid Qt version. @@ -18136,20 +18084,10 @@ Izlaz: CMake configuration has a path to a C++ compiler set that does not match the compiler path configured in the tool chain of the kit. - - CMake Configuration - CMake konfiguracija - - - - CMakeProjectManager::Internal::CMakeLocatorFilter Build CMake target Odredište za CMake gradnju - - - CMakeProjectManager::CMakeProject No cmake tool set. Nijedan cmake alat nije postavljen. @@ -18162,16 +18100,10 @@ Izlaz: Scan "%1" project tree Pretraži "%1" stablo projekta - - - CMakeProjectManager::Internal::CMakeEditorFactory CMake Editor CMake uređivač - - - CMakeProjectManager::Internal::CMakeManager Run CMake Pokreni CMake @@ -18221,30 +18153,20 @@ Kopirati stazu do izvornih datoteka u međuspremnik? - CMakeProjectManager::Internal::CMakeProjectPlugin + CMakeProjectManager CMake SnippetProvider CMake - - Build - Izgradi - Build "%1" Izgradi "%1" - - - CMakeProjectManager::Internal::CMakeRunConfiguration The project no longer builds the target associated with this run configuration. - - - CMakeProjectManager::CMakeSettingsPage (Default) (Zadano) @@ -18289,9 +18211,6 @@ Kopirati stazu do izvornih datoteka u međuspremnik? Path: Staza: - - - CMakeProjectManager::Internal::CMakeToolConfigWidget Add Dodaj @@ -18320,23 +18239,6 @@ Kopirati stazu do izvornih datoteka u međuspremnik? New CMake Novi CMake - - - CMakeProjectManager::Internal::CMakeSettingsPage - - CMake - CMake - - - - CMakeProjectManager::Internal::CMakeSpecificSettingsPage - - CMake - CMake - - - - CMakeProjectManager::CMakeToolManager CMake at %1 CMake pri %1 @@ -18345,17 +18247,6 @@ Kopirati stazu do izvornih datoteka u međuspremnik? System CMake at %1 CMake sustava pri %1 - - CMake - CMake - - - - CMakeProjectManager::ConfigModel - - Key - Ključ - Value Vrijednost @@ -18368,13 +18259,6 @@ Kopirati stazu do izvornih datoteka u međuspremnik? Current kit: %1 Trenutačni komplet: %1 - - <UNSET> - <NEPOSTAVLJENO> - - - - CMakeProjectManager Current CMake: %1 Trenutačni CMake: %1 @@ -18387,9 +18271,6 @@ Kopirati stazu do izvornih datoteka u međuspremnik? Value requested by kit: %1 Komplet zahtijeva vrijednost: %1 - - - CMakeProjectManager::ConfigModelItemDelegate Select a file for %1 Odaberi datoteku za %1 @@ -18398,9 +18279,6 @@ Kopirati stazu do izvornih datoteka u međuspremnik? Select a directory for %1 Odaberi direktorij za %1 - - - CMakeProjectManager::Internal::ServerMode Running "%1 %2" in %3. Pokretanje "%1 %2" u %3. @@ -18485,9 +18363,6 @@ Kopirati stazu do izvornih datoteka u međuspremnik? Received a signal in reply to a request. - - - CMakeProjectManager::Internal::ServerModeReader Parsing of CMake project failed: Connection to CMake server lost. Obrada CMake projekta neuspjela: Veza sa CMake poslužiteljem izgubljena. @@ -18544,21 +18419,10 @@ Kopirati stazu do izvornih datoteka u međuspremnik? <Headers> <Zaglavlja> - - - CMakeProjectManager::Internal::TeaLeafReader The build directory is not for %1 but for %2 Direktorij gradnje nije za %1, već za %2 - - Running "%1 %2" in %3. - Pokretanje "%1 %2" u %3. - - - Configuring "%1" - Konfiguriranje "%1" - *** cmake process crashed. *** cmake proces se urušio. diff --git a/share/qtcreator/translations/qtcreator_hu.ts b/share/qtcreator/translations/qtcreator_hu.ts index e419e12d835..5f485187fec 100644 --- a/share/qtcreator/translations/qtcreator_hu.ts +++ b/share/qtcreator/translations/qtcreator_hu.ts @@ -263,7 +263,7 @@ - CMakeProjectManager::Internal::0 + CMakeProjectManager Build Environment Fordítási környezet @@ -356,9 +356,6 @@ Qt Creator has found a recent cbp file, which Qt Creator will parse to gather information about the project. You can change the command line arguments used to create this file in the project mode. Click finish to load the project A Qt Creator megtalálta a legutolsó cbp fájlt, amelyet a Qt Creator elemzésre for használni, hogy információkat nyerhessen a projektről. Megváltoztathatja aparancssori argumentumokat, amelyeket új fájl létrehozására hoztak létre projekt módban. Kattintson a befejezés gombra a projekt betöltéséhez. - - - CMakeProjectManager::Internal::CMakeBuildConfigurationFactory Create Létrehozás @@ -371,9 +368,6 @@ New Configuration Name: Új konfiguráció név: - - - CMakeProjectManager::Internal::CMakeBuildEnvironmentWidget Clear system environment Rendszer környezet megtisztítása @@ -382,23 +376,14 @@ Build Environment Fordítási környezet - - - CMakeProjectManager::Internal::CMakeBuildSettingsWidget &Change &Váltotatás - - - CMakeProjectManager::Internal::CMakeOpenProjectWizard CMake Wizard CMake Varázsló - - - CMakeProjectManager::Internal::CMakeRunConfigurationWidget Arguments: Argumentumok: @@ -431,17 +416,10 @@ System Environment Rendszer környezet - - Build Environment - Fordítási környezet - Running executable: <b>%1</b> %2 - - - CMakeProjectManager::Internal::CMakeRunPage Please specify the path to the cmake executable. No cmake executable was found in the path. Kérem határozza meg a cmake futtatható fájl útvonalát. Nem található cmake futtatható fájl az útvonalon. @@ -502,9 +480,6 @@ No valid cmake executable specified. Nincsen érvényes, meghatározott cmake futtatható. - - - CMakeProjectManager::Internal::CMakeSettingsPage CMake CMake @@ -513,16 +488,10 @@ CMake executable CMake futtatható fájl - - - CMakeProjectManager::Internal::InSourceBuildPage Qt Creator has detected an <b>in-source-build in %1</b> which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project. A Qt Creator egy <b>beépített forrást észlelt a(z) %1-ben</b>, amely megelőzi az árnyék építéstől. A Qt Creator nem fogja engedélyezni Önnek, hogy megváltoztassa az építési könyvtárat. Ha árnyék építést szeretne végrehajtani, ürítse ki a forrás könyvtárat és nyissa meg újra a projektet. - - - CMakeProjectManager::Internal::MakeStepConfigWidget Additional arguments: További argumentumok: @@ -535,9 +504,6 @@ <b>Make:</b> %1 %2 <b>Make:</b> %1 %2 - - - CMakeProjectManager::Internal::ShadowBuildPage Please enter the directory in which you want to build your project. Kérem gépelje be a könyvtár nevét, amelybe a projektet szeretné felépíteni. diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts index dee6eca34ba..f675922862e 100644 --- a/share/qtcreator/translations/qtcreator_it.ts +++ b/share/qtcreator/translations/qtcreator_it.ts @@ -294,7 +294,7 @@ - CMakeProjectManager::Internal::CMakeBuildEnvironmentWidget + CMakeProjectManager Clear system environment @@ -303,9 +303,6 @@ Build Environment Ambiente di Compilazione - - - CMakeProjectManager::Internal::CMakeBuildConfigurationFactory Create @@ -318,23 +315,14 @@ New Configuration Name: Nome della Nuova Configurazione: - - - CMakeProjectManager::Internal::CMakeBuildSettingsWidget &Change &Cambia - - - CMakeProjectManager::Internal::CMakeOpenProjectWizard CMake Wizard Procedura Guidata di CMake - - - CMakeProjectManager::Internal::CMakeRunConfigurationWidget Arguments: Parametri: @@ -375,9 +363,6 @@ Running executable: <b>%1</b> %2 - - - CMakeProjectManager::Internal::InSourceBuildPage Qt Creator has detected an <b>in-source-build in %1</b> which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project. @@ -386,9 +371,6 @@ Qt Creator has detected an in-source-build which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project. Qt Creator ha rilevato che la compilazione avviene nella cartella dei file sorgenti e ciò impedisce la compilazione in cartelle separate. Qt Creator non permette di di cambiare la cartella di compilazione, perciò se vuoi una compilazione in cartella separata, pulisci la cartella dei file sorgenti e apri nuovamente il progetto. - - - CMakeProjectManager::Internal::CMakeRunPage Please specify the path to the cmake executable. No cmake executable was found in the path. @@ -449,9 +431,6 @@ No valid cmake executable specified. - - - CMakeProjectManager::Internal::CMakeSettingsPage CMake CMake @@ -460,9 +439,6 @@ CMake executable Eseguibile CMake - - - CMakeProjectManager::Internal::MakeStepConfigWidget Additional arguments: Parametri aggiuntivi: @@ -475,9 +451,6 @@ <b>Make:</b> %1 %2 - - - CMakeProjectManager::Internal::ShadowBuildPage Please enter the directory in which you want to build your project. Inserisci la cartella in cui vuoi compilare il tuo progetto. @@ -490,9 +463,6 @@ Build directory: Cartella di compilazione: - - - CMakeProjectManager::Internal::XmlFileUpToDatePage Qt Creator has found a recent cbp file, which Qt Creator will parse to gather information about the project. You can change the command line arguments used to create this file in the project mode. Click finish to load the project. Qt Creator ha rilevato un file cbp recente, e lo leggerà per ricavare informazioni sul progetto. Puoi cambiare i parametri usati per creare questo file nella modalità di progetto. Fai clic su fine per caricare il progetto. diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index fd8b41e44dc..aa9f96e65ba 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -13419,7 +13419,7 @@ in the system's browser for manual download. - CMakeProjectManager::Internal::CMakeBuildConfigurationFactory + CMakeProjectManager Default The name of the build configuration created by default for a cmake project. @@ -13445,16 +13445,10 @@ in the system's browser for manual download. Release with Debug Information デバッグ情報付きリリース - - - CMakeProjectManager::Internal::CMakeLocatorFilter Build CMake target CMake ターゲットをビルド - - - CMakeProjectManager::Internal::CMakeBuildSettingsWidget Build directory: ビルドディレクトリ: @@ -13607,9 +13601,6 @@ To unset a variable, use -U<variable>. CMake CMake - - - CMakeProjectManager::Internal::CMakeManager Run CMake CMake の実行 @@ -13622,10 +13613,6 @@ To unset a variable, use -U<variable>. Rescan Project プロジェクトを再スキャン - - Build - ビルド - Build File ファイルのビルド @@ -13646,16 +13633,6 @@ To unset a variable, use -U<variable>. Failed opening project "%1": Project is not a file プロジェクト "%1" が開けません: プロジェクトがファイルではありません - - - CMakeProjectManager::Internal::CMakeSettingsPage - - CMake - CMake - - - - CMakeProjectManager::Internal::CMakeRunConfiguration Run CMake kit CMake キットの実行 @@ -26770,7 +26747,7 @@ to project "%2". - CMakeProjectManager::Internal::CMakeTarget + CMakeProjectManager Desktop CMake Default target display name @@ -39167,7 +39144,7 @@ clang の実行ファイルを設定してください。 - CMakeProjectManager::Internal::BuildDirManager + CMakeProjectManager The build directory is not for %1 but for %2 このビルドディレクトリは %2 向けで %1 向けではありません @@ -39208,9 +39185,6 @@ clang の実行ファイルを設定してください。 Failed to open %1 for reading. 読み込み用に %1 を開くのに失敗しました。 - - - CMakeProjectManager::Internal::CMakeBuildStep Make Default display name for the cmake make step. @@ -39278,24 +39252,10 @@ clang の実行ファイルを設定してください。 Display name for CMakeProjectManager::CMakeBuildStep id. CMake ビルド - - - CMakeProjectManager::CMakeBuildStep Qt Creator needs a CMake Tool set up to build. Configure a CMake Tool in the kit options. ビルドする為には CMake ツールの設定が必要です。キットのオプションの CMake ツールを設定してください。 - - - CMakeProjectManager::Internal::CMakeBuildStepConfigWidget - - Tool arguments: - ツールの引数: - - - Targets: - ターゲット: - Build CMakeProjectManager::CMakeBuildStepConfigWidget display name. @@ -39305,17 +39265,11 @@ clang の実行ファイルを設定してください。 <b>No build configuration found on this kit.</b> <b>このキットからビルド設定が見つかりません。</b> - - - CMakeProjectManager::Internal::CMakeBuildStepFactory Build Display name for CMakeProjectManager::CMakeBuildStep id. ビルド - - - CMakeProjectManager::Internal::CMakeKitConfigWidget CMake Tool: CMake ツール: @@ -39328,9 +39282,6 @@ clang の実行ファイルを設定してください。 <No CMake Tool available> <CMake ツールが見つかりません> - - - CMakeProjectManager::Internal::CMakeGeneratorKitConfigWidget CMake Generator: CMake ジェネレータ: @@ -39343,9 +39294,6 @@ clang の実行ファイルを設定してください。 CMake generator defines how a project is built when using CMake.<br>This setting is ignored when using other build systems. CMake ジェネレータは CMake 使用時のプロジェクトビルド方法を定義します。<br>他のビルドシステム使用時には無視されます。 - - - CMakeProjectManager::Internal::CMakeConfigurationKitConfigWidget Change... 変更... @@ -39358,21 +39306,10 @@ clang の実行ファイルを設定してください。 Default configuration passed to CMake when setting up a project. プロジェクト設定時に既定の設定が CMake に渡されます。 - - Edit CMake Configuration - CMake 設定の編集 - Enter one variable per line with the variable name separated from the variable value by "=".<br>You may provide a type hint by adding ":TYPE" before the "=". 一行に付き一つの変数をその名と値を "=" で繋ぐ形式で入力してください。<br>"=" の前に ":TYPE" 形式で型のヒントを指定できます。 - - - CMakeProjectManager::CMakeKitInformation - - CMake - CMake - Unconfigured 未設定 @@ -39381,9 +39318,6 @@ clang の実行ファイルを設定してください。 Path to the cmake executable cmake 実行ファイルへのパス - - - CMakeProjectManager::CMakeGeneratorKitInformation CMake Tool is unconfigured, CMake generator will be ignored. CMake ツールが設定されていないため、CMake ジェネレータは無視されます。 @@ -39400,13 +39334,6 @@ clang の実行ファイルを設定してください。 CMake Generator CMake ジェネレータ - - <Use Default Generator> - <既定のジェネレータを使用> - - - - CMakeProjectManager::CMakeConfigurationKitInformation CMake configuration has no path to qmake binary set, even though the kit has a valid Qt version. キットに有効な Qt が存在するにもかかわらず、CMake の設定に qmake へのパスが見つかりません。 @@ -39431,13 +39358,6 @@ clang の実行ファイルを設定してください。 CMake configuration has a path to a C++ compiler set, that does not match up with the compiler path configured in the tool chain of the kit. CMake の設定で指定されている C++ コンパイラのパスがキットのツールチェインのパスとは異なります。 - - CMake Configuration - CMake 設定 - - - - CMakeProjectManager::CMakeProject No cmake tool set. CMake ツールが見つかりません。 @@ -39446,9 +39366,6 @@ clang の実行ファイルを設定してください。 No compilers set in kit. キットにコンパイラが設定されていません。 - - - CMakeProjectManager::CMakeSettingsPage yes はい @@ -39489,9 +39406,6 @@ clang の実行ファイルを設定してください。 Help file: ヘルプファイル: - - - CMakeProjectManager::Internal::CMakeToolConfigWidget Add 追加 @@ -39520,13 +39434,6 @@ clang の実行ファイルを設定してください。 New CMake 新しい CMake - - CMake - CMake - - - - CMakeProjectManager::CMakeToolManager CMake at %1 CMake(パス: %1) @@ -39535,21 +39442,10 @@ clang の実行ファイルを設定してください。 System CMake at %1 システムの CMake(パス: %1) - - CMake - CMake - - - - CMakeProjectManager::ConfigModel (ADVANCED) (拡張) - - <UNSET> - <未定義> - Setting 設定 @@ -39558,10 +39454,6 @@ clang の実行ファイルを設定してください。 Value 値 - - Advanced - 拡張 - Core::BaseFileWizard @@ -45590,22 +45482,11 @@ Output: - CMakeProjectManager::Internal::CMakeBuildConfiguration + CMakeProjectManager CMake configuration set by the kit was overridden in the project. キットで設定された CMake 設定はプロジェクトで上書きされました。 - - Minimum Size Release - 最小サイズリリース - - - Release with Debug Information - デバッグ情報付きリリース - - - - CMakeProjectManager::Internal::CMakeEditorFactory CMake Editor CMake エディタ @@ -49669,7 +49550,7 @@ Output: - CMakeProjectManager::CMakeBuildConfiguration + CMakeProjectManager Changing Build Directory ビルドディレクトリの変更 @@ -49686,144 +49567,6 @@ Output: The CMake flag for the provisioning profile プロビジョニングプロファイルの CMake フラグ - - Minimum Size Release - 最小サイズリリース - - - Release with Debug Information - デバッグ情報付きリリース - - - - CMakeProjectManager::CMakeConfigItem - - Failed to open %1 for reading. - 読み込み用に %1 を開くのに失敗しました。 - - - - CMakeProjectManager::Internal::CMakeKitAspect - - <No CMake Tool available> - <CMake ツールが見つかりません> - - - - CMakeProjectManager::CMakeKitAspect - - The CMake Tool to use when building a project with CMake.<br>This setting is ignored when using other build systems. - CMake ツールはプロジェクトを CMake でビルドする際に使用します。<br>他のビルドシステム使用時には無視されます。 - - - CMake - CMake - - - Unconfigured - 未設定 - - - Path to the cmake executable - cmake 実行ファイルへのパス - - - - CMakeProjectManager::Internal::CMakeGeneratorKitAspect - - Change... - 変更... - - - CMake Generator - CMake ジェネレータ - - - - CMakeProjectManager::CMakeGeneratorKitAspect - - CMake generator defines how a project is built when using CMake.<br>This setting is ignored when using other build systems. - CMake ジェネレータは CMake 使用時のプロジェクトビルド方法を定義します。<br>他のビルドシステム使用時には無視されます。 - - - CMake Tool is unconfigured, CMake generator will be ignored. - CMake ツールが設定されていないため、CMake ジェネレータは無視されます。 - - - CMake Tool does not support the configured generator. - CMake ツールがジェネレータに対応していません。 - - - <Use Default Generator> - <既定のジェネレータを使用> - - - CMake Generator - CMake ジェネレータ - - - - CMakeProjectManager::Internal::CMakeConfigurationKitAspect - - Change... - 変更... - - - Edit CMake Configuration - CMake 設定の編集 - - - Enter one variable per line with the variable name separated from the variable value by "=".<br>You may provide a type hint by adding ":TYPE" before the "=". - 一行に付き一つの変数をその名と値を "=" で繋ぐ形式で入力してください。<br>"=" の前に ":TYPE" 形式で型のヒントを指定できます。 - - - - CMakeProjectManager::CMakeConfigurationKitAspect - - CMake Configuration - CMake 設定 - - - Default configuration passed to CMake when setting up a project. - プロジェクト設定時に既定の設定が CMake に渡されます。 - - - CMake configuration has no path to qmake binary set, even though the kit has a valid Qt version. - キットに有効な Qt が存在するにもかかわらず、CMake の設定に qmake へのパスが見つかりません。 - - - CMake configuration has a path to a qmake binary set, even though the kit has no valid Qt version. - キットに有効な Qt が存在しないにもかかわらず、CMake の設定に qmake へのパスが存在します。 - - - CMake configuration has no path to a C++ compiler set, even though the kit has a valid tool chain. - キットに有効なツールチェインが存在するにもかかわらず、CMake の設定に C++ コンパイラへのパスが見つかりません。 - - - CMake configuration has a path to a C++ compiler set, even though the kit has no valid tool chain. - キットに有効なツールチェインが存在しないにもかかわらず、CMake の設定に C++ コンパイラへのパスが存在します。 - - - - CMakeProjectManager::Internal::BuildCMakeTargetLocatorFilter - - Build CMake target - CMake ターゲットをビルド - - - - CMakeProjectManager::Internal::CMakeProcess - - Configuring "%1" - "%1" の設定中 - - - - CMakeProjectManager::Internal::CMakeProjectPlugin - - Build - ビルド - Build "%1" "%1" のビルド @@ -49834,13 +49577,6 @@ Output: CMake - - CMakeProjectManager::Internal::CMakeSpecificSettingWidget - - CMake - CMake - - ConanPackageManager::Internal::ConanInstallStep diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 841ccc239bd..a61f64966f7 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -2072,7 +2072,7 @@ Przyczyna: %3 - CMakeProjectManager::Internal::CMakeBuildSettingsWidget + CMakeProjectManager Build directory: Katalog wersji: @@ -2126,13 +2126,6 @@ Przyczyna: %3 CMake - - CMakeProjectManager::Internal::CMakeSettingsPage - - CMake - CMake - - Core::BaseFileWizard @@ -10867,7 +10860,7 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM - CMakeProjectManager::Internal::CMakeRunConfiguration + CMakeProjectManager Run CMake kit Uruchom zestaw CMake @@ -10880,9 +10873,6 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM The executable is not built by the current build configuration Plik wykonywalny nie został zbudowany przez bieżącą konfigurację budowania - - - CMakeProjectManager::Internal::CMakeTarget Desktop CMake Default target display name @@ -14931,7 +14921,7 @@ Local pulls are not applied to the master branch. - CMakeProjectManager::Internal::CMakeManager + CMakeProjectManager Run CMake Uruchom CMake @@ -21446,7 +21436,7 @@ Wersje Qt można dodać w: Opcje > Budowanie i uruchamianie > Wersje Qt. - CMakeProjectManager::Internal::CMakeLocatorFilter + CMakeProjectManager Build CMake target Zbudowanie programu CMake'owego @@ -34216,7 +34206,7 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan - CMakeProjectManager::Internal::CMakeKitConfigWidget + CMakeProjectManager CMake Tool: Narzędzie CMake: @@ -34229,17 +34219,10 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan <No CMake Tool available> <Brak narzędzia CMake> - - - CMakeProjectManager::CMakeKitInformation CMake version %1 is unsupported. Please update to version 3.0 or later. Wersja CMake %1 nie jest obsługiwana. Należy zainstalować wersję 3.0 lub nowszą. - - CMake - CMake - Unconfigured Nieskonfigurowane @@ -34248,9 +34231,6 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan Path to the cmake executable Ścieżka do pliku wykonywalnego cmake - - - CMakeProjectManager::CMakeSettingsPage (Default) what default??? @@ -34288,9 +34268,6 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan Path: Ścieżka: - - - CMakeProjectManager::Internal::CMakeToolConfigWidget Add Dodaj @@ -34319,9 +34296,6 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan New CMake Nowy CMake - - - CMakeProjectManager::CMakeToolManager CMake at %1 CMake w %1 @@ -36359,7 +36333,7 @@ itself takes time. - CMakeProjectManager::CMakeProject + CMakeProjectManager No cmake tool set. Nie ustawiono narzędzia cmake. @@ -37739,7 +37713,7 @@ Ustaw prawdziwy plik wykonywalny Clang. - CMakeProjectManager::Internal::BuildDirManager + CMakeProjectManager Failed to create temporary directory "%1". Nie można utworzyć katalogu tymczasowego "%1". @@ -37772,16 +37746,10 @@ Ustaw prawdziwy plik wykonywalny Clang. Apply Changes to Project Zastosuj zmiany w projekcie - - - CMakeProjectManager::Internal::CMakeBuildConfiguration CMake configuration set by the kit was overridden in the project. Konfiguracja CMake, ustawiona przez zestaw narzędzi, została nadpisana przez projekt. - - - CMakeProjectManager::Internal::CMakeBuildStep CMake Build Default display name for the cmake make step. @@ -37809,16 +37777,10 @@ Ustaw prawdziwy plik wykonywalny Clang. Błąd parsowania QMake: %1 - - - CMakeProjectManager::CMakeBuildStep The build configuration is currently disabled. Konfiguracja budowania aktualnie wyłączona. - - - CMakeProjectManager::Internal::CMakeBuildStepConfigWidget Tool arguments: Argumenty narzędzia: @@ -37836,17 +37798,11 @@ Ustaw prawdziwy plik wykonywalny Clang. <b>No build configuration found on this kit.</b> <b>Brak konfiguracji budowania dla tego zestawu narzędzi.</b> - - - CMakeProjectManager::Internal::CMakeBuildStepFactory Build Display name for CMakeProjectManager::CMakeBuildStep id. Budowanie - - - CMakeProjectManager::Internal::CMakeGeneratorKitConfigWidget Change... Zmień... @@ -37887,13 +37843,6 @@ Ustaw prawdziwy plik wykonywalny Clang. Toolset: Zestaw narzędzi: - - - CMakeProjectManager::Internal::CMakeConfigurationKitConfigWidget - - Change... - Zmień... - CMake Configuration Konfiguracja CMake @@ -37910,9 +37859,6 @@ Ustaw prawdziwy plik wykonywalny Clang. Enter one variable per line with the variable name separated from the variable value by "=".<br>You may provide a type hint by adding ":TYPE" before the "=". W każdej linii podaj jedną zmienną. Nazwa zmiennej powinna być oddzielona od wartości zmiennej przy użyciu "=".<br>Informacje o typie można dodać poprzez umieszczenie ":TYP" przed "=". - - - CMakeProjectManager::CMakeGeneratorKitInformation CMake Tool is unconfigured, CMake generator will be ignored. Narzędzie CMake nie jest skonfigurowane. Generator CMake zostanie zignorowany. @@ -37945,17 +37891,10 @@ Ustaw prawdziwy plik wykonywalny Clang. <br>Toolset: %1 <br>Zestaw narzędzi: %1 - - CMake Generator - Generator CMake - <Use Default Generator> <Użyj domyślnego generatora> - - - CMakeProjectManager::CMakeConfigurationKitInformation CMake configuration has no path to qmake binary set, even though the kit has a valid Qt version. Brak ścieżki do pliku wykonywalnego qmake w konfiguracji CMake, mimo że zestaw narzędzi posiada poprawną wersję Qt. @@ -37996,17 +37935,6 @@ Ustaw prawdziwy plik wykonywalny Clang. CMake configuration has a path to a C++ compiler set, even though the kit has no valid tool chain. Konfiguracja CMake posiada ustawioną ścieżkę do kompilatora C++, mimo że zestaw narzędzi nie posiada poprawnej ścieżki. - - CMake Configuration - Konfiguracja CMake - - - - CMakeProjectManager::ConfigModel - - <UNSET> - <USUNIĘTO> - Kit value: %1 Wartość zestawu narzędzi: %1 @@ -38019,10 +37947,6 @@ Ustaw prawdziwy plik wykonywalny Clang. Value Wartość - - Advanced - Zaawansowane - Core::Internal::ThemeChooser @@ -39127,7 +39051,7 @@ Komunikat: - CMakeProjectManager::Internal::CMakeEditorFactory + CMakeProjectManager CMake Editor Edytor CMake @@ -41834,7 +41758,7 @@ Błąd: %2 - CMakeProjectManager::CMakeConfigItem + CMakeProjectManager Failed to open %1 for reading. Błąd otwierania %1 do odczytu. @@ -41863,7 +41787,7 @@ Błąd: %2 - CMakeProjectManager::Internal::CMakeProjectPlugin + CMakeProjectManager CMake SnippetProvider @@ -41877,9 +41801,6 @@ Błąd: %2 Build "%1" Zbuduj "%1" - - - CMakeProjectManager Current CMake: %1 Bieżący CMake: %1 @@ -41888,9 +41809,6 @@ Błąd: %2 Not in CMakeCache.txt Brak w CMakeCache.txt - - - CMakeProjectManager::Internal::ServerMode Running "%1 %2" in %3. Uruchamianie "%1 %2" w %3. @@ -41975,9 +41893,6 @@ Błąd: %2 Received a signal in reply to a request. Otrzymano sygnał w odpowiedzi na żądanie. - - - CMakeProjectManager::Internal::ServerModeReader Configuring "%1" Konfiguracja "%1" @@ -42010,21 +41925,10 @@ Błąd: %2 <Headers> <Nagłówki> - - - CMakeProjectManager::Internal::TeaLeafReader The build directory is not for %1 but for %2 Katalog budowania nie jest przeznaczony dla %1, lecz dla %2 - - Running "%1 %2" in %3. - Uruchamianie "%1 %2" w %3. - - - Configuring "%1" - Konfiguracja "%1" - *** cmake process crashed. *** Proces cmake przerwał pracę. diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 16826e3a9b0..b7f138be074 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -6074,16 +6074,10 @@ For example, "Revision: 15" will leave the branch at revision 15.Value requested by kit: %1 Запрошенное комплектом значение: %1 - - - CMakeProjectManager::CMakeConfigItem Failed to open %1 for reading. Не удалось открыть %1 для чтения. - - - CMakeProjectManager::CMakeConfigurationKitAspect CMake Configuration Конфигурация CMake @@ -6132,9 +6126,6 @@ For example, "Revision: 15" will leave the branch at revision 15.CMake configuration has a path to a C++ compiler set that does not match the compiler path configured in the tool chain of the kit. В конфигурации CMake указан путь к компилятору С++, но он не совпадает с заданным в инструментарии комплекта. - - - CMakeProjectManager::CMakeGeneratorKitAspect CMake generator Генератор CMake @@ -6183,9 +6174,6 @@ For example, "Revision: 15" will leave the branch at revision 15.CMake Generator Генератор CMake - - - CMakeProjectManager::CMakeKitAspect CMake Tool Программа CMake @@ -6210,9 +6198,6 @@ For example, "Revision: 15" will leave the branch at revision 15.Path to the cmake executable Путь к программе cmake - - - CMakeProjectManager::CMakeProject No cmake tool set. Программа cmake не указана. @@ -6221,9 +6206,6 @@ For example, "Revision: 15" will leave the branch at revision 15.No compilers set in kit. У комплекта не заданы компиляторы. - - - CMakeProjectManager::CMakeSettingsPage Version: %1<br>Supports fileApi: %2 Версия: %1<br>Поддерживается fileApi: %2 @@ -6288,20 +6270,10 @@ For example, "Revision: 15" will leave the branch at revision 15.Help file: Файл справки: - - - CMakeProjectManager::CMakeToolManager System CMake at %1 Системная CMake в %1 - - CMake - CMake - - - - CMakeProjectManager::ConfigModel Key Ключ @@ -6322,9 +6294,6 @@ For example, "Revision: 15" will leave the branch at revision 15.Value Значение - - - CMakeProjectManager::ConfigModelItemDelegate Select a file for %1 Выберите файл для %1 @@ -6333,9 +6302,6 @@ For example, "Revision: 15" will leave the branch at revision 15.Select a directory for %1 Выберите каталог для %1 - - - CMakeProjectManager::Internal Failed to set up CMake file API support. Qt Creator cannot extract project information. Не удалось настроить поддержку API файла CMake. Qt Creator не может извлечь информацию о проекте. @@ -6408,16 +6374,10 @@ For example, "Revision: 15" will leave the branch at revision 15.Invalid target file generated by CMake: Broken indexes in target details. CMake создал неверный цели файл: повреждены индексы в деталях цели. - - - CMakeProjectManager::Internal::BuildCMakeTargetLocatorFilter Build CMake target Собрать цель CMake - - - CMakeProjectManager::Internal::CMakeBuildConfiguration Changing Build Directory Изменение каталога сборки @@ -6434,9 +6394,6 @@ For example, "Revision: 15" will leave the branch at revision 15.Release with Debug Information Выпуск с отладочной информацией - - - CMakeProjectManager::Internal::CMakeBuildSettingsWidget Filter Фильтр @@ -6497,10 +6454,6 @@ For example, "Revision: 15" will leave the branch at revision 15.Apply Configuration Changes Применить изменения - - <UNSET> - <не задано> - bool display string for cmake type BOOLEAN @@ -6526,13 +6479,6 @@ For example, "Revision: 15" will leave the branch at revision 15.Принудительно булевый/файл/каталог/строка Принудительно %1 - - CMake - CMake - - - - CMakeProjectManager::Internal::CMakeBuildStep CMake Build Default display name for the cmake make step. @@ -6567,9 +6513,6 @@ For example, "Revision: 15" will leave the branch at revision 15.Display name for CMakeProjectManager::CMakeBuildStep id. Сборка - - - CMakeProjectManager::Internal::CMakeBuildStepConfigWidget CMake arguments: Параметры CMake: @@ -6587,9 +6530,6 @@ For example, "Revision: 15" will leave the branch at revision 15.CMakeProjectManager::CMakeBuildStepConfigWidget display name. Сборка - - - CMakeProjectManager::Internal::CMakeBuildSystem Scan "%1" project tree Сканирование дерева проекта «%1» @@ -6618,9 +6558,6 @@ For example, "Revision: 15" will leave the branch at revision 15.CMakeCache.txt file not found. Не удалось найти файл CMakeCache.txt. - - - CMakeProjectManager::Internal::CMakeConfigurationKitAspect Change... Изменить... @@ -6633,13 +6570,6 @@ For example, "Revision: 15" will leave the branch at revision 15.Enter one variable per line with the variable name separated from the variable value by "=".<br>You may provide a type hint by adding ":TYPE" before the "=". Задавайте значения переменных по одной в строке, отделяя значение от имени символом "=".<br>Можно указывать тип, добавляя «:ТИП» перед "=".<br>Например: CMAKE_BUILD_TYPE:STRING=DebWithRelInfo. - - - CMakeProjectManager::Internal::CMakeGeneratorKitAspect - - Change... - Изменить... - %1 - %2, Platform: %3, Toolset: %4 %1 - %2, Платформа: %3, Инструментарий: %4 @@ -6648,10 +6578,6 @@ For example, "Revision: 15" will leave the branch at revision 15.<none> <нет> - - CMake Generator - Генератор CMake - Generator: Генератор: @@ -6668,16 +6594,10 @@ For example, "Revision: 15" will leave the branch at revision 15.Toolset: Инструментарий: - - - CMakeProjectManager::Internal::CMakeKitAspect <No CMake Tool available> <Программа CMake недоступна> - - - CMakeProjectManager::Internal::CMakeManager Run CMake Запустить CMake @@ -6730,9 +6650,6 @@ For example, "Revision: 15" will leave the branch at revision 15.Build File is not supported for generator "%1" Операция «Собрать файл» не поддерживается генератором «%1» - - - CMakeProjectManager::Internal::CMakeProcess Running %1 in %2. Работа %1 на %2. @@ -6753,25 +6670,15 @@ For example, "Revision: 15" will leave the branch at revision 15.CMake process exited with exit code %1. Процесс CMake завершился с кодом %1. - - - CMakeProjectManager::Internal::CMakeProjectPlugin CMake SnippetProvider CMake - - Build - Собрать - Build "%1" Собрать «%1» - - - CMakeProjectManager::Internal::CMakeSpecificSettingForm Determines whether file paths are copied to the clipboard for pasting to the CMakeLists.txt file when you add new files to CMake projects. Определяет, будут ли копироваться в буфер обмена пути файлов для вставки в файл CMakeLists.txt при добавлении их в проект CMake. @@ -6792,16 +6699,6 @@ For example, "Revision: 15" will leave the branch at revision 15.Copy file paths Копировать - - - CMakeProjectManager::Internal::CMakeSpecificSettingWidget - - CMake - CMake - - - - CMakeProjectManager::Internal::CMakeToolConfigWidget Add Добавить @@ -6830,13 +6727,6 @@ For example, "Revision: 15" will leave the branch at revision 15.New CMake Новый CMake - - CMake - CMake - - - - CMakeProjectManager::Internal::CMakeToolTreeItem CMake executable path does not exist. Не найден путь к программе CMake. @@ -6853,9 +6743,6 @@ For example, "Revision: 15" will leave the branch at revision 15.CMake executable does not provided required IDE integration features. Не указана программа CMake необходимая для среды разработки. - - - CMakeProjectManager::Internal::FileApi <Build Directory> <Каталог сборки> @@ -6864,38 +6751,18 @@ For example, "Revision: 15" will leave the branch at revision 15.<Other Locations> <Другие места> - - - CMakeProjectManager::Internal::FileApiReader Parsing has been canceled. Разбор был отменён. - - - CMakeProjectManager::Internal::InitialCMakeArgumentsAspect Initial CMake parameters: Начальные параметры CMake: - - - CMakeProjectManager::Internal::OpenCMakeTargetLocatorFilter Open CMake target Открыть цель CMake - - - CMakeProjectManager::Internal::ProjectTreeHelper - - <Build Directory> - <Каталог сборки> - - - <Other Locations> - <Другие места> - <Headers> <Заголовки> diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts index 425122542d9..e36ea3677b6 100644 --- a/share/qtcreator/translations/qtcreator_sl.ts +++ b/share/qtcreator/translations/qtcreator_sl.ts @@ -280,7 +280,7 @@ - CMakeProjectManager::Internal::CMakeBuildConfigurationFactory + CMakeProjectManager Build Zgradi @@ -301,9 +301,6 @@ New Configuration Name: Ime nove nastavitve: - - - CMakeProjectManager::Internal::CMakeBuildSettingsWidget Reconfigure project: Ponastavi projekt: @@ -312,16 +309,10 @@ &Change &Spremeni - - - CMakeProjectManager::Internal::CMakeOpenProjectWizard CMake Wizard Čarovnik za CMake - - - CMakeProjectManager::Internal::InSourceBuildPage Qt Creator has detected an <b>in-source-build in %1</b> which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project. Qt Creator je zaznal <b>gradnjo znotraj mape %1 z izvorno kodo</b>, kar preprečuje gradnje izven te mape, zato vam Qt Creator ne bo dovolil spremeniti mape za gradnjo. Če želite gradnjo v ločeni mapi, počistite mapo z izvorno kodo in projekt odprite znova. @@ -330,9 +321,6 @@ Build Location Mesto gradnje - - - CMakeProjectManager::Internal::CMakeRunPage Please specify the path to the cmake executable. No cmake executable was found in the path. Določite pot do programa cmake. Programa cmak ni bilo moč najti v poti. @@ -437,9 +425,6 @@ MinGW Generator Ustvarjalnik za MinGW - - - CMakeProjectManager::Internal::CMakeSettingsPage CMake CMake @@ -448,9 +433,6 @@ Executable: Program: - - - CMakeProjectManager::Internal::MakeStepConfigWidget Additional arguments: Dodatni argumenti: @@ -476,9 +458,6 @@ <b>Unknown Toolchain</b> <b>Neznana veriga orodij</b> - - - CMakeProjectManager::Internal::ShadowBuildPage Please enter the directory in which you want to build your project. Vnesite mapo, v kateri želite zgraditi svoj projekt. @@ -491,10 +470,6 @@ Build directory: Mapa za gradnjo: - - Build Location - Mesto gradnje - CPlusPlus::OverviewModel @@ -12206,11 +12181,7 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan - CMakeProjectManager::Internal::CMakeRunConfigurationWidget - - Arguments: - Argumenti: - + CMakeProjectManager Select Working Directory Izberite delovno mapo @@ -13598,23 +13569,11 @@ Razlog: %2 - CMakeProjectManager::Internal::CMakeRunConfiguration + CMakeProjectManager Run CMake target Zaženi cilj CMake - - Clean Environment - Čisto okolje - - - System Environment - Sistemsko okolje - - - Build Environment - Okolje za gradnjo - The executable is not built by the current buildconfiguration Izvršljiva datoteka ni zgrajena s trenutno nastavitvijo gradnje @@ -15613,15 +15572,12 @@ Desetiška predznačena vrednost (najprej veliki konec): %4 - CMakeProjectManager::Internal::CMakeTarget + CMakeProjectManager Desktop CMake Default target display name Namizje - - - CMakeProjectManager::Internal::MakeStep Make Default display name for the cmake make step. @@ -15633,9 +15589,6 @@ Desetiška predznačena vrednost (najprej veliki konec): %4 CMakeProjectManager::MakeStep display name. Make - - - CMakeProjectManager::Internal::MakeStepFactory Make Display name for CMakeProjectManager::MakeStep id. @@ -22879,7 +22832,7 @@ Seznam za strežnik je: %2. - CMakeProjectManager::Internal::CMakeEditor + CMakeProjectManager Changes to cmake files are shown in the project tree after building. Spremembe datotek *.cmake so v drevesu projektov vidne po gradnji. @@ -22889,13 +22842,6 @@ Seznam za strežnik je: %2. Zgradi sedaj - - CMakeProjectManager::Internal::CMakeManager - - Run CMake - Zaženi CMake - - Core::Internal::ExternalToolModel diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index 8afbb857097..fdcd6b6d282 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -1047,7 +1047,7 @@ Local pulls are not applied to the master branch. - CMakeProjectManager::Internal::CMakeBuildConfigurationFactory + CMakeProjectManager Default The name of the build configuration created by default for a cmake project. @@ -1081,9 +1081,6 @@ Local pulls are not applied to the master branch. New configuration name: Назва нової конфігурації: - - - CMakeProjectManager::Internal::CMakeBuildSettingsWidget Run cmake Запустити cmake @@ -1124,20 +1121,6 @@ Local pulls are not applied to the master branch. CMake CMake - - - CMakeProjectManager::Internal::CMakeEditor - - Changes to cmake files are shown in the project tree after building. - Зміни у файлах cmake будуть відображені в дереві проекту після збірки. - - - Build now - Зібрати зараз - - - - CMakeProjectManager::Internal::CMakeManager Run CMake Запустити CMake @@ -1154,16 +1137,10 @@ Local pulls are not applied to the master branch. Failed opening project '%1': Project is not a file Збій відкриття проекту '%1': Проект не є файлом - - - CMakeProjectManager::Internal::CMakeOpenProjectWizard CMake Wizard Майстер CMake - - - CMakeProjectManager::Internal::CMakeRunConfiguration Run CMake kit Запустити комплект cmake @@ -1180,9 +1157,6 @@ Local pulls are not applied to the master branch. (disabled) (вимкнено) - - - CMakeProjectManager::Internal::CMakeRunConfigurationWidget Arguments: Аргументи: @@ -1211,17 +1185,6 @@ Local pulls are not applied to the master branch. Run in Terminal Запускати в терміналі - - - CMakeProjectManager::Internal::CMakeRunPage - - Run CMake - Запустити CMake - - - Arguments: - Аргументи: - Generator: Генератор: @@ -1290,13 +1253,6 @@ Local pulls are not applied to the master branch. CMake exited with errors. Please check CMake output. CMake завершився з помилками. Будь ласка, перевірте виведення CMake. - - - CMakeProjectManager::Internal::CMakeSettingsPage - - CMake - CMake - Executable: Виконуваний модуль: @@ -1305,9 +1261,6 @@ Local pulls are not applied to the master branch. Prefer Ninja generator (CMake 2.8.9 or higher required) Надавати перевагу генератору Ninja (необхідний CMake 2.8.9 або вище) - - - CMakeProjectManager::Internal::CMakeTarget Desktop CMake Default target display name @@ -1317,9 +1270,6 @@ Local pulls are not applied to the master branch. Desktop Стаціонарний комп'ютер - - - CMakeProjectManager::Internal::InSourceBuildPage Qt Creator has detected an <b>in-source-build in %1</b> which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project. Qt Creator знайшов <b>збірку в теці з кодом в%1</b>, яка заважає тіньовим збіркам. Qt Creator не дозволить вам змінити теку збірки. Якщо ви хочете тіньової збірки, то очистіть теку з кодом та перевідкрийте проект. @@ -1328,14 +1278,6 @@ Local pulls are not applied to the master branch. Build Location Розташування збірки - - - CMakeProjectManager::Internal::MakeStep - - Make - Default display name for the cmake make step. - Make - Qt Creator needs a compiler set up to build. Configure a compiler in the kit options. Qt Creator потребує компілятора для збірки. Сконфігуруйте компілятор в налаштуваннях комплекту. @@ -1344,9 +1286,6 @@ Local pulls are not applied to the master branch. Configuration is faulty. Check the Issues view for details. Конфігурація збійна. Перевірте вид "Проблеми" для деталей. - - - CMakeProjectManager::Internal::MakeStepConfigWidget Override command: Команда на заміну: @@ -1355,38 +1294,11 @@ Local pulls are not applied to the master branch. Additional arguments: Додаткові аргументи: - - Targets: - Цілі: - - - <b>No build configuration found on this kit.</b> - <b>Для цього комплекту відсутня конфігурація збірки.</b> - - - Make - CMakeProjectManager::MakeStepConfigWidget display name. - Make - - - Make - Make - - - - CMakeProjectManager::Internal::MakeStepFactory Make Display name for CMakeProjectManager::MakeStep id. Make - - Make - Make - - - - CMakeProjectManager::Internal::ShadowBuildPage Please enter the directory in which you want to build your project. Будь ласка, введіть теку, в якій ви хочете зібрати ваш проект. @@ -1399,14 +1311,6 @@ Local pulls are not applied to the master branch. Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings. Будь ласка, введіть теку, в якій ви хочете зібрати ваш проект. Qt Creator рекомендує не використовувати теку з кодом для збірки. Це гарантуватиме, що тека з кодом лишатиметься чистою, та дозволить здійснювати декілька збірок з різними налаштуваннями. - - Build directory: - Тека збірки: - - - Build Location - Розташування збірки - CPlusPlus::OverviewModel @@ -26701,7 +26605,7 @@ should a repository require SSH-authentication (see documentation on SSH and the - CMakeProjectManager::Internal::CMakeLocatorFilter + CMakeProjectManager Build CMake target Зібрати ціль CMake @@ -30259,7 +30163,7 @@ To add the Qt versions, select Options > Build & Run > Qt Versions. - CMakeProjectManager::Internal::ChooseCMakePage + CMakeProjectManager CMake Executable: Виконуваний модуль CMake: @@ -34123,7 +34027,7 @@ cannot be found in the path. - CMakeProjectManager::Internal::GeneratorInfo + CMakeProjectManager Ninja (%1) Ninja (%1) @@ -34140,9 +34044,6 @@ cannot be found in the path. Unix Generator (%1) Генератор для Unix (%1) - - - CMakeProjectManager::Internal::NoKitPage Show Options Показати опції @@ -48789,7 +48690,7 @@ Setting breakpoints by file name and line number may fail. - CMakeProjectManager::Internal::CMakeKitConfigWidget + CMakeProjectManager CMake Tool: Інструмент CMake: @@ -48802,20 +48703,10 @@ Setting breakpoints by file name and line number may fail. <No CMake Tool available> <Немає інструмента CMake> - - - CMakeProjectManager::CMakeKitInformation - - CMake - CMake - Unconfigured Не сконфігуровано - - - CMakeProjectManager::Internal::NoCMakePage Check CMake Tools Перевірити інструменти CMake @@ -48828,9 +48719,6 @@ Setting breakpoints by file name and line number may fail. Qt Creator has no CMake Tools that are required for CMake projects. Please configure at least one. В Qt Creator немає інструментів CMake, які необхідні для проектів CMake. Будь ласка, сконфігуруйте хоча б один. - - - CMakeProjectManager::CMakeSettingsPage (Default) (Типово) @@ -48859,9 +48747,6 @@ Setting breakpoints by file name and line number may fail. Path: Шлях: - - - CMakeProjectManager::Internal::CMakeToolConfigWidget Add Додати @@ -48886,10 +48771,6 @@ Setting breakpoints by file name and line number may fail. Set as the default CMake Tool to use when creating a new Kit, or no value is set. Встановити як типовий інструмент CMake для використання при створенні нових комлектів. - - Prefer Ninja generator (CMake 2.8.9 or higher required) - Надавати перевагу генератору Ninja (необхідний CMake 2.8.9 або вище) - Clone of %1 Клон %1 @@ -48898,9 +48779,6 @@ Setting breakpoints by file name and line number may fail. New CMake Новий CMake - - - CMakeProjectManager::CMakeToolManager CMake at %1 CMake в %1 @@ -50229,7 +50107,7 @@ the program. - CMakeProjectManager::CMakeProject + CMakeProjectManager Internal Error: No build configuration found in settings file. Внутрішня помилка: конфігурацію збірки не знайдено в файлі налаштувань. @@ -51680,7 +51558,7 @@ Please set a real Clang executable. - CMakeProjectManager::Internal::BuildDirManager + CMakeProjectManager The build directory is not for %1 Тека збірки не для %1 @@ -51705,9 +51583,6 @@ Please set a real Clang executable. Failed to open %1 for reading. Збій відкриття %1 для читання. - - - CMakeProjectManager::Internal::CMakeBuildStep Make Default display name for the cmake make step. @@ -51717,16 +51592,10 @@ Please set a real Clang executable. Persisting CMake state... Збереження стану CMake... - - - CMakeProjectManager::CMakeBuildStep Qt Creator needs a CMake Tool set up to build. Configure a CMake Tool in the kit options. Qt Creator потребує заданого засобу CMake для збірки. Налаштуйте засіб CMake в опціях комплекту. - - - CMakeProjectManager::Internal::CMakeBuildStepConfigWidget Tool arguments: Аргументи для засобу: @@ -51744,17 +51613,11 @@ Please set a real Clang executable. <b>No build configuration found on this kit.</b> <b>Для цього комплекту відсутня конфігурація збірки.</b> - - - CMakeProjectManager::Internal::CMakeBuildStepFactory Build Display name for CMakeProjectManager::CMakeBuildStep id. Збірка - - - CMakeProjectManager::Internal::CMakeGeneratorKitConfigWidget CMake Generator: Генератор CMake: @@ -51767,9 +51630,6 @@ Please set a real Clang executable. CMake generator defines how a project is built when using CMake.<br>This setting is ignored when using other build systems. Генератор CMake визначає, як проект буде збудовано за допомогою CMake.<br>Це налаштування ігнорується для інших систем збірки. - - - CMakeProjectManager::Internal::CMakeConfigurationKitConfigWidget Change... Змінити... @@ -51794,9 +51654,6 @@ Please set a real Clang executable. Enter one variable per line with the variable name separated from the variable value by "=".<br>You may provide a type hint by adding ":TYPE" before the "=". Введіть змінні, по одній на кожний рядок. Назва змінної має відділятись від значення символом "=".<br>Ви можете давати підказку типу, додаючи ":TYPE" перед "=". - - - CMakeProjectManager::CMakeGeneratorKitInformation No CMake Tool configured, CMake generator will be ignored. Засіб CMake не задано, генератор CMake буде зігноровано. @@ -51817,13 +51674,6 @@ Please set a real Clang executable. CMake Generator Генератор CMake - - <Use Default Generator> - <Типовий генератор> - - - - CMakeProjectManager::CMakeConfigurationKitInformation CMake configuration has no path to qmake binary set, even though the kit has a valid Qt version. Конфігурація CMake не має встановленого шляху до виконуваного модуля qmake, хоча комплект має правильну версію Qt. @@ -51848,13 +51698,6 @@ Please set a real Clang executable. CMake configuration has a path to a C++ compiler set, that does not match up with the compiler path configured in the tool chain of the kit. Конфігурація CMake має встановлений шлях до компілятора C++, який не збігається з шляхом до компілятора налаштованим в наборі інструментів комплекту. - - CMake Configuration - Конфігурація CMake - - - - CMakeProjectManager::ConfigModel <UNSET> <НЕ ЗАДАНО> @@ -51867,10 +51710,6 @@ Please set a real Clang executable. Value Значення - - Advanced - Додатково - Core::Internal::ThemeChooser diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index fb9bf277950..7e32dfa3128 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -313,18 +313,11 @@ - CMakeProjectManager::Internal::CMakeBuildEnvironmentWidget + CMakeProjectManager Clear system environment 清除系统环境变量 - - Build Environment - 构建时的环境变量 - - - - CMakeProjectManager::Internal::CMakeBuildConfigurationFactory Create 创建 @@ -349,9 +342,6 @@ New Configuration Name: 新配置名称: - - - CMakeProjectManager::Internal::CMakeBuildSettingsWidget Run cmake 执行cmake @@ -368,16 +358,10 @@ Build directory: 构建目录: - - - CMakeProjectManager::Internal::CMakeOpenProjectWizard CMake Wizard CMake 向导 - - - CMakeProjectManager::Internal::CMakeRunConfigurationWidget Arguments: 参数: @@ -434,9 +418,6 @@ Running executable: <b>%1</b> %2 运行的执行档: <b>%1</b> %2 - - - CMakeProjectManager::Internal::InSourceBuildPage Qt Creator has detected an <b>in-source-build in %1</b> which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project. Qt Creator在<b>%1</b>检测到一个<b>在源代码中的构建</b>，无法进行shadow build. Qt Creator将不允许您更改编译目录。如果您想要进行shadow build，请清理源码目录再重新打开此项目。 @@ -445,29 +426,6 @@ Build Location 构建路径 - - - CMakeProjectManager::Internal::CMakeRunPage - - Please specify the path to the cmake executable. No cmake executable was found in the path. - 请指定cmake可执行档的路径，在环境变量path中没有找到cmake执行档。 - - - The cmake executable (%1) does not exist. - cmake执行档 (%1) 不存在。 - - - The path %1 is not a executable. - 路径 (%1) 不是可执行程序。 - - - The path %1 is not a valid cmake. - 路径 (%1) 不是有效的cmake。 - - - Arguments: - 参数: - Generator: 创建器: @@ -564,9 +522,6 @@ No valid cmake executable specified. 没有指定有效的cmake执行档。 - - - CMakeProjectManager::Internal::CMakeSettingsPage CMake CMake @@ -579,9 +534,6 @@ CMake executable 可执行的cmake - - - CMakeProjectManager::Internal::MakeStepConfigWidget Additional arguments: 额外的参数: @@ -611,9 +563,6 @@ <b>Unknown Toolchain</b> <b>未知工具链</b> - - - CMakeProjectManager::Internal::ShadowBuildPage Please enter the directory in which you want to build your project. 请进入您想构建项目的目录。 @@ -622,14 +571,6 @@ Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings. 请进入您想构建项目的目录。Qt Creator 建议您不要使用源目录构建。这能确保源目录干净，并且可以针对不同设定多次构建。 - - Build directory: - 构建目录: - - - Build Location - 构建路径 - CPlusPlus::OverviewModel @@ -20033,31 +19974,15 @@ S60 emulator run configuration default display name, %1 is base pro-File name - CMakeProjectManager::Internal::CMakeRunConfiguration + CMakeProjectManager Run CMake target 执行 CMake 目标 - - Clean Environment - 清理时的环境变量 - - - System Environment - 系统环境变量 - - - Build Environment - 构建时的环境变量 - The executable is not built by the current build configuration 这个可执行档不是使用当前的构建配置构建出来的 - - The executable is not built by the current buildconfiguration - 这个可执行档不是使用当前的构建配置制作出来的 - (disabled) (禁用) @@ -22324,15 +22249,12 @@ Previous decimal signed value (big endian): %4 - CMakeProjectManager::Internal::CMakeTarget + CMakeProjectManager Desktop CMake Default target display name 桌面 - - - CMakeProjectManager::Internal::MakeStepFactory Make Display name for CMakeProjectManager::MakeStep id. @@ -27781,7 +27703,7 @@ Id必须以小写字母开头。 - CMakeProjectManager::Internal::MakeStep + CMakeProjectManager Make Default display name for the cmake make step. @@ -32171,17 +32093,6 @@ Specifies how backspace interacts with indentation. Bazaar 命令 - - CMakeProjectManager::Internal::CMakeManager - - Run cmake - 执行CMake - - - Run CMake - 执行CMake - - Core::Internal::ExternalToolModel @@ -36108,7 +36019,7 @@ With cache simulation, further event counters are enabled: - CMakeProjectManager::Internal::CMakeEditor + CMakeProjectManager Changes to cmake files are shown in the project tree after building. 构建之后在项目树中显示cmake文件的变化。 @@ -45200,14 +45111,11 @@ Please choose a valid package name for your application (e.g. "org.example. - CMakeProjectManager::Internal::CMakeLocatorFilter + CMakeProjectManager Build CMake target 构建 CMake 目标 - - - CMakeProjectManager::Internal::ChooseCMakePage Choose Cmake Executable 选择CMake 的执行档 diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index 46e26a465f2..5f51f6b37fd 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -192,7 +192,7 @@ - CMakeProjectManager::Internal::CMakeBuildConfigurationFactory + CMakeProjectManager Build 建置 @@ -205,9 +205,6 @@ New configuration name: 新設置名稱: - - - CMakeProjectManager::Internal::CMakeBuildSettingsWidget Run cmake 執行 cmake @@ -220,20 +217,10 @@ &Change 變更(&C) - - Build directory: - 建置目錄: - - - - CMakeProjectManager::Internal::CMakeOpenProjectWizard CMake Wizard CMake 精靈 - - - CMakeProjectManager::Internal::CMakeRunConfigurationWidget Arguments: 參數： @@ -274,9 +261,6 @@ Build Environment 建置環境變數 - - - CMakeProjectManager::Internal::InSourceBuildPage Qt Creator has detected an <b>in-source-build in %1</b> which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project. Qt Creator在<b>%1</b>中偵測到先前做過<b>直接在源碼中建置</b>，因此無法進行分離建置（shadow build）。Qt Creator將不會允許您變更建置目錄。如果你想要進行分離建置，請清除源碼中的編譯後再重新開啟此專案。 @@ -285,29 +269,6 @@ Build Location 建置路徑 - - - CMakeProjectManager::Internal::CMakeRunPage - - Please specify the path to the cmake executable. No cmake executable was found in the path. - 請指定 cmake 執行檔的路徑。在環境變數 path 中找不到 cmake 執行檔。 - - - The cmake executable (%1) does not exist. - cmake 執行檔 (%1) 不存在。 - - - The path %1 is not a executable. - 路徑 (%1) 不是可執行檔。 - - - The path %1 is not a valid cmake. - 路徑 (%1) 不是有效的 cmake。 - - - Arguments: - 參數： - Generator: 建立器: @@ -368,9 +329,6 @@ No valid cmake executable specified. 沒有指定有效的 cmake 執行檔。 - - - CMakeProjectManager::Internal::CMakeSettingsPage CMake CMake @@ -379,9 +337,6 @@ Executable: 執行檔: - - - CMakeProjectManager::Internal::MakeStepConfigWidget Additional arguments: 額外的參數： @@ -403,9 +358,6 @@ <b>Unknown tool chain</b> <b>未知的工具鍊</b> - - - CMakeProjectManager::Internal::ShadowBuildPage Please enter the directory in which you want to build your project. 請輸入您想建置專案的目錄。 @@ -414,14 +366,6 @@ Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings. 請輸入您想建置專案的目錄。Qt Creator 建議您不要直接用源碼的目錄來做建置。這樣可以保持源碼目錄的乾淨，並且可以讓您用不同的設定進行多個建置。 - - Build directory: - 建置目錄： - - - Build Location - 建置路徑 - CPlusPlus::OverviewModel @@ -12184,23 +12128,11 @@ Reason: %2 - CMakeProjectManager::Internal::CMakeRunConfiguration + CMakeProjectManager Run CMake target 執行 CMake 目標 - - Clean Environment - 清除環境變數 - - - System Environment - 系統環境變數 - - - Build Environment - 建置環境變數 - The executable is not built by the current build configuration 這個可執行檔不是使用目前的建置設置製作出來的 @@ -13086,15 +13018,12 @@ For qmlproject projects, use the importPaths property to add import paths. - CMakeProjectManager::Internal::CMakeTarget + CMakeProjectManager Desktop CMake Default target display name 桌面 - - - CMakeProjectManager::Internal::MakeStepFactory Make Display name for CMakeProjectManager::MakeStep id. @@ -16131,7 +16060,7 @@ Ids must begin with a lowercase letter. - CMakeProjectManager::Internal::MakeStep + CMakeProjectManager Make Default display name for the cmake make step. @@ -19249,11 +19178,7 @@ Local pulls are not applied to the master branch. - CMakeProjectManager::Internal::CMakeManager - - Run CMake - 執行 CMake - + CMakeProjectManager Core::Internal::ExternalToolModel @@ -22384,7 +22309,7 @@ With cache simulation, further event counters are enabled: - CMakeProjectManager::Internal::CMakeEditor + CMakeProjectManager Changes to cmake files are shown in the project tree after building. 建置之後在專案樹中顯示 cmake 檔的變化。 @@ -28460,7 +28385,7 @@ should a repository require SSH-authentication (see documentation on SSH and the - CMakeProjectManager::Internal::CMakeLocatorFilter + CMakeProjectManager Build CMake target 建置 CMake 目標 @@ -31259,7 +31184,7 @@ Please choose a valid package name for your application (e.g. "org.example. - CMakeProjectManager::Internal::ChooseCMakePage + CMakeProjectManager Choose Cmake Executable diff --git a/src/plugins/cmakeprojectmanager/builddirparameters.cpp b/src/plugins/cmakeprojectmanager/builddirparameters.cpp index a7aabf49fef..7ac614e06cd 100644 --- a/src/plugins/cmakeprojectmanager/builddirparameters.cpp +++ b/src/plugins/cmakeprojectmanager/builddirparameters.cpp @@ -18,8 +18,7 @@ using namespace ProjectExplorer; -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { BuildDirParameters::BuildDirParameters() = default; @@ -78,5 +77,4 @@ CMakeTool *BuildDirParameters::cmakeTool() const return CMakeToolManager::findById(cmakeToolId); } -} // namespace Internal -} // namespace CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/builddirparameters.h b/src/plugins/cmakeprojectmanager/builddirparameters.h index e32ec714c87..2326ee81f73 100644 --- a/src/plugins/cmakeprojectmanager/builddirparameters.h +++ b/src/plugins/cmakeprojectmanager/builddirparameters.h @@ -8,8 +8,7 @@ #include #include -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { class CMakeBuildSystem; @@ -37,5 +36,4 @@ public: QStringList additionalCMakeArguments; }; -} // namespace Internal -} // namespace CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/cmakeautocompleter.cpp b/src/plugins/cmakeprojectmanager/cmakeautocompleter.cpp index bc61fca405b..1b3d673b521 100644 --- a/src/plugins/cmakeprojectmanager/cmakeautocompleter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeautocompleter.cpp @@ -5,8 +5,7 @@ #include -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { CMakeAutoCompleter::CMakeAutoCompleter() { @@ -123,5 +122,4 @@ bool CMakeAutoCompleter::contextAllowsElectricCharacters(const QTextCursor &curs return !isInComment(cursor) && !isInString(cursor); } -} // namespace Internal -} // namespace CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/cmakeautocompleter.h b/src/plugins/cmakeprojectmanager/cmakeautocompleter.h index 75a1e517565..bbe4a91020a 100644 --- a/src/plugins/cmakeprojectmanager/cmakeautocompleter.h +++ b/src/plugins/cmakeprojectmanager/cmakeautocompleter.h @@ -7,8 +7,7 @@ #include -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { class CMAKE_EXPORT CMakeAutoCompleter : public TextEditor::AutoCompleter { @@ -27,5 +26,4 @@ public: bool contextAllowsElectricCharacters(const QTextCursor &cursor) const override; }; -} // namespace Internal -} // namespace CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index e746f2374f2..119a5c1d3f8 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -10,6 +10,7 @@ #include "cmakekitinformation.h" #include "cmakeproject.h" #include "cmakeprojectconstants.h" +#include "cmakeprojectmanagertr.h" #include "cmakeprojectplugin.h" #include "cmakespecificsettings.h" #include "configmodel.h" @@ -75,8 +76,8 @@ using namespace ProjectExplorer; using namespace Utils; -using namespace CMakeProjectManager::Internal; +using namespace CMakeProjectManager::Internal; namespace CMakeProjectManager { static Q_LOGGING_CATEGORY(cmakeBuildConfigurationLog, "qtc.cmake.bc", QtWarningMsg); @@ -96,8 +97,6 @@ namespace Internal { class CMakeBuildSettingsWidget : public NamedWidget { - Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::CMakeBuildSettingsWidget) - public: CMakeBuildSettingsWidget(CMakeBuildSystem *bc); @@ -165,7 +164,7 @@ static QModelIndex mapToSource(const QAbstractItemView *view, const QModelIndex } CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) : - NamedWidget(tr("CMake")), + NamedWidget(Tr::tr("CMake")), m_buildSystem(bs), m_configModel(new ConfigModel(this)), m_configFilterModel(new CategorySortFilterModel(this)), @@ -211,19 +210,19 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) : m_warningMessageLabel->setVisible(false); m_configurationStates = new QTabBar(this); - m_configurationStates->addTab(tr("Initial Configuration")); - m_configurationStates->addTab(tr("Current Configuration")); + m_configurationStates->addTab(Tr::tr("Initial Configuration")); + m_configurationStates->addTab(Tr::tr("Current Configuration")); connect(m_configurationStates, &QTabBar::currentChanged, this, [this](int index) { updateConfigurationStateIndex(index); }); - m_kitConfiguration = new QPushButton(tr("Kit Configuration")); - m_kitConfiguration->setToolTip(tr("Edit the current kit's CMake configuration.")); + m_kitConfiguration = new QPushButton(Tr::tr("Kit Configuration")); + m_kitConfiguration->setToolTip(Tr::tr("Edit the current kit's CMake configuration.")); m_kitConfiguration->setFixedWidth(m_kitConfiguration->sizeHint().width()); connect(m_kitConfiguration, &QPushButton::clicked, this, [this]() { kitCMakeConfiguration(); }); m_filterEdit = new FancyLineEdit; - m_filterEdit->setPlaceholderText(tr("Filter")); + m_filterEdit->setPlaceholderText(Tr::tr("Filter")); m_filterEdit->setFiltering(true); auto tree = new TreeView; connect(tree, &TreeView::activated, @@ -271,46 +270,46 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) : m_showProgressTimer.setInterval(50); // don't show progress for < 50ms tasks connect(&m_showProgressTimer, &QTimer::timeout, [this]() { m_progressIndicator->show(); }); - m_addButton = new QPushButton(tr("&Add")); - m_addButton->setToolTip(tr("Add a new configuration value.")); + m_addButton = new QPushButton(Tr::tr("&Add")); + m_addButton->setToolTip(Tr::tr("Add a new configuration value.")); auto addButtonMenu = new QMenu(this); - addButtonMenu->addAction(tr("&Boolean"))->setData( + addButtonMenu->addAction(Tr::tr("&Boolean"))->setData( QVariant::fromValue(static_cast(ConfigModel::DataItem::BOOLEAN))); - addButtonMenu->addAction(tr("&String"))->setData( + addButtonMenu->addAction(Tr::tr("&String"))->setData( QVariant::fromValue(static_cast(ConfigModel::DataItem::STRING))); - addButtonMenu->addAction(tr("&Directory"))->setData( + addButtonMenu->addAction(Tr::tr("&Directory"))->setData( QVariant::fromValue(static_cast(ConfigModel::DataItem::DIRECTORY))); - addButtonMenu->addAction(tr("&File"))->setData( + addButtonMenu->addAction(Tr::tr("&File"))->setData( QVariant::fromValue(static_cast(ConfigModel::DataItem::FILE))); m_addButton->setMenu(addButtonMenu); - m_editButton = new QPushButton(tr("&Edit")); - m_editButton->setToolTip(tr("Edit the current CMake configuration value.")); + m_editButton = new QPushButton(Tr::tr("&Edit")); + m_editButton->setToolTip(Tr::tr("Edit the current CMake configuration value.")); - m_setButton = new QPushButton(tr("&Set")); - m_setButton->setToolTip(tr("Set a value in the CMake configuration.")); + m_setButton = new QPushButton(Tr::tr("&Set")); + m_setButton->setToolTip(Tr::tr("Set a value in the CMake configuration.")); - m_unsetButton = new QPushButton(tr("&Unset")); - m_unsetButton->setToolTip(tr("Unset a value in the CMake configuration.")); + m_unsetButton = new QPushButton(Tr::tr("&Unset")); + m_unsetButton->setToolTip(Tr::tr("Unset a value in the CMake configuration.")); - m_resetButton = new QPushButton(tr("&Reset")); - m_resetButton->setToolTip(tr("Reset all unapplied changes.")); + m_resetButton = new QPushButton(Tr::tr("&Reset")); + m_resetButton->setToolTip(Tr::tr("Reset all unapplied changes.")); m_resetButton->setEnabled(false); - m_batchEditButton = new QPushButton(tr("Batch Edit...")); - m_batchEditButton->setToolTip(tr("Set or reset multiple values in the CMake configuration.")); + m_batchEditButton = new QPushButton(Tr::tr("Batch Edit...")); + m_batchEditButton->setToolTip(Tr::tr("Set or reset multiple values in the CMake configuration.")); - m_showAdvancedCheckBox = new QCheckBox(tr("Advanced")); + m_showAdvancedCheckBox = new QCheckBox(Tr::tr("Advanced")); connect(m_configView->selectionModel(), &QItemSelectionModel::selectionChanged, this, [this](const QItemSelection &, const QItemSelection &) { updateSelection(); }); - m_reconfigureButton = new QPushButton(tr("Run CMake")); + m_reconfigureButton = new QPushButton(Tr::tr("Run CMake")); m_reconfigureButton->setEnabled(false); - auto clearBox = new QCheckBox(tr("Clear system environment"), this); + auto clearBox = new QCheckBox(Tr::tr("Clear system environment"), this); clearBox->setChecked(cbc->useClearConfigureEnvironment()); auto envWidget = new EnvironmentWidget(this, EnvironmentWidget::TypeLocal, clearBox); @@ -479,14 +478,14 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) : connect(addButtonMenu, &QMenu::triggered, this, [this](QAction *action) { ConfigModel::DataItem::Type type = static_cast(action->data().value()); - QString value = tr(""); + QString value = Tr::tr(""); if (type == ConfigModel::DataItem::BOOLEAN) value = QString::fromLatin1("OFF"); - m_configModel->appendConfiguration(tr(""), value, type, isInitialConfiguration()); + m_configModel->appendConfiguration(Tr::tr(""), value, type, isInitialConfiguration()); const TreeItem *item = m_configModel->findNonRootItem([&value, type](TreeItem *item) { ConfigModel::DataItem dataItem = ConfigModel::dataItemFromIndex(item->index()); - return dataItem.key == tr("") && dataItem.type == type && dataItem.value == value; + return dataItem.key == Tr::tr("") && dataItem.type == type && dataItem.value == value; }); QModelIndex idx = m_configModel->indexForItem(item); idx = m_configTextFilterModel->mapFromSource(m_configFilterModel->mapFromSource(idx)); @@ -537,14 +536,14 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) : void CMakeBuildSettingsWidget::batchEditConfiguration() { auto dialog = new QDialog(this); - dialog->setWindowTitle(tr("Edit CMake Configuration")); + dialog->setWindowTitle(Tr::tr("Edit CMake Configuration")); dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->setModal(true); auto layout = new QVBoxLayout(dialog); auto editor = new QPlainTextEdit(dialog); auto label = new QLabel(dialog); - label->setText(tr("Enter one CMake variable per line.
" + label->setText(Tr::tr("Enter one CMake variable per line.
" "To set or change a variable, use -D<variable>:<type>=<value>.
" "<type> can have one of the following values: FILEPATH, PATH, BOOL, INTERNAL, or STRING.
" "To unset a variable, use -U<variable>.
")); @@ -598,9 +597,9 @@ void CMakeBuildSettingsWidget::reconfigureWithInitialParameters() if (!doNotAsk) { QDialogButtonBox::StandardButton reply = Utils::CheckableMessageBox::question( Core::ICore::dialogParent(), - tr("Re-configure with Initial Parameters"), - tr("Clear CMake configuration and configure with initial parameters?"), - tr("Do not ask again"), + Tr::tr("Re-configure with Initial Parameters"), + Tr::tr("Clear CMake configuration and configure with initial parameters?"), + Tr::tr("Do not ask again"), &doNotAsk, QDialogButtonBox::Yes | QDialogButtonBox::No, QDialogButtonBox::Yes); @@ -657,7 +656,7 @@ void CMakeBuildSettingsWidget::kitCMakeConfiguration() m_buildSystem->kit()->blockNotification(); auto dialog = new QDialog(this); - dialog->setWindowTitle(tr("Kit CMake Configuration")); + dialog->setWindowTitle(Tr::tr("Kit CMake Configuration")); dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->setModal(true); dialog->setSizeGripEnabled(true); @@ -708,7 +707,7 @@ void CMakeBuildSettingsWidget::updateConfigureDetailsWidgetsSummary( cmd.addArgs(configurationArguments); params.setCommandLine(cmd); - m_configureDetailsWidget->setSummaryText(params.summary(tr("Configure"))); + m_configureDetailsWidget->setSummaryText(params.summary(Tr::tr("Configure"))); m_configureDetailsWidget->setState(DetailsWidget::Expanded); } @@ -777,14 +776,14 @@ void CMakeBuildSettingsWidget::updateButtonState() // Update label and text boldness of the reconfigure button QFont reconfigureButtonFont = m_reconfigureButton->font(); if (isParsing) { - m_reconfigureButton->setText(tr("Stop CMake")); + m_reconfigureButton->setText(Tr::tr("Stop CMake")); reconfigureButtonFont.setBold(false); } else { m_reconfigureButton->setEnabled(true); if (isInitial) { - m_reconfigureButton->setText(tr("Re-configure with Initial Parameters")); + m_reconfigureButton->setText(Tr::tr("Re-configure with Initial Parameters")); } else { - m_reconfigureButton->setText(tr("Run CMake")); + m_reconfigureButton->setText(Tr::tr("Run CMake")); } reconfigureButtonFont.setBold(isInitial ? m_configModel->hasChanges(isInitial) : !configChanges.isEmpty()); @@ -998,21 +997,21 @@ QAction *CMakeBuildSettingsWidget::createForceAction(int type, const QModelIndex QString typeString; switch (type) { case ConfigModel::DataItem::BOOLEAN: - typeString = tr("bool", "display string for cmake type BOOLEAN"); + typeString = Tr::tr("bool", "display string for cmake type BOOLEAN"); break; case ConfigModel::DataItem::FILE: - typeString = tr("file", "display string for cmake type FILE"); + typeString = Tr::tr("file", "display string for cmake type FILE"); break; case ConfigModel::DataItem::DIRECTORY: - typeString = tr("directory", "display string for cmake type DIRECTORY"); + typeString = Tr::tr("directory", "display string for cmake type DIRECTORY"); break; case ConfigModel::DataItem::STRING: - typeString = tr("string", "display string for cmake type STRING"); + typeString = Tr::tr("string", "display string for cmake type STRING"); break; case ConfigModel::DataItem::UNKNOWN: return nullptr; } - QAction *forceAction = new QAction(tr("Force to %1").arg(typeString), nullptr); + QAction *forceAction = new QAction(Tr::tr("Force to %1").arg(typeString), nullptr); forceAction->setEnabled(m_configModel->canForceTo(idx, t)); connect(forceAction, &QAction::triggered, this, [this, idx, t]() { m_configModel->forceTo(idx, t); }); @@ -1033,7 +1032,7 @@ bool CMakeBuildSettingsWidget::eventFilter(QObject *target, QEvent *event) auto menu = new QMenu(this); connect(menu, &QMenu::triggered, menu, &QMenu::deleteLater); - auto help = new QAction(tr("Help"), this); + auto help = new QAction(Tr::tr("Help"), this); menu->addAction(help); connect(help, &QAction::triggered, this, [=] { const CMakeConfigItem item = ConfigModel::dataItemFromIndex(idx).toCMakeConfigItem(); @@ -1058,8 +1057,8 @@ bool CMakeBuildSettingsWidget::eventFilter(QObject *target, QEvent *event) menu->addSeparator(); auto applyKitOrInitialValue = new QAction(isInitialConfiguration() - ? tr("Apply Kit Value") - : tr("Apply Initial Configuration Value"), + ? Tr::tr("Apply Kit Value") + : Tr::tr("Apply Initial Configuration Value"), this); menu->addAction(applyKitOrInitialValue); connect(applyKitOrInitialValue, &QAction::triggered, this, [this] { @@ -1079,7 +1078,7 @@ bool CMakeBuildSettingsWidget::eventFilter(QObject *target, QEvent *event) menu->addSeparator(); - auto copy = new QAction(tr("Copy"), this); + auto copy = new QAction(Tr::tr("Copy"), this); menu->addAction(copy); connect(copy, &QAction::triggered, this, [this] { const QModelIndexList selectedIndexes = m_configView->selectionModel()->selectedIndexes(); @@ -1377,8 +1376,8 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id) if (QDir(oldDir).exists("CMakeCache.txt") && !QDir(newDir).exists("CMakeCache.txt")) { if (QMessageBox::information( Core::ICore::dialogParent(), - tr("Changing Build Directory"), - tr("Change the build directory to \"%1\" and start with a " + Tr::tr("Changing Build Directory"), + Tr::tr("Change the build directory to \"%1\" and start with a " "basic CMake configuration?") .arg(newDir), QMessageBox::Ok, @@ -1398,7 +1397,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id) additionalCMakeArgumentsAspect->setMacroExpanderProvider([this] { return macroExpander(); }); macroExpander()->registerVariable(DEVELOPMENT_TEAM_FLAG, - tr("The CMake flag for the development team"), + Tr::tr("The CMake flag for the development team"), [this] { const CMakeConfig flags = signingFlags(); if (!flags.isEmpty()) @@ -1406,7 +1405,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id) return QString(); }); macroExpander()->registerVariable(PROVISIONING_PROFILE_FLAG, - tr("The CMake flag for the provisioning profile"), + Tr::tr("The CMake flag for the provisioning profile"), [this] { const CMakeConfig flags = signingFlags(); if (flags.size() > 1 && !flags.at(1).isUnset) { @@ -1416,7 +1415,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id) }); macroExpander()->registerVariable(CMAKE_OSX_ARCHITECTURES_FLAG, - tr("The CMake flag for the architecture on macOS"), + Tr::tr("The CMake flag for the architecture on macOS"), [target] { if (HostOsInfo::isRunningUnderRosetta()) { if (auto *qt = QtSupport::QtKitAspect::qtVersion(target->kit())) { @@ -1430,7 +1429,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id) return QLatin1String(); }); macroExpander()->registerVariable(QT_QML_DEBUG_FLAG, - tr("The CMake flag for QML debugging, if enabled"), + Tr::tr("The CMake flag for QML debugging, if enabled"), [this] { if (aspect()->value() == TriState::Enabled) { @@ -1997,17 +1996,17 @@ BuildInfo CMakeBuildConfigurationFactory::createBuildInfo(BuildType buildType) break; case BuildTypeMinSizeRel: info.typeName = "MinSizeRel"; - info.displayName = CMakeBuildConfiguration::tr("Minimum Size Release"); + info.displayName = Tr::tr("Minimum Size Release"); info.buildType = BuildConfiguration::Release; break; case BuildTypeRelWithDebInfo: info.typeName = "RelWithDebInfo"; - info.displayName = CMakeBuildConfiguration::tr("Release with Debug Information"); + info.displayName = Tr::tr("Release with Debug Information"); info.buildType = BuildConfiguration::Profile; break; case BuildTypeProfile: { info.typeName = "Profile"; - info.displayName = CMakeBuildConfiguration::tr("Profile"); + info.displayName = Tr::tr("Profile"); info.buildType = BuildConfiguration::Profile; QVariantMap extraInfo; // override CMake build type, which defaults to info.typeName @@ -2125,9 +2124,9 @@ Environment CMakeBuildConfiguration::baseConfigureEnvironment() const QString CMakeBuildConfiguration::baseConfigureEnvironmentText() const { if (useClearConfigureEnvironment()) - return tr("Clean Environment"); + return Tr::tr("Clean Environment"); else - return tr("System Environment"); + return Tr::tr("System Environment"); } QString CMakeBuildSystem::cmakeBuildType() const @@ -2262,7 +2261,7 @@ void InitialCMakeArgumentsAspect::toMap(QVariantMap &map) const InitialCMakeArgumentsAspect::InitialCMakeArgumentsAspect() { setSettingsKey("CMake.Initial.Parameters"); - setLabelText(tr("Additional CMake options:")); + setLabelText(Tr::tr("Additional CMake options:")); setDisplayStyle(LineEditDisplay); } @@ -2273,7 +2272,7 @@ InitialCMakeArgumentsAspect::InitialCMakeArgumentsAspect() AdditionalCMakeOptionsAspect::AdditionalCMakeOptionsAspect() { setSettingsKey("CMake.Additional.Options"); - setLabelText(tr("Additional CMake options:")); + setLabelText(Tr::tr("Additional CMake options:")); setDisplayStyle(LineEditDisplay); } @@ -2292,7 +2291,7 @@ SourceDirectoryAspect::SourceDirectoryAspect() BuildTypeAspect::BuildTypeAspect() { setSettingsKey(CMAKE_BUILD_TYPE); - setLabelText(tr("Build type:")); + setLabelText(Tr::tr("Build type:")); setDisplayStyle(LineEditDisplay); setDefaultValue("Unknown"); } diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp index c9fcf2acf7c..1608a454d60 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp @@ -9,6 +9,7 @@ #include "cmakeparser.h" #include "cmakeproject.h" #include "cmakeprojectconstants.h" +#include "cmakeprojectmanagertr.h" #include "cmaketool.h" #include @@ -38,8 +39,7 @@ using namespace Core; using namespace ProjectExplorer; using namespace Utils; -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { const char BUILD_TARGETS_KEY[] = "CMakeProjectManager.MakeStep.BuildTargets"; const char CMAKE_ARGUMENTS_KEY[] = "CMakeProjectManager.MakeStep.CMakeArguments"; @@ -112,17 +112,17 @@ QVariant CMakeTargetItem::data(int column, int role) const if (column == 0) { if (role == Qt::DisplayRole) { if (m_target.isEmpty()) - return CMakeBuildStep::tr("Current executable"); + return Tr::tr("Current executable"); return m_target; } if (role == Qt::ToolTipRole) { if (m_target.isEmpty()) { - return CMakeBuildStep::tr("Build the executable used in the active run " + return Tr::tr("Build the executable used in the active run " "configuration. Currently: %1") .arg(m_step->activeRunConfigTarget()); } - return CMakeBuildStep::tr("Target: %1").arg(m_target); + return Tr::tr("Target: %1").arg(m_target); } if (role == Qt::CheckStateRole) @@ -161,12 +161,12 @@ CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Utils::Id id) : { m_cmakeArguments = addAspect(); m_cmakeArguments->setSettingsKey(CMAKE_ARGUMENTS_KEY); - m_cmakeArguments->setLabelText(tr("CMake arguments:")); + m_cmakeArguments->setLabelText(Tr::tr("CMake arguments:")); m_cmakeArguments->setDisplayStyle(StringAspect::LineEditDisplay); m_toolArguments = addAspect(); m_toolArguments->setSettingsKey(TOOL_ARGUMENTS_KEY); - m_toolArguments->setLabelText(tr("Tool arguments:")); + m_toolArguments->setLabelText(Tr::tr("Tool arguments:")); m_toolArguments->setDisplayStyle(StringAspect::LineEditDisplay); Kit *kit = buildConfiguration()->kit(); @@ -176,13 +176,13 @@ CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Utils::Id id) : m_useiOSAutomaticProvisioningUpdates->setSettingsKey( IOS_AUTOMATIC_PROVISIONG_UPDATES_ARGUMENTS_KEY); m_useiOSAutomaticProvisioningUpdates->setLabel( - tr("Enable automatic provisioning updates:")); + Tr::tr("Enable automatic provisioning updates:")); m_useiOSAutomaticProvisioningUpdates->setToolTip( - tr("Tells xcodebuild to create and download a provisioning profile " + Tr::tr("Tells xcodebuild to create and download a provisioning profile " "if a valid one does not exist.")); } - m_buildTargetModel.setHeader({tr("Target")}); + m_buildTargetModel.setHeader({Tr::tr("Target")}); setBuildTargets({defaultBuildTarget()}); auto *bs = qobject_cast(buildSystem()); @@ -248,7 +248,7 @@ bool CMakeBuildStep::init() if (!bc->isEnabled()) { emit addTask(BuildSystemTask(Task::Error, - tr("The build configuration is currently disabled."))); + Tr::tr("The build configuration is currently disabled."))); emitFaultyConfigurationMessage(); return false; } @@ -256,7 +256,7 @@ bool CMakeBuildStep::init() CMakeTool *tool = CMakeKitAspect::cmakeTool(kit()); if (!tool || !tool->isValid()) { emit addTask(BuildSystemTask(Task::Error, - tr("A CMake tool must be set up for building. " + Tr::tr("A CMake tool must be set up for building. " "Configure a CMake tool in the kit options."))); emitFaultyConfigurationMessage(); return false; @@ -280,7 +280,7 @@ bool CMakeBuildStep::init() if (bc->buildDirectory() != projectDirectory) { if (projectDirectory.pathAppended("CMakeCache.txt").exists()) { emit addTask(BuildSystemTask(Task::Warning, - tr("There is a CMakeCache.txt file in \"%1\", which suggest an " + Tr::tr("There is a CMakeCache.txt file in \"%1\", which suggest an " "in-source build was done before. You are now building in \"%2\", " "and the CMakeCache.txt file might confuse CMake.") .arg(projectDirectory.toUserOutput(), bc->buildDirectory().toUserOutput()))); @@ -323,10 +323,10 @@ void CMakeBuildStep::doRun() m_waiting = false; auto bs = static_cast(buildSystem()); if (bs->persistCMakeState()) { - emit addOutput(tr("Persisting CMake state..."), BuildStep::OutputFormat::NormalMessage); + emit addOutput(Tr::tr("Persisting CMake state..."), BuildStep::OutputFormat::NormalMessage); m_waiting = true; } else if (buildSystem()->isWaitingForParse()) { - emit addOutput(tr("Running CMake in preparation to build..."), BuildStep::OutputFormat::NormalMessage); + emit addOutput(Tr::tr("Running CMake in preparation to build..."), BuildStep::OutputFormat::NormalMessage); m_waiting = true; } @@ -353,7 +353,7 @@ void CMakeBuildStep::handleProjectWasParsed(bool success) } else if (success) { runImpl(); } else { - AbstractProcessStep::stdError(tr("Project did not parse successfully, cannot build.")); + AbstractProcessStep::stdError(Tr::tr("Project did not parse successfully, cannot build.")); emit finished(false); } } @@ -518,7 +518,7 @@ QWidget *CMakeBuildStep::createConfigWidget() setSummaryText(summaryText); }; - setDisplayName(tr("Build", "ConfigWidget display name.")); + setDisplayName(Tr::tr("Build", "ConfigWidget display name.")); auto buildTargetsView = new QTreeView; buildTargetsView->setMinimumHeight(200); @@ -530,7 +530,7 @@ QWidget *CMakeBuildStep::createConfigWidget() ItemViewFind::LightColored); auto createAndAddEnvironmentWidgets = [this](Layouting::Form &builder) { - auto clearBox = new QCheckBox(tr("Clear system environment")); + auto clearBox = new QCheckBox(Tr::tr("Clear system environment")); clearBox->setChecked(useClearEnvironment()); auto envWidget = new EnvironmentWidget(nullptr, EnvironmentWidget::TypeLocal, clearBox); @@ -564,7 +564,7 @@ QWidget *CMakeBuildStep::createConfigWidget() if (m_useiOSAutomaticProvisioningUpdates) builder.addRow(m_useiOSAutomaticProvisioningUpdates); - builder.addRow({new QLabel(tr("Targets:")), frame}); + builder.addRow({new QLabel(Tr::tr("Targets:")), frame}); if (!isCleanStep() && !m_buildPreset.isEmpty()) createAndAddEnvironmentWidgets(builder); @@ -712,9 +712,9 @@ Environment CMakeBuildStep::baseEnvironment() const QString CMakeBuildStep::baseEnvironmentText() const { if (useClearEnvironment()) - return tr("Clean Environment"); + return Tr::tr("Clean Environment"); else - return tr("System Environment"); + return Tr::tr("System Environment"); } void CMakeBuildStep::processFinished(int exitCode, QProcess::ExitStatus status) @@ -728,11 +728,10 @@ void CMakeBuildStep::processFinished(int exitCode, QProcess::ExitStatus status) CMakeBuildStepFactory::CMakeBuildStepFactory() { registerStep(Constants::CMAKE_BUILD_STEP_ID); - setDisplayName(CMakeBuildStep::tr("CMake Build", "Display name for CMakeProjectManager::CMakeBuildStep id.")); + setDisplayName(Tr::tr("CMake Build", "Display name for CMakeProjectManager::CMakeBuildStep id.")); setSupportedProjectType(Constants::CMAKE_PROJECT_ID); } -} // Internal -} // CMakeProjectManager +} // CMakeProjectManager::Internal #include diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.h b/src/plugins/cmakeprojectmanager/cmakebuildstep.h index f44474cdaac..b827b533650 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.h +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.h @@ -11,8 +11,7 @@ class CommandLine; class StringAspect; } // Utils -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { class CMakeBuildStep; @@ -123,5 +122,4 @@ public: CMakeBuildStepFactory(); }; -} // namespace Internal -} // namespace CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index 43e354dbf09..5157f87b6ea 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp @@ -11,6 +11,7 @@ #include "cmakeproject.h" #include "cmakeprojectconstants.h" #include "cmakeprojectnodes.h" +#include "cmakeprojectmanagertr.h" #include "cmakeprojectplugin.h" #include "cmakespecificsettings.h" #include "projecttreehelper.h" @@ -59,8 +60,7 @@ using namespace ProjectExplorer; using namespace Utils; -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { static void copySourcePathsToClipboard(const FilePaths &srcPaths, const ProjectNode *node) { @@ -92,8 +92,8 @@ static void noAutoAdditionNotify(const FilePaths &filePaths, const ProjectNode * bool checkValue{false}; QDialogButtonBox::StandardButton reply = CheckableMessageBox::question( Core::ICore::dialogParent(), - QMessageBox::tr("Copy to Clipboard?"), - QMessageBox::tr("Files are not automatically added to the " + Tr::tr("Copy to Clipboard?"), + Tr::tr("Files are not automatically added to the " "CMakeLists.txt file of the CMake project." "\nCopy the path to the source files to the clipboard?"), "Remember My Choice", @@ -359,7 +359,7 @@ void CMakeBuildSystem::setParametersAndRequestParse(const BuildDirParameters &pa if (!tool || !tool->isValid()) { TaskHub::addTask( BuildSystemTask(Task::Error, - tr("The kit needs to define a CMake tool to parse this project."))); + Tr::tr("The kit needs to define a CMake tool to parse this project."))); return; } if (!tool->hasFileApi()) { @@ -391,8 +391,8 @@ bool CMakeBuildSystem::mustApplyConfigurationChangesArguments(const BuildDirPara return false; int answer = QMessageBox::question(Core::ICore::dialogParent(), - tr("Apply configuration changes?"), - "

" + tr("Run CMake with configuration changes?") + Tr::tr("Apply configuration changes?"), + "

" + Tr::tr("Run CMake with configuration changes?") + "

"
                                        + parameters.configurationChangesArguments.join("\n")
                                        + "
", @@ -498,7 +498,7 @@ void CMakeBuildSystem::combineScanAndParse(bool restoredFromBackup) if (restoredFromBackup) project()->addIssue( CMakeProject::IssueType::Warning, - tr("CMake configuration failed" + Tr::tr("CMake configuration failed" "

The backup of the previous configuration has been restored.

" "

Issues and \"Projects > Build\" settings " "show more information about the failure.addIssue( CMakeProject::IssueType::Warning, - tr("Failed to load project" + Tr::tr("Failed to load project" "

Issues and \"Projects > Build\" settings " "show more information about the failure.displayName()), "CMake.Scan.Tree"); } @@ -853,13 +853,13 @@ void CMakeBuildSystem::ensureBuildDirectory(const BuildDirParameters ¶meters const FilePath bdir = parameters.buildDirectory; if (!buildConfiguration()->createBuildDirectory()) { - handleParsingFailed(tr("Failed to create build directory \"%1\".").arg(bdir.toUserOutput())); + handleParsingFailed(Tr::tr("Failed to create build directory \"%1\".").arg(bdir.toUserOutput())); return; } const CMakeTool *tool = parameters.cmakeTool(); if (!tool) { - handleParsingFailed(tr("No CMake tool set up in kit.")); + handleParsingFailed(Tr::tr("No CMake tool set up in kit.")); return; } @@ -867,7 +867,7 @@ void CMakeBuildSystem::ensureBuildDirectory(const BuildDirParameters ¶meters if (!tool->cmakeExecutable().ensureReachable(bdir)) { // Make sure that the build directory is available on the device. handleParsingFailed( - tr("The remote CMake executable cannot write to the local build directory.")); + Tr::tr("The remote CMake executable cannot write to the local build directory.")); } } } @@ -1337,5 +1337,4 @@ MakeInstallCommand CMakeBuildSystem::makeInstallCommand(const FilePath &installR return cmd; } -} // namespace Internal -} // namespace CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp b/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp index 28dadbcd999..f3865a81f6e 100644 --- a/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp @@ -3,6 +3,8 @@ #include "cmakeconfigitem.h" +#include "cmakeprojectmanagertr.h" + #include #include @@ -337,8 +339,7 @@ CMakeConfig CMakeConfig::fromFile(const Utils::FilePath &cacheFile, QString *err QFile cache(cacheFile.toString()); if (!cache.open(QIODevice::ReadOnly | QIODevice::Text)) { if (errorMessage) - *errorMessage = QCoreApplication::translate("CMakeProjectManager::CMakeConfigItem", "Failed to open %1 for reading.") - .arg(cacheFile.toUserOutput()); + *errorMessage = Tr::tr("Failed to open %1 for reading.").arg(cacheFile.toUserOutput()); return CMakeConfig(); } diff --git a/src/plugins/cmakeprojectmanager/cmakeconfigitem.h b/src/plugins/cmakeprojectmanager/cmakeconfigitem.h index afec217cd1a..c5e771b1a3e 100644 --- a/src/plugins/cmakeprojectmanager/cmakeconfigitem.h +++ b/src/plugins/cmakeprojectmanager/cmakeconfigitem.h @@ -5,7 +5,6 @@ #include "cmake_global.h" - #include #include diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp index 53dc1f30c60..e7463c40eae 100644 --- a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp @@ -21,13 +21,18 @@ using namespace Core; using namespace TextEditor; -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { // // CMakeEditor // +class CMakeEditor : public TextEditor::BaseTextEditor +{ +public: + void contextHelp(const HelpCallback &callback) const final; +}; + void CMakeEditor::contextHelp(const HelpCallback &callback) const { int pos = position(); @@ -239,5 +244,4 @@ CMakeEditorFactory::CMakeEditorFactory() contextMenu->addAction(ActionManager::command(TextEditor::Constants::UN_COMMENT_SELECTION)); } -} // namespace Internal -} // namespace CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.h b/src/plugins/cmakeprojectmanager/cmakeeditor.h index fba93488b57..57e2e606877 100644 --- a/src/plugins/cmakeprojectmanager/cmakeeditor.h +++ b/src/plugins/cmakeprojectmanager/cmakeeditor.h @@ -5,20 +5,7 @@ #include -namespace CMakeProjectManager { -namespace Internal { - -class CMakeEditorWidget; - -class CMakeEditor : public TextEditor::BaseTextEditor -{ - Q_OBJECT - -public: - void contextHelp(const HelpCallback &callback) const override; - - friend class CMakeEditorWidget; -}; +namespace CMakeProjectManager::Internal { class CMakeEditorFactory : public TextEditor::TextEditorFactory { @@ -26,5 +13,4 @@ public: CMakeEditorFactory(); }; -} // namespace Internal -} // namespace CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp b/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp index 44ee335b8e8..a06aae70d38 100644 --- a/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp +++ b/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp @@ -14,18 +14,18 @@ #include -using namespace CMakeProjectManager::Internal; using namespace TextEditor; using namespace ProjectExplorer; -// ------------------------------- -// CMakeFileCompletionAssistProvider -// ------------------------------- +namespace CMakeProjectManager::Internal { -IAssistProcessor *CMakeFileCompletionAssistProvider::createProcessor(const AssistInterface *) const +class CMakeFileCompletionAssist : public TextEditor::KeywordsCompletionAssistProcessor { - return new CMakeFileCompletionAssist; -} +public: + CMakeFileCompletionAssist(); + + TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) final; +}; CMakeFileCompletionAssist::CMakeFileCompletionAssist() : KeywordsCompletionAssistProcessor(Keywords()) @@ -50,3 +50,10 @@ IAssistProposal *CMakeFileCompletionAssist::perform(const AssistInterface *inter setKeywords(kw); return KeywordsCompletionAssistProcessor::perform(interface); } + +IAssistProcessor *CMakeFileCompletionAssistProvider::createProcessor(const AssistInterface *) const +{ + return new CMakeFileCompletionAssist; +} + +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.h b/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.h index 9ca0af0c756..026b29acd18 100644 --- a/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.h +++ b/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.h @@ -5,25 +5,12 @@ #include -namespace CMakeProjectManager { -namespace Internal { - -class CMakeFileCompletionAssist : public TextEditor::KeywordsCompletionAssistProcessor -{ -public: - CMakeFileCompletionAssist(); - - // IAssistProcessor interface - TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) override; -}; +namespace CMakeProjectManager::Internal { class CMakeFileCompletionAssistProvider : public TextEditor::CompletionAssistProvider { - Q_OBJECT - public: - TextEditor::IAssistProcessor *createProcessor(const TextEditor::AssistInterface *) const override; + TextEditor::IAssistProcessor *createProcessor(const TextEditor::AssistInterface *) const final; }; -} // Internal -} // CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/cmakeindenter.cpp b/src/plugins/cmakeprojectmanager/cmakeindenter.cpp index 49eff068f13..a9a2aeaaafb 100644 --- a/src/plugins/cmakeprojectmanager/cmakeindenter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeindenter.cpp @@ -3,8 +3,7 @@ #include "cmakeindenter.h" -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { CMakeIndenter::CMakeIndenter(QTextDocument *doc) : TextEditor::TextIndenter(doc) @@ -111,7 +110,4 @@ int CMakeIndenter::indentFor(const QTextBlock &block, return qMax(0, indentation); } -} // namespace Internal -} // namespace CMakeProjectManager - - +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/cmakeindenter.h b/src/plugins/cmakeprojectmanager/cmakeindenter.h index ce30b220d6f..ad85f8a26cc 100644 --- a/src/plugins/cmakeprojectmanager/cmakeindenter.h +++ b/src/plugins/cmakeprojectmanager/cmakeindenter.h @@ -7,8 +7,7 @@ #include -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { class CMAKE_EXPORT CMakeIndenter : public TextEditor::TextIndenter { @@ -21,5 +20,4 @@ public: int cursorPositionInEditor = -1) override; }; -} // namespace Internal -} // namespace CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp index e5816581725..22e963a1be4 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp @@ -1,10 +1,11 @@ // Copyright (C) 2016 Canonical Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "cmakeconfigitem.h" #include "cmakekitinformation.h" +#include "cmakeconfigitem.h" #include "cmakeprojectconstants.h" +#include "cmakeprojectmanagertr.h" #include "cmakeprojectplugin.h" #include "cmakespecificsettings.h" #include "cmaketool.h" @@ -50,9 +51,6 @@ using namespace ProjectExplorer; using namespace Utils; namespace CMakeProjectManager { -// -------------------------------------------------------------------- -// CMakeKitAspect: -// -------------------------------------------------------------------- static bool isIos(const Kit *k) { @@ -69,7 +67,6 @@ static Id defaultCMakeToolId() class CMakeKitAspectWidget final : public KitAspectWidget { - Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::CMakeKitAspect) public: CMakeKitAspectWidget(Kit *kit, const KitAspect *ki) : KitAspectWidget(kit, ki), m_comboBox(createSubWidget()), @@ -137,7 +134,7 @@ private: m_comboBox->removeItem(pos); if (m_comboBox->count() == 0) { - m_comboBox->addItem(tr(""), Id().toSetting()); + m_comboBox->addItem(Tr::tr(""), Id().toSetting()); m_comboBox->setEnabled(false); } else { m_comboBox->setEnabled(true); @@ -199,8 +196,8 @@ CMakeKitAspect::CMakeKitAspect() { setObjectName(QLatin1String("CMakeKitAspect")); setId(Constants::TOOL_ID); - setDisplayName(tr("CMake Tool")); - setDescription(tr("The CMake Tool to use when building a project with CMake.
" + setDisplayName(Tr::tr("CMake Tool")); + setDescription(Tr::tr("The CMake Tool to use when building a project with CMake.
" "This setting is ignored when using other build systems.")); setPriority(20000); @@ -278,7 +275,7 @@ void CMakeKitAspect::fix(Kit *k) KitAspect::ItemList CMakeKitAspect::toUserOutput(const Kit *k) const { const CMakeTool *const tool = cmakeTool(k); - return {{tr("CMake"), tool ? tool->displayName() : tr("Unconfigured")}}; + return {{Tr::tr("CMake"), tool ? tool->displayName() : Tr::tr("Unconfigured")}}; } KitAspectWidget *CMakeKitAspect::createConfigWidget(Kit *k) const @@ -290,7 +287,7 @@ KitAspectWidget *CMakeKitAspect::createConfigWidget(Kit *k) const void CMakeKitAspect::addToMacroExpander(Kit *k, MacroExpander *expander) const { QTC_ASSERT(k, return); - expander->registerFileVariables("CMake:Executable", tr("Path to the cmake executable"), + expander->registerFileVariables("CMake:Executable", Tr::tr("Path to the cmake executable"), [k] { CMakeTool *tool = CMakeKitAspect::cmakeTool(k); return tool ? tool->cmakeExecutable() : FilePath(); @@ -306,7 +303,7 @@ QSet CMakeKitAspect::availableFeatures(const Kit *k) const QString CMakeKitAspect::msgUnsupportedVersion(const QByteArray &versionString) { - return tr("CMake version %1 is unsupported. Update to " + return Tr::tr("CMake version %1 is unsupported. Update to " "version 3.14 (with file-api) or later.") .arg(QString::fromUtf8(versionString)); } @@ -324,8 +321,6 @@ const char TOOLSET_KEY[] = "Toolset"; class CMakeGeneratorKitAspectWidget final : public KitAspectWidget { - Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::CMakeGeneratorKitAspect) - public: CMakeGeneratorKitAspectWidget(Kit *kit, const KitAspect *ki) : KitAspectWidget(kit, ki), @@ -338,7 +333,7 @@ public: }); m_label->setToolTip(ki->description()); - m_changeButton->setText(tr("Change...")); + m_changeButton->setText(Tr::tr("Change...")); refresh(); connect(m_changeButton, &QPushButton::clicked, this, &CMakeGeneratorKitAspectWidget::changeGenerator); @@ -380,9 +375,9 @@ private: messageLabel << generator; if (!platform.isEmpty()) - messageLabel << ", " << tr("Platform") << ": " << platform; + messageLabel << ", " << Tr::tr("Platform") << ": " << platform; if (!toolset.isEmpty()) - messageLabel << ", " << tr("Toolset") << ": " << toolset; + messageLabel << ", " << Tr::tr("Toolset") << ": " << toolset; m_label->setText(messageLabel.join("")); } @@ -396,7 +391,7 @@ private: flags |= Qt::MSWindowsFixedSizeDialogHint; changeDialog->setWindowFlags(flags); - changeDialog->setWindowTitle(tr("CMake Generator")); + changeDialog->setWindowTitle(Tr::tr("CMake Generator")); auto layout = new QGridLayout(changeDialog); layout->setSizeConstraint(QLayout::SetFixedSize); @@ -414,19 +409,19 @@ private: layout->addWidget(cmakeLabel, row, 1); ++row; - layout->addWidget(new QLabel(tr("Generator:")), row, 0); + layout->addWidget(new QLabel(Tr::tr("Generator:")), row, 0); layout->addWidget(generatorCombo, row, 1); ++row; - layout->addWidget(new QLabel(tr("Extra generator:")), row, 0); + layout->addWidget(new QLabel(Tr::tr("Extra generator:")), row, 0); layout->addWidget(extraGeneratorCombo, row, 1); ++row; - layout->addWidget(new QLabel(tr("Platform:")), row, 0); + layout->addWidget(new QLabel(Tr::tr("Platform:")), row, 0); layout->addWidget(platformEdit, row, 1); ++row; - layout->addWidget(new QLabel(tr("Toolset:")), row, 0); + layout->addWidget(new QLabel(Tr::tr("Toolset:")), row, 0); layout->addWidget(toolsetEdit, row, 1); ++row; @@ -452,7 +447,7 @@ private: generatorCombo->setCurrentText(name); extraGeneratorCombo->clear(); - extraGeneratorCombo->addItem(tr(""), QString()); + extraGeneratorCombo->addItem(Tr::tr(""), QString()); for (const QString &eg : qAsConst(it->extraGenerators)) extraGeneratorCombo->addItem(eg, eg); extraGeneratorCombo->setEnabled(extraGeneratorCombo->count() > 1); @@ -550,8 +545,8 @@ CMakeGeneratorKitAspect::CMakeGeneratorKitAspect() { setObjectName(QLatin1String("CMakeGeneratorKitAspect")); setId(GENERATOR_ID); - setDisplayName(tr("CMake generator")); - setDescription(tr("CMake generator defines how a project is built when using CMake.
" + setDisplayName(Tr::tr("CMake generator")); + setDescription(Tr::tr("CMake generator defines how a project is built when using CMake.
" "This setting is ignored when using other build systems.")); setPriority(19000); } @@ -755,7 +750,7 @@ Tasks CMakeGeneratorKitAspect::validate(const Kit *k) const }; if (!tool->isValid()) { - addWarning(tr("CMake Tool is unconfigured, CMake generator will be ignored.")); + addWarning(Tr::tr("CMake Tool is unconfigured, CMake generator will be ignored.")); } else { const GeneratorInfo info = generatorInfo(k); QList known = tool->supportedGenerators(); @@ -763,15 +758,15 @@ Tasks CMakeGeneratorKitAspect::validate(const Kit *k) const return g.matches(info.generator, info.extraGenerator); }); if (it == known.constEnd()) { - addWarning(tr("CMake Tool does not support the configured generator.")); + addWarning(Tr::tr("CMake Tool does not support the configured generator.")); } else { if (!it->supportsPlatform && !info.platform.isEmpty()) - addWarning(tr("Platform is not supported by the selected CMake generator.")); + addWarning(Tr::tr("Platform is not supported by the selected CMake generator.")); if (!it->supportsToolset && !info.toolset.isEmpty()) - addWarning(tr("Toolset is not supported by the selected CMake generator.")); + addWarning(Tr::tr("Toolset is not supported by the selected CMake generator.")); } if (!tool->hasFileApi()) { - addWarning(tr("The selected CMake binary does not support file-api. " + addWarning(Tr::tr("The selected CMake binary does not support file-api. " "%1 will not be able to parse CMake projects.") .arg(Core::Constants::IDE_DISPLAY_NAME)); } @@ -838,15 +833,15 @@ KitAspect::ItemList CMakeGeneratorKitAspect::toUserOutput(const Kit *k) const const GeneratorInfo info = generatorInfo(k); QString message; if (info.generator.isEmpty()) { - message = tr(""); + message = Tr::tr(""); } else { - message = tr("Generator: %1
Extra generator: %2").arg(info.generator).arg(info.extraGenerator); + message = Tr::tr("Generator: %1
Extra generator: %2").arg(info.generator).arg(info.extraGenerator); if (!info.platform.isEmpty()) - message += "
" + tr("Platform: %1").arg(info.platform); + message += "
" + Tr::tr("Platform: %1").arg(info.platform); if (!info.toolset.isEmpty()) - message += "
" + tr("Toolset: %1").arg(info.toolset); + message += "
" + Tr::tr("Toolset: %1").arg(info.toolset); } - return {{tr("CMake Generator"), message}}; + return {{Tr::tr("CMake Generator"), message}}; } KitAspectWidget *CMakeGeneratorKitAspect::createConfigWidget(Kit *k) const @@ -880,8 +875,6 @@ const char QTC_CMAKE_PRESET_KEY[] = "QTC_CMAKE_PRESET"; class CMakeConfigurationKitAspectWidget final : public KitAspectWidget { - Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::CMakeConfigurationKitAspect) - public: CMakeConfigurationKitAspectWidget(Kit *kit, const KitAspect *ki) : KitAspectWidget(kit, ki), @@ -889,7 +882,7 @@ public: m_manageButton(createSubWidget()) { refresh(); - m_manageButton->setText(tr("Change...")); + m_manageButton->setText(Tr::tr("Change...")); connect(m_manageButton, &QAbstractButton::clicked, this, &CMakeConfigurationKitAspectWidget::editConfigurationChanges); } @@ -940,11 +933,11 @@ private: const CMakeTool *tool = CMakeKitAspect::cmakeTool(kit()); m_dialog = new QDialog(m_summaryLabel->window()); - m_dialog->setWindowTitle(tr("Edit CMake Configuration")); + m_dialog->setWindowTitle(Tr::tr("Edit CMake Configuration")); auto layout = new QVBoxLayout(m_dialog); m_editor = new QPlainTextEdit; auto editorLabel = new QLabel(m_dialog); - editorLabel->setText(tr("Enter one CMake variable per line.
" + editorLabel->setText(Tr::tr("Enter one CMake variable per line.
" "To set a variable, use -D<variable>:<type>=<value>.
" "<type> can have one of the following values: FILEPATH, PATH, " "BOOL, INTERNAL, or STRING.")); @@ -959,7 +952,7 @@ private: m_additionalEditor = new QLineEdit; auto additionalLabel = new QLabel(m_dialog); - additionalLabel->setText(tr("Additional CMake options:")); + additionalLabel->setText(Tr::tr("Additional CMake options:")); connect(additionalLabel, &QLabel::linkActivated, this, [=](const QString &) { CMakeTool::openCMakeHelpUrl(tool, "%1/manual/cmake.1.html#options"); }); @@ -1042,8 +1035,8 @@ CMakeConfigurationKitAspect::CMakeConfigurationKitAspect() { setObjectName(QLatin1String("CMakeConfigurationKitAspect")); setId(CONFIGURATION_ID); - setDisplayName(tr("CMake Configuration")); - setDescription(tr("Default configuration passed to CMake when setting up a project.")); + setDisplayName(Tr::tr("CMake Configuration")); + setDescription(Tr::tr("Default configuration passed to CMake when setting up a project.")); setPriority(18000); } @@ -1185,22 +1178,22 @@ Tasks CMakeConfigurationKitAspect::validate(const Kit *k) const // Validate Qt: if (qmakePath.isEmpty()) { if (version && version->isValid() && isQt4) { - addWarning(tr("CMake configuration has no path to qmake binary set, " + addWarning(Tr::tr("CMake configuration has no path to qmake binary set, " "even though the kit has a valid Qt version.")); } } else { if (!version || !version->isValid()) { - addWarning(tr("CMake configuration has a path to a qmake binary set, " + addWarning(Tr::tr("CMake configuration has a path to a qmake binary set, " "even though the kit has no valid Qt version.")); } else if (qmakePath != version->qmakeFilePath() && isQt4) { - addWarning(tr("CMake configuration has a path to a qmake binary set " + addWarning(Tr::tr("CMake configuration has a path to a qmake binary set " "that does not match the qmake binary path " "configured in the Qt version.")); } } if (version && !qtInstallDirs.contains(version->prefix().path()) && !isQt4) { if (version->isValid()) { - addWarning(tr("CMake configuration has no CMAKE_PREFIX_PATH set " + addWarning(Tr::tr("CMake configuration has no CMAKE_PREFIX_PATH set " "that points to the kit Qt version.")); } } @@ -1208,15 +1201,15 @@ Tasks CMakeConfigurationKitAspect::validate(const Kit *k) const // Validate Toolchains: if (tcCPath.isEmpty()) { if (tcC && tcC->isValid()) { - addWarning(tr("CMake configuration has no path to a C compiler set, " + addWarning(Tr::tr("CMake configuration has no path to a C compiler set, " "even though the kit has a valid tool chain.")); } } else { if (!tcC || !tcC->isValid()) { - addWarning(tr("CMake configuration has a path to a C compiler set, " + addWarning(Tr::tr("CMake configuration has a path to a C compiler set, " "even though the kit has no valid tool chain.")); } else if (tcCPath != tcC->compilerCommand() && tcCPath != tcC->compilerCommand().onDevice(tcCPath)) { - addWarning(tr("CMake configuration has a path to a C compiler set " + addWarning(Tr::tr("CMake configuration has a path to a C compiler set " "that does not match the compiler path " "configured in the tool chain of the kit.")); } @@ -1224,15 +1217,15 @@ Tasks CMakeConfigurationKitAspect::validate(const Kit *k) const if (tcCxxPath.isEmpty()) { if (tcCxx && tcCxx->isValid()) { - addWarning(tr("CMake configuration has no path to a C++ compiler set, " + addWarning(Tr::tr("CMake configuration has no path to a C++ compiler set, " "even though the kit has a valid tool chain.")); } } else { if (!tcCxx || !tcCxx->isValid()) { - addWarning(tr("CMake configuration has a path to a C++ compiler set, " + addWarning(Tr::tr("CMake configuration has a path to a C++ compiler set, " "even though the kit has no valid tool chain.")); } else if (tcCxxPath != tcCxx->compilerCommand() && tcCxxPath != tcCxx->compilerCommand().onDevice(tcCxxPath)) { - addWarning(tr("CMake configuration has a path to a C++ compiler set " + addWarning(Tr::tr("CMake configuration has a path to a C++ compiler set " "that does not match the compiler path " "configured in the tool chain of the kit.")); } @@ -1254,7 +1247,7 @@ void CMakeConfigurationKitAspect::fix(Kit *k) KitAspect::ItemList CMakeConfigurationKitAspect::toUserOutput(const Kit *k) const { - return {{tr("CMake Configuration"), toStringList(k).join("
")}}; + return {{Tr::tr("CMake Configuration"), toStringList(k).join("
")}}; } KitAspectWidget *CMakeConfigurationKitAspect::createConfigWidget(Kit *k) const diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.h b/src/plugins/cmakeprojectmanager/cmakekitinformation.h index 302b5c7c1d6..da2435664b3 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.h +++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.h @@ -10,11 +10,11 @@ #include namespace CMakeProjectManager { + class CMakeTool; class CMAKE_EXPORT CMakeKitAspect : public ProjectExplorer::KitAspect { - Q_OBJECT public: CMakeKitAspect(); @@ -40,7 +40,6 @@ public: class CMAKE_EXPORT CMakeGeneratorKitAspect : public ProjectExplorer::KitAspect { - Q_OBJECT public: CMakeGeneratorKitAspect(); @@ -73,7 +72,6 @@ private: class CMAKE_EXPORT CMakeConfigurationKitAspect : public ProjectExplorer::KitAspect { - Q_OBJECT public: CMakeConfigurationKitAspect(); @@ -104,4 +102,4 @@ private: QVariant defaultValue(const ProjectExplorer::Kit *k) const; }; -} // namespace CMakeProjectManager +} // CMakeProjectManager diff --git a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp index 8df144de4c3..835822acdc0 100644 --- a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp @@ -6,8 +6,10 @@ #include "cmakebuildstep.h" #include "cmakebuildsystem.h" #include "cmakeproject.h" +#include "cmakeprojectmanagertr.h" #include + #include #include #include @@ -15,11 +17,11 @@ #include -using namespace CMakeProjectManager; -using namespace CMakeProjectManager::Internal; using namespace ProjectExplorer; using namespace Utils; +namespace CMakeProjectManager::Internal { + // -------------------------------------------------------------------- // CMakeTargetLocatorFilter: // -------------------------------------------------------------------- @@ -93,8 +95,8 @@ void CMakeTargetLocatorFilter::projectListUpdated() BuildCMakeTargetLocatorFilter::BuildCMakeTargetLocatorFilter() { setId("Build CMake target"); - setDisplayName(tr("Build CMake target")); - setDescription(tr("Builds a target of any open CMake project.")); + setDisplayName(Tr::tr("Build CMake target")); + setDescription(Tr::tr("Builds a target of any open CMake project.")); setDefaultShortcutString("cm"); setPriority(High); } @@ -143,8 +145,8 @@ void BuildCMakeTargetLocatorFilter::accept(const Core::LocatorFilterEntry &selec OpenCMakeTargetLocatorFilter::OpenCMakeTargetLocatorFilter() { setId("Open CMake target definition"); - setDisplayName(tr("Open CMake target")); - setDescription(tr("Jumps to the definition of a target of any open CMake project.")); + setDisplayName(Tr::tr("Open CMake target")); + setDescription(Tr::tr("Jumps to the definition of a target of any open CMake project.")); setDefaultShortcutString("cmo"); setPriority(Medium); } @@ -169,3 +171,5 @@ void OpenCMakeTargetLocatorFilter::accept(const Core::LocatorFilterEntry &select else Core::EditorManager::openEditor(file, {}, Core::EditorManager::AllowExternalEditor); } + +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.h b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.h index 3385892cbd8..688f6899c79 100644 --- a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.h +++ b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.h @@ -5,13 +5,10 @@ #include -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { class CMakeTargetLocatorFilter : public Core::ILocatorFilter { - Q_OBJECT - public: CMakeTargetLocatorFilter(); @@ -27,8 +24,6 @@ private: class BuildCMakeTargetLocatorFilter : CMakeTargetLocatorFilter { - Q_OBJECT - public: BuildCMakeTargetLocatorFilter(); @@ -40,8 +35,6 @@ public: class OpenCMakeTargetLocatorFilter : CMakeTargetLocatorFilter { - Q_OBJECT - public: OpenCMakeTargetLocatorFilter(); @@ -51,5 +44,4 @@ public: int *selectionLength) const final; }; -} // namespace Internal -} // namespace CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/cmakeprocess.cpp b/src/plugins/cmakeprojectmanager/cmakeprocess.cpp index fd158ac61e5..00a958b5496 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprocess.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprocess.cpp @@ -5,6 +5,7 @@ #include "builddirparameters.h" #include "cmakeparser.h" +#include "cmakeprojectmanagertr.h" #include #include @@ -17,12 +18,11 @@ #include +using namespace ProjectExplorer; using namespace Utils; -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { -using namespace ProjectExplorer; const int USER_STOP_EXIT_CODE = 15; static QString stripTrailingNewline(QString str) @@ -57,7 +57,7 @@ void CMakeProcess::run(const BuildDirParameters ¶meters, const QStringList & if (!cmakeExecutable.ensureReachable(parameters.sourceDirectory) || !cmakeExecutable.ensureReachable(parameters.buildDirectory)) { - QString msg = ::CMakeProjectManager::Internal::CMakeProcess::tr( + QString msg = ::CMakeProjectManager::Tr::tr( "The source or build directory is not reachable by the CMake executable."); BuildSystem::appendBuildSystemOutput(msg + '\n'); emit finished(); @@ -68,8 +68,7 @@ void CMakeProcess::run(const BuildDirParameters ¶meters, const QStringList & const FilePath buildDirectory = parameters.buildDirectory.onDevice(cmakeExecutable); if (!buildDirectory.exists()) { - QString msg = ::CMakeProjectManager::Internal::CMakeProcess::tr( - "The build directory \"%1\" does not exist") + QString msg = ::CMakeProjectManager::Tr::tr( "The build directory \"%1\" does not exist") .arg(buildDirectory.toUserOutput()); BuildSystem::appendBuildSystemOutput(msg + '\n'); emit finished(); @@ -78,9 +77,8 @@ void CMakeProcess::run(const BuildDirParameters ¶meters, const QStringList & if (buildDirectory.needsDevice()) { if (cmake->cmakeExecutable().host() != buildDirectory.host()) { - QString msg = ::CMakeProjectManager::Internal::CMakeProcess::tr( - "CMake executable \"%1\" and build directory " - "\"%2\" must be on the same device.") + QString msg = ::CMakeProjectManager::Tr::tr("CMake executable \"%1\" and build directory " + "\"%2\" must be on the same device.") .arg(cmake->cmakeExecutable().toUserOutput(), buildDirectory.toUserOutput()); BuildSystem::appendBuildSystemOutput(msg + '\n'); @@ -120,15 +118,13 @@ void CMakeProcess::run(const BuildDirParameters ¶meters, const QStringList & TaskHub::clearTasks(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM); - BuildSystem::startNewBuildSystemOutput( - ::CMakeProjectManager::Internal::CMakeProcess::tr("Running %1 in %2.") + BuildSystem::startNewBuildSystemOutput(::CMakeProjectManager::Tr::tr("Running %1 in %2.") .arg(commandLine.toUserOutput(), buildDirectory.toUserOutput())); m_futureInterface = QFutureInterface(); m_futureInterface.setProgressRange(0, 1); Core::ProgressManager::addTimedTask(m_futureInterface, - ::CMakeProjectManager::Internal::CMakeProcess::tr( - "Configuring \"%1\"") + ::CMakeProjectManager::Tr::tr("Configuring \"%1\"") .arg(parameters.projectName), "CMake.Configure", 10); @@ -160,17 +156,14 @@ void CMakeProcess::handleProcessDone(const Utils::ProcessResultData &resultData) QString msg; if (resultData.m_error == QProcess::FailedToStart) { - msg = ::CMakeProjectManager::Internal::CMakeProcess::tr("CMake process failed to start."); + msg = ::CMakeProjectManager::Tr::tr("CMake process failed to start."); } else if (resultData.m_exitStatus != QProcess::NormalExit) { if (m_futureInterface.isCanceled() || code == USER_STOP_EXIT_CODE) - msg = ::CMakeProjectManager::Internal::CMakeProcess::tr( - "CMake process was canceled by the user."); + msg = ::CMakeProjectManager::Tr::tr("CMake process was canceled by the user."); else - msg = ::CMakeProjectManager::Internal::CMakeProcess::tr("CMake process crashed."); + msg = ::CMakeProjectManager::Tr::tr("CMake process crashed."); } else if (code != 0) { - msg = ::CMakeProjectManager::Internal::CMakeProcess::tr( - "CMake process exited with exit code %1.") - .arg(code); + msg = ::CMakeProjectManager::Tr::tr("CMake process exited with exit code %1.") .arg(code); } m_lastExitCode = code; @@ -190,5 +183,4 @@ void CMakeProcess::handleProcessDone(const Utils::ProcessResultData &resultData) BuildSystem::appendBuildSystemOutput(elapsedTime + '\n'); } -} // namespace Internal -} // namespace CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/cmakeprocess.h b/src/plugins/cmakeprojectmanager/cmakeprocess.h index cf816c27d0c..31ff1d37c5d 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprocess.h +++ b/src/plugins/cmakeprojectmanager/cmakeprocess.h @@ -22,8 +22,7 @@ class ProcessResultData; class QtcProcess; } -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { class BuildDirParameters; @@ -55,5 +54,4 @@ private: int m_lastExitCode = 0; }; -} // namespace Internal -} // namespace CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index e3873d35df5..8be9be049e9 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -6,6 +6,7 @@ #include "cmakekitinformation.h" #include "cmakeprojectconstants.h" #include "cmakeprojectimporter.h" +#include "cmakeprojectmanagertr.h" #include "cmaketool.h" #include @@ -19,11 +20,10 @@ using namespace ProjectExplorer; using namespace Utils; +using namespace CMakeProjectManager::Internal; namespace CMakeProjectManager { -using namespace Internal; - /*! \class CMakeProject */ @@ -49,9 +49,9 @@ Tasks CMakeProject::projectIssues(const Kit *k) const Tasks result = Project::projectIssues(k); if (!CMakeKitAspect::cmakeTool(k)) - result.append(createProjectTask(Task::TaskType::Error, tr("No cmake tool set."))); + result.append(createProjectTask(Task::TaskType::Error, Tr::tr("No cmake tool set."))); if (ToolChainKitAspect::toolChains(k).isEmpty()) - result.append(createProjectTask(Task::TaskType::Warning, tr("No compilers set in kit."))); + result.append(createProjectTask(Task::TaskType::Warning, Tr::tr("No compilers set in kit."))); result.append(m_issues); @@ -115,7 +115,7 @@ Internal::PresetsData CMakeProject::combinePresets(Internal::PresetsData &cmakeP if (presetsHash.contains(p.name)) { TaskHub::addTask( BuildSystemTask(Task::TaskType::Error, - tr("CMakeUserPresets.json cannot re-define the %1 preset: %2") + Tr::tr("CMakeUserPresets.json cannot re-define the %1 preset: %2") .arg(presetType) .arg(p.name), "CMakeUserPresets.json")); @@ -158,7 +158,7 @@ void CMakeProject::setupBuildPresets(Internal::PresetsData &presetsData) if (!buildPreset.configurePreset) { TaskHub::addTask(BuildSystemTask( Task::TaskType::Error, - tr("Build preset %1 is missing a corresponding configure preset.") + Tr::tr("Build preset %1 is missing a corresponding configure preset.") .arg(buildPreset.name))); TaskHub::requestPopup(); } @@ -189,7 +189,7 @@ void CMakeProject::readPresets() data = parser.presetsData(); } else { TaskHub::addTask(BuildSystemTask(Task::TaskType::Error, - tr("Failed to load %1: %2") + Tr::tr("Failed to load %1: %2") .arg(presetFile.fileName()) .arg(errorMessage), presetFile, diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp index 7eab725f955..be51a7d47cb 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp @@ -6,6 +6,7 @@ #include "cmakebuildconfiguration.h" #include "cmakekitinformation.h" #include "cmakeprojectconstants.h" +#include "cmakeprojectmanagertr.h" #include "cmaketoolmanager.h" #include "presetsmacros.h" @@ -488,7 +489,7 @@ QList CMakeProjectImporter::examineDirectory(const FilePath &importPath, .canonicalPath(); const FilePath canonicalProjectDirectory = projectDirectory().canonicalPath(); if (data->cmakeHomeDirectory != canonicalProjectDirectory) { - *warningMessage = tr("Unexpected source directory \"%1\", expected \"%2\". " + *warningMessage = Tr::tr("Unexpected source directory \"%1\", expected \"%2\". " "This can be correct in some situations, for example when " "importing a standalone Qt test, but usually this is an error. " "Import the build anyway?") diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.h b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.h index 52f3c1dc0df..f4f66d47faa 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.h @@ -16,8 +16,6 @@ namespace Internal { class CMakeProjectImporter : public QtSupport::QtProjectImporter { - Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::CMakeProjectImporter) - public: CMakeProjectImporter(const Utils::FilePath &path, const Internal::PresetsData &presetsData); diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp index fd7e1de31b8..33d9684acbc 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp @@ -7,6 +7,7 @@ #include "cmakekitinformation.h" #include "cmakeproject.h" #include "cmakeprojectconstants.h" +#include "cmakeprojectmanagertr.h" #include "cmakeprojectnodes.h" #include @@ -32,10 +33,10 @@ using namespace ProjectExplorer; using namespace CMakeProjectManager::Internal; CMakeManager::CMakeManager() - : m_runCMakeAction(new QAction(QIcon(), tr("Run CMake"), this)) - , m_clearCMakeCacheAction(new QAction(QIcon(), tr("Clear CMake Configuration"), this)) - , m_runCMakeActionContextMenu(new QAction(QIcon(), tr("Run CMake"), this)) - , m_rescanProjectAction(new QAction(QIcon(), tr("Rescan Project"), this)) + : m_runCMakeAction(new QAction(QIcon(), Tr::tr("Run CMake"), this)) + , m_clearCMakeCacheAction(new QAction(QIcon(), Tr::tr("Clear CMake Configuration"), this)) + , m_runCMakeActionContextMenu(new QAction(QIcon(), Tr::tr("Run CMake"), this)) + , m_rescanProjectAction(new QAction(QIcon(), Tr::tr("Rescan Project"), this)) { Core::ActionContainer *mbuild = Core::ActionManager::actionContainer(ProjectExplorer::Constants::M_BUILDPROJECT); @@ -77,7 +78,7 @@ CMakeManager::CMakeManager() runCMake(ProjectTree::currentBuildSystem()); }); - m_buildFileContextMenu = new QAction(tr("Build"), this); + m_buildFileContextMenu = new QAction(Tr::tr("Build"), this); command = Core::ActionManager::registerAction(m_buildFileContextMenu, Constants::BUILD_FILE_CONTEXT_MENU, projectContext); @@ -95,15 +96,15 @@ CMakeManager::CMakeManager() rescanProject(ProjectTree::currentBuildSystem()); }); - m_buildFileAction = new Utils::ParameterAction(tr("Build File"), - tr("Build File \"%1\""), + m_buildFileAction = new Utils::ParameterAction(Tr::tr("Build File"), + Tr::tr("Build File \"%1\""), Utils::ParameterAction::AlwaysEnabled, this); command = Core::ActionManager::registerAction(m_buildFileAction, Constants::BUILD_FILE); command->setAttribute(Core::Command::CA_Hide); command->setAttribute(Core::Command::CA_UpdateText); command->setDescription(m_buildFileAction->text()); - command->setDefaultKeySequence(QKeySequence(tr("Ctrl+Alt+B"))); + command->setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Alt+B"))); mbuild->addAction(command, ProjectExplorer::Constants::G_BUILD_BUILD); connect(m_buildFileAction, &QAction::triggered, this, [this] { buildFile(); }); @@ -230,7 +231,7 @@ void CMakeManager::buildFile(Node *node) targetBase = relativeBuildDir / "CMakeFiles" / (targetNode->displayName() + ".dir"); } else if (!generator.contains("Makefiles")) { Core::MessageManager::writeFlashing( - tr("Build File is not supported for generator \"%1\"").arg(generator)); + Tr::tr("Build File is not supported for generator \"%1\"").arg(generator)); return; } diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp index 3cb364a08ad..fb634398224 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp @@ -5,29 +5,32 @@ #include "cmakebuildsystem.h" #include "cmakeprojectconstants.h" +#include "cmakeprojectmanagertr.h" #include + #include + #include #include #include using namespace ProjectExplorer; +using namespace Utils; -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { -CMakeInputsNode::CMakeInputsNode(const Utils::FilePath &cmakeLists) : +CMakeInputsNode::CMakeInputsNode(const FilePath &cmakeLists) : ProjectExplorer::ProjectNode(cmakeLists) { setPriority(Node::DefaultPriority - 10); // Bottom most! - setDisplayName(QCoreApplication::translate("CMakeFilesProjectNode", "CMake Modules")); + setDisplayName(Tr::tr("CMake Modules")); setIcon(DirectoryIcon(ProjectExplorer::Constants::FILEOVERLAY_MODULES)); setListInProject(false); } -CMakeListsNode::CMakeListsNode(const Utils::FilePath &cmakeListPath) : +CMakeListsNode::CMakeListsNode(const FilePath &cmakeListPath) : ProjectExplorer::ProjectNode(cmakeListPath) { setIcon(DirectoryIcon(Constants::Icons::FILE_OVERLAY)); @@ -39,12 +42,12 @@ bool CMakeListsNode::showInSimpleTree() const return false; } -std::optional CMakeListsNode::visibleAfterAddFileAction() const +std::optional CMakeListsNode::visibleAfterAddFileAction() const { return filePath().pathAppended("CMakeLists.txt"); } -CMakeProjectNode::CMakeProjectNode(const Utils::FilePath &directory) : +CMakeProjectNode::CMakeProjectNode(const FilePath &directory) : ProjectExplorer::ProjectNode(directory) { setPriority(Node::DefaultProjectPriority + 1000); @@ -57,7 +60,7 @@ QString CMakeProjectNode::tooltip() const return QString(); } -CMakeTargetNode::CMakeTargetNode(const Utils::FilePath &directory, const QString &target) : +CMakeTargetNode::CMakeTargetNode(const FilePath &directory, const QString &target) : ProjectExplorer::ProjectNode(directory) { m_target = target; @@ -77,17 +80,17 @@ QString CMakeTargetNode::buildKey() const return m_target; } -Utils::FilePath CMakeTargetNode::buildDirectory() const +FilePath CMakeTargetNode::buildDirectory() const { return m_buildDirectory; } -void CMakeTargetNode::setBuildDirectory(const Utils::FilePath &directory) +void CMakeTargetNode::setBuildDirectory(const FilePath &directory) { m_buildDirectory = directory; } -QVariant CMakeTargetNode::data(Utils::Id role) const +QVariant CMakeTargetNode::data(Id role) const { auto value = [this](const QByteArray &key) -> QVariant { for (const CMakeConfigItem &configItem : m_config) { @@ -169,7 +172,7 @@ void CMakeTargetNode::setConfig(const CMakeConfig &config) m_config = config; } -std::optional CMakeTargetNode::visibleAfterAddFileAction() const +std::optional CMakeTargetNode::visibleAfterAddFileAction() const { return filePath().pathAppended("CMakeLists.txt"); } @@ -182,19 +185,16 @@ void CMakeTargetNode::build() static_cast(t->buildSystem())->buildCMakeTarget(displayName()); } -void CMakeTargetNode::setTargetInformation(const QList &artifacts, - const QString &type) +void CMakeTargetNode::setTargetInformation(const QList &artifacts, const QString &type) { - m_tooltip = QCoreApplication::translate("CMakeTargetNode", "Target type: ") + type + "
"; + m_tooltip = Tr::tr("Target type: ") + type + "
"; if (artifacts.isEmpty()) { - m_tooltip += QCoreApplication::translate("CMakeTargetNode", "No build artifacts"); + m_tooltip += Tr::tr("No build artifacts"); } else { - const QStringList tmp = Utils::transform(artifacts, &Utils::FilePath::toUserOutput); - m_tooltip += QCoreApplication::translate("CMakeTargetNode", "Build artifacts:") + "
" - + tmp.join("
"); + const QStringList tmp = Utils::transform(artifacts, &FilePath::toUserOutput); + m_tooltip += Tr::tr("Build artifacts:") + "
" + tmp.join("
"); m_artifact = artifacts.first(); } } -} // Internal -} // CMakeBuildSystem +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h index 05f081bf994..2de51c592bd 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h @@ -7,8 +7,7 @@ #include -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { class CMakeInputsNode : public ProjectExplorer::ProjectNode { @@ -59,5 +58,4 @@ private: CMakeConfig m_config; }; -} // namespace Internal -} // namespace CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp index e543f02f866..0178164b39c 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp @@ -12,6 +12,7 @@ #include "cmakeproject.h" #include "cmakeprojectconstants.h" #include "cmakeprojectmanager.h" +#include "cmakeprojectmanagertr.h" #include "cmakeprojectnodes.h" #include "cmakesettingspage.h" #include "cmakespecificsettings.h" @@ -20,9 +21,11 @@ #include #include #include + #include #include #include + #include #include @@ -32,8 +35,7 @@ using namespace Core; using namespace ProjectExplorer; using namespace Utils; -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { class CMakeProjectPluginPrivate { @@ -41,8 +43,8 @@ public: CMakeToolManager cmakeToolManager; // have that before the first CMakeKitAspect ParameterAction buildTargetContextAction{ - CMakeProjectPlugin::tr("Build"), - CMakeProjectPlugin:: tr("Build \"%1\""), + Tr::tr("Build"), + Tr::tr("Build \"%1\""), ParameterAction::AlwaysEnabled/*handled manually*/ }; @@ -86,7 +88,7 @@ bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString * "CMakeLists.txt"); TextEditor::SnippetProvider::registerGroup(Constants::CMAKE_SNIPPETS_GROUP_ID, - tr("CMake", "SnippetProvider")); + Tr::tr("CMake", "SnippetProvider")); ProjectManager::registerProjectType(Constants::CMAKE_PROJECT_MIMETYPE); //register actions @@ -131,6 +133,5 @@ void CMakeProjectPlugin::updateContextActions(Node *node) d->buildTargetContextAction.setVisible(targetNode); } -} // Internal -} // CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h index 288500fc82b..9ff1ae68bdf 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h @@ -7,8 +7,7 @@ namespace ProjectExplorer { class Node; } -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { class CMakeSpecificSettings; @@ -45,5 +44,4 @@ private: class CMakeProjectPluginPrivate *d = nullptr; }; -} // namespace Internal -} // namespace CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp index a3aec3c339c..319e35b6858 100644 --- a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp +++ b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp @@ -4,6 +4,7 @@ #include "cmakesettingspage.h" #include "cmakeprojectconstants.h" +#include "cmakeprojectmanagertr.h" #include "cmaketool.h" #include "cmaketoolmanager.h" @@ -21,7 +22,6 @@ #include #include -#include #include #include #include @@ -42,8 +42,6 @@ class CMakeToolTreeItem; class CMakeToolItemModel : public TreeModel { - Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::CMakeSettingsPage) - public: CMakeToolItemModel(); @@ -77,8 +75,6 @@ private: class CMakeToolTreeItem : public TreeItem { - Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::CMakeSettingsPage) - public: CMakeToolTreeItem(const CMakeTool *item, bool changed) : m_id(item->id()) @@ -122,9 +118,9 @@ public: cmake.setFilePath(m_executable); m_isSupported = cmake.hasFileApi(); - m_tooltip = tr("Version: %1").arg(cmake.versionDisplay()); - m_tooltip += "
" + tr("Supports fileApi: %1").arg(m_isSupported ? tr("yes") : tr("no")); - m_tooltip += "
" + tr("Detection source: \"%1\"").arg(m_detectionSource); + m_tooltip = Tr::tr("Version: %1").arg(cmake.versionDisplay()); + m_tooltip += "
" + Tr::tr("Supports fileApi: %1").arg(m_isSupported ? Tr::tr("yes") : Tr::tr("no")); + m_tooltip += "
" + Tr::tr("Detection source: \"%1\"").arg(m_detectionSource); m_versionDisplay = cmake.versionDisplay(); } @@ -141,7 +137,7 @@ public: case 0: { QString name = m_name; if (model()->defaultItemId() == m_id) - name += tr(" (Default)"); + name += Tr::tr(" (Default)"); return name; } case 1: { @@ -160,20 +156,13 @@ public: QString result = m_tooltip; QString error; if (!m_pathExists) { - error = QCoreApplication::translate( - "CMakeProjectManager::Internal::CMakeToolTreeItem", - "CMake executable path does not exist."); + error = Tr::tr("CMake executable path does not exist."); } else if (!m_pathIsFile) { - error = QCoreApplication::translate( - "CMakeProjectManager::Internal::CMakeToolTreeItem", - "CMake executable path is not a file."); + error = Tr::tr("CMake executable path is not a file."); } else if (!m_pathIsExecutable) { - error = QCoreApplication::translate( - "CMakeProjectManager::Internal::CMakeToolTreeItem", - "CMake executable path is not executable."); + error = Tr::tr("CMake executable path is not executable."); } else if (!m_isSupported) { - error = QCoreApplication::translate( - "CMakeProjectManager::Internal::CMakeToolTreeItem", + error = Tr::tr( "CMake executable does not provide required IDE integration features."); } if (result.isEmpty() || error.isEmpty()) @@ -213,11 +202,11 @@ public: CMakeToolItemModel::CMakeToolItemModel() { - setHeader({tr("Name"), tr("Path")}); + setHeader({Tr::tr("Name"), Tr::tr("Path")}); rootItem()->appendChild( new StaticTreeItem({ProjectExplorer::Constants::msgAutoDetected()}, {ProjectExplorer::Constants::msgAutoDetectedToolTip()})); - rootItem()->appendChild(new StaticTreeItem(tr("Manual"))); + rootItem()->appendChild(new StaticTreeItem(Tr::tr("Manual"))); const QList items = CMakeToolManager::cmakeTools(); for (const CMakeTool *item : items) @@ -400,8 +389,6 @@ QString CMakeToolItemModel::uniqueDisplayName(const QString &base) const class CMakeToolItemConfigWidget : public QWidget { - Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::CMakeSettingsPage) - public: explicit CMakeToolItemConfigWidget(CMakeToolItemModel *model); void load(const CMakeToolTreeItem *item); @@ -437,20 +424,20 @@ CMakeToolItemConfigWidget::CMakeToolItemConfigWidget(CMakeToolItemModel *model) m_qchFileChooser->setMinimumWidth(400); m_qchFileChooser->setHistoryCompleter(QLatin1String("Cmake.qchFile.History")); m_qchFileChooser->setPromptDialogFilter("*.qch"); - m_qchFileChooser->setPromptDialogTitle(tr("CMake .qch File")); + m_qchFileChooser->setPromptDialogTitle(Tr::tr("CMake .qch File")); m_versionLabel = new QLabel(this); m_autoRunCheckBox = new QCheckBox; - m_autoRunCheckBox->setText(tr("Autorun CMake")); - m_autoRunCheckBox->setToolTip(tr("Automatically run CMake after changes to CMake project files.")); + m_autoRunCheckBox->setText(Tr::tr("Autorun CMake")); + m_autoRunCheckBox->setToolTip(Tr::tr("Automatically run CMake after changes to CMake project files.")); auto formLayout = new QFormLayout(this); formLayout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); - formLayout->addRow(new QLabel(tr("Name:")), m_displayNameLineEdit); - formLayout->addRow(new QLabel(tr("Path:")), m_binaryChooser); - formLayout->addRow(new QLabel(tr("Version:")), m_versionLabel); - formLayout->addRow(new QLabel(tr("Help file:")), m_qchFileChooser); + formLayout->addRow(new QLabel(Tr::tr("Name:")), m_displayNameLineEdit); + formLayout->addRow(new QLabel(Tr::tr("Path:")), m_binaryChooser); + formLayout->addRow(new QLabel(Tr::tr("Version:")), m_versionLabel); + formLayout->addRow(new QLabel(Tr::tr("Help file:")), m_qchFileChooser); formLayout->addRow(m_autoRunCheckBox); connect(m_binaryChooser, &PathChooser::browsingFinished, this, &CMakeToolItemConfigWidget::onBinaryPathEditingFinished); @@ -517,22 +504,20 @@ void CMakeToolItemConfigWidget::load(const CMakeToolTreeItem *item) class CMakeToolConfigWidget : public Core::IOptionsPageWidget { - Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::CMakeToolConfigWidget) - public: CMakeToolConfigWidget() { - m_addButton = new QPushButton(tr("Add"), this); + m_addButton = new QPushButton(Tr::tr("Add"), this); - m_cloneButton = new QPushButton(tr("Clone"), this); + m_cloneButton = new QPushButton(Tr::tr("Clone"), this); m_cloneButton->setEnabled(false); - m_delButton = new QPushButton(tr("Remove"), this); + m_delButton = new QPushButton(Tr::tr("Remove"), this); m_delButton->setEnabled(false); - m_makeDefButton = new QPushButton(tr("Make Default"), this); + m_makeDefButton = new QPushButton(Tr::tr("Make Default"), this); m_makeDefButton->setEnabled(false); - m_makeDefButton->setToolTip(tr("Set as the default CMake Tool to use when creating a new kit or when no value is set.")); + m_makeDefButton->setToolTip(Tr::tr("Set as the default CMake Tool to use when creating a new kit or when no value is set.")); m_container = new DetailsWidget(this); m_container->setState(DetailsWidget::NoSummary); @@ -613,7 +598,7 @@ void CMakeToolConfigWidget::cloneCMakeTool() if (!m_currentItem) return; - QModelIndex newItem = m_model.addCMakeTool(tr("Clone of %1").arg(m_currentItem->m_name), + QModelIndex newItem = m_model.addCMakeTool(Tr::tr("Clone of %1").arg(m_currentItem->m_name), m_currentItem->m_executable, m_currentItem->m_qchFile, m_currentItem->m_isAutoRun, @@ -624,7 +609,7 @@ void CMakeToolConfigWidget::cloneCMakeTool() void CMakeToolConfigWidget::addCMakeTool() { - QModelIndex newItem = m_model.addCMakeTool(m_model.uniqueDisplayName(tr("New CMake")), + QModelIndex newItem = m_model.addCMakeTool(m_model.uniqueDisplayName(Tr::tr("New CMake")), FilePath(), FilePath(), true, @@ -681,7 +666,7 @@ void CMakeToolConfigWidget::currentCMakeToolChanged(const QModelIndex &newCurren CMakeSettingsPage::CMakeSettingsPage() { setId(Constants::Settings::TOOLS_ID); - setDisplayName(tr("Tools")); + setDisplayName(Tr::Tr::tr("Tools")); setDisplayCategory("CMake"); setCategory(Constants::Settings::CATEGORY); setWidgetCreator([] { return new CMakeToolConfigWidget; }); diff --git a/src/plugins/cmakeprojectmanager/cmakespecificsettings.cpp b/src/plugins/cmakeprojectmanager/cmakespecificsettings.cpp index 00c8ad6fe7f..b87e539b881 100644 --- a/src/plugins/cmakeprojectmanager/cmakespecificsettings.cpp +++ b/src/plugins/cmakeprojectmanager/cmakespecificsettings.cpp @@ -1,9 +1,11 @@ // Copyright (C) 2018 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "cmakeprojectconstants.h" #include "cmakespecificsettings.h" +#include "cmakeprojectconstants.h" +#include "cmakeprojectmanagertr.h" + #include #include @@ -11,8 +13,7 @@ using namespace Utils; -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { CMakeSpecificSettings::CMakeSpecificSettings() { @@ -25,10 +26,10 @@ CMakeSpecificSettings::CMakeSpecificSettings() registerAspect(&afterAddFileSetting); afterAddFileSetting.setSettingsKey("ProjectPopupSetting"); afterAddFileSetting.setDefaultValue(AfterAddFileAction::AskUser); - afterAddFileSetting.addOption(tr("Ask about copying file paths")); - afterAddFileSetting.addOption(tr("Do not copy file paths")); - afterAddFileSetting.addOption(tr("Copy file paths")); - afterAddFileSetting.setToolTip(tr("Determines whether file paths are copied " + afterAddFileSetting.addOption(::CMakeProjectManager::Tr::tr("Ask about copying file paths")); + afterAddFileSetting.addOption(::CMakeProjectManager::Tr::tr("Do not copy file paths")); + afterAddFileSetting.addOption(::CMakeProjectManager::Tr::tr("Copy file paths")); + afterAddFileSetting.setToolTip(::CMakeProjectManager::Tr::tr("Determines whether file paths are copied " "to the clipboard for pasting to the CMakeLists.txt file when you " "add new files to CMake projects.")); @@ -41,21 +42,22 @@ CMakeSpecificSettings::CMakeSpecificSettings() registerAspect(&packageManagerAutoSetup); packageManagerAutoSetup.setSettingsKey("PackageManagerAutoSetup"); packageManagerAutoSetup.setDefaultValue(false); - packageManagerAutoSetup.setLabelText(tr("Package manager auto setup")); - packageManagerAutoSetup.setToolTip(tr("Add the CMAKE_PROJECT_INCLUDE_BEFORE variable " + packageManagerAutoSetup.setLabelText(::CMakeProjectManager::Tr::tr("Package manager auto setup")); + packageManagerAutoSetup.setToolTip(::CMakeProjectManager::Tr::tr("Add the CMAKE_PROJECT_INCLUDE_BEFORE variable " "pointing to a CMake script that will install dependencies from the conanfile.txt, " "conanfile.py, or vcpkg.json file from the project source directory.")); registerAspect(&askBeforeReConfigureInitialParams); askBeforeReConfigureInitialParams.setSettingsKey("AskReConfigureInitialParams"); askBeforeReConfigureInitialParams.setDefaultValue(true); - askBeforeReConfigureInitialParams.setLabelText(tr("Ask before re-configuring with " + askBeforeReConfigureInitialParams.setLabelText(::CMakeProjectManager::Tr::tr("Ask before re-configuring with " "initial parameters")); registerAspect(&showSourceSubFolders); showSourceSubFolders.setSettingsKey("ShowSourceSubFolders"); showSourceSubFolders.setDefaultValue(true); - showSourceSubFolders.setLabelText(tr("Show subfolders inside source group folders")); + showSourceSubFolders.setLabelText( + ::CMakeProjectManager::Tr::tr("Show subfolders inside source group folders")); } // CMakeSpecificSettingsPage @@ -63,7 +65,7 @@ CMakeSpecificSettings::CMakeSpecificSettings() CMakeSpecificSettingsPage::CMakeSpecificSettingsPage(CMakeSpecificSettings *settings) { setId(Constants::Settings::GENERAL_ID); - setDisplayName(tr("General")); + setDisplayName(::CMakeProjectManager::Tr::tr("General")); setDisplayCategory("CMake"); setCategory(Constants::Settings::CATEGORY); setCategoryIconPath(Constants::Icons::SETTINGS_CATEGORY); @@ -74,7 +76,7 @@ CMakeSpecificSettingsPage::CMakeSpecificSettingsPage(CMakeSpecificSettings *sett using namespace Layouting; Column { Group { - title(::CMakeProjectManager::Internal::CMakeSpecificSettings::tr("Adding Files")), + title(::CMakeProjectManager::Tr::tr("Adding Files")), Column { s.afterAddFileSetting } }, s.packageManagerAutoSetup, @@ -85,5 +87,4 @@ CMakeSpecificSettingsPage::CMakeSpecificSettingsPage(CMakeSpecificSettings *sett }); } -} // Internal -} // CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/cmakespecificsettings.h b/src/plugins/cmakeprojectmanager/cmakespecificsettings.h index dce62f23140..6fccc790b9e 100644 --- a/src/plugins/cmakeprojectmanager/cmakespecificsettings.h +++ b/src/plugins/cmakeprojectmanager/cmakespecificsettings.h @@ -7,8 +7,7 @@ #include -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { enum AfterAddFileAction : int { AskUser, @@ -18,8 +17,6 @@ enum AfterAddFileAction : int { class CMakeSpecificSettings final : public Utils::AspectContainer { - Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::CMakeSpecificSettings) - public: CMakeSpecificSettings(); @@ -36,5 +33,4 @@ public: explicit CMakeSpecificSettingsPage(CMakeSpecificSettings *settings); }; -} // Internal -} // CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/cmaketool.cpp b/src/plugins/cmakeprojectmanager/cmaketool.cpp index 7b9f699f067..5d82561d68b 100644 --- a/src/plugins/cmakeprojectmanager/cmaketool.cpp +++ b/src/plugins/cmakeprojectmanager/cmaketool.cpp @@ -3,6 +3,7 @@ #include "cmaketool.h" +#include "cmakeprojectmanagertr.h" #include "cmaketoolmanager.h" #include @@ -294,7 +295,7 @@ CMakeTool::Version CMakeTool::version() const QString CMakeTool::versionDisplay() const { if (!isValid()) - return CMakeToolManager::tr("Version not parseable"); + return Tr::tr("Version not parseable"); const Version &version = m_introspection->m_version; if (version.fullVersion.isEmpty()) diff --git a/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp b/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp index f6174e6681c..2d017528293 100644 --- a/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp +++ b/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp @@ -3,6 +3,7 @@ #include "cmaketoolmanager.h" +#include "cmakeprojectmanagertr.h" #include "cmaketoolsettingsaccessor.h" #include @@ -19,10 +20,6 @@ using namespace Utils; namespace CMakeProjectManager { -// -------------------------------------------------------------------- -// CMakeToolManagerPrivate: -// -------------------------------------------------------------------- - class CMakeToolManagerPrivate { public: @@ -30,12 +27,8 @@ public: std::vector> m_cmakeTools; Internal::CMakeToolSettingsAccessor m_accessor; }; + static CMakeToolManagerPrivate *d = nullptr; - -// -------------------------------------------------------------------- -// CMakeToolManager: -// -------------------------------------------------------------------- - CMakeToolManager *CMakeToolManager::m_instance = nullptr; CMakeToolManager::CMakeToolManager() @@ -163,14 +156,14 @@ QList CMakeToolManager::autoDetectCMakeForDevice(const FilePaths &searchPath QString *logMessage) { QList result; - QStringList messages{tr("Searching CMake binaries...")}; + QStringList messages{Tr::tr("Searching CMake binaries...")}; for (const FilePath &path : searchPaths) { const FilePath cmake = path.pathAppended("cmake").withExecutableSuffix(); if (cmake.isExecutableFile()) { const Id currentId = registerCMakeByPath(cmake, detectionSource); if (currentId.isValid()) result.push_back(currentId); - messages.append(tr("Found \"%1\"").arg(cmake.toUserOutput())); + messages.append(Tr::tr("Found \"%1\"").arg(cmake.toUserOutput())); } } if (logMessage) @@ -200,12 +193,12 @@ Id CMakeToolManager::registerCMakeByPath(const FilePath &cmakePath, const QStrin void CMakeToolManager::removeDetectedCMake(const QString &detectionSource, QString *logMessage) { - QStringList logMessages{tr("Removing CMake entries...")}; + QStringList logMessages{Tr::tr("Removing CMake entries...")}; while (true) { auto toRemove = Utils::take(d->m_cmakeTools, Utils::equal(&CMakeTool::detectionSource, detectionSource)); if (!toRemove.has_value()) break; - logMessages.append(tr("Removed \"%1\"").arg((*toRemove)->displayName())); + logMessages.append(Tr::tr("Removed \"%1\"").arg((*toRemove)->displayName())); emit m_instance->cmakeRemoved((*toRemove)->id()); } @@ -218,7 +211,7 @@ void CMakeToolManager::removeDetectedCMake(const QString &detectionSource, QStri void CMakeToolManager::listDetectedCMake(const QString &detectionSource, QString *logMessage) { QTC_ASSERT(logMessage, return); - QStringList logMessages{tr("CMake:")}; + QStringList logMessages{Tr::tr("CMake:")}; for (const auto &tool : qAsConst(d->m_cmakeTools)) { if (tool->detectionSource() == detectionSource) logMessages.append(tool->displayName()); @@ -257,4 +250,4 @@ void CMakeToolManager::ensureDefaultCMakeToolIsValid() emit m_instance->defaultCMakeChanged(); } -} // namespace CMakeProjectManager +} // CMakeProjectManager diff --git a/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp b/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp index 3851afc2844..176334a57eb 100644 --- a/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp +++ b/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp @@ -3,15 +3,15 @@ #include "cmaketoolsettingsaccessor.h" +#include "cmakeprojectmanagertr.h" #include "cmaketool.h" -#include "cmaketoolmanager.h" #include #include -#include #include +#include #include @@ -83,8 +83,7 @@ static std::vector> autoDetectCMakeTools() for (const FilePath &command : qAsConst(suspects)) { auto item = std::make_unique(CMakeTool::AutoDetection, CMakeTool::createId()); item->setFilePath(command); - item->setDisplayName(::CMakeProjectManager::CMakeToolManager::tr("System CMake at %1") - .arg(command.toUserOutput())); + item->setDisplayName(Tr::tr("System CMake at %1").arg(command.toUserOutput())); found.emplace_back(std::move(item)); } @@ -145,7 +144,7 @@ mergeTools(std::vector> &sdkTools, CMakeToolSettingsAccessor::CMakeToolSettingsAccessor() : UpgradingSettingsAccessor("QtCreatorCMakeTools", - QCoreApplication::translate("CMakeProjectManager::CMakeToolManager", "CMake"), + Tr::tr("CMake"), Core::Constants::IDE_DISPLAY_NAME) { setBaseFilePath(Core::ICore::userResourcePath(CMAKE_TOOL_FILENAME)); diff --git a/src/plugins/cmakeprojectmanager/configmodel.cpp b/src/plugins/cmakeprojectmanager/configmodel.cpp index dd4f82683fa..084d917ffa8 100644 --- a/src/plugins/cmakeprojectmanager/configmodel.cpp +++ b/src/plugins/cmakeprojectmanager/configmodel.cpp @@ -3,6 +3,8 @@ #include "configmodel.h" +#include "cmakeprojectmanagertr.h" + #include #include #include @@ -11,8 +13,7 @@ #include #include -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { // DataItem @@ -104,7 +105,7 @@ CMakeConfigItem ConfigModel::DataItem::toCMakeConfigItem() const ConfigModel::ConfigModel(QObject *parent) : Utils::TreeModel<>(parent) { - setHeader({tr("Key"), tr("Value")}); + setHeader({Tr::tr("Key"), Tr::tr("Value")}); } ConfigModel::~ConfigModel() = default; @@ -578,9 +579,7 @@ QVariant ConfigModelTreeItem::data(int column, int role) const : QVariant(); case Qt::DisplayRole: if (column == 0) - return dataItem->key.isEmpty() - ? ConfigModel::tr("") - : dataItem->key; + return dataItem->key.isEmpty() ? Tr::tr("") : dataItem->key; return value; case Qt::EditRole: if (column == 0) @@ -668,23 +667,22 @@ QString ConfigModelTreeItem::toolTip() const const QString pattern = "

%1
%2
"; if (dataItem->isInitial) { if (!dataItem->kitValue.isEmpty()) - tooltip << pattern.arg(ConfigModel::tr("Kit:")).arg(dataItem->kitValue); + tooltip << pattern.arg(Tr::tr("Kit:")).arg(dataItem->kitValue); - tooltip << pattern.arg(ConfigModel::tr("Initial Configuration:")).arg(dataItem->currentValue()); + tooltip << pattern.arg(Tr::tr("Initial Configuration:")).arg(dataItem->currentValue()); } else { if (!dataItem->initialValue.isEmpty()) { - tooltip << pattern.arg(ConfigModel::tr("Initial Configuration:")) + tooltip << pattern.arg(Tr::tr("Initial Configuration:")) .arg(dataItem->initialValue); } if (dataItem->inCMakeCache) { - tooltip << pattern.arg(ConfigModel::tr("Current Configuration:")) - .arg(dataItem->currentValue()); + tooltip << pattern.arg(Tr::tr("Current Configuration:")).arg(dataItem->currentValue()); } else { - tooltip << pattern.arg(ConfigModel::tr("Not in CMakeCache.txt")).arg(QString()); + tooltip << pattern.arg(Tr::tr("Not in CMakeCache.txt")).arg(QString()); } } - tooltip << pattern.arg(ConfigModel::tr("Type:")).arg(dataItem->typeDisplay()); + tooltip << pattern.arg(Tr::tr("Type:")).arg(dataItem->typeDisplay()); return "
" + tooltip.join(QString()) + "
"; } @@ -695,5 +693,4 @@ QString ConfigModelTreeItem::currentValue() const return dataItem->isUserChanged ? dataItem->newValue : dataItem->value; } -} // namespace Internal -} // namespace CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/configmodel.h b/src/plugins/cmakeprojectmanager/configmodel.h index fd556cf0037..2d235a30aa9 100644 --- a/src/plugins/cmakeprojectmanager/configmodel.h +++ b/src/plugins/cmakeprojectmanager/configmodel.h @@ -7,10 +7,7 @@ #include -#include - -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { class ConfigModelTreeItem; @@ -136,5 +133,4 @@ public: ConfigModel::InternalDataItem *dataItem; }; -} // namespace Internal -} // namespace CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp b/src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp index 93d33b98c30..d12b91438e7 100644 --- a/src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp +++ b/src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp @@ -4,15 +4,17 @@ #include "configmodelitemdelegate.h" #include "configmodel.h" +#include "cmakeprojectmanagertr.h" #include #include -namespace CMakeProjectManager { -namespace Internal { +using namespace Utils; -ConfigModelItemDelegate::ConfigModelItemDelegate(const Utils::FilePath &base, QObject* parent) +namespace CMakeProjectManager::Internal { + +ConfigModelItemDelegate::ConfigModelItemDelegate(const FilePath &base, QObject* parent) : QStyledItemDelegate(parent) , m_base(base) { } @@ -24,17 +26,17 @@ QWidget *ConfigModelItemDelegate::createEditor(QWidget *parent, const QStyleOpti if (index.column() == 1) { ConfigModel::DataItem data = ConfigModel::dataItemFromIndex(index); if (data.type == ConfigModel::DataItem::FILE || data.type == ConfigModel::DataItem::DIRECTORY) { - auto edit = new Utils::PathChooser(parent); + auto edit = new PathChooser(parent); edit->setAttribute(Qt::WA_MacSmallSize); edit->setFocusPolicy(Qt::StrongFocus); edit->setBaseDirectory(m_base); edit->setAutoFillBackground(true); if (data.type == ConfigModel::DataItem::FILE) { - edit->setExpectedKind(Utils::PathChooser::File); - edit->setPromptDialogTitle(tr("Select a file for %1").arg(data.key)); + edit->setExpectedKind(PathChooser::File); + edit->setPromptDialogTitle(Tr::tr("Select a file for %1").arg(data.key)); } else { - edit->setExpectedKind(Utils::PathChooser::Directory); - edit->setPromptDialogTitle(tr("Select a directory for %1").arg(data.key)); + edit->setExpectedKind(PathChooser::Directory); + edit->setPromptDialogTitle(Tr::tr("Select a directory for %1").arg(data.key)); } return edit; } else if (!data.values.isEmpty()) { @@ -64,8 +66,8 @@ void ConfigModelItemDelegate::setEditorData(QWidget *editor, const QModelIndex & if (index.column() == 1) { ConfigModel::DataItem data = ConfigModel::dataItemFromIndex(index); if (data.type == ConfigModel::DataItem::FILE || data.type == ConfigModel::DataItem::DIRECTORY) { - auto edit = static_cast(editor); - edit->setFilePath(Utils::FilePath::fromUserInput(data.value)); + auto edit = static_cast(editor); + edit->setFilePath(FilePath::fromUserInput(data.value)); return; } else if (!data.values.isEmpty()) { auto edit = static_cast(editor); @@ -91,7 +93,7 @@ void ConfigModelItemDelegate::setModelData(QWidget *editor, QAbstractItemModel * if (index.column() == 1) { ConfigModel::DataItem data = ConfigModel::dataItemFromIndex(index); if (data.type == ConfigModel::DataItem::FILE || data.type == ConfigModel::DataItem::DIRECTORY) { - auto edit = static_cast(editor); + auto edit = static_cast(editor); if (edit->rawFilePath().toString() != data.value) model->setData(index, edit->filePath().toString(), Qt::EditRole); return; @@ -133,6 +135,4 @@ QSize ConfigModelItemDelegate::sizeHint(const QStyleOptionViewItem &option, return QSize(100, height); } -} // namespace Internal -} // namespace CMakeProjectManager - +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/configmodelitemdelegate.h b/src/plugins/cmakeprojectmanager/configmodelitemdelegate.h index a8668456448..d8584f10ea5 100644 --- a/src/plugins/cmakeprojectmanager/configmodelitemdelegate.h +++ b/src/plugins/cmakeprojectmanager/configmodelitemdelegate.h @@ -3,13 +3,12 @@ #pragma once -#include +#include #include #include -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { class ConfigModelItemDelegate : public QStyledItemDelegate { @@ -29,5 +28,4 @@ private: Utils::FilePath m_base; }; -} // namespace Internal -} // namespace CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp index 3069e7631ed..804f6a0841b 100644 --- a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp +++ b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp @@ -3,6 +3,7 @@ #include "fileapidataextractor.h" +#include "cmakeprojectmanagertr.h" #include "cmakeprojectplugin.h" #include "cmakespecificsettings.h" #include "fileapiparser.h" @@ -22,13 +23,10 @@ using namespace ProjectExplorer; using namespace Utils; - -namespace { - -using namespace CMakeProjectManager; -using namespace CMakeProjectManager::Internal; using namespace CMakeProjectManager::Internal::FileApiDetails; +namespace CMakeProjectManager::Internal { + // -------------------------------------------------------------------- // Helpers: // -------------------------------------------------------------------- @@ -601,14 +599,12 @@ void addCompileGroups(ProjectNode *targetRoot, addCMakeVFolder(targetRoot, buildDirectory, 100, - QCoreApplication::translate("CMakeProjectManager::Internal::FileApi", - ""), + Tr::tr(""), std::move(buildFileNodes)); addCMakeVFolder(targetRoot, Utils::FilePath(), 10, - QCoreApplication::translate("CMakeProjectManager::Internal::FileApi", - ""), + Tr::tr(""), std::move(otherFileNodes)); } @@ -730,11 +726,6 @@ void setupLocationInfoForTargets(CMakeProjectNode *rootNode, const QList -#include +#include #include #include @@ -17,8 +17,7 @@ #include #include -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { class FileApiData; @@ -53,5 +52,4 @@ FileApiQtcData extractData(FileApiData &data, const Utils::FilePath &sourceDirectory, const Utils::FilePath &buildDirectory); -} // namespace Internal -} // namespace CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/fileapiparser.cpp b/src/plugins/cmakeprojectmanager/fileapiparser.cpp index a5e4216b874..ea323931559 100644 --- a/src/plugins/cmakeprojectmanager/fileapiparser.cpp +++ b/src/plugins/cmakeprojectmanager/fileapiparser.cpp @@ -3,6 +3,8 @@ #include "fileapiparser.h" +#include "cmakeprojectmanagertr.h" + #include #include #include @@ -15,11 +17,11 @@ #include #include -namespace CMakeProjectManager { -namespace Internal { +using namespace Utils; + +namespace CMakeProjectManager::Internal { using namespace FileApiDetails; -using namespace Utils; const char CMAKE_RELATIVE_REPLY_PATH[] = ".cmake/api/v1/reply"; const char CMAKE_RELATIVE_QUERY_PATH[] = ".cmake/api/v1/query"; @@ -40,9 +42,8 @@ static FilePath cmakeReplyDirectory(const FilePath &buildDirectory) static void reportFileApiSetupFailure() { Core::MessageManager::writeFlashing( - QCoreApplication::translate("CMakeProjectManager::Internal", - "Failed to set up CMake file API support. %1 cannot " - "extract project information.") + Tr::tr("Failed to set up CMake file API support. %1 cannot " + "extract project information.") .arg(Core::Constants::IDE_DISPLAY_NAME)); } @@ -99,8 +100,7 @@ std::vector indexList(const QJsonValue &v) static ReplyFileContents readReplyFile(const FilePath &filePath, QString &errorMessage) { const QJsonDocument document = readJsonFile(filePath); - static const QString msg = QCoreApplication::translate("CMakeProjectManager::Internal", - "Invalid reply file created by CMake."); + static const QString msg = Tr::tr("Invalid reply file created by CMake."); ReplyFileContents result; if (document.isNull() || document.isEmpty() || !document.isObject()) { @@ -171,8 +171,7 @@ static CMakeConfig readCacheFile(const FilePath &cacheFile, QString &errorMessag const QJsonObject root = doc.object(); if (!checkJsonObject(root, "cache", 2)) { - errorMessage = QCoreApplication::translate("CMakeProjectManager::Internal", - "Invalid cache file generated by CMake."); + errorMessage = Tr::tr("Invalid cache file generated by CMake."); return {}; } @@ -217,8 +216,7 @@ static std::vector readCMakeFilesFile(const FilePath &cmakeFilesF const QJsonObject root = doc.object(); if (!checkJsonObject(root, "cmakeFiles", 1)) { - errorMessage = QCoreApplication::translate("CMakeProjectManager::Internal", - "Invalid cmakeFiles file generated by CMake."); + errorMessage = Tr::tr( "Invalid cmakeFiles file generated by CMake."); return {}; } @@ -247,8 +245,7 @@ static std::vector readCMakeFilesFile(const FilePath &cmakeFilesF std::vector extractDirectories(const QJsonArray &directories, QString &errorMessage) { if (directories.isEmpty()) { - errorMessage = QCoreApplication::translate( - "CMakeProjectManager::Internal", + errorMessage = Tr::tr( "Invalid codemodel file generated by CMake: No directories."); return {}; } @@ -257,8 +254,7 @@ std::vector extractDirectories(const QJsonArray &directories, QString for (const QJsonValue &v : directories) { const QJsonObject obj = v.toObject(); if (obj.isEmpty()) { - errorMessage = QCoreApplication::translate( - "CMakeProjectManager::Internal", + errorMessage = Tr::tr( "Invalid codemodel file generated by CMake: Empty directory object."); continue; } @@ -279,8 +275,7 @@ std::vector extractDirectories(const QJsonArray &directories, QString static std::vector extractProjects(const QJsonArray &projects, QString &errorMessage) { if (projects.isEmpty()) { - errorMessage = QCoreApplication::translate( - "CMakeProjectManager::Internal", + errorMessage = Tr::tr( "Invalid codemodel file generated by CMake: No projects."); return {}; } @@ -290,8 +285,7 @@ static std::vector extractProjects(const QJsonArray &projects, QString const QJsonObject obj = v.toObject(); if (obj.isEmpty()) { qCDebug(cmakeFileApi) << "Empty project skipped!"; - errorMessage = QCoreApplication::translate( - "CMakeProjectManager::Internal", + errorMessage = Tr::tr( "Invalid codemodel file generated by CMake: Empty project object."); continue; } @@ -304,8 +298,7 @@ static std::vector extractProjects(const QJsonArray &projects, QString if (project.directories.empty()) { qCDebug(cmakeFileApi) << "Invalid project skipped!"; - errorMessage = QCoreApplication::translate( - "CMakeProjectManager::Internal", + errorMessage = Tr::tr( "Invalid codemodel file generated by CMake: Broken project data."); continue; } @@ -322,8 +315,7 @@ static std::vector extractTargets(const QJsonArray &targets, QString &er for (const QJsonValue &v : targets) { const QJsonObject obj = v.toObject(); if (obj.isEmpty()) { - errorMessage = QCoreApplication::translate( - "CMakeProjectManager::Internal", + errorMessage = Tr::tr( "Invalid codemodel file generated by CMake: Empty target object."); continue; } @@ -336,8 +328,7 @@ static std::vector extractTargets(const QJsonArray &targets, QString &er if (target.name.isEmpty() || target.id.isEmpty() || target.jsonFile.isEmpty() || target.directory == -1 || target.project == -1) { - errorMessage = QCoreApplication::translate( - "CMakeProjectManager::Internal", + errorMessage = Tr::tr( "Invalid codemodel file generated by CMake: Broken target data."); continue; } @@ -437,8 +428,7 @@ static std::vector extractConfigurations(const QJsonArray &config QString &errorMessage) { if (configs.isEmpty()) { - errorMessage = QCoreApplication::translate( - "CMakeProjectManager::Internal", + errorMessage = Tr::tr( "Invalid codemodel file generated by CMake: No configurations."); return {}; } @@ -447,8 +437,7 @@ static std::vector extractConfigurations(const QJsonArray &config for (const QJsonValue &v : configs) { const QJsonObject obj = v.toObject(); if (obj.isEmpty()) { - errorMessage = QCoreApplication::translate( - "CMakeProjectManager::Internal", + errorMessage = Tr::tr( "Invalid codemodel file generated by CMake: Empty configuration object."); continue; } @@ -460,10 +449,8 @@ static std::vector extractConfigurations(const QJsonArray &config config.targets = extractTargets(obj.value("targets").toArray(), errorMessage); if (!validateIndexes(config)) { - errorMessage - = QCoreApplication::translate("CMakeProjectManager::Internal", - "Invalid codemodel file generated by CMake: Broken " - "indexes in directories, projects, or targets."); + errorMessage = Tr::tr("Invalid codemodel file generated by CMake: Broken " + "indexes in directories, projects, or targets."); return {}; } @@ -479,8 +466,7 @@ static std::vector readCodemodelFile(const FilePath &codemodelFil const QJsonObject root = doc.object(); if (!checkJsonObject(root, "codemodel", 2)) { - errorMessage = QCoreApplication::translate("CMakeProjectManager::Internal", - "Invalid codemodel file generated by CMake."); + errorMessage = Tr::tr("Invalid codemodel file generated by CMake."); return {}; } @@ -507,8 +493,7 @@ static TargetDetails extractTargetDetails(const QJsonObject &root, QString &erro t.type = root.value("type").toString(); if (t.name.isEmpty() || t.id.isEmpty() || t.type.isEmpty()) { - errorMessage = QCoreApplication::translate("CMakeProjectManager::Internal", - "Invalid target file: Information is missing."); + errorMessage = Tr::tr("Invalid target file: Information is missing."); return {}; } @@ -776,8 +761,7 @@ static TargetDetails readTargetFile(const FilePath &targetFile, QString &errorMe TargetDetails result = extractTargetDetails(root, errorMessage); if (errorMessage.isEmpty() && !validateTargetDetails(result)) { - errorMessage = QCoreApplication::translate( - "CMakeProjectManager::Internal", + errorMessage = Tr::tr( "Invalid target file generated by CMake: Broken indexes in target details."); } return result; @@ -854,7 +838,7 @@ FileApiData FileApiParser::parseData(QFutureInterface bool { if (fi.isCanceled()) { - errorMessage = FileApiParser::tr("CMake parsing was cancelled."); + errorMessage = Tr::tr("CMake parsing was cancelled."); return true; } return false; @@ -888,12 +872,12 @@ FileApiData FileApiParser::parseData(QFutureInterface -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { namespace FileApiDetails { @@ -218,7 +217,6 @@ public: class FileApiParser { - Q_DECLARE_TR_FUNCTIONS(FileApiParser) public: static FileApiData parseData(QFutureInterface> &fi, const Utils::FilePath &replyFilePath, @@ -233,5 +231,4 @@ public: static Utils::FilePath scanForCMakeReplyFile(const Utils::FilePath &buildDirectory); }; -} // namespace Internal -} // namespace CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/fileapireader.cpp b/src/plugins/cmakeprojectmanager/fileapireader.cpp index a0e5630fe9b..debc22d4dff 100644 --- a/src/plugins/cmakeprojectmanager/fileapireader.cpp +++ b/src/plugins/cmakeprojectmanager/fileapireader.cpp @@ -4,6 +4,7 @@ #include "fileapireader.h" #include "cmakeprocess.h" +#include "cmakeprojectmanagertr.h" #include "fileapidataextractor.h" #include "fileapiparser.h" @@ -20,8 +21,7 @@ using namespace ProjectExplorer; using namespace Utils; -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { static Q_LOGGING_CATEGORY(cmakeFileApiMode, "qtc.cmake.fileApiMode", QtWarningMsg); @@ -180,7 +180,7 @@ QList FileApiReader::takeBuildTargets(QString &errorMessage){ CMakeConfig FileApiReader::takeParsedConfiguration(QString &errorMessage) { if (m_lastCMakeExitCode != 0) - errorMessage = tr("CMake returned error code: %1").arg(m_lastCMakeExitCode); + errorMessage = Tr::tr("CMake returned error code: %1").arg(m_lastCMakeExitCode); return std::exchange(m_cache, {}); } @@ -283,7 +283,7 @@ void FileApiReader::makeBackupConfiguration(bool store) replyPrev.removeRecursively(); QTC_CHECK(!replyPrev.exists()); if (!reply.renameFile(replyPrev)) - Core::MessageManager::writeFlashing(tr("Failed to rename %1 to %2.") + Core::MessageManager::writeFlashing(Tr::tr("Failed to rename %1 to %2.") .arg(reply.toString(), replyPrev.toString())); } @@ -294,7 +294,7 @@ void FileApiReader::makeBackupConfiguration(bool store) if (cmakeCacheTxt.exists()) if (!FileUtils::copyIfDifferent(cmakeCacheTxt, cmakeCacheTxtPrev)) - Core::MessageManager::writeFlashing(tr("Failed to copy %1 to %2.") + Core::MessageManager::writeFlashing(Tr::tr("Failed to copy %1 to %2.") .arg(cmakeCacheTxt.toString(), cmakeCacheTxtPrev.toString())); } @@ -383,5 +383,4 @@ void FileApiReader::replyDirectoryHasChanged(const QString &directory) const emit dirty(); } -} // namespace Internal -} // namespace CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/fileapireader.h b/src/plugins/cmakeprojectmanager/fileapireader.h index 6f59a17ddda..f8eeceab7ce 100644 --- a/src/plugins/cmakeprojectmanager/fileapireader.h +++ b/src/plugins/cmakeprojectmanager/fileapireader.h @@ -20,12 +20,9 @@ #include #include -namespace ProjectExplorer { -class ProjectNode; -} +namespace ProjectExplorer { class ProjectNode; } -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { class CMakeProcess; class FileApiQtcData; @@ -103,5 +100,4 @@ private: QDateTime m_lastReplyTimestamp; }; -} // namespace Internal -} // namespace CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/presetsparser.cpp b/src/plugins/cmakeprojectmanager/presetsparser.cpp index 98c335975a6..970b05921a5 100644 --- a/src/plugins/cmakeprojectmanager/presetsparser.cpp +++ b/src/plugins/cmakeprojectmanager/presetsparser.cpp @@ -3,13 +3,13 @@ #include "presetsparser.h" -#include +#include "cmakeprojectmanagertr.h" + #include #include #include -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { bool parseVersion(const QJsonValue &jsonValue, int &version) { @@ -284,9 +284,7 @@ bool PresetsParser::parse(const Utils::FilePath &jsonFile, QString &errorMessage { const std::optional jsonContents = jsonFile.fileContents(); if (!jsonContents) { - errorMessage = QCoreApplication::translate("CMakeProjectManager::Internal", - "Failed to read %1 file") - .arg(jsonFile.fileName()); + errorMessage = Tr::tr("Failed to read %1 file").arg(jsonFile.fileName()); return false; } @@ -302,18 +300,14 @@ bool PresetsParser::parse(const Utils::FilePath &jsonFile, QString &errorMessage } if (!jsonDoc.isObject()) { - errorMessage = QCoreApplication::translate("CMakeProjectManager::Internal", - "Invalid %1 file") - .arg(jsonFile.fileName()); + errorMessage = Tr::tr( "Invalid %1 file").arg(jsonFile.fileName()); return false; } QJsonObject root = jsonDoc.object(); if (!parseVersion(root.value("version"), m_presetsData.version)) { - errorMessage = QCoreApplication::translate("CMakeProjectManager::Internal", - "Invalid \"version\" in %1 file") - .arg(jsonFile.fileName()); + errorMessage = Tr::tr("Invalid \"version\" in %1 file").arg(jsonFile.fileName()); return false; } @@ -324,18 +318,14 @@ bool PresetsParser::parse(const Utils::FilePath &jsonFile, QString &errorMessage // optional if (!parseConfigurePresets(root.value("configurePresets"), m_presetsData.configurePresets)) { errorMessage - = QCoreApplication::translate("CMakeProjectManager::Internal", - "Invalid \"configurePresets\" section in %1 file") - .arg(jsonFile.fileName()); + = Tr::tr("Invalid \"configurePresets\" section in %1 file").arg(jsonFile.fileName()); return false; } // optional if (!parseBuildPresets(root.value("buildPresets"), m_presetsData.buildPresets)) { errorMessage - = QCoreApplication::translate("CMakeProjectManager::Internal", - "Invalid \"buildPresets\" section in %1 file") - .arg(jsonFile.fileName()); + = Tr::tr("Invalid \"buildPresets\" section in %1 file").arg(jsonFile.fileName()); return false; } @@ -411,5 +401,4 @@ void PresetsDetails::BuildPreset::inheritFrom(const BuildPreset &other) nativeToolOptions = other.nativeToolOptions; } -} // namespace Internal -} // namespace CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/presetsparser.h b/src/plugins/cmakeprojectmanager/presetsparser.h index 17076dfa770..0dd65be7caa 100644 --- a/src/plugins/cmakeprojectmanager/presetsparser.h +++ b/src/plugins/cmakeprojectmanager/presetsparser.h @@ -3,16 +3,14 @@ #pragma once -#include - #include "cmakeconfigitem.h" +#include + #include -#include #include -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { namespace PresetsDetails { @@ -109,5 +107,4 @@ public: const PresetsData &presetsData() const; }; -} // namespace Internal -} // namespace CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/projecttreehelper.cpp b/src/plugins/cmakeprojectmanager/projecttreehelper.cpp index d922648856e..ae0ee65966e 100644 --- a/src/plugins/cmakeprojectmanager/projecttreehelper.cpp +++ b/src/plugins/cmakeprojectmanager/projecttreehelper.cpp @@ -3,6 +3,8 @@ #include "projecttreehelper.h" +#include "cmakeprojectmanagertr.h" + #include #include @@ -11,8 +13,7 @@ using namespace ProjectExplorer; -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { std::unique_ptr createCMakeVFolder(const Utils::FilePath &basePath, int priority, @@ -77,18 +78,17 @@ void addCMakeInputs(FolderNode *root, addCMakeVFolder(cmakeVFolder.get(), buildDir, 100, - QCoreApplication::translate("CMakeProjectManager::Internal::ProjectTreeHelper", - ""), + Tr::tr(""), removeKnownNodes(knownFiles, std::move(buildInputs))); addCMakeVFolder(cmakeVFolder.get(), Utils::FilePath(), 10, - QCoreApplication::translate("CMakeProjectManager::Internal::ProjectTreeHelper", - ""), + Tr::tr(""), removeKnownNodes(knownFiles, std::move(rootInputs))); root->addNode(std::move(cmakeVFolder)); } + QHash addCMakeLists( CMakeProjectNode *root, std::vector> &&cmakeLists) { @@ -177,9 +177,7 @@ void addFileSystemNodes(ProjectNode *root, const std::shared_ptr &fo auto fileSystemNode = cloneFolderNode(folderNode.get()); // just before special nodes like "CMake Modules" fileSystemNode->setPriority(Node::DefaultPriority - 6); - fileSystemNode->setDisplayName( - QCoreApplication::translate("CMakeProjectManager::Internal::ProjectTreeHelper", - "")); + fileSystemNode->setDisplayName(Tr::tr("")); fileSystemNode->setIcon(DirectoryIcon(ProjectExplorer::Constants::FILEOVERLAY_UNKNOWN)); if (!fileSystemNode->isEmpty()) { @@ -192,5 +190,4 @@ void addFileSystemNodes(ProjectNode *root, const std::shared_ptr &fo } } -} // namespace Internal -} // namespace CMakeProjectManager +} // CMakeProjectManager::Internal diff --git a/src/plugins/cmakeprojectmanager/projecttreehelper.h b/src/plugins/cmakeprojectmanager/projecttreehelper.h index f211c6c25c6..4870d279b98 100644 --- a/src/plugins/cmakeprojectmanager/projecttreehelper.h +++ b/src/plugins/cmakeprojectmanager/projecttreehelper.h @@ -3,12 +3,11 @@ #include "cmakeprojectnodes.h" -#include +#include #include -namespace CMakeProjectManager { -namespace Internal { +namespace CMakeProjectManager::Internal { std::unique_ptr createCMakeVFolder(const Utils::FilePath &basePath, int priority, @@ -44,5 +43,5 @@ CMakeTargetNode *createTargetNode( void addFileSystemNodes(ProjectExplorer::ProjectNode *root, const std::shared_ptr &folderNode); -} // namespace Internal -} // namespace CMakeProjectManager + +} // CMakeProjectManager::Internal