From 07aba7a18f0dac08754730a0ae94a10b4df76200 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sun, 31 Jul 2016 14:45:36 -0700 Subject: [PATCH] Remove old SettingsDialog --- qgroundcontrol.pro | 3 --- src/ui/MainWindow.cc | 13 +-------- src/ui/MainWindow.h | 4 --- src/ui/MainWindow.ui | 12 --------- src/ui/SettingsDialog.cc | 57 ---------------------------------------- src/ui/SettingsDialog.h | 37 -------------------------- src/ui/SettingsDialog.ui | 43 ------------------------------ 7 files changed, 1 insertion(+), 168 deletions(-) delete mode 100644 src/ui/SettingsDialog.cc delete mode 100644 src/ui/SettingsDialog.h delete mode 100644 src/ui/SettingsDialog.ui diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index c7329a791..d213b17bf 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -238,7 +238,6 @@ FORMS += \ src/ui/QGCTabbedInfoView.ui \ src/ui/QGCUASFileView.ui \ src/ui/QGCUASFileViewMulti.ui \ - src/ui/SettingsDialog.ui \ src/ui/uas/UASQuickView.ui \ src/ui/uas/UASQuickViewItemSelect.ui \ src/ui/UASInfo.ui \ @@ -363,7 +362,6 @@ HEADERS += \ src/ui/MultiVehicleDockWidget.h \ src/ui/QGCMAVLinkLogPlayer.h \ src/ui/QGCMapRCToParamDialog.h \ - src/ui/SettingsDialog.h \ src/ui/uas/UASMessageView.h \ src/ui/uas/QGCUnconnectedInfoWidget.h \ src/ui/QGCDataPlot2D.h \ @@ -490,7 +488,6 @@ SOURCES += \ src/ui/uas/UASMessageView.cc \ src/uas/FileManager.cc \ src/ui/uas/QGCUnconnectedInfoWidget.cc \ - src/ui/SettingsDialog.cc \ src/ui/MAVLinkDecoder.cc \ src/ui/MAVLinkSettingsWidget.cc \ src/ui/QGCMapRCToParamDialog.cpp \ diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index 596142a32..c2c9f0155 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -25,6 +25,7 @@ #include #include #include +#include #include "QGC.h" #include "MAVLinkProtocol.h" @@ -42,7 +43,6 @@ #include "QGCImageProvider.h" #ifndef __mobile__ -#include "SettingsDialog.h" #include "QGCDataPlot2D.h" #include "Linecharts.h" #include "QGCUASFileViewMulti.h" @@ -489,9 +489,6 @@ void MainWindow::connectCommonActions() connect(qgcApp()->toolbox()->audioOutput(), &GAudioOutput::mutedChanged, _ui.actionMuteAudioOutput, &QAction::setChecked); connect(_ui.actionMuteAudioOutput, &QAction::triggered, qgcApp()->toolbox()->audioOutput(), &GAudioOutput::mute); - // Application Settings - connect(_ui.actionSettings, &QAction::triggered, this, &MainWindow::showSettings); - // Connect internal actions connect(qgcApp()->toolbox()->multiVehicleManager(), &MultiVehicleManager::vehicleAdded, this, &MainWindow::_vehicleAdded); } @@ -503,14 +500,6 @@ void MainWindow::_openUrl(const QString& url, const QString& errorMessage) } } -#ifndef __mobile__ -void MainWindow::showSettings() -{ - SettingsDialog settings(this); - settings.exec(); -} -#endif - void MainWindow::_vehicleAdded(Vehicle* vehicle) { connect(vehicle->uas(), &UAS::valueChanged, this, &MainWindow::valueChanged); diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h index 9d2dd0738..3f7c31d38 100644 --- a/src/ui/MainWindow.h +++ b/src/ui/MainWindow.h @@ -89,10 +89,6 @@ public: QObject* rootQmlObject(void); public slots: -#ifndef __mobile__ - void showSettings(); -#endif - /** @brief Save power by reducing update rates */ void enableLowPowerMode(bool enabled) { _lowPowerMode = enabled; } diff --git a/src/ui/MainWindow.ui b/src/ui/MainWindow.ui index 4f1730f6a..4d6bb7f53 100644 --- a/src/ui/MainWindow.ui +++ b/src/ui/MainWindow.ui @@ -61,7 +61,6 @@ - @@ -95,17 +94,6 @@ Mute Audio Output - - - Settings - - - Application settings - - - QAction::PreferencesRole - - true diff --git a/src/ui/SettingsDialog.cc b/src/ui/SettingsDialog.cc deleted file mode 100644 index 4ce0df1b2..000000000 --- a/src/ui/SettingsDialog.cc +++ /dev/null @@ -1,57 +0,0 @@ -/**************************************************************************** - * - * (c) 2009-2016 QGROUNDCONTROL PROJECT - * - * QGroundControl is licensed according to the terms in the file - * COPYING.md in the root of the source code directory. - * - ****************************************************************************/ - - -#include -#include - -#include "SettingsDialog.h" -#include "MainWindow.h" -#include "ui_SettingsDialog.h" - -#include "LinkManager.h" -#include "MAVLinkProtocol.h" -#include "MAVLinkSettingsWidget.h" -#include "GAudioOutput.h" -#include "QGCApplication.h" -#include "QGCFileDialog.h" -#include "QGCMessageBox.h" -#include "MainToolBarController.h" -#include "FlightMapSettings.h" - -SettingsDialog::SettingsDialog(QWidget *parent, Qt::WindowFlags flags) - : QDialog(parent, flags) - , _ui(new Ui::SettingsDialog) -{ - _ui->setupUi(this); - - // Center the window on the screen. - QDesktopWidget *desktop = QApplication::desktop(); - int screen = desktop->screenNumber(parent); - - QRect position = frameGeometry(); - position.moveCenter(QApplication::desktop()->availableGeometry(screen).center()); - move(position.topLeft()); - - MAVLinkSettingsWidget* pMavsettings = new MAVLinkSettingsWidget(qgcApp()->toolbox()->mavlinkProtocol(), this); - - // Add the MAVLink settings pane - _ui->tabWidget->addTab(pMavsettings, "MAVLink"); - - this->window()->setWindowTitle(tr("QGroundControl Settings")); - - _ui->tabWidget->setCurrentWidget(pMavsettings); - - connect(_ui->buttonBox, &QDialogButtonBox::accepted, this, &SettingsDialog::accept); -} - -SettingsDialog::~SettingsDialog() -{ - delete _ui; -} diff --git a/src/ui/SettingsDialog.h b/src/ui/SettingsDialog.h deleted file mode 100644 index 3c12cc141..000000000 --- a/src/ui/SettingsDialog.h +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** - * - * (c) 2009-2016 QGROUNDCONTROL PROJECT - * - * QGroundControl is licensed according to the terms in the file - * COPYING.md in the root of the source code directory. - * - ****************************************************************************/ - - -#ifndef SETTINGSDIALOG_H -#define SETTINGSDIALOG_H - -#include - -#include "MainWindow.h" -#include "GAudioOutput.h" -#include "FlightMapSettings.h" - -namespace Ui -{ - class SettingsDialog; -} - -class SettingsDialog : public QDialog -{ - Q_OBJECT - -public: - SettingsDialog(QWidget *parent = 0, Qt::WindowFlags flags = Qt::Sheet); - ~SettingsDialog(); - -private: - Ui::SettingsDialog* _ui; -}; - -#endif diff --git a/src/ui/SettingsDialog.ui b/src/ui/SettingsDialog.ui deleted file mode 100644 index a2169229b..000000000 --- a/src/ui/SettingsDialog.ui +++ /dev/null @@ -1,43 +0,0 @@ - - - SettingsDialog - - - - 0 - 0 - 500 - 689 - - - - - 0 - 0 - - - - Dialog - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Ok - - - false - - - - - - - - -- 2.22.0