From 9649798bb17fb69fa1fdae488f72b4fedcedfaca Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Tue, 18 Nov 2014 18:13:50 -0800 Subject: [PATCH] Remove support for user style file --- src/ui/QGCSettingsWidget.cc | 107 +----------------------------------- src/ui/QGCSettingsWidget.h | 3 - src/ui/QGCSettingsWidget.ui | 40 -------------- 3 files changed, 1 insertion(+), 149 deletions(-) diff --git a/src/ui/QGCSettingsWidget.cc b/src/ui/QGCSettingsWidget.cc index 2c9e775fe..1ddef28ac 100644 --- a/src/ui/QGCSettingsWidget.cc +++ b/src/ui/QGCSettingsWidget.cc @@ -72,20 +72,9 @@ QGCSettingsWidget::QGCSettingsWidget(JoystickInput *joystick, QWidget *parent, Q // Intialize the style UI to the proper values obtained from the MainWindow. MainWindow::QGC_MAINWINDOW_STYLE style = mainWindow->getStyle(); ui->styleChooser->setCurrentIndex(style); - if (style == MainWindow::QGC_MAINWINDOW_STYLE_DARK) - { - ui->styleSheetFile->setText(mainWindow->getDarkStyleSheet()); - } - else - { - ui->styleSheetFile->setText(mainWindow->getLightStyleSheet()); - } // And then connect all the signals for the UI for changing styles. connect(ui->styleChooser, SIGNAL(currentIndexChanged(int)), this, SLOT(styleChanged(int))); - connect(ui->styleCustomButton, SIGNAL(clicked()), this, SLOT(selectStylesheet())); - connect(ui->styleDefaultButton, SIGNAL(clicked()), this, SLOT(setDefaultStyle())); - connect(ui->styleSheetFile, SIGNAL(editingFinished()), this, SLOT(lineEditFinished())); // Close / destroy connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(deleteLater())); @@ -96,103 +85,9 @@ QGCSettingsWidget::~QGCSettingsWidget() delete ui; } -void QGCSettingsWidget::selectStylesheet() -{ - // Let user select style sheet. The root directory for the file picker is the user's home directory if they haven't loaded a custom style. - // Otherwise it defaults to the directory of that custom file. - QString findDir; - QString oldStylesheet(ui->styleSheetFile->text()); - QFile styleSheet(oldStylesheet); - if (styleSheet.exists() && oldStylesheet[0] != ':') - { - findDir = styleSheet.fileName(); - } - else - { - findDir = QDir::homePath(); - } - - // Prompt the user to select a new style sheet. Do nothing if they cancel. - QString newStyleFileName = QFileDialog::getOpenFileName(this, tr("Specify stylesheet"), findDir, tr("CSS Stylesheet (*.css);;")); - if (newStyleFileName.isNull()) { - return; - } - - // Load the new style sheet if a valid one was selected, notifying the user - // of an error if necessary. - QFile newStyleFile(newStyleFileName); - if (!newStyleFile.exists() || !updateStyle(newStyleFileName)) - { - QMessageBox msgBox; - msgBox.setIcon(QMessageBox::Information); - msgBox.setText(tr("QGroundControl did not load a new style")); - msgBox.setInformativeText(tr("Stylesheet file %1 was not readable").arg(newStyleFileName)); - msgBox.setStandardButtons(QMessageBox::Ok); - msgBox.setDefaultButton(QMessageBox::Ok); - msgBox.exec(); - } - // And update the UI as needed. - else - { - ui->styleSheetFile->setText(newStyleFileName); - } -} - -bool QGCSettingsWidget::updateStyle(QString style) -{ - switch (ui->styleChooser->currentIndex()) - { - case 0: - return mainWindow->loadStyle(MainWindow::QGC_MAINWINDOW_STYLE_DARK, style); - case 1: - return mainWindow->loadStyle(MainWindow::QGC_MAINWINDOW_STYLE_LIGHT, style); - default: - return false; - } -} - -void QGCSettingsWidget::lineEditFinished() -{ - QString newStyleFileName(ui->styleSheetFile->text()); - QFile newStyleFile(newStyleFileName); - if (!newStyleFile.exists() || !updateStyle(newStyleFileName)) - { - QMessageBox msgBox; - msgBox.setIcon(QMessageBox::Information); - msgBox.setText(tr("QGroundControl did not load a new style")); - msgBox.setInformativeText(tr("Stylesheet file %1 was not readable").arg(newStyleFileName)); - msgBox.setStandardButtons(QMessageBox::Ok); - msgBox.setDefaultButton(QMessageBox::Ok); - msgBox.exec(); - } -} - void QGCSettingsWidget::styleChanged(int index) { - if (index == 1) - { - ui->styleSheetFile->setText(mainWindow->getLightStyleSheet()); - mainWindow->loadStyle(MainWindow::QGC_MAINWINDOW_STYLE_LIGHT, mainWindow->getLightStyleSheet()); - } - else - { - ui->styleSheetFile->setText(mainWindow->getDarkStyleSheet()); - mainWindow->loadStyle(MainWindow::QGC_MAINWINDOW_STYLE_DARK, mainWindow->getDarkStyleSheet()); - } -} - -void QGCSettingsWidget::setDefaultStyle() -{ - if (ui->styleChooser->currentIndex() == 1) - { - ui->styleSheetFile->setText(MainWindow::defaultLightStyle); - mainWindow->loadStyle(MainWindow::QGC_MAINWINDOW_STYLE_LIGHT, MainWindow::defaultLightStyle); - } - else - { - ui->styleSheetFile->setText(MainWindow::defaultDarkStyle); - mainWindow->loadStyle(MainWindow::QGC_MAINWINDOW_STYLE_DARK, MainWindow::defaultDarkStyle); - } + mainWindow->loadStyle((index == 1) ? MainWindow::QGC_MAINWINDOW_STYLE_LIGHT : MainWindow::QGC_MAINWINDOW_STYLE_DARK); } void QGCSettingsWidget::selectCustomMode(int mode) diff --git a/src/ui/QGCSettingsWidget.h b/src/ui/QGCSettingsWidget.h index aca37c75e..5c2f4675d 100644 --- a/src/ui/QGCSettingsWidget.h +++ b/src/ui/QGCSettingsWidget.h @@ -19,9 +19,6 @@ public: public slots: void styleChanged(int index); - void lineEditFinished(); - void setDefaultStyle(); - void selectStylesheet(); void selectCustomMode(int mode); private slots: diff --git a/src/ui/QGCSettingsWidget.ui b/src/ui/QGCSettingsWidget.ui index 768d04232..c3e13c2c8 100644 --- a/src/ui/QGCSettingsWidget.ui +++ b/src/ui/QGCSettingsWidget.ui @@ -108,46 +108,6 @@ - - - - - - - 0 - 0 - - - - Stylesheet: - - - - - - - - - - Custom - - - false - - - - - - - Default - - - false - - - - - -- 2.22.0