From e2e4513647975cfaadcc08178e6dbe2e31cdbe6c Mon Sep 17 00:00:00 2001
From: Sean Rhea <sean.c.rhea@gmail.com>
Date: Sun, 9 Aug 2009 15:04:17 -0700
Subject: [PATCH] add combobox to select device type

---
 src/DownloadRideDialog.cpp | 12 +++++++++++-
 src/DownloadRideDialog.h   |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/DownloadRideDialog.cpp b/src/DownloadRideDialog.cpp
index 404fccc6b..88475498b 100644
--- a/src/DownloadRideDialog.cpp
+++ b/src/DownloadRideDialog.cpp
@@ -25,6 +25,7 @@
 #include <errno.h>
 #include <QtGui>
 #include <boost/bind.hpp>
+#include <boost/foreach.hpp>
 
 DownloadRideDialog::DownloadRideDialog(MainWindow *mainWindow,
                                        const QDir &home) : 
@@ -42,6 +43,13 @@ DownloadRideDialog::DownloadRideDialog(MainWindow *mainWindow,
     label = new QLabel(this);
     label->setIndent(10);
 
+    deviceCombo = new QComboBox();
+    QList<QString> deviceTypes = Device::deviceTypes();
+    assert(deviceTypes.size() > 0);
+    BOOST_FOREACH(QString device, deviceTypes) {
+        deviceCombo->addItem(device);
+    }
+
     downloadButton = new QPushButton(tr("&Download"), this);
     rescanButton = new QPushButton(tr("&Rescan"), this);
     cancelButton = new QPushButton(tr("&Cancel"), this);
@@ -62,6 +70,8 @@ DownloadRideDialog::DownloadRideDialog(MainWindow *mainWindow,
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
     mainLayout->addWidget(availLabel);
     mainLayout->addWidget(listWidget);
+    mainLayout->addWidget(new QLabel(tr("Select device type:"), this));
+    mainLayout->addWidget(deviceCombo);
     mainLayout->addWidget(instructLabel);
     mainLayout->addWidget(label);
     mainLayout->addLayout(buttonLayout);
@@ -139,7 +149,7 @@ DownloadRideDialog::downloadClicked()
     assert(dev);
     QString err;
     QString tmpname, filename;
-    Device &device = Device::device("PowerTap");
+    Device &device = Device::device(deviceCombo->currentText());
     if (!device.download(
             dev, home, tmpname, filename,
             boost::bind(&DownloadRideDialog::statusCallback, this, _1), err))
diff --git a/src/DownloadRideDialog.h b/src/DownloadRideDialog.h
index ff891bf17..8684b23f1 100644
--- a/src/DownloadRideDialog.h
+++ b/src/DownloadRideDialog.h
@@ -46,6 +46,7 @@ class DownloadRideDialog : public QDialog
         QDir home;
         QListWidget *listWidget;
         QPushButton *downloadButton, *rescanButton, *cancelButton;
+        QComboBox *deviceCombo;
         QLabel *label;
 
         QVector<CommPortPtr> devList;