Browse Source

Merge branch 'config' of github.com:mavlink/qgroundcontrol into config

QGC4.4
Lorenz Meier 12 years ago
parent
commit
a5112f49ea
  1. 2
      src/ui/QGCPX4VehicleConfig.cc
  2. 10
      src/ui/QGCPX4VehicleConfig.ui

2
src/ui/QGCPX4VehicleConfig.cc

@ -220,6 +220,8 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) : @@ -220,6 +220,8 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) :
rcMappedNormalizedValue[i] = 0.0f;
}
firmwareMenuButtonClicked();
updateTimer.setInterval(150);
connect(&updateTimer, SIGNAL(timeout()), this, SLOT(updateView()));
updateTimer.start();

10
src/ui/QGCPX4VehicleConfig.ui

@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
</font>
</property>
<property name="text">
<string>Configuration</string>
<string/>
</property>
</widget>
</item>
@ -819,8 +819,8 @@ @@ -819,8 +819,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>492</width>
<height>828</height>
<width>98</width>
<height>28</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4">
@ -856,8 +856,8 @@ @@ -856,8 +856,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>491</width>
<height>828</height>
<width>98</width>
<height>28</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_5">

Loading…
Cancel
Save