Fix provider naming when using mock location (#4316)

* Fix provider naming when using mock location

* Small code updates

Author: Withalion

app/position/positionkit.cpp

@@ -103,6 +103,7 @@ void PositionKit::setPositionProvider( AbstractPositionProvider *provider )
   }
 
   emit positionProviderChanged( provider );
+  emit positionProviderNameChanged();
 
   // reset last position data
   parsePositionUpdate( GeoPosition() );
@@ -112,7 +113,7 @@ QString PositionKit::positionProviderName() const
 {
   if ( isMockPosition() )
   {
-    return tr( "Mocked position provider" );
+    return tr( "External (Mock)" );
   }
   return mPositionProvider->name();
 }
@@ -366,6 +367,8 @@ void PositionKit::parsePositionUpdate( const GeoPosition &newPosition )
     mPosition.isMock = newPosition.isMock;
     emit isMockPositionChanged( mPosition.isMock );
     hasAnythingChanged = true;
+    // we also change the name
+    emit positionProviderNameChanged();
   }
 
   if ( hasAnythingChanged )

app/position/positionkit.h

@@ -1,4 +1,4 @@
-/***************************************************************************
+/***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -77,6 +77,7 @@ class PositionKit : public QObject
 
     // Provider of position data
     Q_PROPERTY( AbstractPositionProvider *positionProvider READ positionProvider WRITE setPositionProvider NOTIFY positionProviderChanged )
+    Q_PROPERTY( QString positionProviderName READ positionProviderName NOTIFY positionProviderNameChanged )
     Q_PROPERTY( bool isMockPosition READ isMockPosition NOTIFY isMockPositionChanged )
 
     Q_PROPERTY( AppSettings *appSettings READ appSettings WRITE setAppSettings NOTIFY appSettingsChanged )
@@ -117,7 +118,7 @@ class PositionKit : public QObject
 
     AbstractPositionProvider *positionProvider() const;
     void setPositionProvider( AbstractPositionProvider *newPositionProvider );
-    Q_INVOKABLE QString positionProviderName() const;
+    QString positionProviderName() const;
 
     double hdop() const;
     double vdop() const;
@@ -176,6 +177,7 @@ class PositionKit : public QObject
     void fixChanged( const QString & );
 
     void positionProviderChanged( AbstractPositionProvider *provider );
+    void positionProviderNameChanged();
 
     void positionChanged( const GeoPosition & );
     void isMockPositionChanged( bool );

app/qml/gps/MMGpsDataDrawer.qml

@@ -27,6 +27,7 @@ MMComponents.MMDrawer {
 
   drawerHeader.title: qsTr( "GPS info" )
 
+
   drawerContent: MMComponents.MMScrollView {
 
     width: parent.width
@@ -62,13 +63,7 @@ MMComponents.MMDrawer {
             width: parent.width / 2
 
             title: qsTr( "Source" )
-            value: {
-              if ( PositionKit.positionProvider ) {
-                PositionKit.positionProviderName()
-              } else {
-                qsTr( "No receiver" )
-              }
-            }
+            value: PositionKit.positionProvider ? PositionKit.positionProviderName : qsTr( "No receiver" )
 
             alignmentRight: Positioner.index % 2 === 1
           }