Skip to content

Commit 41eae16

Browse files
MinyazevRiakov
authored andcommitted
Add a popup window with a hint
Fix translations Fix typo
1 parent cb3e098 commit 41eae16

5 files changed

Lines changed: 100 additions & 54 deletions

File tree

plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
<property name="windowTitle">
1414
<string>2D Robot Model</string>
1515
</property>
16+
<property name="toolTip">
17+
<string>Edit Regions</string>
18+
</property>
1619
<layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0,0,0" columnstretch="0,0,0,0,0">
1720
<item row="0" column="1" rowspan="7">
1821
<widget class="QWidget" name="toolbarWidget" native="true">
@@ -152,6 +155,9 @@
152155
</item>
153156
<item row="3" column="0">
154157
<widget class="QPushButton" name="initialStateButton">
158+
<property name="toolTip">
159+
<string>Reset World</string>
160+
</property>
155161
<property name="text">
156162
<string/>
157163
</property>

qrtranslations/es/plugins/robots/common/twoDModel_es.ts

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -380,27 +380,27 @@
380380
<translation>Modelo de robot 2D</translation>
381381
</message>
382382
<message>
383-
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="92"/>
383+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="95"/>
384384
<source>Run program</source>
385385
<translation>Ejecutar programa</translation>
386386
</message>
387387
<message>
388-
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="133"/>
388+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="136"/>
389389
<source>Stop program</source>
390390
<translation>Detener programa</translation>
391391
</message>
392392
<message>
393-
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="384"/>
393+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="390"/>
394394
<source>Left wheel:</source>
395395
<translation>Rueda izquierda:</translation>
396396
</message>
397397
<message>
398-
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="394"/>
398+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="400"/>
399399
<source>Right wheel:</source>
400400
<translation>Rueda derecha:</translation>
401401
</message>
402402
<message>
403-
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="425"/>
403+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="431"/>
404404
<source>Metric system units:</source>
405405
<translation>Unidades del sistema métrico:</translation>
406406
</message>
@@ -409,85 +409,95 @@
409409
<translation type="vanished">Píxeles por cm:</translation>
410410
</message>
411411
<message>
412-
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="439"/>
412+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="17"/>
413+
<source>Edit Regions</source>
414+
<translation>Editar regiones</translation>
415+
</message>
416+
<message>
417+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="159"/>
418+
<source>Reset World</source>
419+
<translation>Restablecer mundo</translation>
420+
</message>
421+
<message>
422+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="445"/>
413423
<source>Grid size:</source>
414424
<translation>Tamaño de cuadrícula:</translation>
415425
</message>
416426
<message>
417-
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="461"/>
427+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="467"/>
418428
<source>Realistic physics</source>
419429
<translation>Física realista</translation>
420430
</message>
421431
<message>
422-
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="468"/>
432+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="474"/>
423433
<source>Realistic sensors</source>
424434
<translation>Sensores realistas</translation>
425435
</message>
426436
<message>
427-
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="475"/>
437+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="481"/>
428438
<source>Realistic engines</source>
429439
<translation>Motores realistas</translation>
430440
</message>
431441
<message>
432-
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="534"/>
442+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="540"/>
433443
<source>Robot height:</source>
434444
<translation>Altura del robot:</translation>
435445
</message>
436446
<message>
437-
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="547"/>
447+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="553"/>
438448
<source>Robot mass:</source>
439449
<translation>Masa del robot:</translation>
440450
</message>
441451
<message>
442-
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="560"/>
452+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="566"/>
443453
<source>Wheel diameter:</source>
444454
<translation>Diámetro de la rueda:</translation>
445455
</message>
446456
<message>
447-
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="611"/>
457+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="617"/>
448458
<source>Robot track:</source>
449459
<translation>Separación entre ruedas:</translation>
450460
</message>
451461
<message>
452-
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="662"/>
462+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="668"/>
453463
<source>Robot width:</source>
454464
<translation>Ancho del robot:</translation>
455465
</message>
456466
<message>
457-
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="669"/>
458-
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="676"/>
459-
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="683"/>
460-
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="697"/>
467+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="675"/>
468+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="682"/>
469+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="689"/>
470+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="703"/>
461471
<source>cm</source>
462472
<translation>cm</translation>
463473
</message>
464474
<message>
465-
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="690"/>
475+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="696"/>
466476
<source>kg</source>
467477
<translation>kg</translation>
468478
</message>
469479
<message>
470-
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="753"/>
480+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="759"/>
471481
<source>Decrease speed</source>
472482
<translation>Disminuir velocidad</translation>
473483
</message>
474484
<message>
475-
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="794"/>
485+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="800"/>
476486
<source>Time in 2D model</source>
477487
<translation>Tiempo en el modelo 2D</translation>
478488
</message>
479489
<message>
480-
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="803"/>
490+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="809"/>
481491
<source> sec.</source>
482492
<translation> seg.</translation>
483493
</message>
484494
<message>
485-
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="831"/>
495+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="837"/>
486496
<source>Increase speed</source>
487497
<translation>Aumentar velocidad</translation>
488498
</message>
489499
<message>
490-
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="939"/>
500+
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.ui" line="945"/>
491501
<source>px</source>
492502
<translation>px</translation>
493503
</message>

qrtranslations/fr/plugins/robots/common/twoDModel_fr.ts

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@
388388
<translation type="vanished">Arrêter le programme (Esc)</translation>
389389
</message>
390390
<message>
391-
<location line="+78"/>
391+
<location line="+81"/>
392392
<source>Run program</source>
393393
<translation>Executer le programme</translation>
394394
</message>
@@ -398,7 +398,7 @@
398398
<translation>Arrêter le programme</translation>
399399
</message>
400400
<message>
401-
<location line="+306"/>
401+
<location line="+309"/>
402402
<source>Grid size:</source>
403403
<translation>Taille de la grille:</translation>
404404
</message>
@@ -446,7 +446,17 @@
446446
<translation>Roue gauche :</translation>
447447
</message>
448448
<message>
449-
<location line="+10"/>
449+
<location line="-373"/>
450+
<source>Edit Regions</source>
451+
<translation>Modifier les régions</translation>
452+
</message>
453+
<message>
454+
<location line="+142"/>
455+
<source>Reset World</source>
456+
<translation>Réinitialiser le monde</translation>
457+
</message>
458+
<message>
459+
<location line="+241"/>
450460
<source>Right wheel:</source>
451461
<translation>Roue droite :</translation>
452462
</message>

qrtranslations/ru/plugins/robots/common/twoDModel_ru.ts

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@
598598
<translation type="vanished">Вернуть робота в исходное положение</translation>
599599
</message>
600600
<message>
601-
<location line="+78"/>
601+
<location line="+81"/>
602602
<source>Run program</source>
603603
<translation>Запустить программу</translation>
604604
</message>
@@ -608,7 +608,7 @@
608608
<translation>Остановить программу</translation>
609609
</message>
610610
<message>
611-
<location line="+306"/>
611+
<location line="+309"/>
612612
<source>Grid size:</source>
613613
<translation>Шаг сетки:</translation>
614614
</message>
@@ -695,7 +695,17 @@
695695
<translation>Высота робота:</translation>
696696
</message>
697697
<message>
698-
<location line="+13"/>
698+
<location line="-523"/>
699+
<source>Edit Regions</source>
700+
<translation>Редактировать регионы</translation>
701+
</message>
702+
<message>
703+
<location line="+142"/>
704+
<source>Reset World</source>
705+
<translation>Сбросить мир</translation>
706+
</message>
707+
<message>
708+
<location line="+394"/>
699709
<source>Robot mass:</source>
700710
<translation>Масса робота:</translation>
701711
</message>

0 commit comments

Comments
 (0)