From 8c4806fa14ae22ebbda31385ff651a61f50c8df8 Mon Sep 17 00:00:00 2001 From: PT_Dreamer Date: Tue, 24 Jul 2012 22:32:54 +0100 Subject: [PATCH] Revert "OP-39 Start and End pages added. Placeholder text added." This reverts commit 559be15142c5d6ef425b855aeee673a181ad023f. Conflicts: ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp ground/openpilotgcs/src/plugins/setupwizard/setupwizard.h ground/openpilotgcs/src/plugins/setupwizard/setupwizard.pro ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.cpp ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h --- .../src/plugins/setupwizard/pages/endpage.cpp | 15 ---- .../src/plugins/setupwizard/pages/endpage.h | 22 ----- .../src/plugins/setupwizard/pages/endpage.ui | 80 ------------------- .../plugins/setupwizard/pages/startpage.cpp | 14 ---- .../src/plugins/setupwizard/pages/startpage.h | 22 ----- .../plugins/setupwizard/pages/startpage.ui | 56 ------------- 6 files changed, 209 deletions(-) delete mode 100644 ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.cpp delete mode 100644 ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.h delete mode 100644 ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.ui delete mode 100644 ground/openpilotgcs/src/plugins/setupwizard/pages/startpage.cpp delete mode 100644 ground/openpilotgcs/src/plugins/setupwizard/pages/startpage.h delete mode 100644 ground/openpilotgcs/src/plugins/setupwizard/pages/startpage.ui diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.cpp deleted file mode 100644 index 3270e23ff..000000000 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "endpage.h" -#include "ui_endpage.h" - -EndPage::EndPage(QWidget *parent) : - QWizardPage(parent), - ui(new Ui::EndPage) -{ - setFinalPage(true); - ui->setupUi(this); -} - -EndPage::~EndPage() -{ - delete ui; -} diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.h b/ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.h deleted file mode 100644 index e4179e677..000000000 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef ENDPAGE_H -#define ENDPAGE_H - -#include - -namespace Ui { -class EndPage; -} - -class EndPage : public QWizardPage -{ - Q_OBJECT - -public: - explicit EndPage(QWidget *parent = 0); - ~EndPage(); - -private: - Ui::EndPage *ui; -}; - -#endif // ENDPAGE_H diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.ui b/ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.ui deleted file mode 100644 index cc0a5c162..000000000 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.ui +++ /dev/null @@ -1,80 +0,0 @@ - - - EndPage - - - - 0 - 0 - 600 - 400 - - - - - 600 - 400 - - - - WizardPage - - - - - 20 - 20 - 550 - 141 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">Setup complete</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">The wizard have now gathered enough information to create a baseline configuration for your OpenPilot controller board to use with your vehicle.</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">You now have two choices:</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">- Upload configuration directly to the currently connected OpenPilot controller board.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">- Save the configuration to a file for later uploading using the configuration import plugin in GCS.</span></p></body></html> - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - 420 - 290 - 125 - 23 - - - - Save configuration... - - - - - - 420 - 340 - 125 - 23 - - - - Uppload configuration - - - - - - diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/startpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/startpage.cpp deleted file mode 100644 index f36631bb0..000000000 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/startpage.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "startpage.h" -#include "ui_startpage.h" - -StartPage::StartPage(QWidget *parent) : - QWizardPage(parent), - ui(new Ui::StartPage) -{ - ui->setupUi(this); -} - -StartPage::~StartPage() -{ - delete ui; -} diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/startpage.h b/ground/openpilotgcs/src/plugins/setupwizard/pages/startpage.h deleted file mode 100644 index f6cf9b6cd..000000000 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/startpage.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef STARTPAGE_H -#define STARTPAGE_H - -#include - -namespace Ui { -class StartPage; -} - -class StartPage : public QWizardPage -{ - Q_OBJECT - -public: - explicit StartPage(QWidget *parent = 0); - ~StartPage(); - -private: - Ui::StartPage *ui; -}; - -#endif // STARTPAGE_H diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/startpage.ui b/ground/openpilotgcs/src/plugins/setupwizard/pages/startpage.ui deleted file mode 100644 index 0f656f35c..000000000 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/startpage.ui +++ /dev/null @@ -1,56 +0,0 @@ - - - StartPage - - - - 0 - 0 - 640 - 400 - - - - - 640 - 400 - - - - WizardPage - - - - - 20 - 20 - 550 - 350 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">Welcome to the OpenPilot Setup Wizard</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">This wizard will guide you through the basic steps of setting up your OpenPilot controller board. The following pages contains simple questions about your vehicle and its characteristics. </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">From the information </span><span style=" font-size:10pt;">gathered</span><span style=" font-size:10pt;"> the wizard will create a baseline configuration that should be good enough for you to get a quick start using your OpenPilot product.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">The baseline configuration can, if desired, be uploaded to the OpenPilot Controller board at the end of this wizard.</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">This wizard does not contain the full range of settings available in the GCS Config plugin. All configuration parameters can be changed at later by using the GCS Config plugin.</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Ok, lets start the configuration by clicking on the 'Next' button below.</span></p></body></html> - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - -