Skip to content

Commit

Permalink
Allow for users to see and send NMEA logs
Browse files Browse the repository at this point in the history
  • Loading branch information
nirvn committed Sep 26, 2024
1 parent 2beb6b2 commit 066f771
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
7 changes: 6 additions & 1 deletion src/core/localfilesmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ void LocalFilesModel::reloadModel()
{
const QStringList items = dir.entryList( QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot, QDir::DirsFirst | QDir::IgnoreCase );
QList<Item> folders;
QList<Item> files;
QList<Item> projects;
QList<Item> datasets;
for ( const QString &item : items )
Expand Down Expand Up @@ -279,9 +280,13 @@ void LocalFilesModel::reloadModel()
{
datasets << Item( ItemMetaType::Dataset, ItemType::RasterDataset, fi.completeBaseName(), suffix, fi.absoluteFilePath(), fi.size() );
}
else if ( suffix == QStringLiteral( "log" ) || suffix == QStringLiteral( "txt" ) )
{
files << Item( ItemMetaType::File, ItemType::OtherFile, fi.completeBaseName(), suffix, fi.absoluteFilePath(), fi.size() );
}
}
}
mItems << folders << projects << datasets;
mItems << folders << projects << datasets << files;
}
}

Expand Down
2 changes: 2 additions & 0 deletions src/core/localfilesmodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ class LocalFilesModel : public QAbstractListModel
enum ItemMetaType
{
Folder,
File,
Project,
Dataset,
Favorite,
Expand All @@ -47,6 +48,7 @@ class LocalFilesModel : public QAbstractListModel
ProjectFile,
VectorDataset,
RasterDataset,
OtherFile,
};
Q_ENUM( ItemType )

Expand Down
7 changes: 5 additions & 2 deletions src/qml/QFieldLocalDataPickerScreen.qml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ Page {
return qsTr('Projects');
case LocalFilesModel.Dataset:
return qsTr('Datasets');
case LocalFilesModel.File:
return qsTr('Files');
case LocalFilesModel.Favorite:
return qsTr('Favorites');
}
Expand All @@ -131,7 +133,7 @@ Page {
property string itemPath: ItemPath
property bool itemIsFavorite: ItemIsFavorite
property bool itemMenuLoadable: !projectFolderView && (ItemMetaType === LocalFilesModel.Project || ItemMetaType === LocalFilesModel.Dataset)
property bool itemMenuVisible: (ItemType === LocalFilesModel.SimpleFolder && table.model.currentPath !== 'root') || ((platformUtilities.capabilities & PlatformUtilities.CustomExport || platformUtilities.capabilities & PlatformUtilities.CustomSend) && (ItemMetaType === LocalFilesModel.Dataset)) || (ItemMetaType === LocalFilesModel.Dataset && ItemType === LocalFilesModel.RasterDataset && cloudProjectsModel.currentProjectId)
property bool itemMenuVisible: ((ItemType === LocalFilesModel.SimpleFolder || ItemMetaType == LocalFilesModel.File) && table.model.currentPath !== 'root') || ((platformUtilities.capabilities & PlatformUtilities.CustomExport || platformUtilities.capabilities & PlatformUtilities.CustomSend) && (ItemMetaType === LocalFilesModel.Dataset)) || (ItemMetaType === LocalFilesModel.Dataset && ItemType === LocalFilesModel.RasterDataset && cloudProjectsModel.currentProjectId)

width: parent ? parent.width : undefined
height: line.height
Expand Down Expand Up @@ -167,6 +169,7 @@ Page {
return Theme.getThemeVectorIcon('ic_map_green_48dp');
case LocalFilesModel.VectorDataset:
case LocalFilesModel.RasterDataset:
case LocalFilesModel.OtherFile:
return Theme.getThemeVectorIcon('ic_file_green_48dp');
}
}
Expand Down Expand Up @@ -362,7 +365,7 @@ Page {

MenuItem {
id: sendDatasetTo
enabled: platformUtilities.capabilities & PlatformUtilities.CustomSend && itemMenu.itemMetaType == LocalFilesModel.Dataset
enabled: itemMenu.itemMetaType === LocalFilesModel.File || (platformUtilities.capabilities & PlatformUtilities.CustomSend && itemMenu.itemMetaType == LocalFilesModel.Dataset)
visible: enabled

font: Theme.defaultFont
Expand Down

0 comments on commit 066f771

Please sign in to comment.