From b9eacad936c7457a4b96998e185bf360625dd9f5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Mon, 23 Apr 2012 12:11:19 +0100 Subject: [PATCH] Remove the API combo box from the UI settings window. The items were outdated, and the API is correctly guessed all the time, so it serves no purpose. --- gui/mainwindow.cpp | 3 --- gui/settingsdialog.cpp | 11 ----------- gui/settingsdialog.h | 2 -- gui/ui/settings.ui | 28 ---------------------------- 4 files changed, 44 deletions(-) diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 2e39bb8..50f7d91 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -625,12 +625,9 @@ void MainWindow::fillStateForFrame() void MainWindow::showSettings() { SettingsDialog dialog; - dialog.setAPI(m_api); dialog.setFilterModel(m_proxyModel); dialog.exec(); - - m_api = dialog.getAPI(); } void MainWindow::openHelp(const QUrl &url) diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp index 42d8d83..c44b107 100644 --- a/gui/settingsdialog.cpp +++ b/gui/settingsdialog.cpp @@ -145,15 +145,4 @@ void SettingsDialog::setFilterModel(ApiTraceFilter *filter) filtersFromModel(m_filter); } -void SettingsDialog::setAPI(trace::API api) -{ - apiComboBox->setCurrentIndex(static_cast(api)); -} - -trace::API SettingsDialog::getAPI(void) -{ - return static_cast(apiComboBox->currentIndex()); - -} - #include "settingsdialog.moc" diff --git a/gui/settingsdialog.h b/gui/settingsdialog.h index 7683982..b676b9d 100644 --- a/gui/settingsdialog.h +++ b/gui/settingsdialog.h @@ -16,8 +16,6 @@ public: void accept(); void setFilterModel(ApiTraceFilter *filter); - void setAPI(trace::API api); - trace::API getAPI(void); private slots: void changeRegexp(const QString &name); void regexpChanged(const QString &pattern); diff --git a/gui/ui/settings.ui b/gui/ui/settings.ui index dac4bc2..1d2da3e 100644 --- a/gui/ui/settings.ui +++ b/gui/ui/settings.ui @@ -17,34 +17,6 @@ QApiTrace Settings - - - - API - - - - - - - Unknown - - - - - GL - - - - - EGL - - - - - - - -- 2.43.0