Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ set(MM_SRCS
ios/iosutils.cpp
position/providers/abstractpositionprovider.cpp
position/providers/internalpositionprovider.cpp
position/providers/networkpositionprovider.cpp
position/providers/positionprovidersmodel.cpp
position/providers/simulatedpositionprovider.cpp
position/providers/nmeaparser.cpp
position/tracking/abstracttrackingbackend.cpp
position/tracking/internaltrackingbackend.cpp
position/tracking/positiontrackinghighlight.cpp
Expand Down Expand Up @@ -122,8 +124,10 @@ set(MM_HDRS
ios/iosutils.h
position/providers/abstractpositionprovider.h
position/providers/internalpositionprovider.h
position/providers/networkpositionprovider.h
position/providers/positionprovidersmodel.h
position/providers/simulatedpositionprovider.h
position/providers/nmeaparser.h
position/tracking/abstracttrackingbackend.h
position/tracking/internaltrackingbackend.h
position/tracking/positiontrackinghighlight.h
Expand Down
8 changes: 5 additions & 3 deletions app/appsettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ QVariantList AppSettings::savedPositionProviders() const
QStringList provider;
provider << settings.value( "providerName" ).toString();
provider << settings.value( "providerAddress" ).toString();
provider << settings.value( "providerType" ).toString();
providers.push_back( provider );
}

Expand All @@ -238,15 +239,16 @@ void AppSettings::savePositionProviders( const QVariantList &providers )
{
QVariantList provider = providers[i].toList();

if ( provider.length() < 2 )
if ( provider.length() < 3 )
{
CoreUtils::log( QStringLiteral( "AppSettings" ), QStringLiteral( "Tried to save provider without sufficient data" ) );
continue;
}
settings.setArrayIndex( i );

settings.setValue( "providerName", providers[i].toList()[0] );
settings.setValue( "providerAddress", providers[i].toList()[1] );
settings.setValue( "providerName", provider[0] );
settings.setValue( "providerAddress", provider[1] );
settings.setValue( "providerType", provider[2] );
}
settings.endArray();
}
Expand Down
3 changes: 3 additions & 0 deletions app/icons/Bluetooth.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions app/icons/Network.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions app/icons/icons.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<file>ArrowLinkRight.svg</file>
<file>ArrowUp.svg</file>
<file>Back.svg</file>
<file>Bluetooth.svg</file>
<file>Briefcase.svg</file>
<file>Calendar.svg</file>
<file>Checkmark.svg</file>
Expand Down Expand Up @@ -57,6 +58,7 @@
<file>Mouth.svg</file>
<file>NaturalResources.svg</file>
<file>Next.svg</file>
<file>Network.svg</file>
<file>Other.svg</file>
<file>Others.svg</file>
<file>Personal.svg</file>
Expand Down
274 changes: 274 additions & 0 deletions app/images/ExternalBluetoothProvider.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 0 additions & 19 deletions app/images/ExternalGpsGreen.svg

This file was deleted.

Loading
Loading