feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Nim: Convert to Tr::tr

Browse Source 
Change-Id: Iad4641479d566347ef9acdfb0a04f37907ac4a2d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2022-10-10 09:58:54 +02:00
parent 7eac686f29
commit 19f2a95e1c
34 changed files with 132 additions and 716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
share/qtcreator/translations/qtcreator_da.ts
View File

@@ -21036,21 +21036,15 @@ Fejl: %5</translation>
</message> </message>
</context> </context>
<context> <context>
<name>Nim::NimBuildConfigurationFactory</name> <name>Nim</name>
<message> <message>
<source>Build</source> <source>Build</source>
<translation>Byg</translation> <translation>Byg</translation>
</message> </message>
</context>
<context>
<name>Nim::NimBuildConfigurationWidget</name>
<message> <message>
<source>Build directory:</source> <source>Build directory:</source>
<translation>Bygmappe:</translation> <translation>Bygmappe:</translation>
</message> </message>
</context>
<context>
<name>Nim::NimCompilerBuildStepConfigWidget</name>
<message> <message>
<source>Target:</source> <source>Target:</source>
<translation>Mål:</translation> <translation>Mål:</translation>
@@ -21079,16 +21073,10 @@ Fejl: %5</translation>
<source>Release</source> <source>Release</source>
<translation>Udgivelse</translation> <translation>Udgivelse</translation>
</message> </message>
</context>
<context>
<name>Nim::NimCompilerBuildStepFactory</name>
<message> <message>
<source>Nim Compiler Build Step</source> <source>Nim Compiler Build Step</source>
<translation>Nim-kompiler byggetrin</translation> <translation>Nim-kompiler byggetrin</translation>
</message> </message>
</context>
<context>
<name>Nim::NimCompilerCleanStep</name>
<message> <message>
<source>Nim Clean Step</source> <source>Nim Clean Step</source>
<translation>Nim renstrin</translation> <translation>Nim renstrin</translation>
@@ -21109,24 +21097,15 @@ Fejl: %5</translation>
<source>Clean step completed successfully.</source> <source>Clean step completed successfully.</source>
<translation>Renstrin fuldført.</translation> <translation>Renstrin fuldført.</translation>
</message> </message>
</context>
<context>
<name>Nim::NimCompilerCleanStepConfigWidget</name>
<message> <message>
<source>Working directory:</source> <source>Working directory:</source>
<translation>Arbejdsmappe:</translation> <translation>Arbejdsmappe:</translation>
</message> </message>
</context>
<context>
<name>Nim::NimPlugin</name>
<message> <message>
<source>Nim</source> <source>Nim</source>
<comment>SnippetProvider</comment> <comment>SnippetProvider</comment>
<translation>Nim</translation> <translation>Nim</translation>
</message> </message>
</context>
<context>
<name>Nim::NimProject</name>
<message> <message>
<source>Scanning for Nim files</source> <source>Scanning for Nim files</source>
<translation>Skanner efter Nim-filer</translation> <translation>Skanner efter Nim-filer</translation>
@@ -21139,9 +21118,6 @@ Fejl: %5</translation>
<source>Nim compiler does not exist.</source> <source>Nim compiler does not exist.</source>
<translation>Nim-kompiler findes ikke.</translation> <translation>Nim-kompiler findes ikke.</translation>
</message> </message>
</context>
<context>
<name>Nim::NimSettings</name>
<message> <message>
<source>Global</source> <source>Global</source>
<comment>Settings</comment> <comment>Settings</comment>
@@ -21151,9 +21127,6 @@ Fejl: %5</translation>
<source>Nim</source> <source>Nim</source>
<translation>Nim</translation> <translation>Nim</translation>
</message> </message>
</context>
<context>
<name>Nim::NimToolChainConfigWidget</name>
<message> <message>
<source>&amp;Compiler path:</source> <source>&amp;Compiler path:</source>
<translation>&amp;Kompilersti:</translation> <translation>&amp;Kompilersti:</translation>
@@ -21162,62 +21135,22 @@ Fejl: %5</translation>
<source>&amp;Compiler version:</source> <source>&amp;Compiler version:</source>
<translation>&amp;Kompiler-version:</translation> <translation>&amp;Kompiler-version:</translation>
</message> </message>
</context>
<context>
<name>Nim::NimToolChainFactory</name>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context>
<name>NimBuildConfigurationWidget</name>
<message> <message>
<source>General</source> <source>General</source>
<translation>Generelt</translation> <translation>Generelt</translation>
</message> </message>
</context>
<context>
<name>NimCodeStylePreferencesFactory</name>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context>
<name>NimCodeStyleSettingsPage</name>
<message> <message>
<source>Code Style</source> <source>Code Style</source>
<translation>Kodestil</translation> <translation>Kodestil</translation>
</message> </message>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context>
<name>NimCompilerBuildStep</name>
<message>
<source>Nim Compiler Build Step</source>
<translation>Nim-kompiler byggetrin</translation>
</message>
</context>
<context>
<name>NimCompilerBuildStepConfigWidget</name>
<message> <message>
<source>Nim build step</source> <source>Nim build step</source>
<translation>Nim-byggetrin</translation> <translation>Nim-byggetrin</translation>
</message> </message>
</context>
<context>
<name>NimCompilerCleanStepFactory</name>
<message> <message>
<source>Nim Compiler Clean Step</source> <source>Nim Compiler Clean Step</source>
<translation>Nim-kompiler renstrin</translation> <translation>Nim-kompiler renstrin</translation>
</message> </message>
</context>
<context>
<name>NimCompilerCleanStepWidget</name>
<message> <message>
<source>Nim clean step</source> <source>Nim clean step</source>
<translation>Nim renstrin</translation> <translation>Nim renstrin</translation>
@@ -42742,19 +42675,12 @@ Vil du overskrive dem?</translation>
</message> </message>
</context> </context>
<context> <context>
<name>Nim::NimRunConfiguration</name> <name>Nim</name>
<message> <message>
<source>Current Build Target</source> <source>Current Build Target</source>
<translation>Aktuelle byggemål</translation> <translation>Aktuelle byggemål</translation>
</message> </message>
</context> </context>
<context>
<name>Nim::NimCodeStyleSettingsPage</name>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context> <context>
<name>ProjectExplorer::BuildStepList</name> <name>ProjectExplorer::BuildStepList</name>
<message> <message>

81
share/qtcreator/translations/qtcreator_de.ts
View File

@@ -35294,7 +35294,7 @@ Möchten Sie sie überschreiben?</translation>
</message> </message>
</context> </context>
<context> <context>
<name>Nim::NimCompilerBuildStepConfigWidget</name> <name>Nim</name>
<message> <message>
<source>Target:</source> <source>Target:</source>
<translation>Ziel:</translation> <translation>Ziel:</translation>
@@ -35771,21 +35771,15 @@ Siehe auch die Einstellungen für Google Test.</translation>
</message> </message>
</context> </context>
<context> <context>
<name>NimCompilerBuildStep</name> <name>Nim</name>
<message> <message>
<source>Nim Compiler Build Step</source> <source>Nim Compiler Build Step</source>
<translation>Nim-Compiler Build-Schritt</translation> <translation>Nim-Compiler Build-Schritt</translation>
</message> </message>
</context>
<context>
<name>NimCompilerBuildStepConfigWidget</name>
<message> <message>
<source>Nim build step</source> <source>Nim build step</source>
<translation>Nim-Build-Schritt</translation> <translation>Nim-Build-Schritt</translation>
</message> </message>
</context>
<context>
<name>NimCodeStyleSettingsPage</name>
<message> <message>
<source>Code Style</source> <source>Code Style</source>
<translation>Coding-Stil</translation> <translation>Coding-Stil</translation>
@@ -35794,16 +35788,6 @@ Siehe auch die Einstellungen für Google Test.</translation>
<source>Nim</source> <source>Nim</source>
<translation>Nim</translation> <translation>Nim</translation>
</message> </message>
</context>
<context>
<name>NimCodeStylePreferencesFactory</name>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context>
<name>Nim::NimCompilerCleanStep</name>
<message> <message>
<source>Nim Clean Step</source> <source>Nim Clean Step</source>
<translation>Nim-Schritt zur Bereinigung</translation> <translation>Nim-Schritt zur Bereinigung</translation>
@@ -35832,18 +35816,11 @@ Siehe auch die Einstellungen für Google Test.</translation>
<source>Nim Compiler Clean Step</source> <source>Nim Compiler Clean Step</source>
<translation>Nim-Compiler-Schritt zur Bereinigung</translation> <translation>Nim-Compiler-Schritt zur Bereinigung</translation>
</message> </message>
</context>
<context>
<name>Nim::NimSettings</name>
<message> <message>
<source>Global</source> <source>Global</source>
<comment>Settings</comment> <comment>Settings</comment>
<translation>Global</translation> <translation>Global</translation>
</message> </message>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context> </context>
<context> <context>
<name>ProjectExplorer::CustomExecutableRunConfiguration</name> <name>ProjectExplorer::CustomExecutableRunConfiguration</name>
@@ -37741,15 +37718,12 @@ Ablaufdatum: %3</translation>
</message> </message>
</context> </context>
<context> <context>
<name>Nim::NimPlugin</name> <name>Nim</name>
<message> <message>
<source>Nim</source> <source>Nim</source>
<comment>SnippetProvider</comment> <comment>SnippetProvider</comment>
<translation>Nim</translation> <translation>Nim</translation>
</message> </message>
</context>
<context>
<name>Nim::NimProject</name>
<message> <message>
<source>No Nim compiler set.</source> <source>No Nim compiler set.</source>
<translation>Es ist kein Nim-Compiler eingerichtet.</translation> <translation>Es ist kein Nim-Compiler eingerichtet.</translation>
@@ -37758,9 +37732,6 @@ Ablaufdatum: %3</translation>
<source>Nim compiler does not exist.</source> <source>Nim compiler does not exist.</source>
<translation>Der Nim-Compiler existiert nicht.</translation> <translation>Der Nim-Compiler existiert nicht.</translation>
</message> </message>
</context>
<context>
<name>Nim::NimToolChainConfigWidget</name>
<message> <message>
<source>&amp;Compiler path:</source> <source>&amp;Compiler path:</source>
<translation>&amp;Compiler-Pfad:</translation> <translation>&amp;Compiler-Pfad:</translation>
@@ -40861,7 +40832,7 @@ Möchten Sie sie überschreiben?</translation>
</message> </message>
</context> </context>
<context> <context>
<name>Nim::NimRunConfiguration</name> <name>Nim</name>
<message> <message>
<source>Current Build Target</source> <source>Current Build Target</source>
<translation>Aktuelles Build-Ziel</translation> <translation>Aktuelles Build-Ziel</translation>
@@ -41922,11 +41893,7 @@ Die Dateien aus dem Quellverzeichnis des Android-Pakets werden in das Verzeichni
</message> </message>
</context> </context>
<context> <context>
<name>Nim::NimCompilerBuildStep</name> <name>Nim</name>
<message>
<source>Nim Compiler Build Step</source>
<translation>Nim-Compiler Build-Schritt</translation>
</message>
</context> </context>
<context> <context>
<name>ProjectExplorer::MakeStep</name> <name>ProjectExplorer::MakeStep</name>
@@ -42198,7 +42165,7 @@ Die Dateien aus dem Quellverzeichnis des Android-Pakets werden in das Verzeichni
</message> </message>
</context> </context>
<context> <context>
<name>Nim::NimToolsSettingsWidget</name> <name>Nim</name>
<message> <message>
<source>Nimsuggest</source> <source>Nimsuggest</source>
<translation>Nimsuggest</translation> <translation>Nimsuggest</translation>
@@ -42821,15 +42788,11 @@ Die Dateien aus dem Quellverzeichnis des Android-Pakets werden in das Verzeichni
</message> </message>
</context> </context>
<context> <context>
<name>NimToolsSettingsPage</name> <name>Nim</name>
<message> <message>
<source>Tools</source> <source>Tools</source>
<translation>Werkzeuge</translation> <translation>Werkzeuge</translation>
</message> </message>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context> </context>
<context> <context>
<name>PerfProfiler</name> <name>PerfProfiler</name>
@@ -43865,7 +43828,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
</message> </message>
</context> </context>
<context> <context>
<name>Nim::NimbleBuildStepWidget</name> <name>Nim</name>
<message> <message>
<source>Arguments:</source> <source>Arguments:</source>
<translation>Argumente:</translation> <translation>Argumente:</translation>
@@ -46401,26 +46364,12 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
</message> </message>
</context> </context>
<context> <context>
<name>Nim::NimbleBuildConfiguration</name> <name>Nim</name>
<message> <message>
<source>General</source> <source>General</source>
<translation>Allgemein</translation> <translation>Allgemein</translation>
</message> </message>
</context> </context>
<context>
<name>Nim::NimBuildConfiguration</name>
<message>
<source>General</source>
<translation>Allgemein</translation>
</message>
</context>
<context>
<name>Nim::CodeStyleSettings</name>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context> <context>
<name>ProjectExplorer::Internal::AddRunConfigDialog</name> <name>ProjectExplorer::Internal::AddRunConfigDialog</name>
<message> <message>
@@ -47462,11 +47411,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
</message> </message>
</context> </context>
<context> <context>
<name>Nim::ToolSettingsPage</name> <name>Nim</name>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context> </context>
<context> <context>
<name>ProjextExplorer::Internal::KitOptionsPageWidget</name> <name>ProjextExplorer::Internal::KitOptionsPageWidget</name>
@@ -48273,11 +48218,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
</message> </message>
</context> </context>
<context> <context>
<name>Nim::NimToolChain</name> <name>Nim</name>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context> </context>
<context> <context>
<name>ProjectExplorer::Internal::BuildEnvironmentWidget</name> <name>ProjectExplorer::Internal::BuildEnvironmentWidget</name>

103
share/qtcreator/translations/qtcreator_hr.ts
View File

@@ -5128,7 +5128,7 @@ Greška: %5</translation>
</message> </message>
</context> </context>
<context> <context>
<name>Nim::NimCompilerBuildStepConfigWidget</name> <name>Nim</name>
<message> <message>
<source>Target:</source> <source>Target:</source>
<translation>Odredište:</translation> <translation>Odredište:</translation>
@@ -5149,24 +5149,14 @@ Greška: %5</translation>
<source>None</source> <source>None</source>
<translation>Bez</translation> <translation>Bez</translation>
</message> </message>
<message>
<source>Debug</source>
<translation>Ukloni greške</translation>
</message>
<message> <message>
<source>Release</source> <source>Release</source>
<translation>Objavi</translation> <translation>Objavi</translation>
</message> </message>
</context>
<context>
<name>Nim::NimCompilerCleanStepConfigWidget</name>
<message> <message>
<source>Working directory:</source> <source>Working directory:</source>
<translation>Radni direktorij:</translation> <translation>Radni direktorij:</translation>
</message> </message>
</context>
<context>
<name>Nim::NimToolsSettingsWidget</name>
<message> <message>
<source>Nimsuggest</source> <source>Nimsuggest</source>
<translation>Nimsuggest</translation> <translation>Nimsuggest</translation>
@@ -27012,42 +27002,27 @@ Rok upotrebe: %3</translation>
</message> </message>
</context> </context>
<context> <context>
<name>NimBuildConfigurationWidget</name> <name>Nim</name>
<message> <message>
<source>General</source> <source>General</source>
<translation>Opće</translation> <translation>Opće</translation>
</message> </message>
</context>
<context>
<name>NimCompilerBuildStep</name>
<message> <message>
<source>Nim Compiler Build Step</source> <source>Nim Compiler Build Step</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context>
<context>
<name>NimCompilerBuildStepConfigWidget</name>
<message> <message>
<source>Nim build step</source> <source>Nim build step</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context>
<context>
<name>NimCompilerCleanStepFactory</name>
<message> <message>
<source>Nim Compiler Clean Step</source> <source>Nim Compiler Clean Step</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context>
<context>
<name>NimCompilerCleanStepWidget</name>
<message> <message>
<source>Nim clean step</source> <source>Nim clean step</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context>
<context>
<name>NimCodeStyleSettingsPage</name>
<message> <message>
<source>Code Style</source> <source>Code Style</source>
<translation>Stil kodiranja</translation> <translation>Stil kodiranja</translation>
@@ -27056,35 +27031,15 @@ Rok upotrebe: %3</translation>
<source>Nim</source> <source>Nim</source>
<translation>Nim</translation> <translation>Nim</translation>
</message> </message>
</context>
<context>
<name>NimToolsSettingsPage</name>
<message> <message>
<source>Tools</source> <source>Tools</source>
<translation>Alati</translation> <translation>Alati</translation>
</message> </message>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context>
<name>NimCodeStylePreferencesFactory</name>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context>
<name>Nim::NimPlugin</name>
<message> <message>
<source>Nim</source> <source>Nim</source>
<comment>SnippetProvider</comment> <comment>SnippetProvider</comment>
<translation>Nim</translation> <translation>Nim</translation>
</message> </message>
</context>
<context>
<name>Nim::NimBuildConfigurationFactory</name>
<message> <message>
<source>Debug</source> <source>Debug</source>
<translation>Uklanjanje grešaka</translation> <translation>Uklanjanje grešaka</translation>
@@ -27093,27 +27048,10 @@ Rok upotrebe: %3</translation>
<source>Profile</source> <source>Profile</source>
<translation>Profil</translation> <translation>Profil</translation>
</message> </message>
<message>
<source>Release</source>
<translation>Objavljivanje</translation>
</message>
</context>
<context>
<name>Nim::NimBuildConfigurationWidget</name>
<message> <message>
<source>Build directory:</source> <source>Build directory:</source>
<translation>Direktorij gradnje:</translation> <translation>Direktorij gradnje:</translation>
</message> </message>
</context>
<context>
<name>Nim::NimCompilerBuildStep</name>
<message>
<source>Nim Compiler Build Step</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Nim::NimCompilerCleanStep</name>
<message> <message>
<source>Nim Clean Step</source> <source>Nim Clean Step</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@@ -27134,9 +27072,6 @@ Rok upotrebe: %3</translation>
<source>Clean step completed successfully.</source> <source>Clean step completed successfully.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context>
<context>
<name>Nim::NimProject</name>
<message> <message>
<source>Scanning for Nim files</source> <source>Scanning for Nim files</source>
<translation>Traženje Nim datoteka</translation> <translation>Traženje Nim datoteka</translation>
@@ -27149,23 +27084,10 @@ Rok upotrebe: %3</translation>
<source>Nim compiler does not exist.</source> <source>Nim compiler does not exist.</source>
<translation>Nim kompajler ne postoji.</translation> <translation>Nim kompajler ne postoji.</translation>
</message> </message>
</context>
<context>
<name>Nim::NimRunConfiguration</name>
<message> <message>
<source>Current Build Target</source> <source>Current Build Target</source>
<translation>Trenutačno odredište gradnje</translation> <translation>Trenutačno odredište gradnje</translation>
</message> </message>
</context>
<context>
<name>Nim::NimToolChainFactory</name>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context>
<name>Nim::NimToolChainConfigWidget</name>
<message> <message>
<source>&amp;Compiler path:</source> <source>&amp;Compiler path:</source>
<translation>Staza za &amp;kompajler:</translation> <translation>Staza za &amp;kompajler:</translation>
@@ -27174,32 +27096,11 @@ Rok upotrebe: %3</translation>
<source>&amp;Compiler version:</source> <source>&amp;Compiler version:</source>
<translation>Verzija &amp;kompajlera:</translation> <translation>Verzija &amp;kompajlera:</translation>
</message> </message>
</context>
<context>
<name>Nim::NimCodeStyleSettingsPage</name>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context>
<name>Nim::NimSettings</name>
<message> <message>
<source>Global</source> <source>Global</source>
<comment>Settings</comment> <comment>Settings</comment>
<translation>Globalno</translation> <translation>Globalno</translation>
</message> </message>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context>
<name>Nim::NimToolsSettingsPage</name>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context> </context>
<context> <context>
<name>Perforce::Internal::PerforceChecker</name> <name>Perforce::Internal::PerforceChecker</name>

159
share/qtcreator/translations/qtcreator_ja.ts
View File

@@ -44262,7 +44262,7 @@ Android パッケージソースディレクトリのファイルはビルドデ
</message> </message>
</context> </context>
<context> <context>
<name>Nim::NimCompilerBuildStepConfigWidget</name> <name>Nim</name>
<message> <message>
<source>Form</source> <source>Form</source>
<translation>フォーム</translation> <translation>フォーム</translation>
@@ -44295,13 +44295,6 @@ Android パッケージソースディレクトリのファイルはビルドデ
<source>Release</source> <source>Release</source>
<translation>リリース</translation> <translation>リリース</translation>
</message> </message>
</context>
<context>
<name>Nim::NimCompilerCleanStepConfigWidget</name>
<message>
<source>Form</source>
<translation>フォーム</translation>
</message>
<message> <message>
<source>Working directory:</source> <source>Working directory:</source>
<translation>作業ディレクトリ:</translation> <translation>作業ディレクトリ:</translation>
@@ -44586,49 +44579,31 @@ Output:
</message> </message>
</context> </context>
<context> <context>
<name>NimRunConfiguration</name> <name>Nim</name>
<message> <message>
<source>Current Build Target</source> <source>Current Build Target</source>
<translation>現在のビルドターゲット</translation> <translation>現在のビルドターゲット</translation>
</message> </message>
</context>
<context>
<name>NimBuildConfigurationWidget</name>
<message> <message>
<source>General</source> <source>General</source>
<translation>一般</translation> <translation>一般</translation>
</message> </message>
</context>
<context>
<name>NimCompilerBuildStep</name>
<message> <message>
<source>Nim Compiler Build Step</source> <source>Nim Compiler Build Step</source>
<translation>Nim コンパイラビルドステップ</translation> <translation>Nim コンパイラビルドステップ</translation>
</message> </message>
</context>
<context>
<name>NimCompilerBuildStepConfigWidget</name>
<message> <message>
<source>Nim build step</source> <source>Nim build step</source>
<translation>Nim ビルドステップ</translation> <translation>Nim ビルドステップ</translation>
</message> </message>
</context>
<context>
<name>NimCompilerCleanStepFactory</name>
<message> <message>
<source>Nim Compiler Clean Step</source> <source>Nim Compiler Clean Step</source>
<translation>Nim コンパイラクリーンステップ</translation> <translation>Nim コンパイラクリーンステップ</translation>
</message> </message>
</context>
<context>
<name>NimCompilerCleanStepWidget</name>
<message> <message>
<source>Nim clean step</source> <source>Nim clean step</source>
<translation>Nim クリーンステップ</translation> <translation>Nim クリーンステップ</translation>
</message> </message>
</context>
<context>
<name>NimCodeStyleSettingsPage</name>
<message> <message>
<source>Code Style</source> <source>Code Style</source>
<translation>コードスタイル</translation> <translation>コードスタイル</translation>
@@ -44637,44 +44612,14 @@ Output:
<source>Nim</source> <source>Nim</source>
<translation>Nim</translation> <translation>Nim</translation>
</message> </message>
</context>
<context>
<name>NimCodeStylePreferencesFactory</name>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context>
<name>NimSnippetProvider</name>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context>
<name>Nim::NimBuildConfigurationFactory</name>
<message> <message>
<source>Build</source> <source>Build</source>
<translation>ビルド</translation> <translation>ビルド</translation>
</message> </message>
</context>
<context>
<name>Nim::NimBuildConfigurationWidget</name>
<message> <message>
<source>Build directory:</source> <source>Build directory:</source>
<translation>ビルドディレクトリ:</translation> <translation>ビルドディレクトリ:</translation>
</message> </message>
</context>
<context>
<name>Nim::NimCompilerBuildStepFactory</name>
<message>
<source>Nim Compiler Build Step</source>
<translation>Nim コンパイラビルドステップ</translation>
</message>
</context>
<context>
<name>Nim::NimCompilerCleanStep</name>
<message> <message>
<source>Nim Clean Step</source> <source>Nim Clean Step</source>
<translation>Nim クリーンステップ</translation> <translation>Nim クリーンステップ</translation>
@@ -44683,10 +44628,6 @@ Output:
<source>Build directory &quot;%1&quot; does not exist.</source> <source>Build directory &quot;%1&quot; does not exist.</source>
<translation>ビルドディレクトリ &quot;%1&quot; が存在しません。</translation> <translation>ビルドディレクトリ &quot;%1&quot; が存在しません。</translation>
</message> </message>
<message>
<source>Working directory:</source>
<translation>作業ディレクトリ:</translation>
</message>
<message> <message>
<source>Failed to delete the cache directory.</source> <source>Failed to delete the cache directory.</source>
<translation>キャッシュディレクトリの削除に失敗しました。</translation> <translation>キャッシュディレクトリの削除に失敗しました。</translation>
@@ -44699,16 +44640,10 @@ Output:
<source>Clean step completed successfully.</source> <source>Clean step completed successfully.</source>
<translation>クリーンステップが正常に完了しました。</translation> <translation>クリーンステップが正常に完了しました。</translation>
</message> </message>
</context>
<context>
<name>Nim::NimProjectManager</name>
<message> <message>
<source>Failed opening project &quot;%1&quot;: Project is not a file.</source> <source>Failed opening project &quot;%1&quot;: Project is not a file.</source>
<translation>プロジェクト &quot;%1&quot; が開けません: プロジェクトがファイルではありません。</translation> <translation>プロジェクト &quot;%1&quot; が開けません: プロジェクトがファイルではありません。</translation>
</message> </message>
</context>
<context>
<name>Nim::NimRunControl</name>
<message> <message>
<source>%1 crashed</source> <source>%1 crashed</source>
<translation>%1 がクラッシュしました</translation> <translation>%1 がクラッシュしました</translation>
@@ -44717,18 +44652,11 @@ Output:
<source>%1 exited with code %2</source> <source>%1 exited with code %2</source>
<translation>%1 は終了コード %2 で終了しました</translation> <translation>%1 は終了コード %2 で終了しました</translation>
</message> </message>
</context>
<context>
<name>Nim::NimSettings</name>
<message> <message>
<source>Global</source> <source>Global</source>
<comment>Settings</comment> <comment>Settings</comment>
<translation>グローバル</translation> <translation>グローバル</translation>
</message> </message>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context> </context>
<context> <context>
<name>QmakeProjectManager</name> <name>QmakeProjectManager</name>
@@ -45709,7 +45637,7 @@ Output:
</message> </message>
</context> </context>
<context> <context>
<name>Nim::NimToolsSettingsWidget</name> <name>Nim</name>
<message> <message>
<source>Path</source> <source>Path</source>
<translation>パス</translation> <translation>パス</translation>
@@ -49342,96 +49270,17 @@ Stepping into the module or setting breakpoints by file and line is expected to
</message> </message>
</context> </context>
<context> <context>
<name>NimToolsSettingsPage</name> <name>Nim</name>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context>
<name>Nim::NimPlugin</name>
<message> <message>
<source>Nim</source> <source>Nim</source>
<comment>SnippetProvider</comment> <comment>SnippetProvider</comment>
<translation>Nim</translation> <translation>Nim</translation>
</message> </message>
</context>
<context>
<name>Nim::NimbleBuildConfiguration</name>
<message>
<source>General</source>
<translation>一般</translation>
</message>
</context>
<context>
<name>Nim::NimBuildConfiguration</name>
<message>
<source>General</source>
<translation>一般</translation>
</message>
</context>
<context>
<name>Nim::NimCompilerBuildStep</name>
<message>
<source>Nim build step</source>
<translation>Nim ビルドステップ</translation>
</message>
<message>
<source>Target:</source>
<translation>ターゲット:</translation>
</message>
<message>
<source>Default arguments:</source>
<translation>デフォルト引数:</translation>
</message>
<message>
<source>Extra arguments:</source>
<translation>追加引数:</translation>
</message>
<message>
<source>Command:</source>
<translation>コマンド:</translation>
</message>
<message>
<source>Nim Compiler Build Step</source>
<translation>Nim コンパイラビルドステップ</translation>
</message>
</context>
<context>
<name>Nim::NimRunConfiguration</name>
<message>
<source>Current Build Target</source>
<translation>現在のビルドターゲット</translation>
</message>
</context>
<context>
<name>Nim::NimToolChain</name>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context>
<name>Nim::NimToolChainConfigWidget</name>
<message> <message>
<source>&amp;Compiler path:</source> <source>&amp;Compiler path:</source>
<translation>コンパイラのパス(&amp;C):</translation> <translation>コンパイラのパス(&amp;C):</translation>
</message> </message>
</context> </context>
<context>
<name>Nim::CodeStyleSettings</name>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context>
<name>Nim::ToolSettingsPage</name>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context> <context>
<name>Perforce::Internal::PerforceDiffConfig</name> <name>Perforce::Internal::PerforceDiffConfig</name>
<message> <message>

73
share/qtcreator/translations/qtcreator_pl.ts
View File

@@ -37874,7 +37874,7 @@ Czy nadpisać go?</translation>
</message> </message>
</context> </context>
<context> <context>
<name>Nim::NimCompilerBuildStepConfigWidget</name> <name>Nim</name>
<message> <message>
<source>Form</source> <source>Form</source>
<translation>Formularz</translation> <translation>Formularz</translation>
@@ -37907,13 +37907,6 @@ Czy nadpisać go?</translation>
<source>Release</source> <source>Release</source>
<translation>Release</translation> <translation>Release</translation>
</message> </message>
</context>
<context>
<name>Nim::NimCompilerCleanStepConfigWidget</name>
<message>
<source>Form</source>
<translation>Formularz</translation>
</message>
<message> <message>
<source>Working directory:</source> <source>Working directory:</source>
<translation>Katalog roboczy:</translation> <translation>Katalog roboczy:</translation>
@@ -38469,49 +38462,31 @@ Komunikat:
</message> </message>
</context> </context>
<context> <context>
<name>NimRunConfiguration</name> <name>Nim</name>
<message> <message>
<source>Current Build Target</source> <source>Current Build Target</source>
<translation>Bieżący cel budowania</translation> <translation>Bieżący cel budowania</translation>
</message> </message>
</context>
<context>
<name>NimBuildConfigurationWidget</name>
<message> <message>
<source>General</source> <source>General</source>
<translation>Ogólne</translation> <translation>Ogólne</translation>
</message> </message>
</context>
<context>
<name>NimCompilerBuildStep</name>
<message> <message>
<source>Nim Compiler Build Step</source> <source>Nim Compiler Build Step</source>
<translation>Krok budowania kompilatora Nim</translation> <translation>Krok budowania kompilatora Nim</translation>
</message> </message>
</context>
<context>
<name>NimCompilerBuildStepConfigWidget</name>
<message> <message>
<source>Nim build step</source> <source>Nim build step</source>
<translation>Krok budowania Nim</translation> <translation>Krok budowania Nim</translation>
</message> </message>
</context>
<context>
<name>NimCompilerCleanStepFactory</name>
<message> <message>
<source>Nim Compiler Clean Step</source> <source>Nim Compiler Clean Step</source>
<translation>Krok czyszczenia kompilatora Nim</translation> <translation>Krok czyszczenia kompilatora Nim</translation>
</message> </message>
</context>
<context>
<name>NimCompilerCleanStepWidget</name>
<message> <message>
<source>Nim clean step</source> <source>Nim clean step</source>
<translation>Krok czyszczenia Nim</translation> <translation>Krok czyszczenia Nim</translation>
</message> </message>
</context>
<context>
<name>NimCodeStyleSettingsPage</name>
<message> <message>
<source>Code Style</source> <source>Code Style</source>
<translation>Styl kodu</translation> <translation>Styl kodu</translation>
@@ -38520,37 +38495,14 @@ Komunikat:
<source>Nim</source> <source>Nim</source>
<translation>Nim</translation> <translation>Nim</translation>
</message> </message>
</context>
<context>
<name>NimCodeStylePreferencesFactory</name>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context>
<name>Nim::NimBuildConfigurationFactory</name>
<message> <message>
<source>Build</source> <source>Build</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context>
<context>
<name>Nim::NimBuildConfigurationWidget</name>
<message> <message>
<source>Build directory:</source> <source>Build directory:</source>
<translation>Katalog budowania:</translation> <translation>Katalog budowania:</translation>
</message> </message>
</context>
<context>
<name>Nim::NimCompilerBuildStepFactory</name>
<message>
<source>Nim Compiler Build Step</source>
<translation>Krok budowania kompilatora Nim</translation>
</message>
</context>
<context>
<name>Nim::NimCompilerCleanStep</name>
<message> <message>
<source>Nim Clean Step</source> <source>Nim Clean Step</source>
<translation>Krok czyszczenia Nim</translation> <translation>Krok czyszczenia Nim</translation>
@@ -38571,18 +38523,11 @@ Komunikat:
<source>Clean step completed successfully.</source> <source>Clean step completed successfully.</source>
<translation>Krok czyszczenia poprawnie zakończony.</translation> <translation>Krok czyszczenia poprawnie zakończony.</translation>
</message> </message>
</context>
<context>
<name>Nim::NimSettings</name>
<message> <message>
<source>Global</source> <source>Global</source>
<comment>Settings</comment> <comment>Settings</comment>
<translation>Globalne</translation> <translation>Globalne</translation>
</message> </message>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context> </context>
<context> <context>
<name>ProjectExplorer::Internal::CustomExecutableConfigurationWidget</name> <name>ProjectExplorer::Internal::CustomExecutableConfigurationWidget</name>
@@ -41422,7 +41367,7 @@ Termin wygaśnięcia: %3</translation>
</message> </message>
</context> </context>
<context> <context>
<name>Nim::NimProject</name> <name>Nim</name>
<message> <message>
<source>Scanning for Nim files</source> <source>Scanning for Nim files</source>
<translation>Skanowanie w poszukiwaniu plików Nim</translation> <translation>Skanowanie w poszukiwaniu plików Nim</translation>
@@ -41435,16 +41380,6 @@ Termin wygaśnięcia: %3</translation>
<source>Nim compiler does not exist</source> <source>Nim compiler does not exist</source>
<translation>Brak kompilatora Nim</translation> <translation>Brak kompilatora Nim</translation>
</message> </message>
</context>
<context>
<name>Nim::NimToolChainFactory</name>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context>
<name>Nim::NimToolChainConfigWidget</name>
<message> <message>
<source>&amp;Compiler path:</source> <source>&amp;Compiler path:</source>
<translation>Ścieżka do &amp;kompilatora:</translation> <translation>Ścieżka do &amp;kompilatora:</translation>
@@ -42111,7 +42046,7 @@ Błąd: %5</translation>
</message> </message>
</context> </context>
<context> <context>
<name>Nim::NimPlugin</name> <name>Nim</name>
<message> <message>
<source>Nim</source> <source>Nim</source>
<comment>SnippetProvider</comment> <comment>SnippetProvider</comment>

121
share/qtcreator/translations/qtcreator_ru.ts
View File

@@ -26906,28 +26906,19 @@ If set to false, the target will be moved straight to the current mouse position
</message> </message>
</context> </context>
<context> <context>
<name>Nim::CodeStyleSettings</name> <name>Nim</name>
<message> <message>
<source>Nim</source> <source>Nim</source>
<translation>Nim</translation> <translation>Nim</translation>
</message> </message>
</context>
<context>
<name>Nim::NimBuildConfiguration</name>
<message> <message>
<source>General</source> <source>General</source>
<translation>Основное</translation> <translation>Основное</translation>
</message> </message>
</context>
<context>
<name>Nim::NimCompilerBuildStep</name>
<message> <message>
<source>Nim Compiler Build Step</source> <source>Nim Compiler Build Step</source>
<translation>Этап сборки компилятора Nim</translation> <translation>Этап сборки компилятора Nim</translation>
</message> </message>
</context>
<context>
<name>Nim::NimCompilerBuildStepConfigWidget</name>
<message> <message>
<source>Target:</source> <source>Target:</source>
<translation>Цель:</translation> <translation>Цель:</translation>
@@ -26956,9 +26947,6 @@ If set to false, the target will be moved straight to the current mouse position
<source>Release</source> <source>Release</source>
<translation>Выпуск</translation> <translation>Выпуск</translation>
</message> </message>
</context>
<context>
<name>Nim::NimCompilerCleanStep</name>
<message> <message>
<source>Nim Clean Step</source> <source>Nim Clean Step</source>
<translation>Этап очистки компилятора Nim</translation> <translation>Этап очистки компилятора Nim</translation>
@@ -26987,17 +26975,11 @@ If set to false, the target will be moved straight to the current mouse position
<source>Nim Compiler Clean Step</source> <source>Nim Compiler Clean Step</source>
<translation>Этап очистки компилятора Nim</translation> <translation>Этап очистки компилятора Nim</translation>
</message> </message>
</context>
<context>
<name>Nim::NimPlugin</name>
<message> <message>
<source>Nim</source> <source>Nim</source>
<comment>SnippetProvider</comment> <comment>SnippetProvider</comment>
<translation>Nim</translation> <translation>Nim</translation>
</message> </message>
</context>
<context>
<name>Nim::NimProject</name>
<message> <message>
<source>No Nim compiler set.</source> <source>No Nim compiler set.</source>
<translation>Компилятор Nim не задан.</translation> <translation>Компилятор Nim не задан.</translation>
@@ -27006,35 +26988,15 @@ If set to false, the target will be moved straight to the current mouse position
<source>Nim compiler does not exist.</source> <source>Nim compiler does not exist.</source>
<translation>Компилятор Nim отсутствует.</translation> <translation>Компилятор Nim отсутствует.</translation>
</message> </message>
</context>
<context>
<name>Nim::NimRunConfiguration</name>
<message> <message>
<source>Current Build Target</source> <source>Current Build Target</source>
<translation>Цель текущей сборки</translation> <translation>Цель текущей сборки</translation>
</message> </message>
</context>
<context>
<name>Nim::NimSettings</name>
<message> <message>
<source>Global</source> <source>Global</source>
<comment>Settings</comment> <comment>Settings</comment>
<translation>Общие</translation> <translation>Общие</translation>
</message> </message>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context>
<name>Nim::NimToolChain</name>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context>
<name>Nim::NimToolChainConfigWidget</name>
<message> <message>
<source>&amp;Compiler path:</source> <source>&amp;Compiler path:</source>
<translation>Путь к &amp;компилятору:</translation> <translation>Путь к &amp;компилятору:</translation>
@@ -27043,9 +27005,6 @@ If set to false, the target will be moved straight to the current mouse position
<source>&amp;Compiler version:</source> <source>&amp;Compiler version:</source>
<translation>&amp;Версия компилятора:</translation> <translation>&amp;Версия компилятора:</translation>
</message> </message>
</context>
<context>
<name>Nim::NimToolsSettingsWidget</name>
<message> <message>
<source>Nimsuggest</source> <source>Nimsuggest</source>
<translation>Nimsuggest</translation> <translation>Nimsuggest</translation>
@@ -27054,23 +27013,10 @@ If set to false, the target will be moved straight to the current mouse position
<source>Path</source> <source>Path</source>
<translation>Путь</translation> <translation>Путь</translation>
</message> </message>
</context>
<context>
<name>Nim::NimbleBuildConfiguration</name>
<message>
<source>General</source>
<translation>Основное</translation>
</message>
</context>
<context>
<name>Nim::NimbleBuildStep</name>
<message> <message>
<source>Nimble Build</source> <source>Nimble Build</source>
<translation>Сборка Nimble</translation> <translation>Сборка Nimble</translation>
</message> </message>
</context>
<context>
<name>Nim::NimbleBuildStepWidget</name>
<message> <message>
<source>Form</source> <source>Form</source>
<translation></translation> <translation></translation>
@@ -27083,9 +27029,6 @@ If set to false, the target will be moved straight to the current mouse position
<source>Reset to Default</source> <source>Reset to Default</source>
<translation>Сбросить на умолчальные</translation> <translation>Сбросить на умолчальные</translation>
</message> </message>
</context>
<context>
<name>Nim::NimbleTaskStep</name>
<message> <message>
<source>Nimble task %1 not found.</source> <source>Nimble task %1 not found.</source>
<translation>Не удалось найти задачу Nimble %1.</translation> <translation>Не удалось найти задачу Nimble %1.</translation>
@@ -27094,13 +27037,6 @@ If set to false, the target will be moved straight to the current mouse position
<source>Nimble Task</source> <source>Nimble Task</source>
<translation>Задача Nimble</translation> <translation>Задача Nimble</translation>
</message> </message>
</context>
<context>
<name>Nim::NimbleTaskStepWidget</name>
<message>
<source>Form</source>
<translation></translation>
</message>
<message> <message>
<source>Task arguments:</source> <source>Task arguments:</source>
<translation>Параметры задачи:</translation> <translation>Параметры задачи:</translation>
@@ -27109,77 +27045,22 @@ If set to false, the target will be moved straight to the current mouse position
<source>Tasks:</source> <source>Tasks:</source>
<translation>Задачи:</translation> <translation>Задачи:</translation>
</message> </message>
</context>
<context>
<name>Nim::NimbleTestConfiguration</name>
<message> <message>
<source>Nimble Test</source> <source>Nimble Test</source>
<translation>Тест Nimble</translation> <translation>Тест Nimble</translation>
</message> </message>
</context>
<context>
<name>Nim::ToolSettingsPage</name>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context>
<name>NimCodeStylePreferencesFactory</name>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context>
<name>NimCodeStyleSettingsPage</name>
<message> <message>
<source>Code Style</source> <source>Code Style</source>
<translation>Стиль кода</translation> <translation>Стиль кода</translation>
</message> </message>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context>
<name>NimCompilerBuildStep</name>
<message>
<source>Nim Compiler Build Step</source>
<translation>Этап сборки компилятора Nim</translation>
</message>
</context>
<context>
<name>NimCompilerBuildStepConfigWidget</name>
<message> <message>
<source>Nim build step</source> <source>Nim build step</source>
<translation>Этап сборки Nim</translation> <translation>Этап сборки Nim</translation>
</message> </message>
</context>
<context>
<name>NimToolsSettingsPage</name>
<message> <message>
<source>Tools</source> <source>Tools</source>
<translation>Инструменты</translation> <translation>Инструменты</translation>
</message> </message>
<message>
<source>Nim</source>
<translation>Nim</translation>
</message>
</context>
<context>
<name>NimbleBuildStep</name>
<message>
<source>Nimble Build</source>
<translation>Сборка Nimble</translation>
</message>
</context>
<context>
<name>NimbleTaskStep</name>
<message>
<source>Nimble Task</source>
<translation>Задача Nimble</translation>
</message>
</context> </context>
<context> <context>
<name>NoShowCheckbox</name> <name>NoShowCheckbox</name>

3
src/plugins/nim/editor/nimeditorfactory.cpp
View File

@@ -7,7 +7,6 @@
#include "nimcompletionassistprovider.h" #include "nimcompletionassistprovider.h"
#include "../nimconstants.h" #include "../nimconstants.h"
#include "../nimplugin.h"
#include "nimtexteditorwidget.h" #include "nimtexteditorwidget.h"
#include <texteditor/texteditoractionhandler.h> #include <texteditor/texteditoractionhandler.h>
@@ -55,4 +54,4 @@ void NimEditorFactory::decorateEditor(TextEditorWidget *editor)
editor->textDocument()->setIndenter(new NimIndenter(editor->textDocument()->document())); editor->textDocument()->setIndenter(new NimIndenter(editor->textDocument()->document()));
} }
} } // Nim

2
src/plugins/nim/editor/nimhighlighter.cpp
View File

@@ -92,4 +92,4 @@ int NimHighlighter::highlightLine(const QString &text, int initialState)
return lexer.state(); return lexer.state();
} }
} } // Nim

2
src/plugins/nim/editor/nimindenter.cpp
View File

@@ -151,4 +151,4 @@ QString NimIndenter::rightTrimmed(const QString &str)
return QString(); return QString();
} }
} } // Nim

11
src/plugins/nim/editor/nimtexteditorwidget.cpp
View File

@@ -15,12 +15,11 @@
#include <QTemporaryFile> #include <QTemporaryFile>
#include <QTextDocument> #include <QTextDocument>
using namespace Nim; using namespace Nim::Suggest;
using namespace Suggest;
namespace { namespace Nim {
std::unique_ptr<QTemporaryFile> writeDirtyFile(const TextEditor::TextDocument *doc) static std::unique_ptr<QTemporaryFile> writeDirtyFile(const TextEditor::TextDocument *doc)
{ {
auto result = std::make_unique<QTemporaryFile>("qtcnim.XXXXXX.nim"); auto result = std::make_unique<QTemporaryFile>("qtcnim.XXXXXX.nim");
QTC_ASSERT(result->open(), return nullptr); QTC_ASSERT(result->open(), return nullptr);
@@ -30,8 +29,6 @@ std::unique_ptr<QTemporaryFile> writeDirtyFile(const TextEditor::TextDocument *d
return result; return result;
} }
}
NimTextEditorWidget::NimTextEditorWidget(QWidget *parent) NimTextEditorWidget::NimTextEditorWidget(QWidget *parent)
: TextEditorWidget(parent) : TextEditorWidget(parent)
{ {
@@ -87,3 +84,5 @@ void NimTextEditorWidget::onFindLinkFinished(Suggest::NimSuggestClientRequest *r
const Line &line = m_request->lines().front(); const Line &line = m_request->lines().front();
m_callback(Utils::Link{Utils::FilePath::fromString(line.abs_path), line.row, line.column}); m_callback(Utils::Link{Utils::FilePath::fromString(line.abs_path), line.row, line.column});
} }
} // Nim

7
src/plugins/nim/nimconstants.h
View File

@@ -30,7 +30,6 @@ const char C_NIMBLEBUILDSTEP_ARGUMENTS[] = "Nim.NimbleBuildStep.Arguments";
// NimbleTaskStep // NimbleTaskStep
const char C_NIMBLETASKSTEP_ID[] = "Nim.NimbleTaskStep"; const char C_NIMBLETASKSTEP_ID[] = "Nim.NimbleTaskStep";
const char C_NIMBLETASKSTEP_DISPLAY[] = QT_TRANSLATE_NOOP("NimbleTaskStep", "Nimble Task");
const QString C_NIMBLETASKSTEP_TASKNAME = QStringLiteral("Nim.NimbleTaskStep.TaskName"); const QString C_NIMBLETASKSTEP_TASKNAME = QStringLiteral("Nim.NimbleTaskStep.TaskName");
const QString C_NIMBLETASKSTEP_TASKARGS = QStringLiteral("Nim.NimbleTaskStep.TaskArgs"); const QString C_NIMBLETASKSTEP_TASKARGS = QStringLiteral("Nim.NimbleTaskStep.TaskArgs");
@@ -48,16 +47,12 @@ const char C_NIMPARSE_ID[] = "Nim.NimParse";
const char C_NIMLANGUAGE_ID[] = "Nim"; const char C_NIMLANGUAGE_ID[] = "Nim";
const char C_NIMCODESTYLESETTINGSPAGE_ID[] = "Nim.NimCodeStyleSettings"; const char C_NIMCODESTYLESETTINGSPAGE_ID[] = "Nim.NimCodeStyleSettings";
const char C_NIMCODESTYLESETTINGSPAGE_DISPLAY[] = QT_TRANSLATE_NOOP("NimCodeStyleSettingsPage", "Code Style");
const char C_NIMCODESTYLESETTINGSPAGE_CATEGORY[] = "Z.Nim"; const char C_NIMCODESTYLESETTINGSPAGE_CATEGORY[] = "Z.Nim";
const char C_NIMCODESTYLESETTINGSPAGE_CATEGORY_DISPLAY[] = QT_TRANSLATE_NOOP("NimCodeStyleSettingsPage", "Nim");
const char C_NIMTOOLSSETTINGSPAGE_ID[] = "Nim.NimToolsSettings"; const char C_NIMTOOLSSETTINGSPAGE_ID[] = "Nim.NimToolsSettings";
const char C_NIMTOOLSSETTINGSPAGE_DISPLAY[] = QT_TRANSLATE_NOOP("NimToolsSettingsPage", "Tools");
const char C_NIMTOOLSSETTINGSPAGE_CATEGORY[] = "Z.Nim"; const char C_NIMTOOLSSETTINGSPAGE_CATEGORY[] = "Z.Nim";
const char C_NIMTOOLSSETTINGSPAGE_CATEGORY_DISPLAY[] = QT_TRANSLATE_NOOP("NimToolsSettingsPage", "Nim");
const char C_NIMLANGUAGE_NAME[] = QT_TRANSLATE_NOOP("NimCodeStylePreferencesFactory", "Nim"); const char C_NIMLANGUAGE_NAME[] = QT_TRANSLATE_NOOP("Nim", "Nim");
const char C_NIMGLOBALCODESTYLE_ID[] = "NimGlobal"; const char C_NIMGLOBALCODESTYLE_ID[] = "NimGlobal";
const QString C_NIMSNIPPETSGROUP_ID = QStringLiteral("Nim.NimSnippetsGroup"); const QString C_NIMSNIPPETSGROUP_ID = QStringLiteral("Nim.NimSnippetsGroup");

3
src/plugins/nim/nimplugin.cpp
View File

@@ -4,6 +4,7 @@
#include "nimplugin.h" #include "nimplugin.h"
#include "nimconstants.h" #include "nimconstants.h"
#include "nimtr.h"
#include "editor/nimeditorfactory.h" #include "editor/nimeditorfactory.h"
#include "project/nimblerunconfiguration.h" #include "project/nimblerunconfiguration.h"
#include "project/nimblebuildconfiguration.h" #include "project/nimblebuildconfiguration.h"
@@ -94,7 +95,7 @@ bool NimPlugin::initialize(const QStringList &arguments, QString *errorMessage)
ToolChainManager::registerLanguage(Constants::C_NIMLANGUAGE_ID, Constants::C_NIMLANGUAGE_NAME); ToolChainManager::registerLanguage(Constants::C_NIMLANGUAGE_ID, Constants::C_NIMLANGUAGE_NAME);
TextEditor::SnippetProvider::registerGroup(Constants::C_NIMSNIPPETSGROUP_ID, TextEditor::SnippetProvider::registerGroup(Constants::C_NIMSNIPPETSGROUP_ID,
tr("Nim", "SnippetProvider"), Tr::tr("Nim", "SnippetProvider"),
&NimEditorFactory::decorateEditor); &NimEditorFactory::decorateEditor);
ProjectManager::registerProjectType<NimProject>(Constants::C_NIM_PROJECT_MIMETYPE); ProjectManager::registerProjectType<NimProject>(Constants::C_NIM_PROJECT_MIMETYPE);

22
src/plugins/nim/project/nimblebuildconfiguration.cpp
View File

@@ -4,9 +4,7 @@
#include "nimblebuildconfiguration.h" #include "nimblebuildconfiguration.h"
#include "nimconstants.h" #include "nimconstants.h"
//#include "nimblebuildstep.h" #include "nimtr.h"
#include "nimbleproject.h"
#include "nimblebuildsystem.h"
#include <projectexplorer/buildinfo.h> #include <projectexplorer/buildinfo.h>
#include <projectexplorer/buildstep.h> #include <projectexplorer/buildstep.h>
@@ -14,20 +12,16 @@
#include <projectexplorer/kit.h> #include <projectexplorer/kit.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <utils/fileutils.h>
#include <utils/osspecificaspects.h>
#include <QFileInfo>
#include <QDir>
using namespace Nim;
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
NimbleBuildConfiguration::NimbleBuildConfiguration(Target *target, Utils::Id id) namespace Nim {
NimbleBuildConfiguration::NimbleBuildConfiguration(Target *target, Id id)
: BuildConfiguration(target, id) : BuildConfiguration(target, id)
{ {
setConfigWidgetDisplayName(tr("General")); setConfigWidgetDisplayName(Tr::tr("General"));
setConfigWidgetHasFrame(true); setConfigWidgetHasFrame(true);
setBuildDirectorySettingsKey("Nim.NimbleBuildConfiguration.BuildDirectory"); setBuildDirectorySettingsKey("Nim.NimbleBuildConfiguration.BuildDirectory");
appendInitialBuildStep(Constants::C_NIMBLEBUILDSTEP_ID); appendInitialBuildStep(Constants::C_NIMBLEBUILDSTEP_ID);
@@ -82,8 +76,10 @@ NimbleBuildConfigurationFactory::NimbleBuildConfigurationFactory()
return info; return info;
}; };
return QList<BuildInfo>{ return QList<BuildInfo>{
oneBuild(BuildConfiguration::Debug, BuildConfiguration::tr("Debug")), oneBuild(BuildConfiguration::Debug, Tr::tr("Debug")),
oneBuild(BuildConfiguration::Release, BuildConfiguration::tr("Release")) oneBuild(BuildConfiguration::Release, Tr::tr("Release"))
}; };
}); });
} }
} // Nim

5
src/plugins/nim/project/nimblebuildstep.cpp
View File

@@ -6,6 +6,7 @@
#include "nimconstants.h" #include "nimconstants.h"
#include "nimbuildsystem.h" #include "nimbuildsystem.h"
#include "nimoutputtaskparser.h" #include "nimoutputtaskparser.h"
#include "nimtr.h"
#include <projectexplorer/buildconfiguration.h> #include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/processparameters.h> #include <projectexplorer/processparameters.h>
@@ -19,8 +20,6 @@ namespace Nim {
class NimbleBuildStep : public AbstractProcessStep class NimbleBuildStep : public AbstractProcessStep
{ {
Q_DECLARE_TR_FUNCTIONS(Nim::NimbleBuilStep)
public: public:
NimbleBuildStep(BuildStepList *parentList, Id id); NimbleBuildStep(BuildStepList *parentList, Id id);
@@ -77,7 +76,7 @@ QString NimbleBuildStep::defaultArguments() const
NimbleBuildStepFactory::NimbleBuildStepFactory() NimbleBuildStepFactory::NimbleBuildStepFactory()
{ {
registerStep<NimbleBuildStep>(Constants::C_NIMBLEBUILDSTEP_ID); registerStep<NimbleBuildStep>(Constants::C_NIMBLEBUILDSTEP_ID);
setDisplayName(NimbleBuildStep::tr("Nimble Build")); setDisplayName(Tr::tr("Nimble Build"));
setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD); setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
setSupportedConfiguration(Constants::C_NIMBLEBUILDCONFIGURATION_ID); setSupportedConfiguration(Constants::C_NIMBLEBUILDCONFIGURATION_ID);
setRepeatable(true); setRepeatable(true);

2
src/plugins/nim/project/nimblebuildsystem.cpp
View File

@@ -4,8 +4,6 @@
#include "nimblebuildsystem.h" #include "nimblebuildsystem.h"
#include "nimbuildsystem.h" #include "nimbuildsystem.h"
#include "nimbleproject.h"
#include "nimproject.h"
#include "../nimconstants.h" #include "../nimconstants.h"
#include <projectexplorer/target.h> #include <projectexplorer/target.h>

5
src/plugins/nim/project/nimbleproject.cpp
View File

@@ -9,9 +9,10 @@
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
using namespace Nim;
using namespace ProjectExplorer; using namespace ProjectExplorer;
namespace Nim {
NimbleProject::NimbleProject(const Utils::FilePath &fileName) NimbleProject::NimbleProject(const Utils::FilePath &fileName)
: ProjectExplorer::Project(Constants::C_NIMBLE_MIMETYPE, fileName) : ProjectExplorer::Project(Constants::C_NIMBLE_MIMETYPE, fileName)
{ {
@@ -46,4 +47,4 @@ void NimbleProject::setExcludedFiles(const QStringList &excludedFiles)
m_excludedFiles = excludedFiles; m_excludedFiles = excludedFiles;
} }
} // Nim

2
src/plugins/nim/project/nimbleproject.h
View File

@@ -28,4 +28,4 @@ protected:
QStringList m_excludedFiles; QStringList m_excludedFiles;
}; };
} } // Nim

9
src/plugins/nim/project/nimblerunconfiguration.cpp
View File

@@ -5,6 +5,7 @@
#include "nimbuildsystem.h" #include "nimbuildsystem.h"
#include "nimconstants.h" #include "nimconstants.h"
#include "nimtr.h"
#include <projectexplorer/localenvironmentaspect.h> #include <projectexplorer/localenvironmentaspect.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
@@ -23,8 +24,6 @@ namespace Nim {
class NimbleRunConfiguration : public RunConfiguration class NimbleRunConfiguration : public RunConfiguration
{ {
Q_DECLARE_TR_FUNCTIONS(Nim::NimbleRunConfiguration)
public: public:
NimbleRunConfiguration(Target *target, Utils::Id id) NimbleRunConfiguration(Target *target, Utils::Id id)
: RunConfiguration(target, id) : RunConfiguration(target, id)
@@ -61,8 +60,6 @@ NimbleRunConfigurationFactory::NimbleRunConfigurationFactory()
class NimbleTestConfiguration : public RunConfiguration class NimbleTestConfiguration : public RunConfiguration
{ {
Q_DECLARE_TR_FUNCTIONS(Nim::NimbleTestConfiguration)
public: public:
NimbleTestConfiguration(ProjectExplorer::Target *target, Utils::Id id) NimbleTestConfiguration(ProjectExplorer::Target *target, Utils::Id id)
: RunConfiguration(target, id) : RunConfiguration(target, id)
@@ -74,8 +71,8 @@ public:
->setDefaultWorkingDirectory(project()->projectDirectory()); ->setDefaultWorkingDirectory(project()->projectDirectory());
addAspect<TerminalAspect>(); addAspect<TerminalAspect>();
setDisplayName(tr("Nimble Test")); setDisplayName(Tr::tr("Nimble Test"));
setDefaultDisplayName(tr("Nimble Test")); setDefaultDisplayName(Tr::tr("Nimble Test"));
} }
}; };

17
src/plugins/nim/project/nimbletaskstep.cpp
View File

@@ -5,7 +5,7 @@
#include "nimconstants.h" #include "nimconstants.h"
#include "nimblebuildsystem.h" #include "nimblebuildsystem.h"
#include "nimbleproject.h" #include "nimtr.h"
#include <projectexplorer/abstractprocessstep.h> #include <projectexplorer/abstractprocessstep.h>
#include <projectexplorer/buildstep.h> #include <projectexplorer/buildstep.h>
@@ -32,8 +32,6 @@ namespace Nim {
class NimbleTaskStep final : public AbstractProcessStep class NimbleTaskStep final : public AbstractProcessStep
{ {
Q_DECLARE_TR_FUNCTIONS(Nim::NimbleTaskStep)
public: public:
NimbleTaskStep(BuildStepList *parentList, Id id); NimbleTaskStep(BuildStepList *parentList, Id id);
@@ -59,8 +57,9 @@ private:
NimbleTaskStep::NimbleTaskStep(BuildStepList *parentList, Id id) NimbleTaskStep::NimbleTaskStep(BuildStepList *parentList, Id id)
: AbstractProcessStep(parentList, id) : AbstractProcessStep(parentList, id)
{ {
setDefaultDisplayName(tr(Constants::C_NIMBLETASKSTEP_DISPLAY)); const QString display = Tr::tr("Nimble Task");
setDisplayName(tr(Constants::C_NIMBLETASKSTEP_DISPLAY)); setDefaultDisplayName(display);
setDisplayName(display);
setCommandLineProvider([this] { setCommandLineProvider([this] {
QString args = m_taskName->value() + " " + m_taskArgs->value(); QString args = m_taskName->value() + " " + m_taskArgs->value();
@@ -75,7 +74,7 @@ NimbleTaskStep::NimbleTaskStep(BuildStepList *parentList, Id id)
m_taskArgs = addAspect<StringAspect>(); m_taskArgs = addAspect<StringAspect>();
m_taskArgs->setSettingsKey(Constants::C_NIMBLETASKSTEP_TASKARGS); m_taskArgs->setSettingsKey(Constants::C_NIMBLETASKSTEP_TASKARGS);
m_taskArgs->setDisplayStyle(StringAspect::LineEditDisplay); m_taskArgs->setDisplayStyle(StringAspect::LineEditDisplay);
m_taskArgs->setLabelText(tr("Task arguments:")); m_taskArgs->setLabelText(Tr::tr("Task arguments:"));
} }
QWidget *NimbleTaskStep::createConfigWidget() QWidget *NimbleTaskStep::createConfigWidget()
@@ -89,7 +88,7 @@ QWidget *NimbleTaskStep::createConfigWidget()
using namespace Layouting; using namespace Layouting;
auto widget = Form { auto widget = Form {
m_taskArgs, m_taskArgs,
tr("Tasks:"), taskList Tr::tr("Tasks:"), taskList
}.emerge(WithoutMargins); }.emerge(WithoutMargins);
auto buildSystem = dynamic_cast<NimbleBuildSystem *>(this->buildSystem()); auto buildSystem = dynamic_cast<NimbleBuildSystem *>(this->buildSystem());
@@ -215,7 +214,7 @@ bool NimbleTaskStep::validate()
auto matchName = [this](const NimbleTask &task) { return task.name == m_taskName->value(); }; auto matchName = [this](const NimbleTask &task) { return task.name == m_taskName->value(); };
if (!Utils::contains(nimbleBuildSystem->tasks(), matchName)) { if (!Utils::contains(nimbleBuildSystem->tasks(), matchName)) {
emit addTask(BuildSystemTask(Task::Error, tr("Nimble task %1 not found.") emit addTask(BuildSystemTask(Task::Error, Tr::tr("Nimble task %1 not found.")
.arg(m_taskName->value()))); .arg(m_taskName->value())));
emitFaultyConfigurationMessage(); emitFaultyConfigurationMessage();
return false; return false;
@@ -229,7 +228,7 @@ bool NimbleTaskStep::validate()
NimbleTaskStepFactory::NimbleTaskStepFactory() NimbleTaskStepFactory::NimbleTaskStepFactory()
{ {
registerStep<NimbleTaskStep>(Constants::C_NIMBLETASKSTEP_ID); registerStep<NimbleTaskStep>(Constants::C_NIMBLETASKSTEP_ID);
setDisplayName(NimbleTaskStep::tr("Nimble Task")); setDisplayName(Tr::tr("Nimble Task"));
setSupportedStepLists({ProjectExplorer::Constants::BUILDSTEPS_BUILD, setSupportedStepLists({ProjectExplorer::Constants::BUILDSTEPS_BUILD,
ProjectExplorer::Constants::BUILDSTEPS_CLEAN, ProjectExplorer::Constants::BUILDSTEPS_CLEAN,
ProjectExplorer::Constants::BUILDSTEPS_DEPLOY}); ProjectExplorer::Constants::BUILDSTEPS_DEPLOY});

9
src/plugins/nim/project/nimbuildconfiguration.cpp
View File

@@ -3,8 +3,8 @@
#include "nimbuildconfiguration.h" #include "nimbuildconfiguration.h"
#include "nimcompilerbuildstep.h" #include "nimcompilerbuildstep.h"
#include "nimproject.h"
#include "../nimtr.h"
#include "../nimconstants.h" #include "../nimconstants.h"
#include <projectexplorer/buildconfiguration.h> #include <projectexplorer/buildconfiguration.h>
@@ -12,6 +12,7 @@
#include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsteplist.h>
#include <projectexplorer/buildstep.h> #include <projectexplorer/buildstep.h>
#include <projectexplorer/kit.h> #include <projectexplorer/kit.h>
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
@@ -37,7 +38,7 @@ static FilePath defaultBuildDirectory(const Kit *k,
NimBuildConfiguration::NimBuildConfiguration(Target *target, Utils::Id id) NimBuildConfiguration::NimBuildConfiguration(Target *target, Utils::Id id)
: BuildConfiguration(target, id) : BuildConfiguration(target, id)
{ {
setConfigWidgetDisplayName(tr("General")); setConfigWidgetDisplayName(Tr::tr("General"));
setConfigWidgetHasFrame(true); setConfigWidgetHasFrame(true);
setBuildDirectorySettingsKey("Nim.NimBuildConfiguration.BuildDirectory"); setBuildDirectorySettingsKey("Nim.NimBuildConfiguration.BuildDirectory");
@@ -90,8 +91,8 @@ NimBuildConfigurationFactory::NimBuildConfigurationFactory()
return info; return info;
}; };
return QList<BuildInfo>{ return QList<BuildInfo>{
oneBuild(BuildConfiguration::Debug, BuildConfiguration::tr("Debug")), oneBuild(BuildConfiguration::Debug, Tr::tr("Debug")),
oneBuild(BuildConfiguration::Release, BuildConfiguration::tr("Release")) oneBuild(BuildConfiguration::Release, Tr::tr("Release"))
}; };
}); });
} }

1
src/plugins/nim/project/nimbuildsystem.cpp
View File

@@ -4,7 +4,6 @@
#include "nimbuildsystem.h" #include "nimbuildsystem.h"
#include "nimconstants.h" #include "nimconstants.h"
#include "nimproject.h"
#include "nimbleproject.h" #include "nimbleproject.h"
#include <projectexplorer/target.h> #include <projectexplorer/target.h>

31
src/plugins/nim/project/nimcompilerbuildstep.cpp
View File

@@ -4,16 +4,17 @@
#include "nimcompilerbuildstep.h" #include "nimcompilerbuildstep.h"
#include "nimbuildconfiguration.h" #include "nimbuildconfiguration.h"
#include "nimbuildsystem.h"
#include "nimconstants.h" #include "nimconstants.h"
#include "nimoutputtaskparser.h" #include "nimoutputtaskparser.h"
#include "nimtoolchain.h" #include "nimtr.h"
#include <projectexplorer/processparameters.h>
#include <projectexplorer/buildconfiguration.h> #include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/ioutputparser.h> #include <projectexplorer/ioutputparser.h>
#include <projectexplorer/kitinformation.h> #include <projectexplorer/kitinformation.h>
#include <projectexplorer/processparameters.h>
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/toolchain.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
@@ -30,12 +31,12 @@ using namespace Utils;
namespace Nim { namespace Nim {
NimCompilerBuildStep::NimCompilerBuildStep(BuildStepList *parentList, Utils::Id id) NimCompilerBuildStep::NimCompilerBuildStep(BuildStepList *parentList, Id id)
: AbstractProcessStep(parentList, id) : AbstractProcessStep(parentList, id)
{ {
setCommandLineProvider([this] { return commandLine(); }); setCommandLineProvider([this] { return commandLine(); });
connect(project(), &ProjectExplorer::Project::fileListChanged, connect(project(), &Project::fileListChanged,
this, &NimCompilerBuildStep::updateTargetNimFile); this, &NimCompilerBuildStep::updateTargetNimFile);
} }
@@ -51,8 +52,8 @@ QWidget *NimCompilerBuildStep::createConfigWidget()
{ {
auto widget = new QWidget; auto widget = new QWidget;
setDisplayName(tr("Nim build step")); setDisplayName(Tr::tr("Nim build step"));
setSummaryText(tr("Nim build step")); setSummaryText(Tr::tr("Nim build step"));
auto targetComboBox = new QComboBox(widget); auto targetComboBox = new QComboBox(widget);
@@ -63,15 +64,15 @@ QWidget *NimCompilerBuildStep::createConfigWidget()
commandTextEdit->setMinimumSize(QSize(0, 0)); commandTextEdit->setMinimumSize(QSize(0, 0));
auto defaultArgumentsComboBox = new QComboBox(widget); auto defaultArgumentsComboBox = new QComboBox(widget);
defaultArgumentsComboBox->addItem(tr("None")); defaultArgumentsComboBox->addItem(Tr::tr("None"));
defaultArgumentsComboBox->addItem(tr("Debug")); defaultArgumentsComboBox->addItem(Tr::tr("Debug"));
defaultArgumentsComboBox->addItem(tr("Release")); defaultArgumentsComboBox->addItem(Tr::tr("Release"));
auto formLayout = new QFormLayout(widget); auto formLayout = new QFormLayout(widget);
formLayout->addRow(tr("Target:"), targetComboBox); formLayout->addRow(Tr::tr("Target:"), targetComboBox);
formLayout->addRow(tr("Default arguments:"), defaultArgumentsComboBox); formLayout->addRow(Tr::tr("Default arguments:"), defaultArgumentsComboBox);
formLayout->addRow(tr("Extra arguments:"), additionalArgumentsLineEdit); formLayout->addRow(Tr::tr("Extra arguments:"), additionalArgumentsLineEdit);
formLayout->addRow(tr("Command:"), commandTextEdit); formLayout->addRow(Tr::tr("Command:"), commandTextEdit);
auto updateUi = [=] { auto updateUi = [=] {
const CommandLine cmd = commandLine(); const CommandLine cmd = commandLine();
@@ -211,7 +212,7 @@ void NimCompilerBuildStep::updateTargetNimFile()
NimCompilerBuildStepFactory::NimCompilerBuildStepFactory() NimCompilerBuildStepFactory::NimCompilerBuildStepFactory()
{ {
registerStep<NimCompilerBuildStep>(Constants::C_NIMCOMPILERBUILDSTEP_ID); registerStep<NimCompilerBuildStep>(Constants::C_NIMCOMPILERBUILDSTEP_ID);
setDisplayName(NimCompilerBuildStep::tr("Nim Compiler Build Step")); setDisplayName(Tr::tr("Nim Compiler Build Step"));
setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD); setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
setSupportedConfiguration(Constants::C_NIMBUILDCONFIGURATION_ID); setSupportedConfiguration(Constants::C_NIMBUILDCONFIGURATION_ID);
setRepeatable(false); setRepeatable(false);

21
src/plugins/nim/project/nimcompilercleanstep.cpp
View File

@@ -5,6 +5,7 @@
#include "nimbuildconfiguration.h" #include "nimbuildconfiguration.h"
#include "../nimconstants.h" #include "../nimconstants.h"
#include "../nimtr.h"
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
@@ -21,10 +22,8 @@ namespace Nim {
class NimCompilerCleanStep final : public BuildStep class NimCompilerCleanStep final : public BuildStep
{ {
Q_DECLARE_TR_FUNCTIONS(Nim::NimCompilerCleanStep)
public: public:
NimCompilerCleanStep(BuildStepList *parentList, Utils::Id id); NimCompilerCleanStep(BuildStepList *parentList, Id id);
private: private:
bool init() final; bool init() final;
@@ -34,14 +33,14 @@ private:
bool removeCacheDirectory(); bool removeCacheDirectory();
bool removeOutFilePath(); bool removeOutFilePath();
Utils::FilePath m_buildDir; FilePath m_buildDir;
}; };
NimCompilerCleanStep::NimCompilerCleanStep(BuildStepList *parentList, Utils::Id id) NimCompilerCleanStep::NimCompilerCleanStep(BuildStepList *parentList, Id id)
: BuildStep(parentList, id) : BuildStep(parentList, id)
{ {
auto workingDirectory = addAspect<StringAspect>(); auto workingDirectory = addAspect<StringAspect>();
workingDirectory->setLabelText(tr("Working directory:")); workingDirectory->setLabelText(Tr::tr("Working directory:"));
workingDirectory->setDisplayStyle(StringAspect::LineEditDisplay); workingDirectory->setDisplayStyle(StringAspect::LineEditDisplay);
setSummaryUpdater([this, workingDirectory] { setSummaryUpdater([this, workingDirectory] {
@@ -62,24 +61,24 @@ bool NimCompilerCleanStep::init()
void NimCompilerCleanStep::doRun() void NimCompilerCleanStep::doRun()
{ {
if (!m_buildDir.exists()) { if (!m_buildDir.exists()) {
emit addOutput(tr("Build directory \"%1\" does not exist.").arg(m_buildDir.toUserOutput()), OutputFormat::ErrorMessage); emit addOutput(Tr::tr("Build directory \"%1\" does not exist.").arg(m_buildDir.toUserOutput()), OutputFormat::ErrorMessage);
emit finished(false); emit finished(false);
return; return;
} }
if (!removeCacheDirectory()) { if (!removeCacheDirectory()) {
emit addOutput(tr("Failed to delete the cache directory."), OutputFormat::ErrorMessage); emit addOutput(Tr::tr("Failed to delete the cache directory."), OutputFormat::ErrorMessage);
emit finished(false); emit finished(false);
return; return;
} }
if (!removeOutFilePath()) { if (!removeOutFilePath()) {
emit addOutput(tr("Failed to delete the out file."), OutputFormat::ErrorMessage); emit addOutput(Tr::tr("Failed to delete the out file."), OutputFormat::ErrorMessage);
emit finished(false); emit finished(false);
return; return;
} }
emit addOutput(tr("Clean step completed successfully."), OutputFormat::NormalMessage); emit addOutput(Tr::tr("Clean step completed successfully."), OutputFormat::NormalMessage);
emit finished(true); emit finished(true);
} }
@@ -115,7 +114,7 @@ NimCompilerCleanStepFactory::NimCompilerCleanStepFactory()
setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_CLEAN); setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_CLEAN);
setSupportedConfiguration(Constants::C_NIMBUILDCONFIGURATION_ID); setSupportedConfiguration(Constants::C_NIMBUILDCONFIGURATION_ID);
setRepeatable(false); setRepeatable(false);
setDisplayName(NimCompilerCleanStep::tr("Nim Clean Step")); setDisplayName(Tr::tr("Nim Clean Step"));
} }
} // Nim } // Nim

4
src/plugins/nim/project/nimoutputtaskparser.cpp
View File

@@ -10,7 +10,7 @@ using namespace Utils;
namespace Nim { namespace Nim {
NimParser::Result NimParser::handleLine(const QString &lne, Utils::OutputFormat) NimParser::Result NimParser::handleLine(const QString &lne, OutputFormat)
{ {
const QString line = lne.trimmed(); const QString line = lne.trimmed();
static const QRegularExpression regex("(.+.nim)\\((\\d+), (\\d+)\\) (.+)"); static const QRegularExpression regex("(.+.nim)\\((\\d+), (\\d+)\\) (.+)");
@@ -44,7 +44,7 @@ NimParser::Result NimParser::handleLine(const QString &lne, Utils::OutputFormat)
return {Status::Done, linkSpecs}; return {Status::Done, linkSpecs};
} }
} // namespace Nim } // Nim
#ifdef WITH_TESTS #ifdef WITH_TESTS

7
src/plugins/nim/project/nimproject.cpp
View File

@@ -4,6 +4,7 @@
#include "nimproject.h" #include "nimproject.h"
#include "../nimconstants.h" #include "../nimconstants.h"
#include "../nimtr.h"
#include "nimbuildsystem.h" #include "nimbuildsystem.h"
#include "nimtoolchain.h" #include "nimtoolchain.h"
@@ -31,11 +32,11 @@ Tasks NimProject::projectIssues(const Kit *k) const
Tasks result = Project::projectIssues(k); Tasks result = Project::projectIssues(k);
auto tc = dynamic_cast<NimToolChain *>(ToolChainKitAspect::toolChain(k, Constants::C_NIMLANGUAGE_ID)); auto tc = dynamic_cast<NimToolChain *>(ToolChainKitAspect::toolChain(k, Constants::C_NIMLANGUAGE_ID));
if (!tc) { if (!tc) {
result.append(createProjectTask(Task::TaskType::Error, tr("No Nim compiler set."))); result.append(createProjectTask(Task::TaskType::Error, Tr::tr("No Nim compiler set.")));
return result; return result;
} }
if (!tc->compilerCommand().exists()) if (!tc->compilerCommand().exists())
result.append(createProjectTask(Task::TaskType::Error, tr("Nim compiler does not exist."))); result.append(createProjectTask(Task::TaskType::Error, Tr::tr("Nim compiler does not exist.")));
return result; return result;
} }
@@ -64,4 +65,4 @@ void NimProject::setExcludedFiles(const QStringList &excludedFiles)
m_excludedFiles = excludedFiles; m_excludedFiles = excludedFiles;
} }
} // namespace Nim } // Nim

7
src/plugins/nim/project/nimrunconfiguration.cpp
View File

@@ -5,6 +5,7 @@
#include "nimbuildconfiguration.h" #include "nimbuildconfiguration.h"
#include "../nimconstants.h" #include "../nimconstants.h"
#include "../nimtr.h"
#include <projectexplorer/buildsystem.h> #include <projectexplorer/buildsystem.h>
#include <projectexplorer/localenvironmentaspect.h> #include <projectexplorer/localenvironmentaspect.h>
@@ -21,8 +22,6 @@ namespace Nim {
class NimRunConfiguration final : public RunConfiguration class NimRunConfiguration final : public RunConfiguration
{ {
Q_DECLARE_TR_FUNCTIONS(Nim::NimRunConfiguration)
public: public:
NimRunConfiguration(Target *target, Utils::Id id) NimRunConfiguration(Target *target, Utils::Id id)
: RunConfiguration(target, id) : RunConfiguration(target, id)
@@ -33,8 +32,8 @@ public:
addAspect<WorkingDirectoryAspect>(macroExpander(), envAspect); addAspect<WorkingDirectoryAspect>(macroExpander(), envAspect);
addAspect<TerminalAspect>(); addAspect<TerminalAspect>();
setDisplayName(tr("Current Build Target")); setDisplayName(Tr::tr("Current Build Target"));
setDefaultDisplayName(tr("Current Build Target")); setDefaultDisplayName(Tr::tr("Current Build Target"));
setUpdater([this, target] { setUpdater([this, target] {
auto buildConfiguration = qobject_cast<NimBuildConfiguration *>(target->activeBuildConfiguration()); auto buildConfiguration = qobject_cast<NimBuildConfiguration *>(target->activeBuildConfiguration());

5
src/plugins/nim/project/nimtoolchain.cpp
View File

@@ -2,14 +2,15 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "nimtoolchain.h" #include "nimtoolchain.h"
#include "nimconstants.h" #include "nimconstants.h"
#include "nimtoolchainfactory.h" #include "nimtoolchainfactory.h"
#include "nimtr.h"
#include <projectexplorer/abi.h> #include <projectexplorer/abi.h>
#include <utils/environment.h> #include <utils/environment.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <QFileInfo>
#include <QRegularExpression> #include <QRegularExpression>
using namespace ProjectExplorer; using namespace ProjectExplorer;
@@ -26,7 +27,7 @@ NimToolChain::NimToolChain(Utils::Id typeId)
, m_version(std::make_tuple(-1,-1,-1)) , m_version(std::make_tuple(-1,-1,-1))
{ {
setLanguage(Constants::C_NIMLANGUAGE_ID); setLanguage(Constants::C_NIMLANGUAGE_ID);
setTypeDisplayName(tr("Nim")); setTypeDisplayName(Tr::tr("Nim"));
setTargetAbiNoSignal(Abi::hostAbi()); setTargetAbiNoSignal(Abi::hostAbi());
setCompilerCommandKey("Nim.NimToolChain.CompilerCommand"); setCompilerCommandKey("Nim.NimToolChain.CompilerCommand");
} }

2
src/plugins/nim/project/nimtoolchain.h
View File

@@ -10,8 +10,6 @@ namespace Nim {
class NimToolChain : public ProjectExplorer::ToolChain class NimToolChain : public ProjectExplorer::ToolChain
{ {
Q_DECLARE_TR_FUNCTIONS(Nim::NimToolChain)
public: public:
NimToolChain(); NimToolChain();
explicit NimToolChain(Utils::Id typeId); explicit NimToolChain(Utils::Id typeId);

7
src/plugins/nim/project/nimtoolchainfactory.cpp
View File

@@ -5,6 +5,7 @@
#include "nimconstants.h" #include "nimconstants.h"
#include "nimtoolchain.h" #include "nimtoolchain.h"
#include "nimtr.h"
#include <projectexplorer/devicesupport/devicemanager.h> #include <projectexplorer/devicesupport/devicemanager.h>
@@ -23,7 +24,7 @@ namespace Nim {
NimToolChainFactory::NimToolChainFactory() NimToolChainFactory::NimToolChainFactory()
{ {
setDisplayName(NimToolChain::tr("Nim")); setDisplayName(Tr::tr("Nim"));
setSupportedToolChainType(Constants::C_NIMTOOLCHAIN_TYPEID); setSupportedToolChainType(Constants::C_NIMTOOLCHAIN_TYPEID);
setSupportedLanguages({Constants::C_NIMLANGUAGE_ID}); setSupportedLanguages({Constants::C_NIMLANGUAGE_ID});
setToolchainConstructor([] { return new NimToolChain; }); setToolchainConstructor([] { return new NimToolChain; });
@@ -77,9 +78,9 @@ NimToolChainConfigWidget::NimToolChainConfigWidget(NimToolChain *tc)
const auto gnuVersionArgs = QStringList("--version"); const auto gnuVersionArgs = QStringList("--version");
m_compilerCommand->setExpectedKind(PathChooser::ExistingCommand); m_compilerCommand->setExpectedKind(PathChooser::ExistingCommand);
m_compilerCommand->setCommandVersionArguments(gnuVersionArgs); m_compilerCommand->setCommandVersionArguments(gnuVersionArgs);
m_mainLayout->addRow(tr("&Compiler path:"), m_compilerCommand); m_mainLayout->addRow(Tr::tr("&Compiler path:"), m_compilerCommand);
m_compilerVersion->setReadOnly(true); m_compilerVersion->setReadOnly(true);
m_mainLayout->addRow(tr("&Compiler version:"), m_compilerVersion); m_mainLayout->addRow(Tr::tr("&Compiler version:"), m_compilerVersion);
// Fill // Fill
fillUI(); fillUI();

20
src/plugins/nim/settings/nimcodestylepreferencesfactory.cpp
View File

@@ -4,13 +4,17 @@
#include "nimcodestylepreferencesfactory.h" #include "nimcodestylepreferencesfactory.h"
#include "nimcodestylepreferenceswidget.h" #include "nimcodestylepreferenceswidget.h"
#include "../nimconstants.h"
#include "../editor/nimindenter.h" #include "../editor/nimindenter.h"
#include "../nimconstants.h"
#include "../nimtr.h"
#include <utils/id.h> #include <utils/id.h>
#include <texteditor/simplecodestylepreferences.h> #include <texteditor/simplecodestylepreferences.h>
#include <QWidget>
#include <QLayout>
using namespace TextEditor; using namespace TextEditor;
namespace Nim { namespace Nim {
@@ -26,16 +30,16 @@ Utils::Id NimCodeStylePreferencesFactory::languageId()
QString NimCodeStylePreferencesFactory::displayName() QString NimCodeStylePreferencesFactory::displayName()
{ {
return tr(Constants::C_NIMLANGUAGE_NAME); return Tr::tr(Constants::C_NIMLANGUAGE_NAME);
} }
TextEditor::ICodeStylePreferences *NimCodeStylePreferencesFactory::createCodeStyle() const ICodeStylePreferences *NimCodeStylePreferencesFactory::createCodeStyle() const
{ {
return new TextEditor::SimpleCodeStylePreferences(); return new SimpleCodeStylePreferences();
} }
TextEditor::CodeStyleEditorWidget *NimCodeStylePreferencesFactory::createEditor( CodeStyleEditorWidget *NimCodeStylePreferencesFactory::createEditor(
TextEditor::ICodeStylePreferences *preferences, ICodeStylePreferences *preferences,
ProjectExplorer::Project *project, ProjectExplorer::Project *project,
QWidget *parent) const QWidget *parent) const
{ {
@@ -44,7 +48,7 @@ TextEditor::CodeStyleEditorWidget *NimCodeStylePreferencesFactory::createEditor(
return result; return result;
} }
TextEditor::Indenter *NimCodeStylePreferencesFactory::createIndenter(QTextDocument *doc) const Indenter *NimCodeStylePreferencesFactory::createIndenter(QTextDocument *doc) const
{ {
return new NimIndenter(doc); return new NimIndenter(doc);
} }
@@ -59,4 +63,4 @@ QString NimCodeStylePreferencesFactory::previewText() const
return QLatin1String(Nim::Constants::C_NIMCODESTYLEPREVIEWSNIPPET); return QLatin1String(Nim::Constants::C_NIMCODESTYLEPREVIEWSNIPPET);
} }
} } // Nim

2
src/plugins/nim/settings/nimcodestylepreferencesfactory.h
View File

@@ -9,8 +9,6 @@ namespace Nim {
class NimCodeStylePreferencesFactory : public TextEditor::ICodeStylePreferencesFactory class NimCodeStylePreferencesFactory : public TextEditor::ICodeStylePreferencesFactory
{ {
Q_DECLARE_TR_FUNCTIONS(Nim::NimCodeStylePreferencesFactory)
public: public:
NimCodeStylePreferencesFactory(); NimCodeStylePreferencesFactory();

10
src/plugins/nim/settings/nimcodestylesettingspage.cpp
View File

@@ -2,10 +2,10 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "nimcodestylesettingspage.h" #include "nimcodestylesettingspage.h"
#include "nimcodestylepreferencesfactory.h"
#include "nimsettings.h"
#include "../nimconstants.h" #include "../nimconstants.h"
#include "../nimtr.h"
#include "nimsettings.h"
#include <texteditor/simplecodestylepreferences.h> #include <texteditor/simplecodestylepreferences.h>
#include <texteditor/codestyleeditor.h> #include <texteditor/codestyleeditor.h>
@@ -20,8 +20,6 @@ namespace Nim {
class NimCodeStyleSettingsWidget : public Core::IOptionsPageWidget class NimCodeStyleSettingsWidget : public Core::IOptionsPageWidget
{ {
Q_DECLARE_TR_FUNCTIONS(Nim::CodeStyleSettings)
public: public:
NimCodeStyleSettingsWidget() NimCodeStyleSettingsWidget()
{ {
@@ -51,9 +49,9 @@ private:
NimCodeStyleSettingsPage::NimCodeStyleSettingsPage() NimCodeStyleSettingsPage::NimCodeStyleSettingsPage()
{ {
setId(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_ID); setId(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_ID);
setDisplayName(tr(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_DISPLAY)); setDisplayName(Tr::tr("Code Style"));
setCategory(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_CATEGORY); setCategory(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_CATEGORY);
setDisplayCategory(NimCodeStyleSettingsWidget::tr("Nim")); setDisplayCategory(Tr::tr("Nim"));
setCategoryIconPath(":/nim/images/settingscategory_nim.png"); setCategoryIconPath(":/nim/images/settingscategory_nim.png");
setWidgetCreator([] { return new NimCodeStyleSettingsWidget; }); setWidgetCreator([] { return new NimCodeStyleSettingsWidget; });
} }

13
src/plugins/nim/settings/nimsettings.cpp
View File

@@ -2,9 +2,10 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "nimsettings.h" #include "nimsettings.h"
#include "nimcodestylepreferencesfactory.h"
#include "../nimconstants.h" #include "../nimconstants.h"
#include "../nimtr.h"
#include "nimcodestylepreferencesfactory.h"
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
@@ -34,7 +35,7 @@ NimSettings::NimSettings()
nimSuggestPath.setSettingsKey("Command"); nimSuggestPath.setSettingsKey("Command");
nimSuggestPath.setDisplayStyle(StringAspect::PathChooserDisplay); nimSuggestPath.setDisplayStyle(StringAspect::PathChooserDisplay);
nimSuggestPath.setExpectedKind(PathChooser::ExistingCommand); nimSuggestPath.setExpectedKind(PathChooser::ExistingCommand);
nimSuggestPath.setLabelText(tr("Path:")); nimSuggestPath.setLabelText(Tr::tr("Path:"));
readSettings(Core::ICore::settings()); readSettings(Core::ICore::settings());
} }
@@ -61,14 +62,14 @@ void NimSettings::InitializeCodeStyleSettings()
m_globalCodeStyle = new SimpleCodeStylePreferences(); m_globalCodeStyle = new SimpleCodeStylePreferences();
m_globalCodeStyle->setDelegatingPool(pool); m_globalCodeStyle->setDelegatingPool(pool);
m_globalCodeStyle->setDisplayName(tr("Global", "Settings")); m_globalCodeStyle->setDisplayName(Tr::tr("Global", "Settings"));
m_globalCodeStyle->setId(Nim::Constants::C_NIMGLOBALCODESTYLE_ID); m_globalCodeStyle->setId(Nim::Constants::C_NIMGLOBALCODESTYLE_ID);
pool->addCodeStyle(m_globalCodeStyle); pool->addCodeStyle(m_globalCodeStyle);
TextEditorSettings::registerCodeStyle(Nim::Constants::C_NIMLANGUAGE_ID, m_globalCodeStyle); TextEditorSettings::registerCodeStyle(Nim::Constants::C_NIMLANGUAGE_ID, m_globalCodeStyle);
auto nimCodeStyle = new SimpleCodeStylePreferences(); auto nimCodeStyle = new SimpleCodeStylePreferences();
nimCodeStyle->setId("nim"); nimCodeStyle->setId("nim");
nimCodeStyle->setDisplayName(tr("Nim")); nimCodeStyle->setDisplayName(Tr::tr("Nim"));
nimCodeStyle->setReadOnly(true); nimCodeStyle->setReadOnly(true);
TabSettings nimTabSettings; TabSettings nimTabSettings;
@@ -110,9 +111,9 @@ void NimSettings::TerminateCodeStyleSettings()
NimToolsSettingsPage::NimToolsSettingsPage(NimSettings *settings) NimToolsSettingsPage::NimToolsSettingsPage(NimSettings *settings)
{ {
setId(Nim::Constants::C_NIMTOOLSSETTINGSPAGE_ID); setId(Nim::Constants::C_NIMTOOLSSETTINGSPAGE_ID);
setDisplayName(NimSettings::tr(Nim::Constants::C_NIMTOOLSSETTINGSPAGE_DISPLAY)); setDisplayName(Tr::tr("Tools"));
setCategory(Nim::Constants::C_NIMTOOLSSETTINGSPAGE_CATEGORY); setCategory(Nim::Constants::C_NIMTOOLSSETTINGSPAGE_CATEGORY);
setDisplayCategory(NimSettings::tr("Nim")); setDisplayCategory(Tr::tr("Nim"));
setCategoryIconPath(":/nim/images/settingscategory_nim.png"); setCategoryIconPath(":/nim/images/settingscategory_nim.png");
setSettings(settings); setSettings(settings);

4
src/plugins/nim/settings/nimsettings.h
View File

@@ -12,8 +12,6 @@ namespace Nim {
class NimSettings : public Utils::AspectContainer class NimSettings : public Utils::AspectContainer
{ {
Q_DECLARE_TR_FUNCTIONS(Nim::NimSettings)
public: public:
NimSettings(); NimSettings();
~NimSettings(); ~NimSettings();
@@ -33,5 +31,5 @@ public:
explicit NimToolsSettingsPage(NimSettings *settings); explicit NimToolsSettingsPage(NimSettings *settings);
}; };
} // namespace Nim } // Nim