Skip to content

Q
qgroundcontrol
Commit d4803699 authored by Michael Carpenter's avatar Michael Carpenter
Browse files
Options

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

parent 4e29541c
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 44 deletions
src/ui/CommSettings.ui
View file @ d4803699
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>770</width> <width>324</width>
<height>563</height> <height>415</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>748</width> <width>302</width>
<height>97</height> <height>69</height>
</rect> </rect>
</property> </property>
</widget> </widget>
...@@ -126,8 +126,8 @@ ...@@ -126,8 +126,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>748</width> <width>302</width>
<height>96</height> <height>69</height>
</rect> </rect>
</property> </property>
</widget> </widget>
...@@ -230,7 +230,6 @@ ...@@ -230,7 +230,6 @@
<zorder>connectionStatusLabel</zorder> <zorder>connectionStatusLabel</zorder>
<zorder>advCheckBox</zorder> <zorder>advCheckBox</zorder>
<zorder>protocolTypeGroupBox</zorder> <zorder>protocolTypeGroupBox</zorder>
<zorder>label_5</zorder>
<zorder>verticalSpacer</zorder> <zorder>verticalSpacer</zorder>
</widget> </widget>
<resources/> <resources/>
......
src/ui/SerialConfigurationWindow.cc
View file @ d4803699
...@@ -134,8 +134,8 @@ SerialConfigurationWindow::SerialConfigurationWindow(LinkInterface* link, QWidge ...@@ -134,8 +134,8 @@ SerialConfigurationWindow::SerialConfigurationWindow(LinkInterface* link, QWidge
ui.advGroupBox->setVisible(false); ui.advGroupBox->setVisible(false);
//connect(this->link, SIGNAL(connected(bool)), this, SLOT()); //connect(this->link, SIGNAL(connected(bool)), this, SLOT());
ui.portName->setSizeAdjustPolicy(QComboBox::AdjustToContentsOnFirstShow); //ui.portName->setSizeAdjustPolicy(QComboBox::AdjustToContentsOnFirstShow);
ui.baudRate->setSizeAdjustPolicy(QComboBox::AdjustToContentsOnFirstShow); //ui.baudRate->setSizeAdjustPolicy(QComboBox::AdjustToContentsOnFirstShow);
switch(this->link->getParityType()) { switch(this->link->getParityType()) {
case 0: case 0:
......
src/ui/SerialSettings.ui
View file @ d4803699
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>546</width> <width>234</width>
<height>457</height> <height>354</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_7" stretch="0,1,5"> <layout class="QHBoxLayout" name="horizontalLayout_7" stretch="0,0">
<item> <item>
<widget class="QLabel" name="portlabel"> <widget class="QLabel" name="portlabel">
<property name="text"> <property name="text">
...@@ -25,6 +25,12 @@ ...@@ -25,6 +25,12 @@
</item> </item>
<item> <item>
<widget class="QComboBox" name="portName"> <widget class="QComboBox" name="portName">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="toolTip"> <property name="toolTip">
<string>The serial port to which the system is connected. All ports listed here should work.</string> <string>The serial port to which the system is connected. All ports listed here should work.</string>
</property> </property>
...@@ -47,23 +53,10 @@ ...@@ -47,23 +53,10 @@
</item> </item>
</widget> </widget>
</item> </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> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_6" stretch="0,1,5"> <layout class="QHBoxLayout" name="horizontalLayout_6" stretch="0,0">
<item> <item>
<widget class="QLabel" name="portlabel_2"> <widget class="QLabel" name="portlabel_2">
<property name="text"> <property name="text">
...@@ -73,6 +66,12 @@ ...@@ -73,6 +66,12 @@
</item> </item>
<item> <item>
<widget class="QComboBox" name="baudRate"> <widget class="QComboBox" name="baudRate">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="toolTip"> <property name="toolTip">
<string>The data transmission rate. If unsure 57600 and 115200 are very common rates.</string> <string>The data transmission rate. If unsure 57600 and 115200 are very common rates.</string>
</property> </property>
...@@ -215,19 +214,6 @@ ...@@ -215,19 +214,6 @@
</item> </item>
</widget> </widget>
</item> </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> </layout>
</item> </item>
<item> <item>
...@@ -429,11 +415,6 @@ ...@@ -429,11 +415,6 @@
</layout> </layout>
</item> </item>
</layout> </layout>
<zorder>horizontalLayoutWidget</zorder>
<zorder>horizontalLayoutWidget_2</zorder>
<zorder>horizontalLayoutWidget_4</zorder>
<zorder>portlabel_5</zorder>
<zorder>horizontalLayoutWidget_3</zorder>
</widget> </widget>
</item> </item>
<item> <item>
......
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