Skip to content

Commit 4910429

Browse files
authored
Merge pull request #651 from deXol/developBLEImplementSmallFileStorage
[BLE] Implement small file storage
2 parents 3f6d442 + 81a1e31 commit 4910429

14 files changed

+424
-216
lines changed

src/FilesManagement.cpp

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "ui_FilesManagement.h"
2121
#include "Common.h"
2222
#include "AppGui.h"
23+
#include "DeviceDetector.h"
2324

2425
FilesFilterModel::FilesFilterModel(QObject *parent):
2526
QSortFilterProxyModel(parent)
@@ -118,6 +119,12 @@ FilesManagement::FilesManagement(QWidget *parent) :
118119
wsClient->sendRefreshFilesCacheRequest();
119120
});
120121

122+
connect(&DeviceDetector::instance(), &DeviceDetector::deviceChanged,
123+
[this](Common::MPHwVersion newDevType)
124+
{
125+
ui->pushButtonUpdateFile->setVisible(Common::MP_BLE != newDevType);
126+
});
127+
121128
ui->filesCacheListWidget->setVisible(false);
122129
ui->emptyCacheLabel->setVisible(false);
123130
}
@@ -138,15 +145,16 @@ void FilesManagement::setWsClient(WSClient *c)
138145
});
139146
connect(wsClient, &WSClient::filesCacheChanged, this, &FilesManagement::loadFilesCacheModel);
140147

141-
setFileCacheControlsVisible(wsClient->isFw12());
148+
setFileCacheControlsVisible(wsClient->isFw12() || wsClient->isMPBLE());
142149
connect(wsClient, &WSClient::fwVersionChanged, [=](const QString &)
143150
{
144-
setFileCacheControlsVisible(wsClient->isFw12());
151+
setFileCacheControlsVisible(wsClient->isFw12() || wsClient->isMPBLE());
145152
});
146153
connect(wsClient, &WSClient::wsConnected, [=] ()
147154
{
148155
wsClient->sendListFilesCacheRequest();
149156
});
157+
ui->pushButtonUpdateFile->setVisible(!wsClient->isMPBLE());
150158
}
151159

152160
void FilesManagement::setFileCacheControlsVisible(bool visible)
@@ -217,7 +225,7 @@ void FilesManagement::loadModel()
217225

218226
void FilesManagement::loadFilesCacheModel(bool isInSync)
219227
{
220-
if (!wsClient->isFw12())
228+
if (!wsClient->isFw12() && !wsClient->isMPBLE())
221229
{
222230
setFileCacheControlsVisible(false);
223231
return;
@@ -566,9 +574,7 @@ void FilesManagement::on_pushButtonFilename_clicked()
566574
s.setValue("last_used_path/load_file_dir", fileInfo.canonicalPath());
567575

568576
ui->lineEditFilename->setText(fileName);
569-
570-
if (ui->addFileServiceInput->text().isEmpty())
571-
ui->addFileServiceInput->setText(fileInfo.fileName().toLower());
577+
ui->addFileServiceInput->setText(fileInfo.fileName().toLower());
572578
}
573579

574580
void FilesManagement::changeEvent(QEvent *event)

0 commit comments

Comments
 (0)