zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Change for new arduplane.pdef.xml, and some small visual fixes on the Configuration page

QGC4.4
Michael Carpenter 12 years ago
parent
913c64179c
commit
5843b6ac31
3 changed files with 937 additions and 393 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1266
      files/ardupilotmega/arduplane.pdef.xml
  2. 4
      src/ui/QGCVehicleConfig.cc
  3. 60
      src/ui/QGCVehicleConfig.ui

1266
files/ardupilotmega/arduplane.pdef.xml
View File

File diff suppressed because it is too large Load Diff

4
src/ui/QGCVehicleConfig.cc
Unescape View File

@ -275,7 +275,7 @@ void QGCVehicleConfig::loadQgcConfig(bool primary) @@ -275,7 +275,7 @@ void QGCVehicleConfig::loadQgcConfig(bool primary)
QPushButton *button = new QPushButton(ui->scrollAreaWidgetContents_3);
connect(button,SIGNAL(clicked()),this,SLOT(menuButtonClicked()));
ui->navBarLayout->insertWidget(2,button);
button->setMinimumHeight(100);
button->setMinimumHeight(75);
button->setMinimumWidth(100);
button->show();
button->setText(dir);
@ -328,7 +328,7 @@ void QGCVehicleConfig::loadQgcConfig(bool primary) @@ -328,7 +328,7 @@ void QGCVehicleConfig::loadQgcConfig(bool primary)
ui->stackedWidget->insertWidget(2,tab);
buttonToWidgetMap[button] = tab;
button->setMinimumHeight(100);
button->setMinimumHeight(75);
button->setMinimumWidth(100);
button->show();
button->setText(dir);

60
src/ui/QGCVehicleConfig.ui
Unescape View File

@ -13,18 +13,18 @@ @@ -13,18 +13,18 @@
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_11" stretch="1,2,1">
<layout class="QHBoxLayout" name="horizontalLayout_11" stretch="1,4,1">
<item>
<widget class="QScrollArea" name="scrollArea_6">
<property name="minimumSize">
<size>
<width>125</width>
<width>135</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>125</width>
<width>135</width>
<height>16777215</height>
</size>
</property>
@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>123</width>
<width>133</width>
<height>582</height>
</rect>
</property>
@ -51,13 +51,13 @@ @@ -51,13 +51,13 @@
<property name="minimumSize">
<size>
<width>100</width>
<height>100</height>
<height>75</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>100</height>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
@ -71,13 +71,7 @@ Calibration</string> @@ -71,13 +71,7 @@ Calibration</string>
<property name="minimumSize">
<size>
<width>100</width>
<height>100</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>100</height>
<height>75</height>
</size>
</property>
<property name="text">
@ -91,13 +85,7 @@ Calibration</string> @@ -91,13 +85,7 @@ Calibration</string>
<property name="minimumSize">
<size>
<width>100</width>
<height>100</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>100</height>
<height>75</height>
</size>
</property>
<property name="text">
@ -111,13 +99,7 @@ Config</string> @@ -111,13 +99,7 @@ Config</string>
<property name="minimumSize">
<size>
<width>100</width>
<height>100</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>100</height>
<height>75</height>
</size>
</property>
<property name="text">
@ -800,8 +782,8 @@ p, li { white-space: pre-wrap; } @@ -800,8 +782,8 @@ p, li { white-space: pre-wrap; }
<rect>
<x>0</x>
<y>0</y>
<width>314</width>
<height>508</height>
<width>98</width>
<height>28</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_10">
@ -875,8 +857,8 @@ p, li { white-space: pre-wrap; } @@ -875,8 +857,8 @@ p, li { white-space: pre-wrap; }
<rect>
<x>0</x>
<y>0</y>
<width>314</width>
<height>434</height>
<width>98</width>
<height>28</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4">
@ -912,8 +894,8 @@ p, li { white-space: pre-wrap; } @@ -912,8 +894,8 @@ p, li { white-space: pre-wrap; }
<rect>
<x>0</x>
<y>0</y>
<width>313</width>
<height>434</height>
<width>98</width>
<height>28</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_5">
@ -991,8 +973,8 @@ p, li { white-space: pre-wrap; } @@ -991,8 +973,8 @@ p, li { white-space: pre-wrap; }
<rect>
<x>0</x>
<y>0</y>
<width>161</width>
<height>446</height>
<width>98</width>
<height>28</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
@ -1028,8 +1010,8 @@ p, li { white-space: pre-wrap; } @@ -1028,8 +1010,8 @@ p, li { white-space: pre-wrap; }
<rect>
<x>0</x>
<y>0</y>
<width>160</width>
<height>446</height>
<width>98</width>
<height>28</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_8">
@ -1079,7 +1061,7 @@ p, li { white-space: pre-wrap; } @@ -1079,7 +1061,7 @@ p, li { white-space: pre-wrap; }
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<width>30</width>
<height>20</height>
</size>
</property>

Write Preview
Loading…
Cancel
Save