From 4edf78d1cda9202edc7ac5402b292ec4e9a303d8 Mon Sep 17 00:00:00 2001 From: PT_Dreamer Date: Sat, 29 Sep 2012 22:44:52 +0100 Subject: [PATCH] GCS-No more hidden settings. --- .../plugins/coreplugin/generalsettings.cpp | 27 +------------------ .../src/plugins/coreplugin/generalsettings.h | 12 --------- 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.cpp b/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.cpp index 663f5e545..39a656de2 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.cpp +++ b/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.cpp @@ -39,7 +39,6 @@ #include #include "ui_generalsettings.h" -#include using namespace Utils; using namespace Core::Internal; @@ -113,14 +112,8 @@ void GeneralSettings::fillLanguageBox() const QWidget *GeneralSettings::createPage(QWidget *parent) { m_page = new Ui::GeneralSettings(); - globalSettingsWidget *w = new globalSettingsWidget(parent); - connect(w,SIGNAL(showHidden()),this,SLOT(showHidden())); + QWidget *w = new QWidget(parent); m_page->setupUi(w); - m_page->labelUDP->setVisible(false); - m_page->cbUseUDPMirror->setVisible(false); - m_page->labelExpert->setVisible(false); - m_page->cbExpertMode->setVisible(false); - fillLanguageBox(); connect(m_page->checkAutoConnect,SIGNAL(stateChanged(int)),this,SLOT(slotAutoConnect(int))); m_page->checkBoxSaveOnExit->setChecked(m_saveSettingsOnExit); @@ -263,21 +256,3 @@ void GeneralSettings::slotAutoConnect(int value) else m_page->checkAutoSelect->setEnabled(true); } - -void GeneralSettings::showHidden() -{ - m_page->labelUDP->setVisible(true); - m_page->cbUseUDPMirror->setVisible(true); - m_page->labelExpert->setVisible(true); - m_page->cbExpertMode->setVisible(true); -} - -globalSettingsWidget::globalSettingsWidget(QWidget *parent):QWidget(parent){} - -void globalSettingsWidget::keyPressEvent(QKeyEvent *event) -{ - if(event->key()==Qt::Key_F7) - { - emit showHidden(); - } -} diff --git a/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.h b/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.h index 8b41d9b0f..8bd498fe8 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.h +++ b/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.h @@ -69,7 +69,6 @@ private slots: void resetLanguage(); void showHelpForExternalEditor(); void slotAutoConnect(int); - void showHidden(); private: void fillLanguageBox() const; @@ -86,17 +85,6 @@ private: QList m_codecs; }; -class globalSettingsWidget:public QWidget -{ - Q_OBJECT -public: - globalSettingsWidget(QWidget * parent); -protected: - void keyPressEvent(QKeyEvent *); -signals: - void showHidden(); -}; - } // namespace Internal } // namespace Core