Browse Source

Change of Serial settings window size and baud/port combobox sizes

QGC4.4
Michael Carpenter 12 years ago
parent
commit
d48036996e
  1. 13
      src/ui/CommSettings.ui
  2. 4
      src/ui/SerialConfigurationWindow.cc
  3. 51
      src/ui/SerialSettings.ui

13
src/ui/CommSettings.ui

@ -6,8 +6,8 @@ @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>770</width>
<height>563</height>
<width>324</width>
<height>415</height>
</rect>
</property>
<property name="windowTitle">
@ -36,8 +36,8 @@ @@ -36,8 +36,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>748</width>
<height>97</height>
<width>302</width>
<height>69</height>
</rect>
</property>
</widget>
@ -126,8 +126,8 @@ @@ -126,8 +126,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>748</width>
<height>96</height>
<width>302</width>
<height>69</height>
</rect>
</property>
</widget>
@ -230,7 +230,6 @@ @@ -230,7 +230,6 @@
<zorder>connectionStatusLabel</zorder>
<zorder>advCheckBox</zorder>
<zorder>protocolTypeGroupBox</zorder>
<zorder>label_5</zorder>
<zorder>verticalSpacer</zorder>
</widget>
<resources/>

4
src/ui/SerialConfigurationWindow.cc

@ -134,8 +134,8 @@ SerialConfigurationWindow::SerialConfigurationWindow(LinkInterface* link, QWidge @@ -134,8 +134,8 @@ SerialConfigurationWindow::SerialConfigurationWindow(LinkInterface* link, QWidge
ui.advGroupBox->setVisible(false);
//connect(this->link, SIGNAL(connected(bool)), this, SLOT());
ui.portName->setSizeAdjustPolicy(QComboBox::AdjustToContentsOnFirstShow);
ui.baudRate->setSizeAdjustPolicy(QComboBox::AdjustToContentsOnFirstShow);
//ui.portName->setSizeAdjustPolicy(QComboBox::AdjustToContentsOnFirstShow);
//ui.baudRate->setSizeAdjustPolicy(QComboBox::AdjustToContentsOnFirstShow);
switch(this->link->getParityType()) {
case 0:

51
src/ui/SerialSettings.ui

@ -6,8 +6,8 @@ @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>546</width>
<height>457</height>
<width>234</width>
<height>354</height>
</rect>
</property>
<property name="windowTitle">
@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_7" stretch="0,1,5">
<layout class="QHBoxLayout" name="horizontalLayout_7" stretch="0,0">
<item>
<widget class="QLabel" name="portlabel">
<property name="text">
@ -25,6 +25,12 @@ @@ -25,6 +25,12 @@
</item>
<item>
<widget class="QComboBox" name="portName">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>The serial port to which the system is connected. All ports listed here should work.</string>
</property>
@ -47,23 +53,10 @@ @@ -47,23 +53,10 @@
</item>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6" stretch="0,1,5">
<layout class="QHBoxLayout" name="horizontalLayout_6" stretch="0,0">
<item>
<widget class="QLabel" name="portlabel_2">
<property name="text">
@ -73,6 +66,12 @@ @@ -73,6 +66,12 @@
</item>
<item>
<widget class="QComboBox" name="baudRate">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>The data transmission rate. If unsure 57600 and 115200 are very common rates.</string>
</property>
@ -215,19 +214,6 @@ @@ -215,19 +214,6 @@
</item>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
@ -429,11 +415,6 @@ @@ -429,11 +415,6 @@
</layout>
</item>
</layout>
<zorder>horizontalLayoutWidget</zorder>
<zorder>horizontalLayoutWidget_2</zorder>
<zorder>horizontalLayoutWidget_4</zorder>
<zorder>portlabel_5</zorder>
<zorder>horizontalLayoutWidget_3</zorder>
</widget>
</item>
<item>

Loading…
Cancel
Save