diff --git a/ios/iOS-Info.plist b/ios/iOS-Info.plist index a7bde7a..f9ea584 100644 --- a/ios/iOS-Info.plist +++ b/ios/iOS-Info.plist @@ -84,5 +84,7 @@ + UIFileSharingEnabled + diff --git a/ios/iOSForAppStore-Info-Source.plist b/ios/iOSForAppStore-Info-Source.plist index e194eec..09f03af 100644 --- a/ios/iOSForAppStore-Info-Source.plist +++ b/ios/iOSForAppStore-Info-Source.plist @@ -2,95 +2,97 @@ - CFBundleDisplayName - QGroundControl - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - NSHumanReadableCopyright - Open Source Flight Systems GmbH - CFBundleIconFile - - NSCameraUsageDescription - QGC uses UVC devices for video streaming. - NSPhotoLibraryUsageDescription - We do not access it. Apple thinks we do. - UIRequiredDeviceCapabilities - - armv7 - - CFBundleIcons - - CFBundlePrimaryIcon - - CFBundleIconFiles - - AppIcon29x29.png - AppIcon29x29@2x.png - AppIcon40x40@2x.png - AppIcon57x57.png - AppIcon57x57@2x.png - AppIcon60x60@2x.png - - - - CFBundleIcons~ipad - - CFBundlePrimaryIcon - - CFBundleIconFiles - - AppIcon29x29.png - AppIcon29x29@2x.png - AppIcon40x40@2x.png - AppIcon57x57.png - AppIcon57x57@2x.png - AppIcon60x60@2x.png - AppIcon29x29~ipad.png - AppIcon29x29@2x~ipad.png - AppIcon40x40~ipad.png - AppIcon40x40@2x~ipad.png - AppIcon50x50~ipad.png - AppIcon50x50@2x~ipad.png - AppIcon72x72~ipad.png - AppIcon72x72@2x~ipad.png - AppIcon76x76~ipad.png - AppIcon76x76@2x~ipad.png - AppIcon83.5x83.5@2x~ipad.png - - - - CFBundleIdentifier - org.QGroundControl.qgc - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - ###VERSION### - CFBundleSignature - ???? - CFBundleVersion - ###BUILD### - ForAppStore - Yes - LSRequiresIPhoneOS - - NSLocationUsageDescription - Ground Station Location - NSLocationWhenInUseUsageDescription - Ground Station Location - UILaunchStoryboardName - QGCLaunchScreen - UIRequiresFullScreen - - UISupportedInterfaceOrientations - - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - + CFBundleDisplayName + QGroundControl + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + NSHumanReadableCopyright + Open Source Flight Systems GmbH + CFBundleIconFile + + NSCameraUsageDescription + QGC uses UVC devices for video streaming. + NSPhotoLibraryUsageDescription + We do not access it. Apple thinks we do. + UIRequiredDeviceCapabilities + + armv7 + + CFBundleIcons + + CFBundlePrimaryIcon + + CFBundleIconFiles + + AppIcon29x29.png + AppIcon29x29@2x.png + AppIcon40x40@2x.png + AppIcon57x57.png + AppIcon57x57@2x.png + AppIcon60x60@2x.png + + + + CFBundleIcons~ipad + + CFBundlePrimaryIcon + + CFBundleIconFiles + + AppIcon29x29.png + AppIcon29x29@2x.png + AppIcon40x40@2x.png + AppIcon57x57.png + AppIcon57x57@2x.png + AppIcon60x60@2x.png + AppIcon29x29~ipad.png + AppIcon29x29@2x~ipad.png + AppIcon40x40~ipad.png + AppIcon40x40@2x~ipad.png + AppIcon50x50~ipad.png + AppIcon50x50@2x~ipad.png + AppIcon72x72~ipad.png + AppIcon72x72@2x~ipad.png + AppIcon76x76~ipad.png + AppIcon76x76@2x~ipad.png + AppIcon83.5x83.5@2x~ipad.png + + + + CFBundleIdentifier + org.QGroundControl.qgc + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + ###VERSION### + CFBundleSignature + ???? + CFBundleVersion + ###BUILD### + ForAppStore + Yes + LSRequiresIPhoneOS + + NSLocationUsageDescription + Ground Station Location + NSLocationWhenInUseUsageDescription + Ground Station Location + UILaunchStoryboardName + QGCLaunchScreen + UIRequiresFullScreen + + UISupportedInterfaceOrientations + + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIFileSharingEnabled + diff --git a/src/QmlControls/QGCComboBox.qml b/src/QmlControls/QGCComboBox.qml index 32634b5..72590ad 100644 --- a/src/QmlControls/QGCComboBox.qml +++ b/src/QmlControls/QGCComboBox.qml @@ -16,10 +16,11 @@ Button { readonly property alias count: popupItems.count readonly property alias currentText: popup.currentText - property var _qgcPal: QGCPalette { colorGroupEnabled: enabled } - property int _horizontalPadding: ScreenTools.defaultFontPixelWidth - property int _verticalPadding: Math.round(ScreenTools.defaultFontPixelHeight / 2) - property var __popup: popup + property bool _showBorder: _qgcPal.globalTheme === QGCPalette.Light + property var _qgcPal: QGCPalette { colorGroupEnabled: enabled } + property int _horizontalPadding: ScreenTools.defaultFontPixelWidth + property int _verticalPadding: Math.round(ScreenTools.defaultFontPixelHeight / 2) + property var __popup: popup signal activated(int index) @@ -37,6 +38,8 @@ Button { implicitWidth: ScreenTools.implicitComboBoxWidth implicitHeight: ScreenTools.implicitComboBoxHeight color: control._qgcPal.button + border.width: control._showBorder ? 1: 0 + border.color: control._qgcPal.buttonText QGCColoredImage { id: image diff --git a/src/QmlControls/ScreenTools.qml b/src/QmlControls/ScreenTools.qml index fc13c3d..507f820 100644 --- a/src/QmlControls/ScreenTools.qml +++ b/src/QmlControls/ScreenTools.qml @@ -137,7 +137,7 @@ Item { // we will just drop point size to make things fit. Correct size not yet determined. baseSize = 12; // This will be lowered in a future pull } else { - baseSize = 12; + baseSize = 14; } } else if((Screen.width / Screen.pixelDensity) < 120) { baseSize = 11; diff --git a/src/Settings/AppSettings.cc b/src/Settings/AppSettings.cc index 581e133..f41031c 100644 --- a/src/Settings/AppSettings.cc +++ b/src/Settings/AppSettings.cc @@ -78,7 +78,11 @@ AppSettings::AppSettings(QObject* parent) QString appName = qgcApp()->applicationName(); if (savePathFact->rawValue().toString().isEmpty() && _nameToMetaDataMap[savePathName]->rawDefaultValue().toString().isEmpty()) { #ifdef __mobile__ +#ifdef __ios__ + QDir rootDir = QDir(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)); +#else QDir rootDir = QDir(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)); +#endif savePathFact->setVisible(false); #else QDir rootDir = QDir(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation));