Commit 2c221b09 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Symbian: Fix layout of Symbian Device detection, add ttyACM?.

parent 2c734ee9
...@@ -85,7 +85,7 @@ S60DeployConfigurationWidget::S60DeployConfigurationWidget(QWidget *parent) ...@@ -85,7 +85,7 @@ S60DeployConfigurationWidget::S60DeployConfigurationWidget(QWidget *parent)
m_installationDriveCombo(new QComboBox()), m_installationDriveCombo(new QComboBox()),
m_silentInstallCheckBox(new QCheckBox(tr("Silent installation"))), m_silentInstallCheckBox(new QCheckBox(tr("Silent installation"))),
m_serialRadioButton(new QRadioButton(tr("Serial:"))), m_serialRadioButton(new QRadioButton(tr("Serial:"))),
m_wlanRadioButton(new QRadioButton(tr("Experimental WLAN:"))), //TODO: Remove ""Experimental" when CODA is stable and official m_wlanRadioButton(new QRadioButton(tr("WLAN:"))),
m_ipAddress(new Utils::IpAddressLineEdit), m_ipAddress(new Utils::IpAddressLineEdit),
m_trkRadioButton(new QRadioButton(tr("TRK"))), m_trkRadioButton(new QRadioButton(tr("TRK"))),
m_codaRadioButton(new QRadioButton(tr("CODA"))) m_codaRadioButton(new QRadioButton(tr("CODA")))
...@@ -213,9 +213,9 @@ QWidget *S60DeployConfigurationWidget::createCommunicationChannel() ...@@ -213,9 +213,9 @@ QWidget *S60DeployConfigurationWidget::createCommunicationChannel()
#endif #endif
QGroupBox *communicationChannelGroupBox = new QGroupBox(tr("Communication Channel")); QGroupBox *communicationChannelGroupBox = new QGroupBox(tr("Communication Channel"));
QFormLayout *communicationChannelFormLayout = new QFormLayout(); QGridLayout *communicationChannelGridLayout = new QGridLayout;
communicationChannelFormLayout->setWidget(0, QFormLayout::LabelRole, m_serialRadioButton); communicationChannelGridLayout->addWidget(m_serialRadioButton, 0, 0);
communicationChannelFormLayout->setWidget(1, QFormLayout::LabelRole, m_wlanRadioButton); communicationChannelGridLayout->addWidget(m_wlanRadioButton, 1, 0);
m_ipAddress->setMinimumWidth(30); m_ipAddress->setMinimumWidth(30);
m_ipAddress->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Ignored); m_ipAddress->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Ignored);
...@@ -230,10 +230,10 @@ QWidget *S60DeployConfigurationWidget::createCommunicationChannel() ...@@ -230,10 +230,10 @@ QWidget *S60DeployConfigurationWidget::createCommunicationChannel()
wlanChannelLayout->addWidget(m_ipAddress); wlanChannelLayout->addWidget(m_ipAddress);
wlanChannelLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Ignored)); wlanChannelLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Ignored));
communicationChannelFormLayout->setLayout(0, QFormLayout::FieldRole, serialPortHBoxLayout); communicationChannelGridLayout->addLayout(serialPortHBoxLayout, 0, 1);
communicationChannelFormLayout->setLayout(1, QFormLayout::FieldRole, wlanChannelLayout); communicationChannelGridLayout->addLayout(wlanChannelLayout, 1, 1);
communicationChannelGroupBox->setLayout(communicationChannelFormLayout); communicationChannelGroupBox->setLayout(communicationChannelGridLayout);
return communicationChannelGroupBox; return communicationChannelGroupBox;
} }
......
...@@ -582,7 +582,9 @@ SymbianDeviceManager::SymbianDeviceList SymbianDeviceManager::blueToothDevices() ...@@ -582,7 +582,9 @@ SymbianDeviceManager::SymbianDeviceList SymbianDeviceManager::blueToothDevices()
} }
// New kernel versions support /dev/ttyUSB0, /dev/ttyUSB1. Trk responds // New kernel versions support /dev/ttyUSB0, /dev/ttyUSB1. Trk responds
// on the latter (usually), try first. // on the latter (usually), try first.
static const char *usbTtyDevices[] = { "/dev/ttyUSB1", "/dev/ttyUSB0" }; static const char *usbTtyDevices[] = {
"/dev/ttyUSB3", "/dev/ttyUSB2", "/dev/ttyUSB1", "/dev/ttyUSB0",
"/dev/ttyACM3", "/dev/ttyACM2", "/dev/ttyACM1", "/dev/ttyACM0"};
const int usbTtyCount = sizeof(usbTtyDevices)/sizeof(const char *); const int usbTtyCount = sizeof(usbTtyDevices)/sizeof(const char *);
for (int d = 0; d < usbTtyCount; d++) { for (int d = 0; d < usbTtyCount; d++) {
const QString ttyUSBDevice = QLatin1String(usbTtyDevices[d]); const QString ttyUSBDevice = QLatin1String(usbTtyDevices[d]);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment