matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Device Emulation (contd.): DeviceGroup Dialog -fit/stretch the rows/cols of vlan Table plus minor stuff

Browse Source
This commit is contained in:
Srivats P 2016-03-03 20:07:10 +05:30
parent 586a177332
commit c2df526aaf
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
client/devicegroupdialog.cpp
View File

@ -61,14 +61,6 @@ DeviceGroupDialog::DeviceGroupDialog(
// Setup the Dialog // Setup the Dialog
setupUi(this); setupUi(this);
vlanTagCount->setRange(0, kMaxVlanTags); vlanTagCount->setRange(0, kMaxVlanTags);
#if 0 // FIXME: not working
qDebug("vlan def size: %d", vlans->verticalHeader()->defaultSectionSize());
qDebug("vlan min size: %d", vlans->verticalHeader()->minimumSectionSize());
vlans->verticalHeader()->setDefaultSectionSize(
vlans->verticalHeader()->minimumSectionSize());
qDebug("vlan def size: %d", vlans->verticalHeader()->defaultSectionSize());
qDebug("vlan min size: %d", vlans->verticalHeader()->minimumSectionSize());
#endif
// Populate the Vlan Table with placeholders - we do this so that // Populate the Vlan Table with placeholders - we do this so that
// user entered values are retained during the lifetime of the dialog // user entered values are retained during the lifetime of the dialog
// even if user is playing around with number of vlan tags // even if user is playing around with number of vlan tags
@ -87,7 +79,7 @@ DeviceGroupDialog::DeviceGroupDialog(
vlans->setItem(i, kVlanPrio, vlans->setItem(i, kVlanPrio,
new QTableWidgetItem(QString::number(0))); new QTableWidgetItem(QString::number(0)));
vlans->setItem(i, kVlanTpid, vlans->setItem(i, kVlanTpid,
new QTableWidgetItem(QString::number(0x8100, 16))); new QTableWidgetItem(QString("0x8100")));
} }
// Set SpinBoxDelegate for all columns except TPID // Set SpinBoxDelegate for all columns except TPID
@ -101,12 +93,16 @@ DeviceGroupDialog::DeviceGroupDialog(
vlans->setItemDelegateForColumn(i, spd); vlans->setItemDelegateForColumn(i, spd);
} }
// Set vlan tag count *after* adding items so connected slots vlans->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
vlans->resizeRowsToContents();
// Set vlan tag count *after* adding all items, so connected slots
// can access the items // can access the items
vlanTagCount->setValue(kMaxVlanTags); vlanTagCount->setValue(kMaxVlanTags);
ipStack->insertItems(0, ipStackItems); ipStack->insertItems(0, ipStackItems);
// setup dialog to auto-resize as widgets are hidden or shown
layout()->setSizeConstraint(QLayout::SetFixedSize); layout()->setSizeConstraint(QLayout::SetFixedSize);
connect(devicePerVlanCount, SIGNAL(valueChanged(const QString&)), connect(devicePerVlanCount, SIGNAL(valueChanged(const QString&)),
@ -232,7 +228,8 @@ void DeviceGroupDialog::loadDeviceGroup()
QString::number(v.vlan_tag() & 0x0fff)); QString::number(v.vlan_tag() & 0x0fff));
vlans->item(i, kVlanCount)->setText(QString::number(v.count())); vlans->item(i, kVlanCount)->setText(QString::number(v.count()));
vlans->item(i, kVlanStep)->setText(QString::number(v.step())); vlans->item(i, kVlanStep)->setText(QString::number(v.step()));
vlans->item(i, kVlanTpid)->setText(QString::number(v.tpid(), 16)); vlans->item(i, kVlanTpid)->setText(QString("0x%1")
.arg(v.tpid(), 0, 16));
} }
} }
vlanTagCount->setValue(tagCount); vlanTagCount->setValue(tagCount);

2
client/devicegroupdialog.ui
View File

@ -10,7 +10,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
<string>Dialog</string> <string>Devices</string>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
<item> <item>