zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #3130 from DonLakeFlyer/QGCPal 

Fix references to __qgcPal which did not exist in control
QGC4.4
Don Gagne 9 years ago
parent
671f7dc798 af286a6370
commit
482ef626ef
2 changed files with 16 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      src/QtLocationPlugin/QMLControl/OfflineMap.qml
  2. 4
      src/ui/preferences/LinkSettings.qml

26
src/QtLocationPlugin/QMLControl/OfflineMap.qml
Unescape View File

@ -36,7 +36,7 @@ import QGroundControl.Palette 1.0
Rectangle { Rectangle {
id: _offlineMapRoot id: _offlineMapRoot
color: __qgcPal.window color: qgcPal.window
anchors.fill: parent anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
@ -59,6 +59,8 @@ Rectangle {
readonly property real minZoomLevel: 3 readonly property real minZoomLevel: 3
readonly property real maxZoomLevel: 20 readonly property real maxZoomLevel: 20
QGCPalette { id: qgcpal }
Component.onCompleted: { Component.onCompleted: {
QGroundControl.mapEngineManager.loadTileSets() QGroundControl.mapEngineManager.loadTileSets()
updateMap() updateMap()
@ -161,7 +163,7 @@ Rectangle {
id: _offlineMapTopRect id: _offlineMapTopRect
width: parent.width width: parent.width
height: labelTitle.height + ScreenTools.defaultFontPixelHeight height: labelTitle.height + ScreenTools.defaultFontPixelHeight
color: __qgcPal.window color: qgcPal.window
anchors.top: parent.top anchors.top: parent.top
Row { Row {
spacing: ScreenTools.defaultFontPixelHeight * 2 spacing: ScreenTools.defaultFontPixelHeight * 2
@ -240,7 +242,7 @@ Rectangle {
//-- Offline Map Definition //-- Offline Map Definition
Rectangle { Rectangle {
id: _mapView id: _mapView
color: __qgcPal.window color: qgcPal.window
width: parent.width width: parent.width
anchors.top: _offlineMapTopRect.bottom anchors.top: _offlineMapTopRect.bottom
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
@ -251,7 +253,7 @@ Rectangle {
width: parent.width width: parent.width
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: bottomRect.top anchors.bottom: bottomRect.top
color: (__qgcPal.globalTheme === QGCPalette.Light) ? "black" : "#98aca4" color: (qgcPal.globalTheme === QGCPalette.Light) ? "black" : "#98aca4"
Map { Map {
id: _map id: _map
@ -332,7 +334,7 @@ Rectangle {
id: bottomRect id: bottomRect
width: parent.width width: parent.width
height: _controlRow.height + (ScreenTools.defaultFontPixelHeight * 2) height: _controlRow.height + (ScreenTools.defaultFontPixelHeight * 2)
color: __qgcPal.window color: qgcPal.window
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
Row { Row {
id: _controlRow id: _controlRow
@ -621,7 +623,7 @@ Rectangle {
} }
Rectangle { Rectangle {
id: _infoView id: _infoView
color: __qgcPal.windowShade color: qgcPal.windowShade
width: parent.width width: parent.width
anchors.top: _offlineMapTopRect.bottom anchors.top: _offlineMapTopRect.bottom
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
@ -644,7 +646,7 @@ Rectangle {
Rectangle { Rectangle {
width: infoWidth width: infoWidth
height: nameLabel.height + (ScreenTools.defaultFontPixelHeight * 2) height: nameLabel.height + (ScreenTools.defaultFontPixelHeight * 2)
color: __qgcPal.window color: qgcPal.window
radius: ScreenTools.defaultFontPixelHeight * 0.5 radius: ScreenTools.defaultFontPixelHeight * 0.5
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
QGCLabel { QGCLabel {
@ -663,7 +665,7 @@ Rectangle {
id: infoRect id: infoRect
width: infoWidth width: infoWidth
height: infoGrid.height + (ScreenTools.defaultFontPixelHeight * 4) height: infoGrid.height + (ScreenTools.defaultFontPixelHeight * 4)
color: __qgcPal.window color: qgcPal.window
radius: ScreenTools.defaultFontPixelHeight * 0.5 radius: ScreenTools.defaultFontPixelHeight * 0.5
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
GridLayout { GridLayout {
@ -804,7 +806,7 @@ Rectangle {
} }
Rectangle { Rectangle {
id: _optionsView id: _optionsView
color: __qgcPal.windowShade color: qgcPal.windowShade
width: parent.width width: parent.width
anchors.top: _offlineMapTopRect.bottom anchors.top: _offlineMapTopRect.bottom
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
@ -834,7 +836,7 @@ Rectangle {
Rectangle { Rectangle {
width: infoWidth width: infoWidth
height: optionsLabel.height + (ScreenTools.defaultFontPixelHeight * 2) height: optionsLabel.height + (ScreenTools.defaultFontPixelHeight * 2)
color: __qgcPal.window color: qgcPal.window
radius: ScreenTools.defaultFontPixelHeight * 0.5 radius: ScreenTools.defaultFontPixelHeight * 0.5
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
QGCLabel { QGCLabel {
@ -848,7 +850,7 @@ Rectangle {
id: optionsRect id: optionsRect
width: optionsGrid.width + (ScreenTools.defaultFontPixelWidth * 4) width: optionsGrid.width + (ScreenTools.defaultFontPixelWidth * 4)
height: optionsGrid.height + (ScreenTools.defaultFontPixelHeight * 4) height: optionsGrid.height + (ScreenTools.defaultFontPixelHeight * 4)
color: __qgcPal.window color: qgcPal.window
radius: ScreenTools.defaultFontPixelHeight * 0.5 radius: ScreenTools.defaultFontPixelHeight * 0.5
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
GridLayout { GridLayout {
@ -890,7 +892,7 @@ Rectangle {
Layout.columnSpan: 2 Layout.columnSpan: 2
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: 1 implicitHeight: 1
color: __qgcPal.text color: qgcPal.text
} }
QGCLabel { QGCLabel {
text: "MapBox Access Token" text: "MapBox Access Token"

4
src/ui/preferences/LinkSettings.qml
Unescape View File

@ -32,7 +32,7 @@ import QGroundControl.Palette 1.0
Rectangle { Rectangle {
id: _linkRoot id: _linkRoot
color: __qgcPal.window color: qgcPal.window
anchors.fill: parent anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
@ -176,7 +176,7 @@ Rectangle {
Component { Component {
id: commSettings id: commSettings
Rectangle { Rectangle {
color: __qgcPal.window color: qgcPal.window
anchors.fill: parent anchors.fill: parent
Component.onCompleted: { Component.onCompleted: {
// If editing, create copy for editing // If editing, create copy for editing

Write Preview
Loading…
Cancel
Save