Browse Source

Rename SettingsGroup json files

QGC4.4
Don Gagne 8 years ago
parent
commit
026e605750
  1. 8
      qgroundcontrol.qrc
  2. 0
      src/Settings/App.SettingsGroup.json
  3. 2
      src/Settings/AppSettings.cc
  4. 0
      src/Settings/AutoConnect.SettingsGroup.json
  5. 2
      src/Settings/AutoConnectSettings.cc
  6. 2
      src/Settings/SettingsGroup.cc
  7. 0
      src/Settings/Units.SettingsGroup.json
  8. 2
      src/Settings/UnitsSettings.cc

8
qgroundcontrol.qrc

@ -179,10 +179,10 @@ @@ -179,10 +179,10 @@
<file alias="Vehicle/GPSFact.json">src/Vehicle/GPSFact.json</file>
<file alias="Vehicle/WindFact.json">src/Vehicle/WindFact.json</file>
<file alias="Vehicle/VibrationFact.json">src/Vehicle/VibrationFact.json</file>
<file alias="SettingsGroup.app.json">src/Settings/SettingsGroup.app.json</file>
<file alias="SettingsGroup.autoConnect.json">src/Settings/SettingsGroup.autoConnect.json</file>
<file alias="SettingsGroup.units.json">src/Settings/SettingsGroup.units.json</file>
<file alias="SettingsGroup.video.json">src/Settings/SettingsGroup.video.json</file>
<file alias="App.SettingsGroup.json">src/Settings/App.SettingsGroup.json</file>
<file alias="AutoConnect.SettingsGroup.json">src/Settings/AutoConnect.SettingsGroup.json</file>
<file alias="Units.SettingsGroup.json">src/Settings/Units.SettingsGroup.json</file>
<file alias="Video.SettingsGroup.json">src/Settings/Video.SettingsGroup.json</file>
<file alias="RallyPoint.FactMetaData.json">src/MissionManager/RallyPoint.FactMetaData.json</file>
<file alias="FWLandingPattern.FactMetaData.json">src/MissionManager/FWLandingPattern.FactMetaData.json</file>
<file alias="Survey.FactMetaData.json">src/MissionManager/Survey.FactMetaData.json</file>

0
src/Settings/SettingsGroup.app.json → src/Settings/App.SettingsGroup.json

2
src/Settings/AppSettings.cc

@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
#include <QQmlEngine>
#include <QtQml>
const char* AppSettings::appSettingsGroupName = "app";
const char* AppSettings::appSettingsGroupName = "App";
const char* AppSettings::offlineEditingFirmwareTypeSettingsName = "OfflineEditingFirmwareType";
const char* AppSettings::offlineEditingVehicleTypeSettingsName = "OfflineEditingVehicleType";
const char* AppSettings::offlineEditingCruiseSpeedSettingsName = "OfflineEditingCruiseSpeed";

0
src/Settings/SettingsGroup.autoConnect.json → src/Settings/AutoConnect.SettingsGroup.json

2
src/Settings/AutoConnectSettings.cc

@ -22,7 +22,7 @@ const char* AutoConnectSettings:: autoConnectPX4FlowSettingsName = "Autocon @@ -22,7 +22,7 @@ const char* AutoConnectSettings:: autoConnectPX4FlowSettingsName = "Autocon
const char* AutoConnectSettings:: autoConnectRTKGPSSettingsName = "AutoconnectRTKGPS";
const char* AutoConnectSettings:: autoConnectLibrePilotSettingsName = "AutoconnectLibrePilot";
const char* AutoConnectSettings::autoConnectSettingsGroupName = "autoConnect";
const char* AutoConnectSettings::autoConnectSettingsGroupName = "AutoConnect";
AutoConnectSettings::AutoConnectSettings(QObject* parent)
: SettingsGroup(autoConnectSettingsGroupName, _settingsGroup, parent)

2
src/Settings/SettingsGroup.cc

@ -17,7 +17,7 @@ SettingsGroup::SettingsGroup(const QString& name, const QString& settingsGroup, @@ -17,7 +17,7 @@ SettingsGroup::SettingsGroup(const QString& name, const QString& settingsGroup,
, _settingsGroup(settingsGroup)
, _visible(qgcApp()->toolbox()->corePlugin()->overrideSettingsGroupVisibility(name))
{
QString jsonNameFormat(":/json/SettingsGroup.%1.json");
QString jsonNameFormat(":/json/%1.SettingsGroup.json");
_nameToMetaDataMap = FactMetaData::createMapFromJsonFile(jsonNameFormat.arg(name), this);
}

0
src/Settings/SettingsGroup.units.json → src/Settings/Units.SettingsGroup.json

2
src/Settings/UnitsSettings.cc

@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
#include <QQmlEngine>
#include <QtQml>
const char* UnitsSettings::unitsSettingsGroupName = "units";
const char* UnitsSettings::unitsSettingsGroupName = "Units";
const char* UnitsSettings::distanceUnitsSettingsName = "DistanceUnits";
const char* UnitsSettings::areaUnitsSettingsName = "AreaUnits";
const char* UnitsSettings::speedUnitsSettingsName = "SpeedUnits";

Loading…
Cancel
Save