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.

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 2e39bb8134099a1d1691baddd4428aa188fb8e97..50f7d9124a9f4dac6184c4cf42ea14f38e89d35a 100644 (file)
--- 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 42d8d83fff1e30c827cb2bc684382445ff6e043e..c44b10740ec97d9f4e631b4acfd23ad7b27f6970 100644 (file)
--- 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<int>(api));
-}
-
-trace::API SettingsDialog::getAPI(void)
-{
-    return static_cast<trace::API>(apiComboBox->currentIndex());
-
-}
-
 #include "settingsdialog.moc"

diff --git a/gui/settingsdialog.h b/gui/settingsdialog.h
index 768398220a60282ed185619f2a573b23f0ea5b71..b676b9df643c1376a6873c5e263d83f6a68dcfdc 100644 (file)
--- 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 dac4bc25f9cdeab746db2ea2a8e6b13f7efb214b..1d2da3e9c4dace78a2aaee5cd49d7b4e5b90bc14 100644 (file)
--- a/gui/ui/settings.ui
+++ b/gui/ui/settings.ui
@@ -17,34 +17,6 @@
    <string>QApiTrace Settings</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QGroupBox" name="apiGroupBox">
-     <property name="title">
-      <string>API</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_4">
-      <item>
-       <widget class="QComboBox" name="apiComboBox">
-        <item>
-         <property name="text">
-          <string>Unknown</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>GL</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>EGL</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="sizePolicy">