From 010c13b28c93150352c392465b13208f40586bb6 Mon Sep 17 00:00:00 2001
From: Arthur Golubtsov <goldartt@gmail.com>
Date: Sun, 31 May 2020 09:54:17 +0300
Subject: [PATCH] Server: Remove fly to point button

---
 Server/server_gui.py | 6 +-----
 Server/server_gui.ui | 9 +--------
 Server/server_qt.py  | 4 ----
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/Server/server_gui.py b/Server/server_gui.py
index 79532a6..a163801 100644
--- a/Server/server_gui.py
+++ b/Server/server_gui.py
@@ -186,10 +186,7 @@ class Ui_MainWindow(object):
         self.formLayout_4.setLayout(2, QtWidgets.QFormLayout.FieldRole, self.horizontalLayout_2)
         self.flip_button = QtWidgets.QPushButton(self.centralwidget)
         self.flip_button.setObjectName("flip_button")
-        self.formLayout_4.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.flip_button)
-        self.fly_button = QtWidgets.QPushButton(self.centralwidget)
-        self.fly_button.setObjectName("fly_button")
-        self.formLayout_4.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.fly_button)
+        self.formLayout_4.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.flip_button)
         self.verticalLayout.addLayout(self.formLayout_4)
         self.line_4 = QtWidgets.QFrame(self.centralwidget)
         self.line_4.setFrameShape(QtWidgets.QFrame.HLine)
@@ -381,7 +378,6 @@ class Ui_MainWindow(object):
         self.z_checkbox.setText(_translate("MainWindow", "  Z     ="))
         self.z_spin.setSuffix(_translate("MainWindow", " m"))
         self.flip_button.setText(_translate("MainWindow", "Flip"))
-        self.fly_button.setText(_translate("MainWindow", "Fly to point"))
         self.reboot_fcu.setText(_translate("MainWindow", "Reboot FCU"))
         self.calibrate_gyro.setText(_translate("MainWindow", "Calibrate gyro"))
         self.calibrate_level.setText(_translate("MainWindow", "Calibrate level"))
diff --git a/Server/server_gui.ui b/Server/server_gui.ui
index d193528..f6c70c1 100644
--- a/Server/server_gui.ui
+++ b/Server/server_gui.ui
@@ -367,20 +367,13 @@
             </item>
            </layout>
           </item>
-          <item row="4" column="1">
+          <item row="3" column="1">
            <widget class="QPushButton" name="flip_button">
             <property name="text">
              <string>Flip</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="1">
-           <widget class="QPushButton" name="fly_button">
-            <property name="text">
-             <string>Fly to point</string>
-            </property>
-           </widget>
-          </item>
          </layout>
         </item>
         <item>
diff --git a/Server/server_qt.py b/Server/server_qt.py
index cef05e1..6627a74 100644
--- a/Server/server_qt.py
+++ b/Server/server_qt.py
@@ -112,10 +112,6 @@ class MainWindow(QtWidgets.QMainWindow):
 
         self.init_model()
 
-        # self.statusBar = QStatusBar()
-        # self.setStatusBar(self.statusBar)
-        # self.statusBar.showMessage("Hey", 2000)
-
         self.register_callbacks()
         self.player = QtMultimedia.QMediaPlayer()