rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-11 01:54:14 +01:00
Code Issues Releases Activity

GCS-Change config file name

Browse Source 
This is to force a new configuration to be loaded and used.
This commit is contained in:
PT_Dreamer 2012-10-08 21:26:39 +01:00
parent 80f038f579
commit 047201211b
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/src/app/main.cpp
View File

@ -252,7 +252,7 @@ int main(int argc, char **argv)
QCoreApplication::applicationDirPath()+QLatin1String(SHARE_PATH)); QCoreApplication::applicationDirPath()+QLatin1String(SHARE_PATH));
// keep this in sync with the MainWindow ctor in coreplugin/mainwindow.cpp // keep this in sync with the MainWindow ctor in coreplugin/mainwindow.cpp
QSettings settings(XmlConfig::XmlSettingsFormat, QSettings::UserScope, QSettings settings(XmlConfig::XmlSettingsFormat, QSettings::UserScope,
QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS")); QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS_config"));
overrideSettings(settings, argc, argv); overrideSettings(settings, argc, argv);
locale = settings.value("General/OverrideLanguage", locale).toString(); locale = settings.value("General/OverrideLanguage", locale).toString();

2
ground/openpilotgcs/src/libs/utils/pathutils.cpp
View File

@ -98,7 +98,7 @@ QString PathUtils::GetStoragePath()
{ {
// This routine works with "/" as the standard: // This routine works with "/" as the standard:
// Work out where the settings are stored on the machine // Work out where the settings are stored on the machine
QSettings set(XmlConfig::XmlSettingsFormat, QSettings::UserScope,QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS")); QSettings set(XmlConfig::XmlSettingsFormat, QSettings::UserScope,QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS_config"));
QFileInfo f(set.fileName()); QFileInfo f(set.fileName());
QDir dir(f.absoluteDir()); QDir dir(f.absoluteDir());

6
ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp
View File

@ -102,11 +102,11 @@ MainWindow::MainWindow() :
m_additionalContexts(m_globalContext), m_additionalContexts(m_globalContext),
// keep this in sync with main() in app/main.cpp // keep this in sync with main() in app/main.cpp
m_settings(new QSettings(XmlConfig::XmlSettingsFormat, QSettings::UserScope, m_settings(new QSettings(XmlConfig::XmlSettingsFormat, QSettings::UserScope,
QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS"), this)), QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS_config"), this)),
m_globalSettings(new QSettings(XmlConfig::XmlSettingsFormat, QSettings::SystemScope, m_globalSettings(new QSettings(XmlConfig::XmlSettingsFormat, QSettings::SystemScope,
QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS"), this)), QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS_config"), this)),
m_settingsDatabase(new SettingsDatabase(QFileInfo(m_settings->fileName()).path(), m_settingsDatabase(new SettingsDatabase(QFileInfo(m_settings->fileName()).path(),
QLatin1String("OpenPilotGCS"), QLatin1String("OpenPilotGCS_config"),
this)), this)),
m_dontSaveSettings(false), m_dontSaveSettings(false),
m_actionManager(new ActionManagerPrivate(this)), m_actionManager(new ActionManagerPrivate(this)),