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

Merge remote-tracking branch 'origin/thread/OP-864_Remove_Configuration_Prompt' into filnet/OP-857_various_gcs_ui_polishing

Browse Source
This commit is contained in:
Philippe Renon 2013-03-19 04:34:32 +01:00
commit 936f851166
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,6 +91,7 @@ using namespace Core;
using namespace Core::Internal; using namespace Core::Internal;
static const char *uriListMimeFormatC = "text/uri-list"; static const char *uriListMimeFormatC = "text/uri-list";
static const char *DEFAULT_CONFIG_FILENAME = "OpenPilotGCS.xml";
enum { debugMainWindow = 0 }; enum { debugMainWindow = 0 };
@ -267,7 +268,6 @@ void MainWindow::modeChanged(Core::IMode */*mode*/)
void MainWindow::extensionsInitialized() void MainWindow::extensionsInitialized()
{ {
QSettings *qs = m_settings; QSettings *qs = m_settings;
QSettings *settings;
QString commandLine; QString commandLine;
if ( ! qs->allKeys().count() ) { if ( ! qs->allKeys().count() ) {
foreach(QString str, qApp->arguments()) { foreach(QString str, qApp->arguments()) {
@ -288,27 +288,29 @@ void MainWindow::extensionsInitialized()
#endif #endif
directory.cd("default_configurations"); directory.cd("default_configurations");
qDebug() << "Looking for default config files in: " + directory.absolutePath(); qDebug() << "Looking for configuration files in:" << directory.absolutePath();
bool showDialog = true;
QString filename; QString filename;
if(!commandLine.isEmpty()) { if(!commandLine.isEmpty() && QFile::exists(directory.absolutePath() + QDir::separator() + commandLine)) {
if(QFile::exists(directory.absolutePath() + QDir::separator()+commandLine)) { filename = directory.absolutePath() + QDir::separator() + commandLine;
filename = directory.absolutePath() + QDir::separator()+commandLine; qDebug() << "Configuration file" << filename << "specified on command line will be loaded.";
qDebug() << "Load configuration from command line";
settings = new QSettings(filename, XmlConfig::XmlSettingsFormat);
showDialog = false;
}
} }
if(showDialog) { else if(QFile::exists(directory.absolutePath() + QDir::separator() + DEFAULT_CONFIG_FILENAME)) {
filename = directory.absolutePath() + QDir::separator() + DEFAULT_CONFIG_FILENAME;
qDebug() << "Default configuration file" << filename << "will be loaded.";
}
else {
qDebug() << "Default configuration file " << directory.absolutePath() << QDir::separator() << DEFAULT_CONFIG_FILENAME << "was not found.";
importSettings *dialog = new importSettings(this); importSettings *dialog = new importSettings(this);
dialog->loadFiles(directory.absolutePath()); dialog->loadFiles(directory.absolutePath());
dialog->exec(); dialog->exec();
filename = dialog->choosenConfig(); filename = dialog->choosenConfig();
settings = new QSettings(filename, XmlConfig::XmlSettingsFormat);
delete dialog; delete dialog;
qDebug() << "Configuration file" << filename << "was selected and will be loaded.";
} }
qs = settings;
qDebug() << "Load default config from resource " << filename; qs = new QSettings(filename, XmlConfig::XmlSettingsFormat);
qDebug() << "Configuration file" << filename << "was loaded.";
} }
qs->beginGroup("General"); qs->beginGroup("General");