From ab798f871f729d1820e13c661cfdc0af2a382437 Mon Sep 17 00:00:00 2001 From: dheideman Date: Fri, 15 Sep 2017 09:23:50 -0700 Subject: [PATCH] Reformat brand image qml property for readability --- src/ui/toolbar/MainToolBarIndicators.qml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/ui/toolbar/MainToolBarIndicators.qml b/src/ui/toolbar/MainToolBarIndicators.qml index 1698ce61a..c045cd687 100644 --- a/src/ui/toolbar/MainToolBarIndicators.qml +++ b/src/ui/toolbar/MainToolBarIndicators.qml @@ -100,8 +100,22 @@ Item { property string _userBrandImageOutdoor: QGroundControl.settingsManager.brandImageSettings.userBrandImageOutdoor.value property bool _userBrandingIndoor: _userBrandImageIndoor.length != 0 property bool _userBrandingOutdoor: _userBrandImageOutdoor.length != 0 - 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 : "") ) ) + 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 { -- 2.22.0