rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-10 18:24:11 +01:00
Code Issues Releases Activity

Merge branch 'master' into bugfix-ground

Browse Source
This commit is contained in:
elafargue 2011-06-07 14:59:43 +02:00
commit 81b29c2b51
5 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/src/plugins/importexport/importexportplugin.cpp
View File

@ -63,7 +63,7 @@ bool ImportExportPlugin::initialize(const QStringList& args, QString *errMsg)
"ImportExportPlugin.ImportExport", "ImportExportPlugin.ImportExport",
QList<int>() << QList<int>() <<
Core::Constants::C_GLOBAL_ID); Core::Constants::C_GLOBAL_ID);
cmd->setDefaultKeySequence(QKeySequence("Ctrl+I")); cmd->setDefaultKeySequence(QKeySequence("Ctrl+S"));
cmd->action()->setText(tr("GCS Settings Import/Export...")); cmd->action()->setText(tr("GCS Settings Import/Export..."));
// ac->menu()->addSeparator(); // ac->menu()->addSeparator();

12
ground/openpilotgcs/src/plugins/uavsettingsimportexport/importsummary.cpp
View File

@ -44,6 +44,10 @@ ImportSummaryDialog::ImportSummaryDialog( QWidget *parent) :
connect( ui->closeButton, SIGNAL(clicked()), this, SLOT(close())); connect( ui->closeButton, SIGNAL(clicked()), this, SLOT(close()));
connect(ui->saveToFlash, SIGNAL(clicked()), this, SLOT(doTheSaving())); connect(ui->saveToFlash, SIGNAL(clicked()), this, SLOT(doTheSaving()));
// Connect the help button
connect(ui->helpButton, SIGNAL(clicked()), this, SLOT(openHelp()));
} }
ImportSummaryDialog::~ImportSummaryDialog() ImportSummaryDialog::~ImportSummaryDialog()
@ -51,6 +55,14 @@ ImportSummaryDialog::~ImportSummaryDialog()
delete ui; delete ui;
} }
/*
Open the right page on the wiki
*/
void ImportSummaryDialog::openHelp()
{
QDesktopServices::openUrl( QUrl("http://wiki.openpilot.org/display/Doc/UAV+Settings+import-export", QUrl::StrictMode) );
}
/* /*
Adds a new line about a UAVObject along with its status Adds a new line about a UAVObject along with its status
(whether it got saved OK or not) (whether it got saved OK or not)

3
ground/openpilotgcs/src/plugins/uavsettingsimportexport/importsummary.h
View File

@ -29,6 +29,8 @@
#include <QDialog> #include <QDialog>
#include <QCheckBox> #include <QCheckBox>
#include <QDesktopServices>
#include <QUrl>
#include "ui_importsummarydialog.h" #include "ui_importsummarydialog.h"
#include "uavdataobject.h" #include "uavdataobject.h"
#include "uavobjectmanager.h" #include "uavobjectmanager.h"
@ -62,6 +64,7 @@ public slots:
private slots: private slots:
void doTheSaving(); void doTheSaving();
void openHelp();
}; };

2
ground/openpilotgcs/src/plugins/uavsettingsimportexport/importsummarydialog.ui
View File

@ -69,7 +69,7 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="pushButton_3"> <widget class="QPushButton" name="helpButton">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>32</width> <width>32</width>

1
ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.cpp
View File

@ -88,6 +88,7 @@ bool UAVSettingsImportExportPlugin::initialize(const QStringList& args, QString
"UAVSettingsImportExportPlugin.UAVSettingsImport", "UAVSettingsImportExportPlugin.UAVSettingsImport",
QList<int>() << QList<int>() <<
Core::Constants::C_GLOBAL_ID); Core::Constants::C_GLOBAL_ID);
cmd->setDefaultKeySequence(QKeySequence("Ctrl+I"));
cmd->action()->setText(tr("Import UAV Settings...")); cmd->action()->setText(tr("Import UAV Settings..."));
ac->addAction(cmd, Core::Constants::G_FILE_SAVE); ac->addAction(cmd, Core::Constants::G_FILE_SAVE);
connect(cmd->action(), SIGNAL(triggered(bool)), this, SLOT(importUAVSettings())); connect(cmd->action(), SIGNAL(triggered(bool)), this, SLOT(importUAVSettings()));