Skip to content

Q
qgroundcontrol
Commit 1ab55919 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #5194 from DonLakeFlyer/Fixes 

Small fixes for release
parents 60ee7a78 19bccbe8
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 95 deletions
ios/iOS-Info.plist
View file @ 1ab55919
...@@ -84,5 +84,7 @@ ...@@ -84,5 +84,7 @@
</array> </array>
</dict> </dict>
</dict> </dict>
<key>UIFileSharingEnabled</key>
<true/>
</dict> </dict>
</plist> </plist>
ios/iOSForAppStore-Info-Source.plist
View file @ 1ab55919
...@@ -2,95 +2,97 @@ ...@@ -2,95 +2,97 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>CFBundleDisplayName</key> <key>CFBundleDisplayName</key>
<string>QGroundControl</string> <string>QGroundControl</string>
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>en</string> <string>en</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string> <string>$(EXECUTABLE_NAME)</string>
<key>NSHumanReadableCopyright</key> <key>NSHumanReadableCopyright</key>
<string>Open Source Flight Systems GmbH</string> <string>Open Source Flight Systems GmbH</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string></string> <string></string>
<key>NSCameraUsageDescription</key> <key>NSCameraUsageDescription</key>
<string>QGC uses UVC devices for video streaming.</string> <string>QGC uses UVC devices for video streaming.</string>
<key>NSPhotoLibraryUsageDescription</key> <key>NSPhotoLibraryUsageDescription</key>
<string>We do not access it. Apple thinks we do.</string> <string>We do not access it. Apple thinks we do.</string>
<key>UIRequiredDeviceCapabilities</key> <key>UIRequiredDeviceCapabilities</key>
<array> <array>
<string>armv7</string> <string>armv7</string>
</array> </array>
<key>CFBundleIcons</key> <key>CFBundleIcons</key>
<dict> <dict>
<key>CFBundlePrimaryIcon</key> <key>CFBundlePrimaryIcon</key>
<dict> <dict>
<key>CFBundleIconFiles</key> <key>CFBundleIconFiles</key>
<array> <array>
<string>AppIcon29x29.png</string> <string>AppIcon29x29.png</string>
<string>AppIcon29x29@2x.png</string> <string>AppIcon29x29@2x.png</string>
<string>AppIcon40x40@2x.png</string> <string>AppIcon40x40@2x.png</string>
<string>AppIcon57x57.png</string> <string>AppIcon57x57.png</string>
<string>AppIcon57x57@2x.png</string> <string>AppIcon57x57@2x.png</string>
<string>AppIcon60x60@2x.png</string> <string>AppIcon60x60@2x.png</string>
</array> </array>
</dict> </dict>
</dict> </dict>
<key>CFBundleIcons~ipad</key> <key>CFBundleIcons~ipad</key>
<dict> <dict>
<key>CFBundlePrimaryIcon</key> <key>CFBundlePrimaryIcon</key>
<dict> <dict>
<key>CFBundleIconFiles</key> <key>CFBundleIconFiles</key>
<array> <array>
<string>AppIcon29x29.png</string> <string>AppIcon29x29.png</string>
<string>AppIcon29x29@2x.png</string> <string>AppIcon29x29@2x.png</string>
<string>AppIcon40x40@2x.png</string> <string>AppIcon40x40@2x.png</string>
<string>AppIcon57x57.png</string> <string>AppIcon57x57.png</string>
<string>AppIcon57x57@2x.png</string> <string>AppIcon57x57@2x.png</string>
<string>AppIcon60x60@2x.png</string> <string>AppIcon60x60@2x.png</string>
<string>AppIcon29x29~ipad.png</string> <string>AppIcon29x29~ipad.png</string>
<string>AppIcon29x29@2x~ipad.png</string> <string>AppIcon29x29@2x~ipad.png</string>
<string>AppIcon40x40~ipad.png</string> <string>AppIcon40x40~ipad.png</string>
<string>AppIcon40x40@2x~ipad.png</string> <string>AppIcon40x40@2x~ipad.png</string>
<string>AppIcon50x50~ipad.png</string> <string>AppIcon50x50~ipad.png</string>
<string>AppIcon50x50@2x~ipad.png</string> <string>AppIcon50x50@2x~ipad.png</string>
<string>AppIcon72x72~ipad.png</string> <string>AppIcon72x72~ipad.png</string>
<string>AppIcon72x72@2x~ipad.png</string> <string>AppIcon72x72@2x~ipad.png</string>
<string>AppIcon76x76~ipad.png</string> <string>AppIcon76x76~ipad.png</string>
<string>AppIcon76x76@2x~ipad.png</string> <string>AppIcon76x76@2x~ipad.png</string>
<string>AppIcon83.5x83.5@2x~ipad.png</string> <string>AppIcon83.5x83.5@2x~ipad.png</string>
</array> </array>
</dict> </dict>
</dict> </dict>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>org.QGroundControl.qgc</string> <string>org.QGroundControl.qgc</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string> <string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>###VERSION###</string> <string>###VERSION###</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>###BUILD###</string> <string>###BUILD###</string>
<key>ForAppStore</key> <key>ForAppStore</key>
<string>Yes</string> <string>Yes</string>
<key>LSRequiresIPhoneOS</key> <key>LSRequiresIPhoneOS</key>
<true/> <true/>
<key>NSLocationUsageDescription</key> <key>NSLocationUsageDescription</key>
<string>Ground Station Location</string> <string>Ground Station Location</string>
<key>NSLocationWhenInUseUsageDescription</key> <key>NSLocationWhenInUseUsageDescription</key>
<string>Ground Station Location</string> <string>Ground Station Location</string>
<key>UILaunchStoryboardName</key> <key>UILaunchStoryboardName</key>
<string>QGCLaunchScreen</string> <string>QGCLaunchScreen</string>
<key>UIRequiresFullScreen</key> <key>UIRequiresFullScreen</key>
<true/> <true/>
<key>UISupportedInterfaceOrientations</key> <key>UISupportedInterfaceOrientations</key>
<array> <array>
<string>UIInterfaceOrientationLandscapeLeft</string> <string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string> <string>UIInterfaceOrientationLandscapeRight</string>
</array> </array>
<key>UIFileSharingEnabled</key>
<true/>
</dict> </dict>
</plist> </plist>
src/QmlControls/QGCComboBox.qml
View file @ 1ab55919
...@@ -16,10 +16,11 @@ Button { ...@@ -16,10 +16,11 @@ Button {
readonly property alias count: popupItems.count readonly property alias count: popupItems.count
readonly property alias currentText: popup.currentText readonly property alias currentText: popup.currentText
property var _qgcPal: QGCPalette { colorGroupEnabled: enabled } property bool _showBorder: _qgcPal.globalTheme === QGCPalette.Light
property int _horizontalPadding: ScreenTools.defaultFontPixelWidth property var _qgcPal: QGCPalette { colorGroupEnabled: enabled }
property int _verticalPadding: Math.round(ScreenTools.defaultFontPixelHeight / 2) property int _horizontalPadding: ScreenTools.defaultFontPixelWidth
property var __popup: popup property int _verticalPadding: Math.round(ScreenTools.defaultFontPixelHeight / 2)
property var __popup: popup
signal activated(int index) signal activated(int index)
...@@ -37,6 +38,8 @@ Button { ...@@ -37,6 +38,8 @@ Button {
implicitWidth: ScreenTools.implicitComboBoxWidth implicitWidth: ScreenTools.implicitComboBoxWidth
implicitHeight: ScreenTools.implicitComboBoxHeight implicitHeight: ScreenTools.implicitComboBoxHeight
color: control._qgcPal.button color: control._qgcPal.button
border.width: control._showBorder ? 1: 0
border.color: control._qgcPal.buttonText
QGCColoredImage { QGCColoredImage {
id: image id: image
......
src/QmlControls/ScreenTools.qml
View file @ 1ab55919
...@@ -137,7 +137,7 @@ Item { ...@@ -137,7 +137,7 @@ Item {
// we will just drop point size to make things fit. Correct size not yet determined. // 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 baseSize = 12; // This will be lowered in a future pull
} else { } else {
baseSize = 12; baseSize = 14;
} }
} else if((Screen.width / Screen.pixelDensity) < 120) { } else if((Screen.width / Screen.pixelDensity) < 120) {
baseSize = 11; baseSize = 11;
......
src/Settings/AppSettings.cc
View file @ 1ab55919
...@@ -78,7 +78,11 @@ AppSettings::AppSettings(QObject* parent) ...@@ -78,7 +78,11 @@ AppSettings::AppSettings(QObject* parent)
QString appName = qgcApp()->applicationName(); QString appName = qgcApp()->applicationName();
if (savePathFact->rawValue().toString().isEmpty() && _nameToMetaDataMap[savePathName]->rawDefaultValue().toString().isEmpty()) { if (savePathFact->rawValue().toString().isEmpty() && _nameToMetaDataMap[savePathName]->rawDefaultValue().toString().isEmpty()) {
#ifdef __mobile__ #ifdef __mobile__
#ifdef __ios__
QDir rootDir = QDir(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation));
#else
QDir rootDir = QDir(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)); QDir rootDir = QDir(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
#endif
savePathFact->setVisible(false); savePathFact->setVisible(false);
#else #else
QDir rootDir = QDir(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)); QDir rootDir = QDir(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment