Skip to content

Commit

Permalink
Added proper objects names
Browse files Browse the repository at this point in the history
  • Loading branch information
@artem30801
artem30801 committed Mar 11, 2019
1 parent cc5bfcd commit 71ea023
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 67 deletions.
113 changes: 62 additions & 51 deletions Server/server_gui.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,65 +2,67 @@

# Form implementation generated from reading ui file 'server_gui.ui'
#
# Created by: PyQt5 UI code generator 5.12
# Created by: PyQt5 UI code generator 5.10.1
#
# WARNING! All changes made in this file will be lost!

from PyQt5 import QtCore, QtGui, QtWidgets


class Ui_MainWindow(object):
def setupUi(self, MainWindow):
MainWindow.setObjectName("MainWindow")
MainWindow.resize(850, 460)
MainWindow.resize(850, 479)
self.centralwidget = QtWidgets.QWidget(MainWindow)
self.centralwidget.setObjectName("centralwidget")
self.pushButton = QtWidgets.QPushButton(self.centralwidget)
self.pushButton.setGeometry(QtCore.QRect(680, 20, 150, 40))
self.pushButton.setObjectName("pushButton")
self.pushButton_2 = QtWidgets.QPushButton(self.centralwidget)
self.pushButton_2.setGeometry(QtCore.QRect(680, 120, 150, 40))
self.pushButton_2.setObjectName("pushButton_2")
self.spinBox = QtWidgets.QSpinBox(self.centralwidget)
self.spinBox.setGeometry(QtCore.QRect(760, 70, 50, 40))
self.spinBox.setObjectName("spinBox")
self.pushButton_3 = QtWidgets.QPushButton(self.centralwidget)
self.pushButton_3.setGeometry(QtCore.QRect(680, 170, 150, 40))
self.pushButton_3.setObjectName("pushButton_3")
self.pushButton_4 = QtWidgets.QPushButton(self.centralwidget)
self.pushButton_4.setGeometry(QtCore.QRect(680, 220, 150, 40))
self.pushButton_4.setObjectName("pushButton_4")
self.pushButton_5 = QtWidgets.QPushButton(self.centralwidget)
self.pushButton_5.setGeometry(QtCore.QRect(680, 280, 150, 40))
self.pushButton_5.setObjectName("pushButton_5")
self.pushButton_6 = QtWidgets.QPushButton(self.centralwidget)
self.pushButton_6.setGeometry(QtCore.QRect(680, 330, 150, 40))
self.pushButton_6.setObjectName("pushButton_6")
self.pushButton_7 = QtWidgets.QPushButton(self.centralwidget)
self.pushButton_7.setGeometry(QtCore.QRect(680, 380, 150, 40))
self.pushButton_7.setObjectName("pushButton_7")
self.label = QtWidgets.QLabel(self.centralwidget)
self.label.setGeometry(QtCore.QRect(680, 70, 71, 40))
self.label.setObjectName("label")
self.label_2 = QtWidgets.QLabel(self.centralwidget)
self.label_2.setGeometry(QtCore.QRect(820, 70, 10, 40))
self.label_2.setObjectName("label_2")
self.check_button = QtWidgets.QPushButton(self.centralwidget)
self.check_button.setGeometry(QtCore.QRect(680, 20, 150, 40))
self.check_button.setObjectName("check_button")
self.start_button = QtWidgets.QPushButton(self.centralwidget)
self.start_button.setEnabled(False)
self.start_button.setGeometry(QtCore.QRect(680, 120, 150, 40))
self.start_button.setFlat(False)
self.start_button.setObjectName("start_button")
self.start_delay_spin = QtWidgets.QSpinBox(self.centralwidget)
self.start_delay_spin.setGeometry(QtCore.QRect(760, 70, 50, 40))
self.start_delay_spin.setObjectName("start_delay_spin")
self.pause_button = QtWidgets.QPushButton(self.centralwidget)
self.pause_button.setGeometry(QtCore.QRect(680, 170, 150, 40))
self.pause_button.setObjectName("pause_button")
self.stop_button = QtWidgets.QPushButton(self.centralwidget)
self.stop_button.setGeometry(QtCore.QRect(680, 220, 150, 40))
self.stop_button.setObjectName("stop_button")
self.takeoff_button = QtWidgets.QPushButton(self.centralwidget)
self.takeoff_button.setEnabled(False)
self.takeoff_button.setGeometry(QtCore.QRect(680, 280, 150, 40))
self.takeoff_button.setObjectName("takeoff_button")
self.land_button = QtWidgets.QPushButton(self.centralwidget)
self.land_button.setGeometry(QtCore.QRect(680, 330, 150, 40))
self.land_button.setObjectName("land_button")
self.disarm_button = QtWidgets.QPushButton(self.centralwidget)
self.disarm_button.setGeometry(QtCore.QRect(680, 380, 150, 40))
self.disarm_button.setObjectName("disarm_button")
self.start_text = QtWidgets.QLabel(self.centralwidget)
self.start_text.setGeometry(QtCore.QRect(680, 70, 71, 40))
self.start_text.setObjectName("start_text")
self.secs_text = QtWidgets.QLabel(self.centralwidget)
self.secs_text.setGeometry(QtCore.QRect(820, 70, 10, 40))
self.secs_text.setObjectName("secs_text")
self.tableView = QtWidgets.QTableView(self.centralwidget)
self.tableView.setGeometry(QtCore.QRect(20, 20, 640, 400))
self.tableView.setObjectName("tableView")
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtWidgets.QMenuBar(MainWindow)
self.menubar.setGeometry(QtCore.QRect(0, 0, 850, 25))
self.menubar.setGeometry(QtCore.QRect(0, 0, 850, 39))
self.menubar.setObjectName("menubar")
self.menuOptions = QtWidgets.QMenu(self.menubar)
self.menuOptions.setObjectName("menuOptions")
MainWindow.setMenuBar(self.menubar)
self.actionSend_Animations = QtWidgets.QAction(MainWindow)
self.actionSend_Animations.setObjectName("actionSend_Animations")
self.actionSend_Configurations = QtWidgets.QAction(MainWindow)
self.actionSend_Configurations.setObjectName("actionSend_Configurations")
self.menuOptions.addAction(self.actionSend_Animations)
self.menuOptions.addAction(self.actionSend_Configurations)
self.action_send_animations = QtWidgets.QAction(MainWindow)
self.action_send_animations.setObjectName("action_send_animations")
self.action_send_configurations = QtWidgets.QAction(MainWindow)
self.action_send_configurations.setObjectName("action_send_configurations")
self.menuOptions.addAction(self.action_send_animations)
self.menuOptions.addAction(self.action_send_configurations)
self.menubar.addAction(self.menuOptions.menuAction())

self.retranslateUi(MainWindow)
Expand All @@ -69,17 +71,26 @@ def setupUi(self, MainWindow):
def retranslateUi(self, MainWindow):
_translate = QtCore.QCoreApplication.translate
MainWindow.setWindowTitle(_translate("MainWindow", "Clever Drone Animation Player"))
self.pushButton.setText(_translate("MainWindow", "Preflight check"))
self.pushButton_2.setText(_translate("MainWindow", "Start animation"))
self.pushButton_3.setText(_translate("MainWindow", "Pause"))
self.pushButton_4.setText(_translate("MainWindow", "Stop"))
self.pushButton_5.setText(_translate("MainWindow", "Takeoff"))
self.pushButton_6.setText(_translate("MainWindow", "Land"))
self.pushButton_7.setText(_translate("MainWindow", "Disarm"))
self.label.setText(_translate("MainWindow", "Start after"))
self.label_2.setText(_translate("MainWindow", "s"))
self.check_button.setText(_translate("MainWindow", "Preflight check"))
self.start_button.setText(_translate("MainWindow", "Start animation"))
self.pause_button.setText(_translate("MainWindow", "Pause"))
self.stop_button.setText(_translate("MainWindow", "Stop"))
self.takeoff_button.setText(_translate("MainWindow", "Takeoff"))
self.land_button.setText(_translate("MainWindow", "Land"))
self.disarm_button.setText(_translate("MainWindow", "Disarm"))
self.start_text.setText(_translate("MainWindow", "Start after"))
self.secs_text.setText(_translate("MainWindow", "s"))
self.menuOptions.setTitle(_translate("MainWindow", "Actions"))
self.actionSend_Animations.setText(_translate("MainWindow", "Send Animations"))
self.actionSend_Configurations.setText(_translate("MainWindow", "Send Configurations"))
self.action_send_animations.setText(_translate("MainWindow", "Send Animations"))
self.action_send_configurations.setText(_translate("MainWindow", "Send Configurations"))


if __name__ == "__main__":
import sys
app = QtWidgets.QApplication(sys.argv)
MainWindow = QtWidgets.QMainWindow()
ui = Ui_MainWindow()
ui.setupUi(MainWindow)
MainWindow.show()
sys.exit(app.exec_())

41 changes: 25 additions & 16 deletions Server/server_gui.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
<x>0</x>
<y>0</y>
<width>850</width>
<height>460</height>
<height>479</height>
</rect>
</property>
<property name="windowTitle">
<string>Clever Drone Animation Player</string>
</property>
<widget class="QWidget" name="centralwidget">
<widget class="QPushButton" name="pushButton">
<widget class="QPushButton" name="check_button">
<property name="geometry">
<rect>
<x>680</x>
Expand All @@ -27,7 +27,10 @@
<string>Preflight check</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_2">
<widget class="QPushButton" name="start_button">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry">
<rect>
<x>680</x>
Expand All @@ -39,8 +42,11 @@
<property name="text">
<string>Start animation</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
<widget class="QSpinBox" name="spinBox">
<widget class="QSpinBox" name="start_delay_spin">
<property name="geometry">
<rect>
<x>760</x>
Expand All @@ -50,7 +56,7 @@
</rect>
</property>
</widget>
<widget class="QPushButton" name="pushButton_3">
<widget class="QPushButton" name="pause_button">
<property name="geometry">
<rect>
<x>680</x>
Expand All @@ -63,7 +69,7 @@
<string>Pause</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_4">
<widget class="QPushButton" name="stop_button">
<property name="geometry">
<rect>
<x>680</x>
Expand All @@ -76,7 +82,10 @@
<string>Stop</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_5">
<widget class="QPushButton" name="takeoff_button">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry">
<rect>
<x>680</x>
Expand All @@ -89,7 +98,7 @@
<string>Takeoff</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_6">
<widget class="QPushButton" name="land_button">
<property name="geometry">
<rect>
<x>680</x>
Expand All @@ -102,7 +111,7 @@
<string>Land</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_7">
<widget class="QPushButton" name="disarm_button">
<property name="geometry">
<rect>
<x>680</x>
Expand All @@ -115,7 +124,7 @@
<string>Disarm</string>
</property>
</widget>
<widget class="QLabel" name="label">
<widget class="QLabel" name="start_text">
<property name="geometry">
<rect>
<x>680</x>
Expand All @@ -128,7 +137,7 @@
<string>Start after</string>
</property>
</widget>
<widget class="QLabel" name="label_2">
<widget class="QLabel" name="secs_text">
<property name="geometry">
<rect>
<x>820</x>
Expand Down Expand Up @@ -158,24 +167,24 @@
<x>0</x>
<y>0</y>
<width>850</width>
<height>25</height>
<height>39</height>
</rect>
</property>
<widget class="QMenu" name="menuOptions">
<property name="title">
<string>Actions</string>
</property>
<addaction name="actionSend_Animations"/>
<addaction name="actionSend_Configurations"/>
<addaction name="action_send_animations"/>
<addaction name="action_send_configurations"/>
</widget>
<addaction name="menuOptions"/>
</widget>
<action name="actionSend_Animations">
<action name="action_send_animations">
<property name="text">
<string>Send Animations</string>
</property>
</action>
<action name="actionSend_Configurations">
<action name="action_send_configurations">
<property name="text">
<string>Send Configurations</string>
</property>
Expand Down

0 comments on commit 71ea023

Please sign in to comment.