diff --git a/sw/supervision/python/hmi.py b/sw/supervision/python/hmi.py index 95dd6ff98f..8a305946cf 100644 --- a/sw/supervision/python/hmi.py +++ b/sw/supervision/python/hmi.py @@ -389,6 +389,7 @@ class Hmi(Widgets.QMainWindow): self.ui.actionSave_3.triggered.connect(self.save_current_session) self.ui.actionFull_screen.triggered.connect(self.fullscreen_view) + self.ui.actionHide_overviews.triggered.connect(self.toggle_overview) self.ui.actionAbout_Paparazzi_UAV.triggered.connect( self.credits_popup.show) @@ -559,6 +560,14 @@ class Hmi(Widgets.QMainWindow): else: self.showMaximized() + def toggle_overview(self): + if self.ui.dockWidget.isVisible(): + self.ui.dockWidget.hide() + self.ui.actionHide_overviews.setText("Show overviews") + else: + self.ui.dockWidget.show() + self.ui.actionHide_overviews.setText("Hide overviews") + def update_set_combo(self): """ -> Clear the 'Set' combobox. diff --git a/sw/supervision/python/ui/main_window.py b/sw/supervision/python/ui/main_window.py index 6363b7abff..220183f1d9 100644 --- a/sw/supervision/python/ui/main_window.py +++ b/sw/supervision/python/ui/main_window.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'ui/main_window.ui' +# Form implementation generated from reading ui file 'main_window.ui' # -# Created: Tue Jun 28 14:49:52 2016 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.9.2 # # WARNING! All changes made in this file will be lost! @@ -12,7 +11,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName("MainWindow") - MainWindow.resize(744, 481) + MainWindow.resize(833, 481) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -227,7 +226,7 @@ class Ui_MainWindow(object): self.scrollArea_3.setWidgetResizable(True) self.scrollArea_3.setObjectName("scrollArea_3") self.scrollAreaWidgetContents_3 = QtWidgets.QWidget() - self.scrollAreaWidgetContents_3.setGeometry(QtCore.QRect(0, 0, 298, 622)) + self.scrollAreaWidgetContents_3.setGeometry(QtCore.QRect(0, 0, 162, 622)) self.scrollAreaWidgetContents_3.setObjectName("scrollAreaWidgetContents_3") self.gridLayout_4 = QtWidgets.QGridLayout(self.scrollAreaWidgetContents_3) self.gridLayout_4.setObjectName("gridLayout_4") @@ -337,6 +336,42 @@ class Ui_MainWindow(object): self.build_flash_tab.setObjectName("build_flash_tab") self.gridLayout_3 = QtWidgets.QGridLayout(self.build_flash_tab) self.gridLayout_3.setObjectName("gridLayout_3") + self.label_28 = QtWidgets.QLabel(self.build_flash_tab) + self.label_28.setMinimumSize(QtCore.QSize(20, 20)) + self.label_28.setMaximumSize(QtCore.QSize(20, 20)) + self.label_28.setText("") + self.label_28.setPixmap(QtGui.QPixmap("icons/gtk-info.svg")) + self.label_28.setObjectName("label_28") + self.gridLayout_3.addWidget(self.label_28, 11, 0, 1, 1) + self.build_result = QtWidgets.QLabel(self.build_flash_tab) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.build_result.sizePolicy().hasHeightForWidth()) + self.build_result.setSizePolicy(sizePolicy) + self.build_result.setMinimumSize(QtCore.QSize(0, 20)) + self.build_result.setMaximumSize(QtCore.QSize(16777215, 20)) + self.build_result.setFrameShape(QtWidgets.QFrame.StyledPanel) + self.build_result.setText("") + self.build_result.setObjectName("build_result") + self.gridLayout_3.addWidget(self.build_result, 3, 3, 1, 9) + self.info_nb = QtWidgets.QLabel(self.build_flash_tab) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.info_nb.sizePolicy().hasHeightForWidth()) + self.info_nb.setSizePolicy(sizePolicy) + self.info_nb.setMinimumSize(QtCore.QSize(30, 20)) + self.info_nb.setMaximumSize(QtCore.QSize(30, 20)) + font = QtGui.QFont() + font.setBold(True) + font.setWeight(75) + self.info_nb.setFont(font) + self.info_nb.setStyleSheet("border:2px solid #00ff00;") + self.info_nb.setFrameShape(QtWidgets.QFrame.StyledPanel) + self.info_nb.setText("") + self.info_nb.setObjectName("info_nb") + self.gridLayout_3.addWidget(self.info_nb, 11, 2, 1, 1) self.flash_resut_icon = QtWidgets.QLabel(self.build_flash_tab) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -362,23 +397,6 @@ class Ui_MainWindow(object): self.flash_result.setText("") self.flash_result.setObjectName("flash_result") self.gridLayout_3.addWidget(self.flash_result, 7, 3, 1, 8) - self.info_nb = QtWidgets.QLabel(self.build_flash_tab) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.info_nb.sizePolicy().hasHeightForWidth()) - self.info_nb.setSizePolicy(sizePolicy) - self.info_nb.setMinimumSize(QtCore.QSize(30, 20)) - self.info_nb.setMaximumSize(QtCore.QSize(30, 20)) - font = QtGui.QFont() - font.setBold(True) - font.setWeight(75) - self.info_nb.setFont(font) - self.info_nb.setStyleSheet("border:2px solid #00ff00;") - self.info_nb.setFrameShape(QtWidgets.QFrame.StyledPanel) - self.info_nb.setText("") - self.info_nb.setObjectName("info_nb") - self.gridLayout_3.addWidget(self.info_nb, 11, 2, 1, 1) self.label_25 = QtWidgets.QLabel(self.build_flash_tab) font = QtGui.QFont() font.setPointSize(14) @@ -408,21 +426,6 @@ class Ui_MainWindow(object): self.label_13.setMaximumSize(QtCore.QSize(60, 16777215)) self.label_13.setObjectName("label_13") self.gridLayout_3.addWidget(self.label_13, 7, 0, 1, 2) - self.label_28 = QtWidgets.QLabel(self.build_flash_tab) - self.label_28.setMinimumSize(QtCore.QSize(20, 20)) - self.label_28.setMaximumSize(QtCore.QSize(20, 20)) - self.label_28.setText("") - self.label_28.setPixmap(QtGui.QPixmap("icons/gtk-info.svg")) - self.label_28.setObjectName("label_28") - self.gridLayout_3.addWidget(self.label_28, 11, 0, 1, 1) - self.label_23 = QtWidgets.QLabel(self.build_flash_tab) - font = QtGui.QFont() - font.setPointSize(14) - font.setBold(True) - font.setWeight(75) - self.label_23.setFont(font) - self.label_23.setObjectName("label_23") - self.gridLayout_3.addWidget(self.label_23, 0, 0, 1, 2) self.warnings_nb = QtWidgets.QLabel(self.build_flash_tab) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -440,11 +443,14 @@ class Ui_MainWindow(object): self.warnings_nb.setText("") self.warnings_nb.setObjectName("warnings_nb") self.gridLayout_3.addWidget(self.warnings_nb, 11, 6, 1, 1) - self.label_9 = QtWidgets.QLabel(self.build_flash_tab) - self.label_9.setMinimumSize(QtCore.QSize(0, 30)) - self.label_9.setMaximumSize(QtCore.QSize(60, 16777215)) - self.label_9.setObjectName("label_9") - self.gridLayout_3.addWidget(self.label_9, 3, 0, 1, 2) + self.label_23 = QtWidgets.QLabel(self.build_flash_tab) + font = QtGui.QFont() + font.setPointSize(14) + font.setBold(True) + font.setWeight(75) + self.label_23.setFont(font) + self.label_23.setObjectName("label_23") + self.gridLayout_3.addWidget(self.label_23, 0, 0, 1, 2) self.label_12 = QtWidgets.QLabel(self.build_flash_tab) self.label_12.setMinimumSize(QtCore.QSize(0, 0)) self.label_12.setMaximumSize(QtCore.QSize(60, 16777215)) @@ -455,6 +461,25 @@ class Ui_MainWindow(object): self.label_14 = QtWidgets.QLabel(self.build_flash_tab) self.label_14.setObjectName("label_14") self.gridLayout_3.addWidget(self.label_14, 11, 1, 1, 1) + self.label_15 = QtWidgets.QLabel(self.build_flash_tab) + self.label_15.setMinimumSize(QtCore.QSize(20, 20)) + self.label_15.setMaximumSize(QtCore.QSize(20, 20)) + self.label_15.setText("") + self.label_15.setPixmap(QtGui.QPixmap("icons/dialog-error.svg")) + self.label_15.setObjectName("label_15") + self.gridLayout_3.addWidget(self.label_15, 11, 7, 1, 1) + self.target = QtWidgets.QComboBox(self.build_flash_tab) + self.target.setMinimumSize(QtCore.QSize(0, 30)) + self.target.setMaximumSize(QtCore.QSize(16777215, 30)) + self.target.setObjectName("target") + self.gridLayout_3.addWidget(self.target, 1, 2, 1, 8) + self.label_16 = QtWidgets.QLabel(self.build_flash_tab) + self.label_16.setMinimumSize(QtCore.QSize(20, 20)) + self.label_16.setMaximumSize(QtCore.QSize(20, 20)) + self.label_16.setText("") + self.label_16.setPixmap(QtGui.QPixmap("icons/dialog-warning.png")) + self.label_16.setObjectName("label_16") + self.gridLayout_3.addWidget(self.label_16, 11, 4, 1, 1) self.clean = QtWidgets.QPushButton(self.build_flash_tab) self.clean.setMinimumSize(QtCore.QSize(130, 30)) self.clean.setMaximumSize(QtCore.QSize(130, 30)) @@ -469,25 +494,6 @@ class Ui_MainWindow(object): self.line_4.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_4.setObjectName("line_4") self.gridLayout_3.addWidget(self.line_4, 9, 0, 1, 12) - self.label_15 = QtWidgets.QLabel(self.build_flash_tab) - self.label_15.setMinimumSize(QtCore.QSize(20, 20)) - self.label_15.setMaximumSize(QtCore.QSize(20, 20)) - self.label_15.setText("") - self.label_15.setPixmap(QtGui.QPixmap("icons/dialog-error.svg")) - self.label_15.setObjectName("label_15") - self.gridLayout_3.addWidget(self.label_15, 11, 7, 1, 1) - self.label_16 = QtWidgets.QLabel(self.build_flash_tab) - self.label_16.setMinimumSize(QtCore.QSize(20, 20)) - self.label_16.setMaximumSize(QtCore.QSize(20, 20)) - self.label_16.setText("") - self.label_16.setPixmap(QtGui.QPixmap("icons/dialog-warning.png")) - self.label_16.setObjectName("label_16") - self.gridLayout_3.addWidget(self.label_16, 11, 4, 1, 1) - self.target = QtWidgets.QComboBox(self.build_flash_tab) - self.target.setMinimumSize(QtCore.QSize(0, 30)) - self.target.setMaximumSize(QtCore.QSize(16777215, 30)) - self.target.setObjectName("target") - self.gridLayout_3.addWidget(self.target, 1, 2, 1, 8) self.errors_nb = QtWidgets.QLabel(self.build_flash_tab) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -516,6 +522,13 @@ class Ui_MainWindow(object): self.device.setMaximumSize(QtCore.QSize(16777215, 30)) self.device.setObjectName("device") self.gridLayout_3.addWidget(self.device, 6, 2, 1, 8) + self.build = QtWidgets.QPushButton(self.build_flash_tab) + self.build.setMinimumSize(QtCore.QSize(130, 30)) + self.build.setMaximumSize(QtCore.QSize(130, 30)) + self.build.setLayoutDirection(QtCore.Qt.LeftToRight) + self.build.setIcon(icon) + self.build.setObjectName("build") + self.gridLayout_3.addWidget(self.build, 2, 11, 1, 1) self.show_console = QtWidgets.QPushButton(self.build_flash_tab) self.show_console.setMinimumSize(QtCore.QSize(0, 30)) self.show_console.setMaximumSize(QtCore.QSize(16777215, 20)) @@ -525,36 +538,8 @@ class Ui_MainWindow(object): self.show_console.setIcon(icon5) self.show_console.setObjectName("show_console") self.gridLayout_3.addWidget(self.show_console, 11, 11, 1, 1, QtCore.Qt.AlignVCenter) - self.build = QtWidgets.QPushButton(self.build_flash_tab) - self.build.setMinimumSize(QtCore.QSize(130, 30)) - self.build.setMaximumSize(QtCore.QSize(130, 30)) - self.build.setLayoutDirection(QtCore.Qt.LeftToRight) - self.build.setIcon(icon) - self.build.setObjectName("build") - self.gridLayout_3.addWidget(self.build, 2, 11, 1, 1) spacerItem3 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) self.gridLayout_3.addItem(spacerItem3, 12, 11, 1, 1) - self.upload = QtWidgets.QPushButton(self.build_flash_tab) - self.upload.setEnabled(True) - self.upload.setMinimumSize(QtCore.QSize(130, 30)) - self.upload.setMaximumSize(QtCore.QSize(130, 30)) - icon6 = QtGui.QIcon() - icon6.addPixmap(QtGui.QPixmap("icons/go-up.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.upload.setIcon(icon6) - self.upload.setObjectName("upload") - self.gridLayout_3.addWidget(self.upload, 6, 11, 1, 1) - self.build_result = QtWidgets.QLabel(self.build_flash_tab) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.build_result.sizePolicy().hasHeightForWidth()) - self.build_result.setSizePolicy(sizePolicy) - self.build_result.setMinimumSize(QtCore.QSize(0, 20)) - self.build_result.setMaximumSize(QtCore.QSize(16777215, 20)) - self.build_result.setFrameShape(QtWidgets.QFrame.StyledPanel) - self.build_result.setText("") - self.build_result.setObjectName("build_result") - self.gridLayout_3.addWidget(self.build_result, 3, 3, 1, 8) self.build_result_icon = QtWidgets.QLabel(self.build_flash_tab) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -568,6 +553,20 @@ class Ui_MainWindow(object): self.build_result_icon.setText("") self.build_result_icon.setObjectName("build_result_icon") self.gridLayout_3.addWidget(self.build_result_icon, 3, 2, 1, 1) + self.upload = QtWidgets.QPushButton(self.build_flash_tab) + self.upload.setEnabled(True) + self.upload.setMinimumSize(QtCore.QSize(130, 30)) + self.upload.setMaximumSize(QtCore.QSize(130, 30)) + icon6 = QtGui.QIcon() + icon6.addPixmap(QtGui.QPixmap("icons/go-up.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.upload.setIcon(icon6) + self.upload.setObjectName("upload") + self.gridLayout_3.addWidget(self.upload, 6, 11, 1, 1) + self.label_9 = QtWidgets.QLabel(self.build_flash_tab) + self.label_9.setMinimumSize(QtCore.QSize(0, 30)) + self.label_9.setMaximumSize(QtCore.QSize(60, 16777215)) + self.label_9.setObjectName("label_9") + self.gridLayout_3.addWidget(self.label_9, 3, 0, 1, 2) self.main_tab.addTab(self.build_flash_tab, "") self.sessions_tab = QtWidgets.QWidget() self.sessions_tab.setObjectName("sessions_tab") @@ -944,7 +943,35 @@ class Ui_MainWindow(object): spacerItem7 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.gridLayout_6.addItem(spacerItem7, 0, 11, 1, 1) self.gridLayout_10.addWidget(self.frame, 2, 0, 1, 2) - self.stackedWidget = QtWidgets.QStackedWidget(self.centralwidget) + MainWindow.setCentralWidget(self.centralwidget) + self.menubar = QtWidgets.QMenuBar(MainWindow) + self.menubar.setGeometry(QtCore.QRect(0, 0, 833, 25)) + self.menubar.setObjectName("menubar") + self.menuSet = QtWidgets.QMenu(self.menubar) + self.menuSet.setObjectName("menuSet") + self.menuConfiguration = QtWidgets.QMenu(self.menubar) + self.menuConfiguration.setObjectName("menuConfiguration") + self.menuMenu = QtWidgets.QMenu(self.menubar) + self.menuMenu.setObjectName("menuMenu") + self.menuTools = QtWidgets.QMenu(self.menubar) + self.menuTools.setObjectName("menuTools") + self.menuView = QtWidgets.QMenu(self.menubar) + self.menuView.setObjectName("menuView") + self.menuHelp = QtWidgets.QMenu(self.menubar) + self.menuHelp.setObjectName("menuHelp") + self.menuSession = QtWidgets.QMenu(self.menubar) + self.menuSession.setObjectName("menuSession") + MainWindow.setMenuBar(self.menubar) + self.statusbar = QtWidgets.QStatusBar(MainWindow) + self.statusbar.setObjectName("statusbar") + MainWindow.setStatusBar(self.statusbar) + self.dockWidget = QtWidgets.QDockWidget(MainWindow) + self.dockWidget.setObjectName("dockWidget") + self.dockWidgetContents = QtWidgets.QWidget() + self.dockWidgetContents.setObjectName("dockWidgetContents") + self.horizontalLayout = QtWidgets.QHBoxLayout(self.dockWidgetContents) + self.horizontalLayout.setObjectName("horizontalLayout") + self.stackedWidget = QtWidgets.QStackedWidget(self.dockWidgetContents) self.stackedWidget.setEnabled(True) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -1029,7 +1056,7 @@ class Ui_MainWindow(object): self.scrollArea.setWidgetResizable(True) self.scrollArea.setObjectName("scrollArea") self.scrollAreaWidgetContents = QtWidgets.QWidget() - self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 148, 598)) + self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 162, 598)) self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents") self.gridLayout_13 = QtWidgets.QGridLayout(self.scrollAreaWidgetContents) self.gridLayout_13.setObjectName("gridLayout_13") @@ -1182,7 +1209,7 @@ class Ui_MainWindow(object): self.scrollArea_2.setWidgetResizable(True) self.scrollArea_2.setObjectName("scrollArea_2") self.scrollAreaWidgetContents_2 = QtWidgets.QWidget() - self.scrollAreaWidgetContents_2.setGeometry(QtCore.QRect(0, 0, 148, 598)) + self.scrollAreaWidgetContents_2.setGeometry(QtCore.QRect(0, 0, 162, 598)) self.scrollAreaWidgetContents_2.setObjectName("scrollAreaWidgetContents_2") self.gridLayout_15 = QtWidgets.QGridLayout(self.scrollAreaWidgetContents_2) self.gridLayout_15.setObjectName("gridLayout_15") @@ -1361,29 +1388,9 @@ class Ui_MainWindow(object): spacerItem9 = QtWidgets.QSpacerItem(20, 94, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) self.gridLayout_14.addItem(spacerItem9, 7, 0, 1, 1) self.stackedWidget.addWidget(self.widget) - self.gridLayout_10.addWidget(self.stackedWidget, 0, 1, 2, 1) - MainWindow.setCentralWidget(self.centralwidget) - self.menubar = QtWidgets.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 744, 25)) - self.menubar.setObjectName("menubar") - self.menuSet = QtWidgets.QMenu(self.menubar) - self.menuSet.setObjectName("menuSet") - self.menuConfiguration = QtWidgets.QMenu(self.menubar) - self.menuConfiguration.setObjectName("menuConfiguration") - self.menuMenu = QtWidgets.QMenu(self.menubar) - self.menuMenu.setObjectName("menuMenu") - self.menuTools = QtWidgets.QMenu(self.menubar) - self.menuTools.setObjectName("menuTools") - self.menuView = QtWidgets.QMenu(self.menubar) - self.menuView.setObjectName("menuView") - self.menuHelp = QtWidgets.QMenu(self.menubar) - self.menuHelp.setObjectName("menuHelp") - self.menuSession = QtWidgets.QMenu(self.menubar) - self.menuSession.setObjectName("menuSession") - MainWindow.setMenuBar(self.menubar) - self.statusbar = QtWidgets.QStatusBar(MainWindow) - self.statusbar.setObjectName("statusbar") - MainWindow.setStatusBar(self.statusbar) + self.horizontalLayout.addWidget(self.stackedWidget) + self.dockWidget.setWidget(self.dockWidgetContents) + MainWindow.addDockWidget(QtCore.Qt.DockWidgetArea(2), self.dockWidget) self.actionNew = QtWidgets.QAction(MainWindow) self.actionNew.setEnabled(False) self.actionNew.setObjectName("actionNew") @@ -1470,6 +1477,8 @@ class Ui_MainWindow(object): self.actionSet_default_cache_at_current_state.setObjectName("actionSet_default_cache_at_current_state") self.actionRestore_default_state = QtWidgets.QAction(MainWindow) self.actionRestore_default_state.setObjectName("actionRestore_default_state") + self.actionHide_overviews = QtWidgets.QAction(MainWindow) + self.actionHide_overviews.setObjectName("actionHide_overviews") self.menuSet.addAction(self.actionSetManager) self.menuConfiguration.addAction(self.actionNew_2) self.menuConfiguration.addAction(self.actionOpen_2) @@ -1483,6 +1492,7 @@ class Ui_MainWindow(object): self.menuMenu.addSeparator() self.menuMenu.addAction(self.actionQuit_Paparazzi_UAV) self.menuView.addAction(self.actionFull_screen) + self.menuView.addAction(self.actionHide_overviews) self.menuHelp.addAction(self.actionTutorial) self.menuHelp.addAction(self.actionAbout_Paparazzi_UAV) self.menuSession.addAction(self.actionNew_empty_session) @@ -1498,7 +1508,7 @@ class Ui_MainWindow(object): self.menubar.addAction(self.menuHelp.menuAction()) self.retranslateUi(MainWindow) - self.main_tab.setCurrentIndex(0) + self.main_tab.setCurrentIndex(3) self.stackedWidget.setCurrentIndex(0) self.main_tab.currentChanged['int'].connect(self.stackedWidget.setCurrentIndex) QtCore.QMetaObject.connectSlotsByName(MainWindow) @@ -1542,30 +1552,30 @@ class Ui_MainWindow(object): self.current_telemetry_label.setText(_translate("MainWindow", "Telemetry :")) self.main_tab.setTabText(self.main_tab.indexOf(self.equipment_tab), _translate("MainWindow", "Equipment")) self.main_tab.setTabToolTip(self.main_tab.indexOf(self.equipment_tab), _translate("MainWindow", "Tab to manage the equipments of the current configuration")) - self.flash_result.setToolTip(_translate("MainWindow", "Flash result")) + self.build_result.setToolTip(_translate("MainWindow", "Clean & build result")) self.info_nb.setToolTip(_translate("MainWindow", "Info found during build")) + self.flash_result.setToolTip(_translate("MainWindow", "Flash result")) self.label_25.setText(_translate("MainWindow", "Flash")) self.label_10.setText(_translate("MainWindow", "Errors :")) self.label_26.setText(_translate("MainWindow", "Target :")) self.label_11.setText(_translate("MainWindow", "Warnings :")) self.label_13.setText(_translate("MainWindow", "Result :")) - self.label_23.setText(_translate("MainWindow", "Build")) self.warnings_nb.setToolTip(_translate("MainWindow", "Warnings found during build")) - self.label_9.setText(_translate("MainWindow", "Result :")) + self.label_23.setText(_translate("MainWindow", "Build")) self.label_12.setText(_translate("MainWindow", "Device :")) self.label_14.setText(_translate("MainWindow", "Info :")) + self.target.setToolTip(_translate("MainWindow", "Current target")) self.clean.setToolTip(_translate("MainWindow", "Clean the current configuration")) self.clean.setText(_translate("MainWindow", "Clean")) - self.target.setToolTip(_translate("MainWindow", "Current target")) self.errors_nb.setToolTip(_translate("MainWindow", "Errors found during build")) self.device.setToolTip(_translate("MainWindow", "Current device")) - self.show_console.setToolTip(_translate("MainWindow", "Switch to the console tab")) - self.show_console.setText(_translate("MainWindow", "Show console")) self.build.setToolTip(_translate("MainWindow", "Build the current configuration")) self.build.setText(_translate("MainWindow", "Build")) + self.show_console.setToolTip(_translate("MainWindow", "Switch to the console tab")) + self.show_console.setText(_translate("MainWindow", "Show console")) self.upload.setToolTip(_translate("MainWindow", "Flash the current device")) self.upload.setText(_translate("MainWindow", "Upload")) - self.build_result.setToolTip(_translate("MainWindow", "Clean & build result")) + self.label_9.setText(_translate("MainWindow", "Result :")) self.main_tab.setTabText(self.main_tab.indexOf(self.build_flash_tab), _translate("MainWindow", "Build / Flash")) self.main_tab.setTabToolTip(self.main_tab.indexOf(self.build_flash_tab), _translate("MainWindow", "Tab to build and flash the current configuration")) self.programs.setToolTip(_translate("MainWindow", "Programs running (green) and stopped (red)")) @@ -1612,6 +1622,13 @@ class Ui_MainWindow(object): self.label_22.setText(_translate("MainWindow", "RUN_VERSION = ")) self.switch_mode.setToolTip(_translate("MainWindow", "Current mode (click to switch the mode)")) self.label_21.setText(_translate("MainWindow", "MODE = ")) + self.menuSet.setTitle(_translate("MainWindow", "Set")) + self.menuConfiguration.setTitle(_translate("MainWindow", "Configuration")) + self.menuMenu.setTitle(_translate("MainWindow", "Menu")) + self.menuTools.setTitle(_translate("MainWindow", "Tools")) + self.menuView.setTitle(_translate("MainWindow", "View")) + self.menuHelp.setTitle(_translate("MainWindow", "Help")) + self.menuSession.setTitle(_translate("MainWindow", "Session")) self.quick_restart.setToolTip(_translate("MainWindow", "Kill & restart all programs")) self.quick_restart.setText(_translate("MainWindow", "Start all")) self.label_33.setText(_translate("MainWindow", "Processus :")) @@ -1642,13 +1659,6 @@ class Ui_MainWindow(object): self.quick_kill_2.setText(_translate("MainWindow", "Kill all")) self.quick_restart_3.setToolTip(_translate("MainWindow", "Kill & restart all programs")) self.quick_restart_3.setText(_translate("MainWindow", "Start all")) - self.menuSet.setTitle(_translate("MainWindow", "Set")) - self.menuConfiguration.setTitle(_translate("MainWindow", "Configuration")) - self.menuMenu.setTitle(_translate("MainWindow", "Menu")) - self.menuTools.setTitle(_translate("MainWindow", "Tools")) - self.menuView.setTitle(_translate("MainWindow", "View")) - self.menuHelp.setTitle(_translate("MainWindow", "Help")) - self.menuSession.setTitle(_translate("MainWindow", "Session")) self.actionNew.setText(_translate("MainWindow", "New empty set")) self.actionNew.setShortcut(_translate("MainWindow", "Ctrl+Shift+N")) self.actionOpen.setText(_translate("MainWindow", "Save set as...")) @@ -1697,4 +1707,5 @@ class Ui_MainWindow(object): self.actionWILL_BE_AVAILABLE_LATER.setText(_translate("MainWindow", "WILL BE AVAILABLE LATER :")) self.actionSet_default_cache_at_current_state.setText(_translate("MainWindow", "Set default app state to current")) self.actionRestore_default_state.setText(_translate("MainWindow", "Restore default app state")) + self.actionHide_overviews.setText(_translate("MainWindow", "Hide overviews")) diff --git a/sw/supervision/python/ui/main_window.ui b/sw/supervision/python/ui/main_window.ui index 728ad997a1..230ae24c47 100644 --- a/sw/supervision/python/ui/main_window.ui +++ b/sw/supervision/python/ui/main_window.ui @@ -6,7 +6,7 @@ 0 0 - 744 + 833 481 @@ -278,7 +278,7 @@ QTabWidget::Triangular - 0 + 3 Qt::ElideNone @@ -578,7 +578,7 @@ 0 0 - 298 + 162 622 @@ -889,6 +889,99 @@ Tab to build and flash the current configuration + + + + + 20 + 20 + + + + + 20 + 20 + + + + + + + icons/gtk-info.svg + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + + 16777215 + 20 + + + + Clean & build result + + + QFrame::StyledPanel + + + + + + + + + + + 0 + 0 + + + + + 30 + 20 + + + + + 30 + 20 + + + + + 75 + true + + + + Info found during build + + + border:2px solid #00ff00; + + + QFrame::StyledPanel + + + + + + @@ -951,46 +1044,6 @@ - - - - - 0 - 0 - - - - - 30 - 20 - - - - - 30 - 20 - - - - - 75 - true - - - - Info found during build - - - border:2px solid #00ff00; - - - QFrame::StyledPanel - - - - - - @@ -1064,42 +1117,6 @@ - - - - - 20 - 20 - - - - - 20 - 20 - - - - - - - icons/gtk-info.svg - - - - - - - - 14 - 75 - true - - - - Build - - - @@ -1140,22 +1157,17 @@ - - - - - 0 - 30 - - - - - 60 - 16777215 - + + + + + 14 + 75 + true + - Result : + Build @@ -1198,6 +1210,69 @@ + + + + + 20 + 20 + + + + + 20 + 20 + + + + + + + icons/dialog-error.svg + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + Current target + + + + + + + + 20 + 20 + + + + + 20 + 20 + + + + + + + icons/dialog-warning.png + + + @@ -1234,69 +1309,6 @@ - - - - - 20 - 20 - - - - - 20 - 20 - - - - - - - icons/dialog-error.svg - - - - - - - - 20 - 20 - - - - - 20 - 20 - - - - - - - icons/dialog-warning.png - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - Current target - - - @@ -1365,35 +1377,6 @@ - - - - - 0 - 30 - - - - - 16777215 - 20 - - - - Switch to the console tab - - - Qt::LeftToRight - - - Show console - - - - icons/utilities-terminal.svgicons/utilities-terminal.svg - - - @@ -1423,6 +1406,35 @@ + + + + + 0 + 30 + + + + + 16777215 + 20 + + + + Switch to the console tab + + + Qt::LeftToRight + + + Show console + + + + icons/utilities-terminal.svgicons/utilities-terminal.svg + + + @@ -1436,6 +1448,37 @@ + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 30 + 16777215 + + + + + + + QFrame::NoFrame + + + + + + @@ -1465,65 +1508,22 @@ - - - - - 0 - 0 - - + + 0 - 20 + 30 - 16777215 - 20 - - - - Clean & build result - - - QFrame::StyledPanel - - - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 30 + 60 16777215 - - - - - QFrame::NoFrame - - + Result : @@ -2429,1035 +2429,6 @@ p, li { white-space: pre-wrap; } - - - - true - - - - 0 - 0 - - - - - 200 - 0 - - - - - 200 - 16777215 - - - - - - - QFrame::StyledPanel - - - QFrame::Plain - - - 0 - - - - - - - true - - - - 75 - false - true - false - false - true - - - - Kill & restart all programs - - - Start all - - - - icons/media-playback-start.svgicons/media-playback-start.svg - - - - - - - Processus : - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Programs running (green) and stopped (red) - - - - - - - Session : - - - - - - - - 0 - 0 - - - - Current session - - - - - - - QFrame::StyledPanel - - - Session overview - - - Qt::AutoText - - - false - - - false - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - true - - - - 75 - false - true - false - false - true - - - - Kill all running programs - - - Kill all - - - - icons/process-stop.svgicons/process-stop.svg - - - - - - - - - - - true - - - - - 0 - 0 - 148 - 598 - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - QFrame::StyledPanel - - - Settings overview - - - Qt::AutoText - - - false - - - - - - - - 0 - 20 - - - - - 16777215 - 20 - - - - - 75 - true - - - - Airframes - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - - - QFrame::StyledPanel - - - true - - - Qt::ElideLeft - - - QAbstractItemView::ScrollPerItem - - - QListView::Adjust - - - QListView::SinglePass - - - - - - - - 0 - 20 - - - - - 16777215 - 20 - - - - - 75 - true - - - - Settings - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - - - QFrame::StyledPanel - - - true - - - Qt::ElideLeft - - - QAbstractItemView::ScrollPerItem - - - QListView::Adjust - - - QListView::SinglePass - - - - - - - - 0 - 20 - - - - - 16777215 - 20 - - - - - 75 - true - - - - Flight plan - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - - - QFrame::StyledPanel - - - true - - - Qt::ElideLeft - - - QAbstractItemView::ScrollPerItem - - - QListView::Adjust - - - QListView::SinglePass - - - - - - - - 0 - 20 - - - - - 16777215 - 20 - - - - - 75 - true - - - - Radio - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - - - QFrame::StyledPanel - - - true - - - Qt::ElideLeft - - - QAbstractItemView::ScrollPerItem - - - QListView::Adjust - - - QListView::SinglePass - - - - - - - - 0 - 20 - - - - - 16777215 - 20 - - - - - 75 - true - - - - Telemetry - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - - - QFrame::StyledPanel - - - true - - - Qt::ElideLeft - - - QAbstractItemView::ScrollPerItem - - - QListView::Adjust - - - QListView::SinglePass - - - - - - - - - - - - - - - true - - - - - 0 - 0 - 148 - 598 - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - QFrame::StyledPanel - - - Settings overview - - - Qt::AutoText - - - false - - - - - - - - 0 - 20 - - - - - 16777215 - 20 - - - - - 75 - true - - - - Airframes - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - - - QFrame::StyledPanel - - - Qt::ElideLeft - - - - - - - - 0 - 20 - - - - - 16777215 - 20 - - - - - 75 - true - - - - Settings - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - - - QFrame::StyledPanel - - - Qt::ElideLeft - - - - - - - - 0 - 20 - - - - - 16777215 - 20 - - - - - 75 - true - - - - Flight plan - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - - - QFrame::StyledPanel - - - Qt::ElideLeft - - - - - - - - 0 - 20 - - - - - 16777215 - 20 - - - - - 75 - true - - - - Radio - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - - - QFrame::StyledPanel - - - Qt::ElideLeft - - - - - - - - 0 - 20 - - - - - 16777215 - 20 - - - - - 75 - true - - - - Telemetry - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - - - QFrame::StyledPanel - - - Qt::ElideLeft - - - - - - - - - - - - - - - QFrame::StyledPanel - - - Session overview - - - Qt::AutoText - - - false - - - false - - - - - - - Session : - - - - - - - - 0 - 0 - - - - Current session - - - - - - - Processus : - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Programs running (green) and stopped (red) - - - - - - - - 75 - true - - - - Kill all running programs - - - Kill all - - - - icons/process-stop.svgicons/process-stop.svg - - - - - - - - 75 - true - - - - Kill & restart all programs - - - Start all - - - - icons/media-playback-start.svgicons/media-playback-start.svg - - - - - - - Qt::Vertical - - - - 20 - 94 - - - - - - - - @@ -3465,7 +2436,7 @@ p, li { white-space: pre-wrap; } 0 0 - 744 + 833 25 @@ -3506,6 +2477,7 @@ p, li { white-space: pre-wrap; } View + @@ -3532,6 +2504,1044 @@ p, li { white-space: pre-wrap; } + + + 2 + + + + + + + true + + + + 0 + 0 + + + + + 200 + 0 + + + + + 200 + 16777215 + + + + + + + QFrame::StyledPanel + + + QFrame::Plain + + + 0 + + + + + + + true + + + + 75 + false + true + false + false + true + + + + Kill & restart all programs + + + Start all + + + + icons/media-playback-start.svgicons/media-playback-start.svg + + + + + + + Processus : + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Programs running (green) and stopped (red) + + + + + + + Session : + + + + + + + + 0 + 0 + + + + Current session + + + + + + + QFrame::StyledPanel + + + Session overview + + + Qt::AutoText + + + false + + + false + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + true + + + + 75 + false + true + false + false + true + + + + Kill all running programs + + + Kill all + + + + icons/process-stop.svgicons/process-stop.svg + + + + + + + + + + + true + + + + + 0 + 0 + 162 + 598 + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + QFrame::StyledPanel + + + Settings overview + + + Qt::AutoText + + + false + + + + + + + + 0 + 20 + + + + + 16777215 + 20 + + + + + 75 + true + + + + Airframes + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + + + QFrame::StyledPanel + + + true + + + Qt::ElideLeft + + + QAbstractItemView::ScrollPerItem + + + QListView::Adjust + + + QListView::SinglePass + + + + + + + + 0 + 20 + + + + + 16777215 + 20 + + + + + 75 + true + + + + Settings + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + + + QFrame::StyledPanel + + + true + + + Qt::ElideLeft + + + QAbstractItemView::ScrollPerItem + + + QListView::Adjust + + + QListView::SinglePass + + + + + + + + 0 + 20 + + + + + 16777215 + 20 + + + + + 75 + true + + + + Flight plan + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + + + QFrame::StyledPanel + + + true + + + Qt::ElideLeft + + + QAbstractItemView::ScrollPerItem + + + QListView::Adjust + + + QListView::SinglePass + + + + + + + + 0 + 20 + + + + + 16777215 + 20 + + + + + 75 + true + + + + Radio + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + + + QFrame::StyledPanel + + + true + + + Qt::ElideLeft + + + QAbstractItemView::ScrollPerItem + + + QListView::Adjust + + + QListView::SinglePass + + + + + + + + 0 + 20 + + + + + 16777215 + 20 + + + + + 75 + true + + + + Telemetry + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + + + QFrame::StyledPanel + + + true + + + Qt::ElideLeft + + + QAbstractItemView::ScrollPerItem + + + QListView::Adjust + + + QListView::SinglePass + + + + + + + + + + + + + + + true + + + + + 0 + 0 + 162 + 598 + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + QFrame::StyledPanel + + + Settings overview + + + Qt::AutoText + + + false + + + + + + + + 0 + 20 + + + + + 16777215 + 20 + + + + + 75 + true + + + + Airframes + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + + + QFrame::StyledPanel + + + Qt::ElideLeft + + + + + + + + 0 + 20 + + + + + 16777215 + 20 + + + + + 75 + true + + + + Settings + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + + + QFrame::StyledPanel + + + Qt::ElideLeft + + + + + + + + 0 + 20 + + + + + 16777215 + 20 + + + + + 75 + true + + + + Flight plan + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + + + QFrame::StyledPanel + + + Qt::ElideLeft + + + + + + + + 0 + 20 + + + + + 16777215 + 20 + + + + + 75 + true + + + + Radio + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + + + QFrame::StyledPanel + + + Qt::ElideLeft + + + + + + + + 0 + 20 + + + + + 16777215 + 20 + + + + + 75 + true + + + + Telemetry + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + + + QFrame::StyledPanel + + + Qt::ElideLeft + + + + + + + + + + + + + + + QFrame::StyledPanel + + + Session overview + + + Qt::AutoText + + + false + + + false + + + + + + + Session : + + + + + + + + 0 + 0 + + + + Current session + + + + + + + Processus : + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Programs running (green) and stopped (red) + + + + + + + + 75 + true + + + + Kill all running programs + + + Kill all + + + + icons/process-stop.svgicons/process-stop.svg + + + + + + + + 75 + true + + + + Kill & restart all programs + + + Start all + + + + icons/media-playback-start.svgicons/media-playback-start.svg + + + + + + + Qt::Vertical + + + + 20 + 94 + + + + + + + + + + + false @@ -3806,6 +3816,11 @@ p, li { white-space: pre-wrap; } Restore default app state + + + Hide overviews + +