Skip to content

Commit 8eb6e90

Browse files
yurii-litvinovyurii-litvinov
committed
Reworked file deletion UI (now it uses Right button), removed trikRuntimeKiller, as it can corrupt button events
1 parent 4002ac3 commit 8eb6e90

File tree

14 files changed

+56
-392
lines changed

14 files changed

+56
-392
lines changed

‎translations/fr/trikGui_fr.ts‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<context>
4343
<name>trikGui::Controller</name>
4444
<message>
45-
<location filename="../../trikGui/controller.cpp" line="145"/>
45+
<location filename="../../trikGui/controller.cpp" line="143"/>
4646
<source>direct command</source>
4747
<translation type="unfinished"></translation>
4848
</message>
@@ -72,6 +72,16 @@
7272
<source>File Manager</source>
7373
<translation type="unfinished"></translation>
7474
</message>
75+
<message>
76+
<location filename="../../trikGui/fileManagerWidget.cpp" line="102"/>
77+
<source>Confirm deletion</source>
78+
<translation type="unfinished"></translation>
79+
</message>
80+
<message>
81+
<location filename="../../trikGui/fileManagerWidget.cpp" line="103"/>
82+
<source>Are you sure you want to delete file?</source>
83+
<translation type="unfinished"></translation>
84+
</message>
7585
</context>
7686
<context>
7787
<name>trikGui::InformationWidget</name>
@@ -119,54 +129,54 @@
119129
<context>
120130
<name>trikGui::LanguageSelectionWidget</name>
121131
<message>
122-
<location filename="../../trikGui/languageSelectionWidget.cpp" line="36"/>
132+
<location filename="../../trikGui/languageSelectionWidget.cpp" line="38"/>
123133
<source>Select language:</source>
124134
<translation type="unfinished"></translation>
125135
</message>
126136
<message>
127-
<location filename="../../trikGui/languageSelectionWidget.cpp" line="42"/>
137+
<location filename="../../trikGui/languageSelectionWidget.cpp" line="44"/>
128138
<source>English</source>
129139
<translation type="unfinished"></translation>
130140
</message>
131141
<message>
132-
<location filename="../../trikGui/languageSelectionWidget.cpp" line="71"/>
142+
<location filename="../../trikGui/languageSelectionWidget.cpp" line="75"/>
133143
<source>Language</source>
134144
<translation type="unfinished"></translation>
135145
</message>
136146
<message>
137-
<location filename="../../trikGui/languageSelectionWidget.cpp" line="87"/>
147+
<location filename="../../trikGui/languageSelectionWidget.cpp" line="92"/>
138148
<source>Warning</source>
139149
<translation type="unfinished"></translation>
140150
</message>
141151
<message>
142-
<location filename="../../trikGui/languageSelectionWidget.cpp" line="88"/>
152+
<location filename="../../trikGui/languageSelectionWidget.cpp" line="93"/>
143153
<source>GUI will now restart</source>
144154
<translation type="unfinished"></translation>
145155
</message>
146156
</context>
147157
<context>
148158
<name>trikGui::MotorLever</name>
149159
<message>
150-
<location filename="../../trikGui/motorLever.cpp" line="41"/>
151-
<location filename="../../trikGui/motorLever.cpp" line="132"/>
160+
<location filename="../../trikGui/motorLever.cpp" line="40"/>
161+
<location filename="../../trikGui/motorLever.cpp" line="127"/>
152162
<source>off</source>
153163
<translation type="unfinished"></translation>
154164
</message>
155165
<message>
156-
<location filename="../../trikGui/motorLever.cpp" line="129"/>
166+
<location filename="../../trikGui/motorLever.cpp" line="124"/>
157167
<source>on</source>
158168
<translation type="unfinished"></translation>
159169
</message>
160170
</context>
161171
<context>
162172
<name>trikGui::MotorsWidget</name>
163173
<message>
164-
<location filename="../../trikGui/motorsWidget.cpp" line="53"/>
174+
<location filename="../../trikGui/motorsWidget.cpp" line="79"/>
165175
<source>Test power motors</source>
166176
<translation type="unfinished"></translation>
167177
</message>
168178
<message>
169-
<location filename="../../trikGui/motorsWidget.cpp" line="56"/>
179+
<location filename="../../trikGui/motorsWidget.cpp" line="82"/>
170180
<source>Test servo motors</source>
171181
<translation type="unfinished"></translation>
172182
</message>

‎translations/ru/trikGui_ru.qm‎

251 Bytes
Binary file not shown.

‎translations/ru/trikGui_ru.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,14 @@
6464
<source>File Manager</source>
6565
<translation>Файлы</translation>
6666
</message>
67+
<message>
68+
<source>Confirm deletion</source>
69+
<translation>Удаление</translation>
70+
</message>
71+
<message>
72+
<source>Are you sure you want to delete file?</source>
73+
<translation>Вы уверены, что хотите удалить файл?</translation>
74+
</message>
6775
</context>
6876
<context>
6977
<name>trikGui::InformationWidget</name>

‎trikGui/controller.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@ void Controller::runFile(const QString &filePath)
8383
} else if (fileInfo.suffix() == "wav" || fileInfo.suffix() == "mp3") {
8484
mScriptRunner->run("brick.playSound(\"" + fileInfo.canonicalFilePath() + "\");", fileInfo.baseName());
8585
} else if (fileInfo.suffix() == "sh") {
86-
QStringList args;
87-
args << filePath;
88-
QProcess::startDetached("sh", args);
86+
QProcess::startDetached("sh", {filePath});
8987
} else if (fileInfo.isExecutable()) {
9088
QProcess::startDetached(filePath);
9189
}

‎trikGui/fileManagerMessageBox.cpp‎

Lines changed: 0 additions & 92 deletions
This file was deleted.

‎trikGui/fileManagerMessageBox.h‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎trikGui/fileManagerWidget.cpp‎

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@
2222
#include <QtGui/QKeyEvent>
2323
#include <QtCore/QSettings>
2424

25+
#include <QtCore/qglobal.h>
26+
27+
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
28+
#include <QtGui/QMessageBox>
29+
#else
30+
#include <QtWidgets/QMessageBox>
31+
#endif
32+
2533
using namespace trikGui;
2634

2735
FileManagerWidget::FileManagerWidget(Controller &controller, MainWidget::FileManagerRootType fileManagerRoot
@@ -91,17 +99,20 @@ void FileManagerWidget::open()
9199
showCurrentDir();
92100
}
93101
} else {
94-
mOpenDeleteBox.showMessage();
95-
FileManagerMessageBox::FileState const choice = mOpenDeleteBox.userAnswer();
96-
switch (choice) {
97-
case FileManagerMessageBox::FileState::Open:
98-
mController.runFile(mFileSystemModel.filePath(index));
99-
break;
100-
case FileManagerMessageBox::FileState::Delete:
102+
mController.runFile(mFileSystemModel.filePath(index));
103+
}
104+
}
105+
106+
void FileManagerWidget::remove()
107+
{
108+
const QModelIndex &index = mFileSystemView.currentIndex();
109+
if (!mFileSystemModel.isDir(index)) {
110+
QMessageBox confirmMessageBox(QMessageBox::Warning, tr("Confirm deletion")
111+
, tr("Are you sure you want to delete file?"), QMessageBox::Yes | QMessageBox::No);
112+
confirmMessageBox.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint);
113+
const int result = confirmMessageBox.exec();
114+
if (result == QMessageBox::Yes) {
101115
mFileSystemModel.remove(index);
102-
break;
103-
default:
104-
break;
105116
}
106117
}
107118
}
@@ -113,6 +124,10 @@ void FileManagerWidget::keyPressEvent(QKeyEvent *event)
113124
open();
114125
break;
115126
}
127+
case Qt::Key_Right: {
128+
remove();
129+
break;
130+
}
116131
default: {
117132
TrikGuiDialog::keyPressEvent(event);
118133
break;

‎trikGui/fileManagerWidget.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535

3636
#include "controller.h"
3737
#include "trikGuiDialog.h"
38-
#include "fileManagerMessageBox.h"
3938

4039
namespace trikGui {
4140

@@ -70,6 +69,7 @@ private slots:
7069
private:
7170
void showCurrentDir();
7271
void open();
72+
void remove();
7373
QString currentPath();
7474

7575
QVBoxLayout mLayout;
@@ -79,8 +79,6 @@ private slots:
7979
Controller &mController;
8080
QString mRootDirPath;
8181
QString mLastSelectedFile;
82-
83-
FileManagerMessageBox mOpenDeleteBox;
8482
};
8583

8684
}

‎trikGui/trikGui.pro‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ HEADERS += \
2222
$$PWD/controller.h \
2323
$$PWD/digitSelector.h \
2424
$$PWD/encoderIndicator.h \
25-
$$PWD/fileManagerMessageBox.h \
2625
$$PWD/fileManagerWidget.h \
2726
$$PWD/informationWidget.h \
2827
$$PWD/languageSelectionWidget.h \
@@ -57,7 +56,6 @@ SOURCES += \
5756
$$PWD/controller.cpp \
5857
$$PWD/digitSelector.cpp \
5958
$$PWD/encoderIndicator.cpp \
60-
$$PWD/fileManagerMessageBox.cpp \
6159
$$PWD/fileManagerWidget.cpp \
6260
$$PWD/informationWidget.cpp \
6361
$$PWD/languageSelectionWidget.cpp \

‎trikRuntime.pro‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ SUBDIRS = \
2626
trikServer \
2727
trikTelemetry \
2828
trikWiFi \
29-
trikRuntimeKiller \
3029
translations \
3130

3231
qslog.file = qslog/QsLogSharedLibrary.pro
@@ -41,4 +40,3 @@ trikScriptRunner.depends = trikControl trikKernel trikNetwork qslog
4140
trikServer.depends = trikCommunicator qslog
4241
trikTelemetry.depends = trikControl trikNetwork trikKernel qslog
4342
trikWiFi.depends = qslog
44-
trikRuntimeKiller.depends = qslog

0 commit comments

Comments
 (0)