Skip to content

Commit

Permalink
Merge branch 'telloUI' of https://github.com/kipr/botui into telloUI
Browse files Browse the repository at this point in the history
  • Loading branch information
erinharrington-12 committed Jun 4, 2024
2 parents 26758c8 + 30d1efe commit e85aa5f
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 204 deletions.
204 changes: 0 additions & 204 deletions ui/OtherNetworkWidget.ui.autosave

This file was deleted.

75 changes: 75 additions & 0 deletions ui/TelloWidget.ui
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,11 @@
<item>
<widget class="QPushButton" name="TelloDisconnect">
<property name="enabled">
<<<<<<< HEAD
<bool>false</bool>
=======
<bool>true</bool>
>>>>>>> 30d1efe98c14af937f5044dc3cfbc5b1e6d3c087
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
Expand Down Expand Up @@ -135,9 +139,12 @@
</item>
<item>
<widget class="QPushButton" name="landButton">
<<<<<<< HEAD
<property name="enabled">
<bool>false</bool>
</property>
=======
>>>>>>> 30d1efe98c14af937f5044dc3cfbc5b1e6d3c087
<property name="minimumSize">
<size>
<width>0</width>
Expand Down Expand Up @@ -252,6 +259,7 @@
</property>
</widget>
</item>
<<<<<<< HEAD
<item row="3" column="2" alignment="Qt::AlignRight|Qt::AlignBottom">
<widget class="QPushButton" name="videoButton">
<property name="minimumSize">
Expand All @@ -265,6 +273,8 @@
</property>
</widget>
</item>
=======
>>>>>>> 30d1efe98c14af937f5044dc3cfbc5b1e6d3c087
</layout>
</item>
<item>
Expand All @@ -290,6 +300,7 @@
</property>
</widget>
</item>
<<<<<<< HEAD
<item row="0" column="1">
<widget class="QPushButton" name="pushButton">
<property name="minimumSize">
Expand All @@ -308,6 +319,8 @@
</property>
</widget>
</item>
=======
>>>>>>> 30d1efe98c14af937f5044dc3cfbc5b1e6d3c087
<item row="1" column="0">
<widget class="QPushButton" name="leftButton">
<property name="minimumSize">
Expand All @@ -326,6 +339,27 @@
</property>
</widget>
</item>
<<<<<<< HEAD
=======
<item row="0" column="1">
<widget class="QPushButton" name="pushButton">
<property name="minimumSize">
<size>
<width>0</width>
<height>50</height>
</size>
</property>
<property name="font">
<font>
<pointsize>18</pointsize>
</font>
</property>
<property name="text">
<string>Forward</string>
</property>
</widget>
</item>
>>>>>>> 30d1efe98c14af937f5044dc3cfbc5b1e6d3c087
<item row="2" column="1">
<widget class="QPushButton" name="backButton">
<property name="minimumSize">
Expand All @@ -344,6 +378,7 @@
</property>
</widget>
</item>
<<<<<<< HEAD
<item row="2" column="0" alignment="Qt::AlignLeft|Qt::AlignBottom">
<widget class="QPushButton" name="telemetryButton">
<property name="minimumSize">
Expand All @@ -357,11 +392,14 @@
</property>
</widget>
</item>
=======
>>>>>>> 30d1efe98c14af937f5044dc3cfbc5b1e6d3c087
</layout>
</item>
</layout>
</item>
<item>
<<<<<<< HEAD
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<layout class="QHBoxLayout" name="telloBatteryHorizontal">
Expand Down Expand Up @@ -419,6 +457,43 @@
</widget>
</item>
</layout>
=======
<layout class="QHBoxLayout" name="telloBatteryHorizontal">
<property name="spacing">
<number>6</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="telloBatteryPercentLabel">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>35</height>
</size>
</property>
<property name="text">
<string>Battery %: </string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="telloBatteryLabel">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>35</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
>>>>>>> 30d1efe98c14af937f5044dc3cfbc5b1e6d3c087
</item>
</layout>
</item>
Expand Down

0 comments on commit e85aa5f

Please sign in to comment.