1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00

Linux fix

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@467 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
zedamota 2010-04-10 02:10:17 +00:00 committed by zedamota
parent cb0d447043
commit 715592c832

View File

@ -171,6 +171,7 @@ QWidget *UploaderGadgetOptionsPage::createPage(QWidget *parent)
x->setLayout(portLayout); x->setLayout(portLayout);
QWidget *label = new QLabel("Port:"); QWidget *label = new QLabel("Port:");
m_portCB = new QComboBox(parent); m_portCB = new QComboBox(parent);
m_portCB->setMinimumSize(200,22);
portLayout->addWidget(label); portLayout->addWidget(label);
portLayout->addWidget(m_portCB); portLayout->addWidget(m_portCB);
@ -180,6 +181,7 @@ QWidget *UploaderGadgetOptionsPage::createPage(QWidget *parent)
y->setLayout(speedLayout); y->setLayout(speedLayout);
label = new QLabel("Port Speed:"); label = new QLabel("Port Speed:");
m_speedCB = new QComboBox(); m_speedCB = new QComboBox();
m_speedCB->setMinimumSize(200,22);
speedLayout->addWidget(label); speedLayout->addWidget(label);
speedLayout->addWidget(m_speedCB); speedLayout->addWidget(m_speedCB);
@ -189,6 +191,7 @@ QWidget *UploaderGadgetOptionsPage::createPage(QWidget *parent)
z->setLayout(flowLayout); z->setLayout(flowLayout);
label = new QLabel("Flow Control:"); label = new QLabel("Flow Control:");
m_flowCB = new QComboBox(); m_flowCB = new QComboBox();
m_flowCB->setMinimumSize(200,22);
flowLayout->addWidget(label); flowLayout->addWidget(label);
flowLayout->addWidget(m_flowCB); flowLayout->addWidget(m_flowCB);
@ -198,6 +201,7 @@ QWidget *UploaderGadgetOptionsPage::createPage(QWidget *parent)
a->setLayout(databitsLayout); a->setLayout(databitsLayout);
label = new QLabel("Data Bits:"); label = new QLabel("Data Bits:");
m_databitsCB = new QComboBox(); m_databitsCB = new QComboBox();
m_databitsCB->setMinimumSize(200,22);
databitsLayout->addWidget(label); databitsLayout->addWidget(label);
databitsLayout->addWidget(m_databitsCB); databitsLayout->addWidget(m_databitsCB);
@ -207,6 +211,7 @@ QWidget *UploaderGadgetOptionsPage::createPage(QWidget *parent)
b->setLayout(stopbitsLayout); b->setLayout(stopbitsLayout);
label = new QLabel("Stop Bits:"); label = new QLabel("Stop Bits:");
m_stopbitsCB = new QComboBox(); m_stopbitsCB = new QComboBox();
m_stopbitsCB->setMinimumSize(200,22);
stopbitsLayout->addWidget(label); stopbitsLayout->addWidget(label);
stopbitsLayout->addWidget(m_stopbitsCB); stopbitsLayout->addWidget(m_stopbitsCB);
@ -216,6 +221,7 @@ QWidget *UploaderGadgetOptionsPage::createPage(QWidget *parent)
c->setLayout(parityLayout); c->setLayout(parityLayout);
label = new QLabel("Parity:"); label = new QLabel("Parity:");
m_parityCB = new QComboBox(); m_parityCB = new QComboBox();
m_parityCB->setMinimumSize(200,22);
parityLayout->addWidget(label); parityLayout->addWidget(label);
parityLayout->addWidget(m_parityCB); parityLayout->addWidget(m_parityCB);
@ -251,7 +257,7 @@ QWidget *UploaderGadgetOptionsPage::createPage(QWidget *parent)
QList<QextPortInfo> ports =QextSerialEnumerator ::getPorts(); QList<QextPortInfo> ports =QextSerialEnumerator ::getPorts();
qSort(ports.begin(), ports.end()); qSort(ports.begin(), ports.end());
for (int i = 0; i < ports.size(); i++) { for (int i = 0; i < ports.size(); i++) {
m_portCB->addItem((QString)ports.at(i).portName.toLocal8Bit().constData()); m_portCB->addItem((QString)ports.at(i).physName.toLocal8Bit().constData());
} }
if(m_portCB->findText(m_config->Port())!=-1){ if(m_portCB->findText(m_config->Port())!=-1){
m_portCB->setCurrentIndex(m_portCB->findText(m_config->Port())); m_portCB->setCurrentIndex(m_portCB->findText(m_config->Port()));