tempo-plotter Changeset - f06b56464889 · protofusion repositories

Changeset - f06b56464889

Parent rev.

Child rev.

[Not reviewed]

portlist

0 1 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-09-05 04:04:53
hy@ozderya.net

added "Port:" label to toolbar

1 file changed with 9 insertions and 8 deletions:

portcontrol.cpp

0 comments (0 inline, 0 general)

portcontrol.cpp

➞

Show inline comments

@@ @@ -13,68 +13,69 @@ @@
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "portcontrol.h"
 #include "ui_portcontrol.h"
 #include <QSerialPortInfo>
 #include <QKeySequence>
 #include <QLabel>
 #include <QtDebug>
 #include "utils.h"
 PortControl::PortControl(QSerialPort* port, QWidget* parent) :
     QWidget(parent),
     ui(new Ui::PortControl),
     portToolBar("Port"),
     openAction("Open", this)
+{
     ui->setupUi(this);
     serialPort = port;
     // setup the toolbar
     openAction.setCheckable(true);
     openAction.setShortcut(QKeySequence("F2"));
     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<int>::OVERLOAD_OF(&QComboBox::activated),
                      this, &PortControl::onCbPortListActivated);
     QObject::connect(&tbPortList,
                      SELECT<int>::OVERLOAD_OF(&QComboBox::activated),
                      this, &PortControl::onTbPortListActivated);
     QObject::connect(ui->cbPortList,
                      SELECT<const QString&>::OVERLOAD_OF(&QComboBox::activated),
                      this, &PortControl::selectPort);
     // setup buttons
     QObject::connect(ui->pbReloadPorts, &QPushButton::clicked,
                      this, &PortControl::loadPortList);
     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<const QString&>::OVERLOAD_OF(&QComboBox::activated),
                      this, &PortControl::selectPort);
     // setup baud rate selection widget
     QObject::connect(ui->cbBaudRate,
                      SELECT<const QString&>::OVERLOAD_OF(&QComboBox::activated),
                      this, &PortControl::selectBaudRate);
     // setup parity selection buttons
     parityButtons.addButton(ui->rbNoParity, (int) QSerialPort::NoParity);
     parityButtons.addButton(ui->rbEvenParity, (int) QSerialPort::EvenParity);
     parityButtons.addButton(ui->rbOddParity, (int) QSerialPort::OddParity);
     QObject::connect(&parityButtons,
                      SELECT<int>::OVERLOAD_OF(&QButtonGroup::buttonClicked),
                      this, &PortControl::selectParity);

0 comments (0 inline, 0 general)