Refactor

trikset · Dec 21, 2023 · f828e2b · f828e2b
1 parent 9d8c8e6
commit f828e2b
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 30 deletions.
diff --git a/installer/.download-arm-none-eabi.sh.kate-swp b/installer/.download-arm-none-eabi.sh.kate-swp
diff --git a/plugins/robots/generators/generators.pro b/plugins/robots/generators/generators.pro
@@ -16,16 +16,16 @@ TEMPLATE = subdirs
 
 SUBDIRS = \
 	generatorBase \
-        trikGeneratorBase \
-        trikQtsGeneratorLibrary \
-        trikV62QtsGenerator \
-        trikPythonGeneratorLibrary \
-        trikV62PythonGenerator \
+	trikGeneratorBase \
+	trikQtsGeneratorLibrary \
+	trikV62QtsGenerator \
+	trikPythonGeneratorLibrary \
+	trikV62PythonGenerator \
 	nxtGeneratorBase \
 	nxtOsekCGenerator \
-        ev3GeneratorBase \
-        ev3RbfGenerator \
-        pioneerLuaGenerator \
+	ev3GeneratorBase \
+	ev3RbfGenerator \
+	pioneerLuaGenerator \
 
 trikGeneratorBase.subdir = $$PWD/trik/trikGeneratorBase
 trikQtsGeneratorLibrary.subdir = $$PWD/trik/trikQtsGeneratorLibrary

diff --git a/plugins/robots/generators/nxt/nxtOsekCGenerator/nxtFlashTool.cpp b/plugins/robots/generators/nxt/nxtOsekCGenerator/nxtFlashTool.cpp
@@ -302,7 +302,7 @@ void NxtFlashTool::readNxtCompileData()
 				error(tr("Compilation error occured. Please check your function blocks syntax. "
 						"If you sure in their validness contact developers"));
 			} else {
-				error(tr("Could not upload program. Make sure the robot is connected and ON."));
+				error(tr("Could not upload program. Make sure the robot is connected and ON"));
 				if (QOperatingSystemVersion::currentType() == QOperatingSystemVersion::OSType::Unknown) {
 					error(tr("If you are using GNU/Linux visit "
 							 "https://help.trikset.com/nxt/run-upload-programs to get instructions"));

diff --git a/plugins/robots/interpreters/interpreters.pro b/plugins/robots/interpreters/interpreters.pro
@@ -18,11 +18,11 @@ SUBDIRS = \
 	interpreterCore \
 	nullKitInterpreter \
 	nxtKitInterpreter \
-        trikKitInterpreterCommon \
-        trikV62KitInterpreter \
-        ev3KitInterpreter \
-        robotsPlugin \
-        pioneerKitInterpreter \
+	trikKitInterpreterCommon \
+	trikV62KitInterpreter \
+	ev3KitInterpreter \
+	robotsPlugin \
+	pioneerKitInterpreter \
 
 CONFIG(trik_retired_features) {
 	SUBDIRS += trikV6KitInterpreter

diff --git a/plugins/robots/interpreters/nxtKitInterpreter/src/nxtAdditionalPreferences.cpp b/plugins/robots/interpreters/nxtKitInterpreter/src/nxtAdditionalPreferences.cpp
@@ -49,8 +49,11 @@ void NxtAdditionalPreferences::setColorOnGeneratorLabel(QColor color){
 
 void NxtAdditionalPreferences::setTextOnGeneratorLabel(){
 	if (!mUi->compilerPicker->isSavedDirExist()){
-		mUi->generatorLabel->setText("WARNING: Current directory doesn't exist. \nOpen link: "
-									 "https://help.trikset.com/nxt/run-upload-programs for instructions");
+		mUi->generatorLabel->setText(tr("WARNING: Current directory doesn't exist. \nOpen "
+										"<a href=\"https://help.trikset.com/nxt/run-upload-programs\">link</a> for instructions"));
+		mUi->generatorLabel->setTextFormat(Qt::RichText);
+		mUi->generatorLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
+		mUi->generatorLabel->setOpenExternalLinks(true);
 		setColorOnGeneratorLabel(QColor("red"));
 	}
 	else {

diff --git a/plugins/robots/thirdparty/thirdparty.pro b/plugins/robots/thirdparty/thirdparty.pro
@@ -17,6 +17,7 @@ TEMPLATE = subdirs
 SUBDIRS += \
 	qextserialport \
 	libusb-1.0 \
+<<<<<<< HEAD
 <<<<<<< HEAD
 	trikRuntime \
 	Box2D \
@@ -26,3 +27,8 @@ SUBDIRS += \
         Box2D \
         python \
 >>>>>>> 4dbe48f3b (lupdate)
+=======
+	trikRuntime \
+	Box2D \
+	python \
+>>>>>>> c4b5f989c (Refactor)
diff --git a/qrtranslations/fr/plugins/robots/nxtKitInterpreter_fr.ts b/qrtranslations/fr/plugins/robots/nxtKitInterpreter_fr.ts
@@ -60,6 +60,12 @@
         <source>Path to arm-none-eabi:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+19"/>
+        <source>WARNING: Current directory doesn&apos;t exist. 
+Open &lt;a href=&quot;https://help.trikset.com/nxt/run-upload-programs&quot;&gt;link&lt;/a&gt; for instructions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>nxt::NxtKitInterpreterPlugin</name>

diff --git a/qrtranslations/fr/plugins/robots/nxtOsekCGenerator_fr.ts b/qrtranslations/fr/plugins/robots/nxtOsekCGenerator_fr.ts
@@ -77,11 +77,12 @@
         <translation>Échec de téléversement. Assurez-vous que le serveur X permet de lancer les applications à l&apos;interface graphique</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Could not upload program. Make sure the robot is connected and ON</source>
-        <translation type="vanished">Échec de téléversement du programme. Assurez-vous que le robot soit connecté et qu&apos;il ne soit pas éteint</translation>
+        <translation>Échec de téléversement du programme. Assurez-vous que le robot soit connecté et qu&apos;il ne soit pas éteint</translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+43"/>
         <source>Error in reading from firmware file: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -151,12 +152,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
-        <source>Could not upload program. Make sure the robot is connected and ON.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+48"/>
         <source>If you are using GNU/Linux visit https://help.trikset.com/nxt/run-upload-programs to get instructions</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/qrtranslations/ru/plugins/robots/nxtKitInterpreter_ru.ts b/qrtranslations/ru/plugins/robots/nxtKitInterpreter_ru.ts
@@ -77,7 +77,14 @@
     <message>
         <location line="+1"/>
         <source>Path to arm-none-eabi:</source>
-        <translation type="unfinished"></translation>
+        <translation>Путь к кросс-компилятору</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>WARNING: Current directory doesn&apos;t exist. 
+Open &lt;a href=&quot;https://help.trikset.com/nxt/run-upload-programs&quot;&gt;link&lt;/a&gt; for instructions</source>
+        <translation>ВНИМАНИЕ: Выбранная директория не существует.
+        Откройте &lt;a href=&quot;https://help.trikset.com/nxt/run-upload-programs&quot;&gt;ссылку&lt;/a&gt; для дальнейших инструкций</translation>
     </message>
 </context>
 <context>

diff --git a/qrtranslations/ru/plugins/robots/nxtOsekCGenerator_ru.ts b/qrtranslations/ru/plugins/robots/nxtOsekCGenerator_ru.ts
@@ -77,11 +77,12 @@
         <translation>Не удалось загрузить программу в робота. Убедитесь, что TRIKStusio запущена с нужными правами</translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Could not upload program. Make sure the robot is connected and ON</source>
-        <translation type="vanished">Не удалось загрузить программу в робота. Убедитесь, что робот включен и подсоединен к компьютеру</translation>
+        <translation>Не удалось загрузить программу в робота. Убедитесь, что робот включен и подсоединен к компьютеру</translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+43"/>
         <source>Error in reading from firmware file: %1</source>
         <translation>Ошибка чтения из файла с прошивкой %1</translation>
     </message>
@@ -151,12 +152,11 @@
         <translation>Загрузка программы не удалась. Возможно, стоит попробовать перезапустить среду с правами суперпользователя</translation>
     </message>
     <message>
-        <location line="+46"/>
         <source>Could not upload program. Make sure the robot is connected and ON.</source>
-        <translation>Не удалось загрузить программу. Убедитесь, что робот подключен и включен.</translation>
+        <translation type="vanished">Не удалось загрузить программу. Убедитесь, что робот подключен и включен.</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+48"/>
         <source>If you are using GNU/Linux visit https://help.trikset.com/nxt/run-upload-programs to get instructions</source>
         <translation>Если вы пользователь ОС GNU/Linux, перейдите по ссылке https://help.trikset.com/nxt/run-upload-programs для получения инструкций.</translation>
     </message>