mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-20 10:54:14 +01:00
rename default configuration xml file
This commit is contained in:
parent
cc2b2149ef
commit
e08feb3c46
@ -45,7 +45,7 @@
|
||||
openpilotgcs -reset -config-file ./MyOpenPilotGCS.xml
|
||||
[/code]
|
||||
|
||||
Relative paths are relative to <install dir>/share/openpilotgcs/default_configurations/
|
||||
Relative paths are relative to <install dir>/share/openpilotgcs/configurations/
|
||||
|
||||
The specified file will be used to load the factory defaults from but only when the user settings are empty.
|
||||
If the user settings are not empty the file will not be used.
|
||||
@ -116,7 +116,7 @@ const QLatin1String ORG_NAME(ORG_BIG_NAME);
|
||||
|
||||
const QLatin1String CORE_PLUGIN_NAME("Core");
|
||||
|
||||
const char *DEFAULT_CONFIG_FILENAME = "OpenPilotGCS.xml";
|
||||
const char *DEFAULT_CONFIG_FILENAME = "default.xml";
|
||||
|
||||
const char *fixedOptionsC = " [OPTION]... [FILE]...\n"
|
||||
"Options:\n"
|
||||
@ -342,7 +342,7 @@ AppOptionValues parseCommandLine(SharedTools::QtSingleApplication &app,
|
||||
|
||||
void loadFactoryDefaults(QSettings &settings, AppOptionValues &appOptionValues)
|
||||
{
|
||||
QDir directory(Utils::GetDataPath() + QString("default_configurations"));
|
||||
QDir directory(Utils::GetDataPath() + QString("configurations"));
|
||||
|
||||
qDebug() << "Looking for factory defaults configuration files in:" << directory.absolutePath();
|
||||
|
||||
|
@ -2,7 +2,7 @@ include(../../openpilotgcs.pri)
|
||||
|
||||
TEMPLATE = aux
|
||||
|
||||
DATACOLLECTIONS = cloudconfig default_configurations dials models pfd sounds diagrams mapicons stylesheets
|
||||
DATACOLLECTIONS = cloudconfig configurations dials models pfd sounds diagrams mapicons stylesheets
|
||||
|
||||
equals(copydata, 1) {
|
||||
for(dir, DATACOLLECTIONS) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user