1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00

ui: fix name is already in use warnings

This commit is contained in:
Philippe Renon 2016-07-12 00:56:21 +02:00
parent 49bb804b00
commit 20ca49dc72
2 changed files with 12 additions and 12 deletions

View File

@ -118,9 +118,9 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>-391</y> <y>-317</y>
<width>754</width> <width>748</width>
<height>783</height> <height>724</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
@ -892,7 +892,7 @@ font:bold;</string>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="fullPID_RP_I_FactorLabel"> <widget class="QLabel" name="fullPID_RP_D_FactorLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>

View File

@ -197,7 +197,7 @@ p, li { white-space: pre-wrap; }
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="servoNeutral"> <widget class="QWidget" name="servoNeutral">
<layout class="QVBoxLayout" name="verticalLayout_5"> <layout class="QVBoxLayout" name="verticalLayout_6">
<item> <item>
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
@ -217,7 +217,7 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer_3">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
@ -628,7 +628,7 @@ QSlider::handle:horizontal:hover {
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label_1">
<property name="text"> <property name="text">
<string>Min</string> <string>Min</string>
</property> </property>
@ -669,7 +669,7 @@ QSlider::handle:horizontal:hover {
<widget class="QWidget" name="dualservoNeutral"> <widget class="QWidget" name="dualservoNeutral">
<layout class="QVBoxLayout" name="verticalLayout_5"> <layout class="QVBoxLayout" name="verticalLayout_5">
<item> <item>
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_11">
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@ -1130,7 +1130,7 @@ QSlider::handle:horizontal:hover {
</item> </item>
<item> <item>
<widget class="QWidget" name="widget2" native="true"> <widget class="QWidget" name="widget2" native="true">
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout_3">
<property name="horizontalSpacing"> <property name="horizontalSpacing">
<number>6</number> <number>6</number>
</property> </property>
@ -1520,21 +1520,21 @@ QSlider::handle:horizontal:hover {
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label_14">
<property name="text"> <property name="text">
<string>Min</string> <string>Min</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_12">
<property name="text"> <property name="text">
<string>Center</string> <string>Center</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_7"> <widget class="QLabel" name="label_13">
<property name="text"> <property name="text">
<string>Max</string> <string>Max</string>
</property> </property>