# HG changeset patch # User Hasan Yavuz Ă–ZDERYA # Date 2015-09-05 04:04:53 # Node ID f06b564648896e182ab356796b48e8255090360d # Parent 1d9b6c31956c909ee078402e1710ea1cd8ba49cf added "Port:" label to toolbar diff --git a/portcontrol.cpp b/portcontrol.cpp --- a/portcontrol.cpp +++ b/portcontrol.cpp @@ -22,6 +22,7 @@ #include #include +#include #include #include "utils.h" @@ -41,11 +42,13 @@ PortControl::PortControl(QSerialPort* po openAction.setToolTip("Open Port (F2)"); QObject::connect(&openAction, &QAction::triggered, this, &PortControl::openActionTriggered); + + portToolBar.addWidget(new QLabel("Port:")); + portToolBar.addWidget(&tbPortList); portToolBar.addAction(&openAction); - portToolBar.addWidget(&tbPortList); + // setup port selection widgets tbPortList.setModel(&portList); - ui->cbPortList->setModel(&portList); QObject::connect(ui->cbPortList, SELECT::OVERLOAD_OF(&QComboBox::activated), @@ -53,6 +56,9 @@ PortControl::PortControl(QSerialPort* po QObject::connect(&tbPortList, SELECT::OVERLOAD_OF(&QComboBox::activated), this, &PortControl::onTbPortListActivated); + QObject::connect(ui->cbPortList, + SELECT::OVERLOAD_OF(&QComboBox::activated), + this, &PortControl::selectPort); // setup buttons QObject::connect(ui->pbReloadPorts, &QPushButton::clicked, @@ -60,12 +66,7 @@ PortControl::PortControl(QSerialPort* po ui->pbOpenPort->setDefaultAction(&openAction); - // TODO: port name coming from combobox is dirty, create a separate layer of signals - // that will sanitize this information - QObject::connect(ui->cbPortList, - SELECT::OVERLOAD_OF(&QComboBox::activated), - this, &PortControl::selectPort); - + // setup baud rate selection widget QObject::connect(ui->cbBaudRate, SELECT::OVERLOAD_OF(&QComboBox::activated), this, &PortControl::selectBaudRate);