Remove userBrandImageLinked fact

src/Settings/App.SettingsGroup.json

@@ -157,13 +157,6 @@
     "type":             "string",
     "defaultValue":     ""
 },
-{
-    "name":             "UserBrandImageLinked",
-    "shortDescription": "Link indoor/outdoor brand images",
-    "longDescription":  "Boolean option to use same image for indoor and outdoor brand images",
-    "type":             "bool",
-    "defaultValue":     true
-},
 {
     "name":             "MapboxToken",
     "shortDescription": "Access token to Mapbox maps",

src/Settings/AppSettings.cc

@@ -34,7 +34,6 @@ const char* AppSettings::showLargeCompassName =                         "ShowLar
 const char* AppSettings::savePathName =                                 "SavePath";
 const char* AppSettings::userBrandImageIndoorName =                     "UserBrandImageIndoor";
 const char* AppSettings::userBrandImageOutdoorName =                    "UserBrandImageOutdoor";
-const char* AppSettings::userBrandImageLinkedName =                     "UserBrandImageLinked";
 const char* AppSettings::autoLoadMissionsName =                         "AutoLoadMissions";
 const char* AppSettings::mapboxTokenName =                              "MapboxToken";
 const char* AppSettings::esriTokenName =                                "EsriToken";
@@ -76,7 +75,6 @@ AppSettings::AppSettings(QObject* parent)
     , _savePathFact(NULL)
     , _userBrandImageIndoorFact(NULL)
     , _userBrandImageOutdoorFact(NULL)
-    , _userBrandImageLinkedFact(NULL)
     , _autoLoadMissionsFact(NULL)
     , _mapboxTokenFact(NULL)
     , _esriTokenFact(NULL)
@@ -355,15 +353,6 @@ Fact* AppSettings::userBrandImageOutdoor(void)
     return _userBrandImageOutdoorFact;
 }
 
-Fact* AppSettings::userBrandImageLinked(void)
-{
-    if (!_userBrandImageLinkedFact) {
-        _userBrandImageLinkedFact = _createSettingsFact(userBrandImageLinkedName);
-    }
-
-    return _userBrandImageLinkedFact;
-}
-
 Fact* AppSettings::autoLoadMissions(void)
 {
     if (!_autoLoadMissionsFact) {

src/Settings/AppSettings.h

@@ -38,7 +38,6 @@ public:
     Q_PROPERTY(Fact* savePath                           READ savePath                           CONSTANT)
     Q_PROPERTY(Fact* userBrandImageIndoor               READ userBrandImageIndoor               CONSTANT)
     Q_PROPERTY(Fact* userBrandImageOutdoor              READ userBrandImageOutdoor              CONSTANT)
-    Q_PROPERTY(Fact* userBrandImageLinked               READ userBrandImageLinked               CONSTANT)
     Q_PROPERTY(Fact* autoLoadMissions                   READ autoLoadMissions                   CONSTANT)
     Q_PROPERTY(Fact* mapboxToken                        READ mapboxToken                        CONSTANT)
     Q_PROPERTY(Fact* esriToken                          READ esriToken                          CONSTANT)
@@ -76,7 +75,6 @@ public:
     Fact* savePath                          (void);
     Fact* userBrandImageIndoor              (void);
     Fact* userBrandImageOutdoor             (void);
-    Fact* userBrandImageLinked              (void);
     Fact* autoLoadMissions                  (void);
     Fact* mapboxToken                       (void);
     Fact* esriToken                         (void);
@@ -111,7 +109,6 @@ public:
     static const char* savePathName;
     static const char* userBrandImageIndoorName;
     static const char* userBrandImageOutdoorName;
-    static const char* userBrandImageLinkedName;
     static const char* autoLoadMissionsName;
     static const char* mapboxTokenName;
     static const char* esriTokenName;
@@ -161,7 +158,6 @@ private:
     SettingsFact* _savePathFact;
     SettingsFact* _userBrandImageIndoorFact;
     SettingsFact* _userBrandImageOutdoorFact;
-    SettingsFact* _userBrandImageLinkedFact;
     SettingsFact* _autoLoadMissionsFact;
     SettingsFact* _mapboxTokenFact;
     SettingsFact* _esriTokenFact;

src/ui/preferences/GeneralSettings.qml

@@ -36,7 +36,6 @@ QGCView {
     property Fact _savePath:                    QGroundControl.settingsManager.appSettings.savePath
     property Fact _userBrandImageIndoor:        QGroundControl.settingsManager.appSettings.userBrandImageIndoor
     property Fact _userBrandImageOutdoor:       QGroundControl.settingsManager.appSettings.userBrandImageOutdoor
-    property Fact _userBrandImageLinked:        QGroundControl.settingsManager.appSettings.userBrandImageLinked
     property Fact _appFontPointSize:            QGroundControl.settingsManager.appSettings.appFontPointSize
     property real _labelWidth:                  ScreenTools.defaultFontPixelWidth * 15
     property real _editFieldWidth:              ScreenTools.defaultFontPixelWidth * 30
@@ -713,19 +712,13 @@ QGCView {
                                     selectExisting: true
                                     selectFolder:   false
 
-                                    onAcceptedForLoad: {
-                                        _userBrandImageIndoor.rawValue = "file:///" + file
-                                        if(_userBrandImageLinked.value) {
-                                            _userBrandImageOutdoor.rawValue = _userBrandImageIndoor.rawValue
-                                        }
-                                    }
+                                    onAcceptedForLoad: _userBrandImageIndoor.rawValue = "file:///" + file
                                 }
                             }
                         }
                         Row {
                             spacing:    ScreenTools.defaultFontPixelWidth
                             visible:    _userBrandImageOutdoor.visible
-                            enabled:    !_userBrandImageLinked.value
 
                             QGCLabel {
                                 anchors.baseline:   userBrandImageOutdoorBrowse.baseline
@@ -759,18 +752,6 @@ QGCView {
                             spacing:    ScreenTools.defaultFontPixelWidth
                             visible:    _userBrandImageIndoor.visible
 
-                            FactCheckBox {
-                                text:       qsTr("Link Brand Images")
-                                width:      _labelWidth*1.5
-                                visible:    _userBrandImageLinked.visible
-                                fact:       _userBrandImageLinked
-                                onClicked: {
-                                    if(_userBrandImageLinked.value) {
-                                        _userBrandImageOutdoor.rawValue = _userBrandImageIndoor.rawValue
-                                    }
-                                }
-                            }
-
                             QGCButton {
                                 id:         userBrandImageReset
                                 text:       "Reset Default Brand Image"

src/ui/toolbar/MainToolBarIndicators.qml

@@ -100,8 +100,8 @@ Item {
         property string _userBrandImageOutdoor: QGroundControl.settingsManager.appSettings.userBrandImageOutdoor.value
         property bool   _userBrandingIndoor:    _userBrandImageIndoor.length != 0
         property bool   _userBrandingOutdoor:   _userBrandImageOutdoor.length != 0
-        property string _brandImageIndoor:      _userBrandingIndoor ? _userBrandImageIndoor : (_corePluginBranding ? QGroundControl.corePlugin.brandImageIndoor : (_activeVehicle ? _activeVehicle.brandImageIndoor : "") )
-        property string _brandImageOutdoor:     _userBrandingOutdoor ? _userBrandImageOutdoor : (_corePluginBranding ? QGroundControl.corePlugin.brandImageOutdoor : (_activeVehicle ? _activeVehicle.brandImageOutdoor : "") )
+        property string _brandImageIndoor:      _userBrandingIndoor ? _userBrandImageIndoor : (_userBrandingOutdoor ? _userBrandImageOutdoor : (_corePluginBranding ? QGroundControl.corePlugin.brandImageIndoor : (_activeVehicle ? _activeVehicle.brandImageIndoor : "") ) )
+        property string _brandImageOutdoor:     _userBrandingOutdoor ? _userBrandImageOutdoor : (_userBrandingIndoor ? _userBrandImageIndoor : (_corePluginBranding ? QGroundControl.corePlugin.brandImageOutdoor : (_activeVehicle ? _activeVehicle.brandImageOutdoor : "") ) )
     }
 
     Row {