diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2017-01-08 17:47:31 +0100 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2017-01-16 16:10:42 +0000 |
| commit | 52967158da2c02efceea610e83786bbd6b5a888a (patch) | |
| tree | da66251af3c827489e74d9d9e36953f5082fae6c /examples/serialbus/can/connectdialog.ui | |
| parent | a0cc6c88fd990b89848a78606e8547f814213a46 (diff) | |
CAN-Example: Introduce bitrate selection combox box
Factor the bitrate selection logic out of connect dialog to allow
re-using the logic for CAN FD data bitrate selection later.
Change-Id: I0a509c6200dddbd6b254a5e7f0702e6b0c99d1a3
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'examples/serialbus/can/connectdialog.ui')
| -rw-r--r-- | examples/serialbus/can/connectdialog.ui | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/examples/serialbus/can/connectdialog.ui b/examples/serialbus/can/connectdialog.ui index f5cc53e..345ff64 100644 --- a/examples/serialbus/can/connectdialog.ui +++ b/examples/serialbus/can/connectdialog.ui @@ -127,14 +127,14 @@ <widget class="QComboBox" name="receiveOwnBox"/> </item> <item row="4" column="0"> - <widget class="QLabel" name="speedLabel"> + <widget class="QLabel" name="bitrateLabel"> <property name="text"> - <string>Speed</string> + <string>Bitrate</string> </property> </widget> </item> <item row="4" column="1"> - <widget class="QComboBox" name="speedBox"/> + <widget class="BitRateBox" name="bitrateBox"/> </item> <item row="5" column="0"> <widget class="QLabel" name="canFdLabel"> @@ -200,6 +200,13 @@ </item> </layout> </widget> + <customwidgets> + <customwidget> + <class>BitRateBox</class> + <extends>QComboBox</extends> + <header>bitratebox.h</header> + </customwidget> + </customwidgets> <resources/> <connections/> </ui> |