Browse Source

Merge pull request #5194 from DonLakeFlyer/Fixes

Small fixes for release
QGC4.4
Don Gagne 8 years ago committed by GitHub
parent
commit
1ab5591954
  1. 2
      ios/iOS-Info.plist
  2. 2
      ios/iOSForAppStore-Info-Source.plist
  3. 3
      src/QmlControls/QGCComboBox.qml
  4. 2
      src/QmlControls/ScreenTools.qml
  5. 4
      src/Settings/AppSettings.cc

2
ios/iOS-Info.plist

@ -84,5 +84,7 @@
</array> </array>
</dict> </dict>
</dict> </dict>
<key>UIFileSharingEnabled</key>
<true/>
</dict> </dict>
</plist> </plist>

2
ios/iOSForAppStore-Info-Source.plist

@ -92,5 +92,7 @@
<string>UIInterfaceOrientationLandscapeLeft</string> <string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string> <string>UIInterfaceOrientationLandscapeRight</string>
</array> </array>
<key>UIFileSharingEnabled</key>
<true/>
</dict> </dict>
</plist> </plist>

3
src/QmlControls/QGCComboBox.qml

@ -16,6 +16,7 @@ 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 bool _showBorder: _qgcPal.globalTheme === QGCPalette.Light
property var _qgcPal: QGCPalette { colorGroupEnabled: enabled } property var _qgcPal: QGCPalette { colorGroupEnabled: enabled }
property int _horizontalPadding: ScreenTools.defaultFontPixelWidth property int _horizontalPadding: ScreenTools.defaultFontPixelWidth
property int _verticalPadding: Math.round(ScreenTools.defaultFontPixelHeight / 2) property int _verticalPadding: Math.round(ScreenTools.defaultFontPixelHeight / 2)
@ -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

2
src/QmlControls/ScreenTools.qml

@ -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;

4
src/Settings/AppSettings.cc

@ -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));

Loading…
Cancel
Save