Skip to content

Commit 5211b38

Browse files
yurii-litvinovyurii-litvinov
committed
Fixed bug with script stopping, some minor fixes
1 parent 6757be9 commit 5211b38

13 files changed

+82
-94
lines changed

‎translations/fr/trikGui_fr.ts‎

Lines changed: 33 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!DOCTYPE TS>
3-
<TS version="2.0" language="fr_FR">
3+
<TS version="2.1" language="fr_FR">
44
<context>
55
<name>QObject</name>
66
<message>
@@ -17,7 +17,7 @@
1717
<translation type="unfinished"></translation>
1818
</message>
1919
<message>
20-
<location filename="../../trikGui/commandSettingsWidget.cpp" line="48"/>
20+
<location filename="../../trikGui/commandSettingsWidget.cpp" line="47"/>
2121
<source>Command Settings</source>
2222
<translation type="unfinished"></translation>
2323
</message>
@@ -30,100 +30,82 @@
3030
<translation type="unfinished"></translation>
3131
</message>
3232
<message>
33-
<location filename="../../trikGui/commandsListWidget.cpp" line="35"/>
34-
<location filename="../../trikGui/commandsListWidget.cpp" line="72"/>
33+
<location filename="../../trikGui/commandsListWidget.cpp" line="36"/>
3534
<source>Play Tone</source>
3635
<translation type="unfinished"></translation>
3736
</message>
3837
<message>
39-
<location filename="../../trikGui/commandsListWidget.cpp" line="36"/>
40-
<location filename="../../trikGui/commandsListWidget.cpp" line="76"/>
38+
<location filename="../../trikGui/commandsListWidget.cpp" line="37"/>
4139
<source>Smile</source>
4240
<translation type="unfinished"></translation>
4341
</message>
4442
<message>
45-
<location filename="../../trikGui/commandsListWidget.cpp" line="37"/>
46-
<location filename="../../trikGui/commandsListWidget.cpp" line="80"/>
43+
<location filename="../../trikGui/commandsListWidget.cpp" line="38"/>
4744
<source>Sad Smile</source>
4845
<translation type="unfinished"></translation>
4946
</message>
5047
<message>
51-
<location filename="../../trikGui/commandsListWidget.cpp" line="38"/>
52-
<location filename="../../trikGui/commandsListWidget.cpp" line="84"/>
48+
<location filename="../../trikGui/commandsListWidget.cpp" line="39"/>
5349
<source>Timer</source>
5450
<translation type="unfinished"></translation>
5551
</message>
5652
<message>
57-
<location filename="../../trikGui/commandsListWidget.cpp" line="39"/>
53+
<location filename="../../trikGui/commandsListWidget.cpp" line="40"/>
5854
<source>Motor Forward</source>
5955
<translation type="unfinished"></translation>
6056
</message>
6157
<message>
62-
<location filename="../../trikGui/commandsListWidget.cpp" line="40"/>
63-
<location filename="../../trikGui/commandsListWidget.cpp" line="156"/>
58+
<location filename="../../trikGui/commandsListWidget.cpp" line="41"/>
6459
<source>Motor Backward</source>
6560
<translation type="unfinished"></translation>
6661
</message>
6762
<message>
68-
<location filename="../../trikGui/commandsListWidget.cpp" line="41"/>
69-
<location filename="../../trikGui/commandsListWidget.cpp" line="94"/>
63+
<location filename="../../trikGui/commandsListWidget.cpp" line="42"/>
7064
<source>Motors Stop</source>
7165
<translation type="unfinished"></translation>
7266
</message>
7367
<message>
74-
<location filename="../../trikGui/commandsListWidget.cpp" line="42"/>
68+
<location filename="../../trikGui/commandsListWidget.cpp" line="43"/>
7569
<source>Wait for Light</source>
7670
<translation type="unfinished"></translation>
7771
</message>
7872
<message>
79-
<location filename="../../trikGui/commandsListWidget.cpp" line="43"/>
80-
<location filename="../../trikGui/commandsListWidget.cpp" line="109"/>
73+
<location filename="../../trikGui/commandsListWidget.cpp" line="44"/>
8174
<source>Wait for Ultrasonic Distance</source>
8275
<translation type="unfinished"></translation>
8376
</message>
8477
<message>
85-
<location filename="../../trikGui/commandsListWidget.cpp" line="44"/>
78+
<location filename="../../trikGui/commandsListWidget.cpp" line="45"/>
8679
<source>Wait for Infrared Distance</source>
8780
<translation type="unfinished"></translation>
8881
</message>
8982
<message>
90-
<location filename="../../trikGui/commandsListWidget.cpp" line="45"/>
91-
<location filename="../../trikGui/commandsListWidget.cpp" line="111"/>
83+
<location filename="../../trikGui/commandsListWidget.cpp" line="46"/>
9284
<source>Wait for Encoder</source>
9385
<translation type="unfinished"></translation>
9486
</message>
9587
<message>
96-
<location filename="../../trikGui/commandsListWidget.cpp" line="60"/>
88+
<location filename="../../trikGui/commandsListWidget.cpp" line="66"/>
9789
<source>Commands List</source>
9890
<translation type="unfinished"></translation>
9991
</message>
10092
<message>
101-
<location filename="../../trikGui/commandsListWidget.cpp" line="85"/>
93+
<location filename="../../trikGui/commandsListWidget.cpp" line="97"/>
10294
<source>Choose waiting time (ms):</source>
10395
<translation type="unfinished"></translation>
10496
</message>
10597
<message>
106-
<location filename="../../trikGui/commandsListWidget.cpp" line="91"/>
98+
<location filename="../../trikGui/commandsListWidget.cpp" line="103"/>
10799
<source>Delay %1 ms</source>
108100
<translation type="unfinished"></translation>
109101
</message>
110102
<message>
111-
<location filename="../../trikGui/commandsListWidget.cpp" line="102"/>
112-
<source>Motor</source>
113-
<translation type="unfinished"></translation>
114-
</message>
115-
<message>
116-
<location filename="../../trikGui/commandsListWidget.cpp" line="105"/>
117-
<source>Wait</source>
118-
<translation type="unfinished"></translation>
119-
</message>
120-
<message>
121-
<location filename="../../trikGui/commandsListWidget.cpp" line="124"/>
103+
<location filename="../../trikGui/commandsListWidget.cpp" line="143"/>
122104
<source>&lt; add command &gt;</source>
123105
<translation type="unfinished"></translation>
124106
</message>
125107
<message>
126-
<location filename="../../trikGui/commandsListWidget.cpp" line="148"/>
108+
<location filename="../../trikGui/commandsListWidget.cpp" line="170"/>
127109
<source>Choose motors power (%): </source>
128110
<translation type="unfinished"></translation>
129111
</message>
@@ -298,19 +280,25 @@
298280
<translation type="unfinished"></translation>
299281
</message>
300282
<message>
301-
<location filename="../../trikGui/programmingWidget.cpp" line="35"/>
302-
<location filename="../../trikGui/programmingWidget.cpp" line="101"/>
303-
<location filename="../../trikGui/programmingWidget.cpp" line="106"/>
283+
<location filename="../../trikGui/programmingWidget.cpp" line="40"/>
284+
<location filename="../../trikGui/programmingWidget.cpp" line="125"/>
304285
<source>&lt; add command &gt;</source>
305286
<translation type="unfinished"></translation>
306287
</message>
307288
<message>
308-
<location filename="../../trikGui/programmingWidget.cpp" line="43"/>
289+
<location filename="../../trikGui/programmingWidget.cpp" line="45"/>
290+
<location filename="../../trikGui/programmingWidget.cpp" line="127"/>
309291
<source>Run program</source>
310292
<translation type="unfinished"></translation>
311293
</message>
312294
<message>
313-
<location filename="../../trikGui/programmingWidget.cpp" line="52"/>
295+
<location filename="../../trikGui/programmingWidget.cpp" line="47"/>
296+
<location filename="../../trikGui/programmingWidget.cpp" line="129"/>
297+
<source>Clear list</source>
298+
<translation type="unfinished"></translation>
299+
</message>
300+
<message>
301+
<location filename="../../trikGui/programmingWidget.cpp" line="57"/>
314302
<source>Programming</source>
315303
<translation type="unfinished"></translation>
316304
</message>
@@ -328,41 +316,27 @@
328316
<translation type="unfinished"></translation>
329317
</message>
330318
</context>
331-
<context>
332-
<name>trikGui::SensorLever</name>
333-
<message>
334-
<location filename="../../trikGui/sensorLever.cpp" line="38"/>
335-
<location filename="../../trikGui/sensorLever.cpp" line="112"/>
336-
<source>&gt;</source>
337-
<translation type="unfinished"></translation>
338-
</message>
339-
<message>
340-
<location filename="../../trikGui/sensorLever.cpp" line="114"/>
341-
<source>&lt;</source>
342-
<translation type="unfinished"></translation>
343-
</message>
344-
</context>
345319
<context>
346320
<name>trikGui::SensorSettingsWidget</name>
347321
<message>
348-
<location filename="../../trikGui/sensorSettingsWidget.cpp" line="35"/>
322+
<location filename="../../trikGui/sensorSettingsWidget.cpp" line="34"/>
349323
<source>Select distance:
350324
</source>
351325
<translation type="unfinished"></translation>
352326
</message>
353327
<message>
354-
<location filename="../../trikGui/sensorSettingsWidget.cpp" line="37"/>
328+
<location filename="../../trikGui/sensorSettingsWidget.cpp" line="34"/>
355329
<source>Select tacho limit:
356330
</source>
357331
<translation type="unfinished"></translation>
358332
</message>
359333
<message>
360-
<location filename="../../trikGui/sensorSettingsWidget.cpp" line="47"/>
334+
<location filename="../../trikGui/sensorSettingsWidget.cpp" line="44"/>
361335
<source>Continue</source>
362336
<translation type="unfinished"></translation>
363337
</message>
364338
<message>
365-
<location filename="../../trikGui/sensorSettingsWidget.cpp" line="61"/>
339+
<location filename="../../trikGui/sensorSettingsWidget.cpp" line="56"/>
366340
<source>Sensor Settings</source>
367341
<translation type="unfinished"></translation>
368342
</message>

‎translations/ru/trikGui_ru.qm‎

-102 Bytes
Binary file not shown.

‎translations/ru/trikGui_ru.ts‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!DOCTYPE TS>
3-
<TS version="2.0" language="ru_RU">
3+
<TS version="2.1" language="ru_RU">
44
<context>
55
<name>QObject</name>
66
<message>
@@ -75,7 +75,8 @@
7575
</message>
7676
<message>
7777
<source>Choose waiting time (ms):</source>
78-
<translation>Выберите время ожидания
78+
<translation>Выберите время
79+
ожидания
7980
(в миллисекундах):</translation>
8081
</message>
8182
<message>
@@ -96,7 +97,8 @@
9697
</message>
9798
<message>
9899
<source>Choose motors power (%): </source>
99-
<translation>Выберите мощность моторов
100+
<translation>Выберите мощность
101+
моторов
100102
(в процентах):</translation>
101103
</message>
102104
<message>
@@ -260,7 +262,8 @@
260262
<name>trikGui::ProgrammingWidget</name>
261263
<message>
262264
<source>Add commands to list</source>
263-
<translation>Добавьте команду в список</translation>
265+
<translation>Добавьте команду
266+
в список</translation>
264267
</message>
265268
<message>
266269
<source>&lt; add command &gt;</source>
@@ -304,11 +307,11 @@
304307
<name>trikGui::SensorLever</name>
305308
<message>
306309
<source>&gt;</source>
307-
<translation>&gt;</translation>
310+
<translation type="vanished">&gt;</translation>
308311
</message>
309312
<message>
310313
<source>&lt;</source>
311-
<translation>&lt;</translation>
314+
<translation type="vanished">&lt;</translation>
312315
</message>
313316
</context>
314317
<context>

‎trikGui/commandSettingsWidget.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include "commandSettingsWidget.h"
1616

1717
#include <QtGui/QKeyEvent>
18+
1819
#include <trikKernel/paths.h>
1920
#include <QsLog.h>
2021

‎trikGui/commandsListWidget.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ CommandsListWidget::CommandsListWidget(Controller &controller, const QString &na
4646
<< tr("Wait for Encoder");
4747

4848
for (int i = 0; i < commandsList.size(); ++i) {
49-
mCommands.addItem(commandsList.at(i).toLocal8Bit().constData());
49+
mCommands.addItem(commandsList.at(i));
5050
mCommands.item(i)->setData(Qt::UserRole, i);
5151
}
5252

@@ -77,7 +77,7 @@ void CommandsListWidget::keyPressEvent(QKeyEvent *event)
7777
case Qt::Key_Return: {
7878
const QVariant data = mCommands.currentItem()->data(Qt::UserRole);
7979

80-
switch(data.toInt()) {
80+
switch (data.toInt()) {
8181
case 0: {
8282
mValue = mCommands.currentItem()->text();
8383
mScript = QString(" brick.playSound(\"media/beep.wav\");\n");

‎trikGui/controller.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Controller::~Controller()
9090

9191
void Controller::runFile(const QString &filePath)
9292
{
93-
QFileInfo const fileInfo(filePath);
93+
const QFileInfo fileInfo(filePath);
9494
if (fileInfo.suffix() == "qts" || fileInfo.suffix() == "js") {
9595
mScriptRunner->run(trikKernel::FileUtils::readFromFile(fileInfo.canonicalFilePath()), fileInfo.baseName());
9696
} else if (fileInfo.suffix() == "wav" || fileInfo.suffix() == "mp3") {

‎trikGui/programmingWidget.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ProgrammingWidget::ProgrammingWidget(Controller &controller, QWidget *parent)
3131
{
3232
mLayout.addWidget(&mTitle);
3333

34-
ScriptHolder* holder = ScriptHolder::instance();
34+
const ScriptHolder * const holder = ScriptHolder::instance();
3535
for (int i = 0; i < holder->size(); ++i) {
3636
mCommands.addItem(tr(holder->titles().at(i).toLocal8Bit().constData()));
3737
mCommands.item(i)->setData(Qt::UserRole, holder->commands().at(i));
@@ -64,7 +64,7 @@ void ProgrammingWidget::renewFocus()
6464

6565
void ProgrammingWidget::keyPressEvent(QKeyEvent *event)
6666
{
67-
ScriptHolder* holder = ScriptHolder::instance();
67+
ScriptHolder * const holder = ScriptHolder::instance();
6868

6969
switch (event->key()) {
7070
case Qt::Key_PowerDown: {

‎trikGui/scriptHolder.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ ScriptHolder* ScriptHolder::instance()
2525
return holder;
2626
}
2727

28-
QStringList ScriptHolder::titles() const
28+
const QStringList &ScriptHolder::titles() const
2929
{
3030
return mTitles;
3131
}
3232

33-
QStringList ScriptHolder::commands() const
33+
const QStringList &ScriptHolder::commands() const
3434
{
3535
return mCommands;
3636
}
@@ -40,7 +40,7 @@ int ScriptHolder::size() const
4040
return mTitles.length();
4141
}
4242

43-
void ScriptHolder::setData(const QString& title, const QString& command)
43+
void ScriptHolder::setData(const QString &title, const QString &command)
4444
{
4545
mTitles.push_back(title);
4646
mCommands.push_back(command);

‎trikGui/scriptHolder.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ class ScriptHolder
2828
static ScriptHolder* instance();
2929

3030
/// Returns list which contains titles of commands.
31-
QStringList titles() const;
31+
const QStringList &titles() const;
3232

3333
/// Returns list which contains scripts for commands.
34-
QStringList commands() const;
34+
const QStringList &commands() const;
3535

3636
/// Returns number of stored commands.
3737
int size() const;
3838

3939
/// Adds given strings to appropriate list.
4040
/// @param title - new string for titles list.
4141
/// @param command - new string for commands list.
42-
void setData(const QString& title, const QString& command);
42+
void setData(const QString &title, const QString &command);
4343

4444
/// Clears all stored data.
4545
void clear();

0 commit comments

Comments
 (0)