From 7ae43aa79bd8cf13ce5326e3e8337e349e729d08 Mon Sep 17 00:00:00 2001
From: Paul Beuchat <beuchatp@control.ee.ethz.ch>
Date: Tue, 5 Dec 2017 07:59:28 +0100
Subject: [PATCH] Adjusted button name in master GUI
---
.../GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.pro.user | 2 +-
.../GUI_Qt/CrazyFlyGUI/src/mainguiwindow.ui | 84 +++++++++----------
2 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.pro.user b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.pro.user
index 562e14c9..c3bd5196 100755
--- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.pro.user
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.pro.user
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.5.1, 2017-11-27T09:29:55. -->
+<!-- Written by QtCreator 3.5.1, 2017-12-05T07:54:15. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.ui b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.ui
index f086e1da..128a1cb9 100755
--- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.ui
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.ui
@@ -276,7 +276,7 @@
<item>
<widget class="QTabWidget" name="tabWidget_2">
<property name="currentIndex">
- <number>1</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="links_tab">
<attribute name="title">
@@ -475,6 +475,25 @@
<string>Command all</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_2">
+ <item row="1" column="0">
+ <widget class="QPushButton" name="all_disconnect_button">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>50</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>100</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Disconnect</string>
+ </property>
+ </widget>
+ </item>
<item row="1" column="1">
<widget class="QPushButton" name="all_connect_button">
<property name="minimumSize">
@@ -579,25 +598,6 @@
</property>
</widget>
</item>
- <item row="1" column="0">
- <widget class="QPushButton" name="all_disconnect_button">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>50</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>100</height>
- </size>
- </property>
- <property name="text">
- <string>Disconnect</string>
- </property>
- </widget>
- </item>
<item row="5" column="1">
<widget class="QPushButton" name="all_enable_custom_controller_button">
<property name="minimumSize">
@@ -617,25 +617,6 @@
</property>
</widget>
</item>
- <item row="8" column="0">
- <widget class="QPushButton" name="all_load_safe_controller_yaml_own_agent_button">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>50</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>100</height>
- </size>
- </property>
- <property name="text">
- <string>Load Safe YAML</string>
- </property>
- </widget>
- </item>
<item row="8" column="1">
<widget class="QPushButton" name="all_load_custom_controller_yaml_own_agent_button">
<property name="minimumSize">
@@ -717,7 +698,7 @@
</size>
</property>
<property name="text">
- <string>Send Safe YAML</string>
+ <string>Load Safe YAML</string>
</property>
</widget>
</item>
@@ -736,7 +717,7 @@
</size>
</property>
<property name="text">
- <string>Send Custom YAML</string>
+ <string>Load Custom YAML</string>
</property>
</widget>
</item>
@@ -778,6 +759,25 @@
</property>
</widget>
</item>
+ <item row="8" column="0">
+ <widget class="QPushButton" name="all_load_safe_controller_yaml_own_agent_button">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>50</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>100</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Load Safe YAML</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</widget>
@@ -830,7 +830,7 @@
<x>0</x>
<y>0</y>
<width>1176</width>
- <height>37</height>
+ <height>25</height>
</rect>
</property>
</widget>
--
GitLab