From b6326b855d4245e28db80d36add103bb3153bf0f Mon Sep 17 00:00:00 2001
From: elafargue <edouard@lafargue.name>
Date: Tue, 7 Jun 2011 07:01:58 +0200
Subject: [PATCH] OP-369 Implement help button and keyboard shortcuts as
 requested.

---
 .../src/plugins/importexport/importexportplugin.cpp  |  2 +-
 .../uavsettingsimportexport/importsummary.cpp        | 12 ++++++++++++
 .../plugins/uavsettingsimportexport/importsummary.h  |  3 +++
 .../uavsettingsimportexport/importsummarydialog.ui   |  2 +-
 .../uavsettingsimportexport.cpp                      |  1 +
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/importexport/importexportplugin.cpp b/ground/openpilotgcs/src/plugins/importexport/importexportplugin.cpp
index 32f783593..d7fa31a54 100644
--- a/ground/openpilotgcs/src/plugins/importexport/importexportplugin.cpp
+++ b/ground/openpilotgcs/src/plugins/importexport/importexportplugin.cpp
@@ -63,7 +63,7 @@ bool ImportExportPlugin::initialize(const QStringList& args, QString *errMsg)
                                             "ImportExportPlugin.ImportExport",
                                             QList<int>() <<
                                             Core::Constants::C_GLOBAL_ID);
-    cmd->setDefaultKeySequence(QKeySequence("Ctrl+I"));
+    cmd->setDefaultKeySequence(QKeySequence("Ctrl+S"));
     cmd->action()->setText(tr("GCS Settings Import/Export..."));
 
 //    ac->menu()->addSeparator();
diff --git a/ground/openpilotgcs/src/plugins/uavsettingsimportexport/importsummary.cpp b/ground/openpilotgcs/src/plugins/uavsettingsimportexport/importsummary.cpp
index bc80afcf3..a7bf6f367 100644
--- a/ground/openpilotgcs/src/plugins/uavsettingsimportexport/importsummary.cpp
+++ b/ground/openpilotgcs/src/plugins/uavsettingsimportexport/importsummary.cpp
@@ -44,6 +44,10 @@ ImportSummaryDialog::ImportSummaryDialog( QWidget *parent) :
 
    connect( ui->closeButton, SIGNAL(clicked()), this, SLOT(close()));
    connect(ui->saveToFlash, SIGNAL(clicked()), this, SLOT(doTheSaving()));
+
+   // Connect the help button
+   connect(ui->helpButton, SIGNAL(clicked()), this, SLOT(openHelp()));
+
 }
 
 ImportSummaryDialog::~ImportSummaryDialog()
@@ -51,6 +55,14 @@ ImportSummaryDialog::~ImportSummaryDialog()
     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
   (whether it got saved OK or not)
diff --git a/ground/openpilotgcs/src/plugins/uavsettingsimportexport/importsummary.h b/ground/openpilotgcs/src/plugins/uavsettingsimportexport/importsummary.h
index 11a9de00c..ab88eb835 100644
--- a/ground/openpilotgcs/src/plugins/uavsettingsimportexport/importsummary.h
+++ b/ground/openpilotgcs/src/plugins/uavsettingsimportexport/importsummary.h
@@ -29,6 +29,8 @@
 
 #include <QDialog>
 #include <QCheckBox>
+#include <QDesktopServices>
+#include <QUrl>
 #include "ui_importsummarydialog.h"
 #include "uavdataobject.h"
 #include "uavobjectmanager.h"
@@ -62,6 +64,7 @@ public slots:
 
 private slots:
     void doTheSaving();
+    void openHelp();
 
 };
 
diff --git a/ground/openpilotgcs/src/plugins/uavsettingsimportexport/importsummarydialog.ui b/ground/openpilotgcs/src/plugins/uavsettingsimportexport/importsummarydialog.ui
index 19f8c27c9..7c7212eb0 100644
--- a/ground/openpilotgcs/src/plugins/uavsettingsimportexport/importsummarydialog.ui
+++ b/ground/openpilotgcs/src/plugins/uavsettingsimportexport/importsummarydialog.ui
@@ -69,7 +69,7 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="pushButton_3">
+      <widget class="QPushButton" name="helpButton">
        <property name="maximumSize">
         <size>
          <width>32</width>
diff --git a/ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.cpp b/ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.cpp
index 2f172e521..a53291d2c 100644
--- a/ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.cpp
+++ b/ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.cpp
@@ -88,6 +88,7 @@ bool UAVSettingsImportExportPlugin::initialize(const QStringList& args, QString
                              "UAVSettingsImportExportPlugin.UAVSettingsImport",
                              QList<int>() <<
                              Core::Constants::C_GLOBAL_ID);
+    cmd->setDefaultKeySequence(QKeySequence("Ctrl+I"));
     cmd->action()->setText(tr("Import UAV Settings..."));
     ac->addAction(cmd, Core::Constants::G_FILE_SAVE);
     connect(cmd->action(), SIGNAL(triggered(bool)), this, SLOT(importUAVSettings()));