diff --git a/Server/server_gui.py b/Server/server_gui.py index 5bc9ec3..448c60a 100644 --- a/Server/server_gui.py +++ b/Server/server_gui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'server_gui.ui' # -# Created by: PyQt5 UI code generator 5.14.0 +# Created by: PyQt5 UI code generator 5.13.0 # # WARNING! All changes made in this file will be lost! @@ -212,7 +212,7 @@ class Ui_MainWindow(object): self.gridLayout.addLayout(self.horizontalLayout, 0, 0, 1, 1) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtWidgets.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 1360, 26)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 1360, 25)) self.menubar.setObjectName("menubar") self.menuOptions = QtWidgets.QMenu(self.menubar) self.menuOptions.setObjectName("menuOptions") @@ -226,8 +226,8 @@ class Ui_MainWindow(object): self.menuSend.setObjectName("menuSend") self.menuRestart = QtWidgets.QMenu(self.menuDrone_2) self.menuRestart.setObjectName("menuRestart") - self.menuRetrive = QtWidgets.QMenu(self.menuDrone_2) - self.menuRetrive.setObjectName("menuRetrive") + self.menuDeveloper_mode = QtWidgets.QMenu(self.menuDrone_2) + self.menuDeveloper_mode.setObjectName("menuDeveloper_mode") MainWindow.setMenuBar(self.menubar) self.action_send_animations = QtWidgets.QAction(MainWindow) self.action_send_animations.setObjectName("action_send_animations") @@ -290,6 +290,8 @@ class Ui_MainWindow(object): self.action_edit_any_config = QtWidgets.QAction(MainWindow) self.action_edit_any_config.setObjectName("action_edit_any_config") self.action_update_server_git = QtWidgets.QAction(MainWindow) + self.action_update_server_git.setEnabled(False) + self.action_update_server_git.setVisible(False) self.action_update_server_git.setObjectName("action_update_server_git") self.action_retrive_any_file = QtWidgets.QAction(MainWindow) self.action_retrive_any_file.setObjectName("action_retrive_any_file") @@ -297,6 +299,8 @@ class Ui_MainWindow(object): self.action_restart_server.setObjectName("action_restart_server") self.action_configure_columns = QtWidgets.QAction(MainWindow) self.action_configure_columns.setObjectName("action_configure_columns") + self.actionSomething = QtWidgets.QAction(MainWindow) + self.actionSomething.setObjectName("actionSomething") self.menuMusic_2.addAction(self.action_select_music_file) self.menuMusic_2.addAction(self.action_play_music) self.menuMusic_2.addAction(self.action_stop_music) @@ -327,21 +331,22 @@ class Ui_MainWindow(object): self.menuRestart.addAction(self.action_restart_clever) self.menuRestart.addAction(self.action_restart_clever_show) self.menuRestart.addSeparator() - self.menuRestart.addAction(self.action_reboot_all) - self.menuRetrive.addAction(self.action_retrive_any_file) + self.menuDeveloper_mode.addAction(self.action_update_client_repo) self.menuDrone_2.addAction(self.menuSend.menuAction()) - self.menuDrone_2.addAction(self.menuRetrive.menuAction()) + self.menuDrone_2.addAction(self.action_retrive_any_file) self.menuDrone_2.addAction(self.menuRestart.menuAction()) self.menuDrone_2.addSeparator() - self.menuDrone_2.addAction(self.action_reset_z_offset) - self.menuDrone_2.addAction(self.action_set_z_offset_to_ground) self.menuDrone_2.addAction(self.action_set_start_to_current_position) self.menuDrone_2.addAction(self.action_reset_start) + self.menuDrone_2.addAction(self.action_set_z_offset_to_ground) + self.menuDrone_2.addAction(self.action_reset_z_offset) self.menuDrone_2.addSeparator() - self.menuDrone_2.addAction(self.action_update_client_repo) + self.menuDrone_2.addAction(self.menuDeveloper_mode.menuAction()) + self.menuDrone_2.addSeparator() + self.menuDrone_2.addAction(self.action_reboot_all) + self.menubar.addAction(self.menuDrone_2.menuAction()) self.menubar.addAction(self.menuOptions.menuAction()) self.menubar.addAction(self.menuTable.menuAction()) - self.menubar.addAction(self.menuDrone_2.menuAction()) self.retranslateUi(MainWindow) QtCore.QMetaObject.connectSlotsByName(MainWindow) @@ -375,37 +380,37 @@ class Ui_MainWindow(object): self.menuOptions.setTitle(_translate("MainWindow", "Server")) self.menuMusic_2.setTitle(_translate("MainWindow", "Music")) self.menuTable.setTitle(_translate("MainWindow", "Table")) - self.menuDrone_2.setTitle(_translate("MainWindow", "Drone")) + self.menuDrone_2.setTitle(_translate("MainWindow", "Selected drones")) self.menuSend.setTitle(_translate("MainWindow", "Send")) - self.menuRestart.setTitle(_translate("MainWindow", "Restart")) - self.menuRetrive.setTitle(_translate("MainWindow", "Retrive")) - self.action_send_animations.setText(_translate("MainWindow", "Send animations")) - self.action_send_configurations.setText(_translate("MainWindow", "Send configurations")) - self.action_send_aruco_map.setText(_translate("MainWindow", "Send aruco map")) + self.menuRestart.setTitle(_translate("MainWindow", "Restart service")) + self.menuDeveloper_mode.setTitle(_translate("MainWindow", "Developer mode")) + self.action_send_animations.setText(_translate("MainWindow", "Animations")) + self.action_send_configurations.setText(_translate("MainWindow", "Configuration")) + self.action_send_aruco_map.setText(_translate("MainWindow", "Aruco map")) self.action_update_client_repo.setText(_translate("MainWindow", "Update clever-show git")) self.actionSend_launch_file_for_clever.setText(_translate("MainWindow", "Send launch file for clever")) - self.action_send_launch_file.setText(_translate("MainWindow", "Send launch files")) - self.action_restart_clever.setText(_translate("MainWindow", "Restart clever service")) - self.action_restart_clever_show.setText(_translate("MainWindow", "Restart clever-show service")) + self.action_send_launch_file.setText(_translate("MainWindow", "Launch files")) + self.action_restart_clever.setText(_translate("MainWindow", "clever")) + self.action_restart_clever_show.setText(_translate("MainWindow", "clever-show")) self.action_select_all_rows.setText(_translate("MainWindow", "Select all drones")) self.action_select_all_rows.setShortcut(_translate("MainWindow", "Ctrl+A")) self.action_set_start_to_current_position.setText(_translate("MainWindow", "Set start X Y to current position")) self.action_reset_start.setText(_translate("MainWindow", "Reset start position")) self.action_set_z_offset_to_ground.setText(_translate("MainWindow", "Set Z offset to ground")) self.action_reset_z_offset.setText(_translate("MainWindow", "Reset Z offset")) - self.action_select_music_file.setText(_translate("MainWindow", "Select music file")) - self.action_play_music.setText(_translate("MainWindow", "Play music")) + self.action_select_music_file.setText(_translate("MainWindow", "Select file")) + self.action_play_music.setText(_translate("MainWindow", "Play")) self.action_test_music_after.setText(_translate("MainWindow", "Test music after")) self.actionFill.setText(_translate("MainWindow", "fill")) - self.action_send_any_file.setText(_translate("MainWindow", "Send any file")) - self.action_send_any_command.setText(_translate("MainWindow", "Send any command")) - self.action_stop_music.setText(_translate("MainWindow", "Stop music")) - self.action_remove_row.setText(_translate("MainWindow", "Remove drone")) + self.action_send_any_file.setText(_translate("MainWindow", "File")) + self.action_send_any_command.setText(_translate("MainWindow", "Command")) + self.action_stop_music.setText(_translate("MainWindow", "Stop")) + self.action_remove_row.setText(_translate("MainWindow", "Remove selected drones")) self.action_remove_row.setShortcut(_translate("MainWindow", "Ctrl+Del")) - self.action_send_calibrations.setText(_translate("MainWindow", "Send camera calibrations")) - self.action_reboot_all.setText(_translate("MainWindow", "Reboot system")) - self.action_restart_chrony.setText(_translate("MainWindow", "Restart chrony")) - self.action_send_fcu_parameters.setText(_translate("MainWindow", "Send FCU parameters")) + self.action_send_calibrations.setText(_translate("MainWindow", "Camera calibrations")) + self.action_reboot_all.setText(_translate("MainWindow", "Reboot")) + self.action_restart_chrony.setText(_translate("MainWindow", "chrony")) + self.action_send_fcu_parameters.setText(_translate("MainWindow", "FCU parameters")) self.action_toggle_select.setText(_translate("MainWindow", "Toggle select")) self.action_toggle_select.setShortcut(_translate("MainWindow", "Ctrl+A")) self.action_select_all.setText(_translate("MainWindow", "Select all")) @@ -415,16 +420,7 @@ class Ui_MainWindow(object): self.action_edit_server_config.setText(_translate("MainWindow", "Edit server config")) self.action_edit_any_config.setText(_translate("MainWindow", "Edit any config")) self.action_update_server_git.setText(_translate("MainWindow", "Update server git")) - self.action_retrive_any_file.setText(_translate("MainWindow", "Retrive any file")) + self.action_retrive_any_file.setText(_translate("MainWindow", "Retrive file")) self.action_restart_server.setText(_translate("MainWindow", "Restart server")) self.action_configure_columns.setText(_translate("MainWindow", "Configure columns")) - - -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_()) + self.actionSomething.setText(_translate("MainWindow", "something")) diff --git a/Server/server_gui.ui b/Server/server_gui.ui index 0dd485a..e00e6f4 100644 --- a/Server/server_gui.ui +++ b/Server/server_gui.ui @@ -426,7 +426,7 @@ 0 0 1360 - 26 + 25 @@ -463,7 +463,7 @@ - Drone + Selected drones @@ -481,48 +481,49 @@ - Restart + Restart service - - + - Retrive + Developer mode - + - + - - + + - + + + + - - Send animations + Animations - Send configurations + Configuration - Send aruco map + Aruco map @@ -537,17 +538,17 @@ - Send launch files + Launch files - Restart clever service + clever - Restart clever-show service + clever-show @@ -580,12 +581,12 @@ - Select music file + Select file - Play music + Play @@ -600,22 +601,22 @@ - Send any file + File - Send any command + Command - Stop music + Stop - Remove drone + Remove selected drones Ctrl+Del @@ -623,22 +624,22 @@ - Send camera calibrations + Camera calibrations - Reboot system + Reboot - Restart chrony + chrony - Send FCU parameters + FCU parameters @@ -676,13 +677,19 @@ + + false + Update server git + + false + - Retrive any file + Retrive file @@ -695,6 +702,11 @@ Configure columns + + + something + + start_delay_spin