diff --git a/wfmain.cpp b/wfmain.cpp index 787a6d1..aba6be4 100644 --- a/wfmain.cpp +++ b/wfmain.cpp @@ -1527,12 +1527,12 @@ void wfmain::setSerialDevicesUI() int vspCount=0; #ifdef Q_OS_WIN - ui->vspCombo->addItem(QString("None"), i++); // i=0 when this is run + vspList.append(QString("None")); // i=0 when this is run + vspData.append(vspCount); foreach(const QSerialPortInfo & serialPortInfo, QSerialPortInfo::availablePorts()) { - ui->vspCombo->addItem(serialPortInfo.portName()); - vspList.append(serialPortInfo.portName(), vspCount); + vspList.append(serialPortInfo.portName()); vspData.append(vspCount); vspCount++; } diff --git a/wfmain.ui b/wfmain.ui index c724112..759464e 100644 --- a/wfmain.ui +++ b/wfmain.ui @@ -18,7 +18,7 @@ - 1 + 0 @@ -2189,8 +2189,8 @@ 0 0 - 818 - 324 + 453 + 235 @@ -4171,7 +4171,6 @@ - 50 false @@ -4191,13 +4190,19 @@ 0 0 1042 - 21 + 20 + + QLedLabel + QWidget +
qledlabel.h
+ 1 +
QCustomPlot 1 @@ -4208,12 +4213,6 @@
meter.h
1
- - QLedLabel - QWidget -
qledlabel.h
- 1 -