Skip to content

Commit 9da2a09

Browse files
EzetowersEzetowers
committed
Added tab order to Qt Windows
* Also added fail Generic_Spinner
1 parent e63ab5a commit 9da2a09

File tree

11 files changed

+521
-9
lines changed

11 files changed

+521
-9
lines changed

‎MLC/GUI/Autogenerated/autogenerated.py‎

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,62 @@ def retranslateUi(self, ArduinoConnectionDialog):
4646

4747
# -*- coding: utf-8 -*-
4848

49+
# Form implementation generated from reading ui file './mlc_qtcreator/generic_spinner.ui'
50+
#
51+
# Created by: PyQt5 UI code generator 5.7.1
52+
#
53+
# WARNING! All changes made in this file will be lost!
54+
55+
from PyQt5 import QtCore, QtGui, QtWidgets
56+
57+
class Ui_GenericSpinnerDialog(object):
58+
def setupUi(self, GenericSpinnerDialog):
59+
GenericSpinnerDialog.setObjectName("GenericSpinnerDialog")
60+
GenericSpinnerDialog.setWindowModality(QtCore.Qt.ApplicationModal)
61+
GenericSpinnerDialog.resize(400, 300)
62+
self.spinner_layout = QtWidgets.QVBoxLayout(GenericSpinnerDialog)
63+
self.spinner_layout.setSizeConstraint(QtWidgets.QLayout.SetMaximumSize)
64+
self.spinner_layout.setObjectName("spinner_layout")
65+
self.spinner_widget = QtWidgets.QWidget(GenericSpinnerDialog)
66+
self.spinner_widget.setObjectName("spinner_widget")
67+
self.spinner_layout.addWidget(self.spinner_widget)
68+
self.spinner_label = QtWidgets.QLabel(GenericSpinnerDialog)
69+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)
70+
sizePolicy.setHorizontalStretch(0)
71+
sizePolicy.setVerticalStretch(0)
72+
sizePolicy.setHeightForWidth(self.spinner_label.sizePolicy().hasHeightForWidth())
73+
self.spinner_label.setSizePolicy(sizePolicy)
74+
self.spinner_label.setTextFormat(QtCore.Qt.RichText)
75+
self.spinner_label.setScaledContents(False)
76+
self.spinner_label.setAlignment(QtCore.Qt.AlignCenter)
77+
self.spinner_label.setWordWrap(False)
78+
self.spinner_label.setObjectName("spinner_label")
79+
self.spinner_layout.addWidget(self.spinner_label, 0, QtCore.Qt.AlignHCenter|QtCore.Qt.AlignVCenter)
80+
self.cancel_button = QtWidgets.QPushButton(GenericSpinnerDialog)
81+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Maximum)
82+
sizePolicy.setHorizontalStretch(0)
83+
sizePolicy.setVerticalStretch(0)
84+
sizePolicy.setHeightForWidth(self.cancel_button.sizePolicy().hasHeightForWidth())
85+
self.cancel_button.setSizePolicy(sizePolicy)
86+
self.cancel_button.setLayoutDirection(QtCore.Qt.LeftToRight)
87+
self.cancel_button.setAutoDefault(True)
88+
self.cancel_button.setDefault(False)
89+
self.cancel_button.setFlat(False)
90+
self.cancel_button.setObjectName("cancel_button")
91+
self.spinner_layout.addWidget(self.cancel_button, 0, QtCore.Qt.AlignHCenter)
92+
93+
self.retranslateUi(GenericSpinnerDialog)
94+
self.cancel_button.clicked.connect(GenericSpinnerDialog.on_cancel_button_clicked)
95+
# QtCore.QMetaObject.connectSlotsByName(GenericSpinnerDialog)
96+
97+
def retranslateUi(self, GenericSpinnerDialog):
98+
_translate = QtCore.QCoreApplication.translate
99+
GenericSpinnerDialog.setWindowTitle(_translate("GenericSpinnerDialog", "Dialog"))
100+
self.spinner_label.setText(_translate("GenericSpinnerDialog", "TextLabel"))
101+
self.cancel_button.setText(_translate("GenericSpinnerDialog", "Cancel"))
102+
103+
# -*- coding: utf-8 -*-
104+
49105
# Form implementation generated from reading ui file './mlc_qtcreator/pinout_design.ui'
50106
#
51107
# Created by: PyQt5 UI code generator 5.7.1
@@ -246,6 +302,14 @@ def setupUi(self, MLCManager):
246302
self.rename_button.clicked.connect(MLCManager.on_rename_button_clicked)
247303
self.edit_workspace.triggered.connect(MLCManager.on_edit_workspace_clicked)
248304
# QtCore.QMetaObject.connectSlotsByName(MLCManager)
305+
MLCManager.setTabOrder(self.new_button, self.remove_button)
306+
MLCManager.setTabOrder(self.remove_button, self.clone_button)
307+
MLCManager.setTabOrder(self.clone_button, self.import_button)
308+
MLCManager.setTabOrder(self.import_button, self.export_button)
309+
MLCManager.setTabOrder(self.export_button, self.open_button)
310+
MLCManager.setTabOrder(self.open_button, self.rename_button)
311+
MLCManager.setTabOrder(self.rename_button, self.experiment_list)
312+
MLCManager.setTabOrder(self.experiment_list, self.experiment_description)
249313

250314
def retranslateUi(self, MLCManager):
251315
_translate = QtCore.QCoreApplication.translate
@@ -960,6 +1024,47 @@ def setupUi(self, ExperimentWindow):
9601024
self.gen_start_over_button.clicked.connect(ExperimentWindow.on_gen_start_over_button_clicked)
9611025
self.test_preev_indiv_button.clicked.connect(ExperimentWindow.on_test_preev_indiv_button_clicked)
9621026
# QtCore.QMetaObject.connectSlotsByName(ExperimentWindow)
1027+
ExperimentWindow.setTabOrder(self.tabWidget, self.textEdit)
1028+
ExperimentWindow.setTabOrder(self.textEdit, self.max_cost_combo)
1029+
ExperimentWindow.setTabOrder(self.max_cost_combo, self.min_cost_combo)
1030+
ExperimentWindow.setTabOrder(self.min_cost_combo, self.valid_points_combo)
1031+
ExperimentWindow.setTabOrder(self.valid_points_combo, self.marker_combo)
1032+
ExperimentWindow.setTabOrder(self.marker_combo, self.overflow_color_combo)
1033+
ExperimentWindow.setTabOrder(self.overflow_color_combo, self.overflow_value_combo)
1034+
ExperimentWindow.setTabOrder(self.overflow_value_combo, self.nan_color_combo)
1035+
ExperimentWindow.setTabOrder(self.nan_color_combo, self.nan_value_combo)
1036+
ExperimentWindow.setTabOrder(self.nan_value_combo, self.preev_edit_button)
1037+
ExperimentWindow.setTabOrder(self.preev_edit_button, self.ev_edit_button)
1038+
ExperimentWindow.setTabOrder(self.ev_edit_button, self.test_indiv_edit)
1039+
ExperimentWindow.setTabOrder(self.test_indiv_edit, self.test_button)
1040+
ExperimentWindow.setTabOrder(self.test_button, self.test_preev_indiv_edit)
1041+
ExperimentWindow.setTabOrder(self.test_preev_indiv_edit, self.test_preev_indiv_button)
1042+
ExperimentWindow.setTabOrder(self.test_preev_indiv_button, self.from_gen_combo)
1043+
ExperimentWindow.setTabOrder(self.from_gen_combo, self.to_gen_combo)
1044+
ExperimentWindow.setTabOrder(self.to_gen_combo, self.start_button)
1045+
ExperimentWindow.setTabOrder(self.start_button, self.board_config_button)
1046+
ExperimentWindow.setTabOrder(self.board_config_button, self.textEdit_2)
1047+
ExperimentWindow.setTabOrder(self.textEdit_2, self.db_view)
1048+
ExperimentWindow.setTabOrder(self.db_view, self.prev_gen_button)
1049+
ExperimentWindow.setTabOrder(self.prev_gen_button, self.gen_count_combo)
1050+
ExperimentWindow.setTabOrder(self.gen_count_combo, self.next_gen_button)
1051+
ExperimentWindow.setTabOrder(self.next_gen_button, self.log_check)
1052+
ExperimentWindow.setTabOrder(self.log_check, self.show_all_check)
1053+
ExperimentWindow.setTabOrder(self.show_all_check, self.dimension_check)
1054+
ExperimentWindow.setTabOrder(self.dimension_check, self.gen_cut_button)
1055+
ExperimentWindow.setTabOrder(self.gen_cut_button, self.gen_start_over_button)
1056+
ExperimentWindow.setTabOrder(self.gen_start_over_button, self.best_indiv_button)
1057+
ExperimentWindow.setTabOrder(self.best_indiv_button, self.convergence_button)
1058+
ExperimentWindow.setTabOrder(self.convergence_button, self.genealogy_button)
1059+
ExperimentWindow.setTabOrder(self.genealogy_button, self.config_table)
1060+
ExperimentWindow.setTabOrder(self.config_table, self.import_config_button)
1061+
ExperimentWindow.setTabOrder(self.import_config_button, self.export_config_button)
1062+
ExperimentWindow.setTabOrder(self.export_config_button, self.save_config_button)
1063+
ExperimentWindow.setTabOrder(self.save_config_button, self.edit_config_button)
1064+
ExperimentWindow.setTabOrder(self.edit_config_button, self.first_indivs_table)
1065+
ExperimentWindow.setTabOrder(self.first_indivs_table, self.first_add_indiv)
1066+
ExperimentWindow.setTabOrder(self.first_add_indiv, self.first_add_indiv_from_textfile)
1067+
ExperimentWindow.setTabOrder(self.first_add_indiv_from_textfile, self.first_remove_indiv)
9631068

9641069
def retranslateUi(self, ExperimentWindow):
9651070
_translate = QtCore.QCoreApplication.translate
@@ -1641,6 +1746,32 @@ def setupUi(self, BoardConfigurationWindow):
16411746
self.analog_resolution_spin.valueChanged['int'].connect(BoardConfigurationWindow.on_analog_resolution_change)
16421747
self.permissions_button.clicked.connect(BoardConfigurationWindow.on_permission_button_clicked)
16431748
# QtCore.QMetaObject.connectSlotsByName(BoardConfigurationWindow)
1749+
BoardConfigurationWindow.setTabOrder(self.arduinoBoard, self.showPinout)
1750+
BoardConfigurationWindow.setTabOrder(self.showPinout, self.serial_radio)
1751+
BoardConfigurationWindow.setTabOrder(self.serial_radio, self.ethernet_radio)
1752+
BoardConfigurationWindow.setTabOrder(self.ethernet_radio, self.interface_combo)
1753+
BoardConfigurationWindow.setTabOrder(self.interface_combo, self.permissions_button)
1754+
BoardConfigurationWindow.setTabOrder(self.permissions_button, self.baud_rate_selector)
1755+
BoardConfigurationWindow.setTabOrder(self.baud_rate_selector, self.parity_bits_selector)
1756+
BoardConfigurationWindow.setTabOrder(self.parity_bits_selector, self.stop_bits_selector)
1757+
BoardConfigurationWindow.setTabOrder(self.stop_bits_selector, self.byte_size_selector)
1758+
BoardConfigurationWindow.setTabOrder(self.byte_size_selector, self.testInterface)
1759+
BoardConfigurationWindow.setTabOrder(self.testInterface, self.digitalPins)
1760+
BoardConfigurationWindow.setTabOrder(self.digitalPins, self.digitalPinType)
1761+
BoardConfigurationWindow.setTabOrder(self.digitalPinType, self.addDigitalPin)
1762+
BoardConfigurationWindow.setTabOrder(self.addDigitalPin, self.removeDigitalPin)
1763+
BoardConfigurationWindow.setTabOrder(self.removeDigitalPin, self.digitalPinsList)
1764+
BoardConfigurationWindow.setTabOrder(self.digitalPinsList, self.analogPins)
1765+
BoardConfigurationWindow.setTabOrder(self.analogPins, self.analogPinType)
1766+
BoardConfigurationWindow.setTabOrder(self.analogPinType, self.addAnalogPin)
1767+
BoardConfigurationWindow.setTabOrder(self.addAnalogPin, self.removeAnalogPin)
1768+
BoardConfigurationWindow.setTabOrder(self.removeAnalogPin, self.analogPinList)
1769+
BoardConfigurationWindow.setTabOrder(self.analogPinList, self.report_mode_combo)
1770+
BoardConfigurationWindow.setTabOrder(self.report_mode_combo, self.read_delay_spin)
1771+
BoardConfigurationWindow.setTabOrder(self.read_delay_spin, self.read_count_spin)
1772+
BoardConfigurationWindow.setTabOrder(self.read_count_spin, self.analog_resolution_spin)
1773+
BoardConfigurationWindow.setTabOrder(self.analog_resolution_spin, self.benchTests)
1774+
BoardConfigurationWindow.setTabOrder(self.benchTests, self.closeButton)
16441775

16451776
def retranslateUi(self, BoardConfigurationWindow):
16461777
_translate = QtCore.QCoreApplication.translate

‎MLC/GUI/Autogenerated/mlc_qtcreator/board_config_design.ui‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,6 +1295,35 @@
12951295
</widget>
12961296
</widget>
12971297
<layoutdefault spacing="6" margin="11"/>
1298+
<tabstops>
1299+
<tabstop>arduinoBoard</tabstop>
1300+
<tabstop>showPinout</tabstop>
1301+
<tabstop>serial_radio</tabstop>
1302+
<tabstop>ethernet_radio</tabstop>
1303+
<tabstop>interface_combo</tabstop>
1304+
<tabstop>permissions_button</tabstop>
1305+
<tabstop>baud_rate_selector</tabstop>
1306+
<tabstop>parity_bits_selector</tabstop>
1307+
<tabstop>stop_bits_selector</tabstop>
1308+
<tabstop>byte_size_selector</tabstop>
1309+
<tabstop>testInterface</tabstop>
1310+
<tabstop>digitalPins</tabstop>
1311+
<tabstop>digitalPinType</tabstop>
1312+
<tabstop>addDigitalPin</tabstop>
1313+
<tabstop>removeDigitalPin</tabstop>
1314+
<tabstop>digitalPinsList</tabstop>
1315+
<tabstop>analogPins</tabstop>
1316+
<tabstop>analogPinType</tabstop>
1317+
<tabstop>addAnalogPin</tabstop>
1318+
<tabstop>removeAnalogPin</tabstop>
1319+
<tabstop>analogPinList</tabstop>
1320+
<tabstop>report_mode_combo</tabstop>
1321+
<tabstop>read_delay_spin</tabstop>
1322+
<tabstop>read_count_spin</tabstop>
1323+
<tabstop>analog_resolution_spin</tabstop>
1324+
<tabstop>benchTests</tabstop>
1325+
<tabstop>closeButton</tabstop>
1326+
</tabstops>
12981327
<resources/>
12991328
<connections>
13001329
<connection>

‎MLC/GUI/Autogenerated/mlc_qtcreator/experiment.ui‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -812,6 +812,50 @@
812812
</layout>
813813
</widget>
814814
</widget>
815+
<tabstops>
816+
<tabstop>tabWidget</tabstop>
817+
<tabstop>textEdit</tabstop>
818+
<tabstop>max_cost_combo</tabstop>
819+
<tabstop>min_cost_combo</tabstop>
820+
<tabstop>valid_points_combo</tabstop>
821+
<tabstop>marker_combo</tabstop>
822+
<tabstop>overflow_color_combo</tabstop>
823+
<tabstop>overflow_value_combo</tabstop>
824+
<tabstop>nan_color_combo</tabstop>
825+
<tabstop>nan_value_combo</tabstop>
826+
<tabstop>preev_edit_button</tabstop>
827+
<tabstop>ev_edit_button</tabstop>
828+
<tabstop>test_indiv_edit</tabstop>
829+
<tabstop>test_button</tabstop>
830+
<tabstop>test_preev_indiv_edit</tabstop>
831+
<tabstop>test_preev_indiv_button</tabstop>
832+
<tabstop>from_gen_combo</tabstop>
833+
<tabstop>to_gen_combo</tabstop>
834+
<tabstop>start_button</tabstop>
835+
<tabstop>board_config_button</tabstop>
836+
<tabstop>textEdit_2</tabstop>
837+
<tabstop>db_view</tabstop>
838+
<tabstop>prev_gen_button</tabstop>
839+
<tabstop>gen_count_combo</tabstop>
840+
<tabstop>next_gen_button</tabstop>
841+
<tabstop>log_check</tabstop>
842+
<tabstop>show_all_check</tabstop>
843+
<tabstop>dimension_check</tabstop>
844+
<tabstop>gen_cut_button</tabstop>
845+
<tabstop>gen_start_over_button</tabstop>
846+
<tabstop>best_indiv_button</tabstop>
847+
<tabstop>convergence_button</tabstop>
848+
<tabstop>genealogy_button</tabstop>
849+
<tabstop>config_table</tabstop>
850+
<tabstop>import_config_button</tabstop>
851+
<tabstop>export_config_button</tabstop>
852+
<tabstop>save_config_button</tabstop>
853+
<tabstop>edit_config_button</tabstop>
854+
<tabstop>first_indivs_table</tabstop>
855+
<tabstop>first_add_indiv</tabstop>
856+
<tabstop>first_add_indiv_from_textfile</tabstop>
857+
<tabstop>first_remove_indiv</tabstop>
858+
</tabstops>
815859
<resources/>
816860
<connections>
817861
<connection>

‎MLC/GUI/Autogenerated/mlc_qtcreator/generic_spinner.ui‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
3+
<class>GenericSpinnerDialog</class>
4+
<widget class="QDialog" name="GenericSpinnerDialog">
5+
<property name="windowModality">
6+
<enum>Qt::ApplicationModal</enum>
7+
</property>
8+
<property name="geometry">
9+
<rect>
10+
<x>0</x>
11+
<y>0</y>
12+
<width>400</width>
13+
<height>300</height>
14+
</rect>
15+
</property>
16+
<property name="windowTitle">
17+
<string>Dialog</string>
18+
</property>
19+
<layout class="QVBoxLayout" name="spinner_layout">
20+
<property name="sizeConstraint">
21+
<enum>QLayout::SetMaximumSize</enum>
22+
</property>
23+
<item>
24+
<widget class="QWidget" name="spinner_widget" native="true"/>
25+
</item>
26+
<item alignment="Qt::AlignHCenter|Qt::AlignVCenter">
27+
<widget class="QLabel" name="spinner_label">
28+
<property name="sizePolicy">
29+
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
30+
<horstretch>0</horstretch>
31+
<verstretch>0</verstretch>
32+
</sizepolicy>
33+
</property>
34+
<property name="text">
35+
<string>TextLabel</string>
36+
</property>
37+
<property name="textFormat">
38+
<enum>Qt::RichText</enum>
39+
</property>
40+
<property name="scaledContents">
41+
<bool>false</bool>
42+
</property>
43+
<property name="alignment">
44+
<set>Qt::AlignCenter</set>
45+
</property>
46+
<property name="wordWrap">
47+
<bool>false</bool>
48+
</property>
49+
</widget>
50+
</item>
51+
<item alignment="Qt::AlignHCenter">
52+
<widget class="QPushButton" name="cancel_button">
53+
<property name="sizePolicy">
54+
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
55+
<horstretch>0</horstretch>
56+
<verstretch>0</verstretch>
57+
</sizepolicy>
58+
</property>
59+
<property name="layoutDirection">
60+
<enum>Qt::LeftToRight</enum>
61+
</property>
62+
<property name="text">
63+
<string>Cancel</string>
64+
</property>
65+
<property name="autoDefault">
66+
<bool>true</bool>
67+
</property>
68+
<property name="default">
69+
<bool>false</bool>
70+
</property>
71+
<property name="flat">
72+
<bool>false</bool>
73+
</property>
74+
</widget>
75+
</item>
76+
</layout>
77+
</widget>
78+
<resources/>
79+
<connections>
80+
<connection>
81+
<sender>cancel_button</sender>
82+
<signal>clicked()</signal>
83+
<receiver>GenericSpinnerDialog</receiver>
84+
<slot>on_cancel_button_clicked()</slot>
85+
<hints>
86+
<hint type="sourcelabel">
87+
<x>199</x>
88+
<y>279</y>
89+
</hint>
90+
<hint type="destinationlabel">
91+
<x>199</x>
92+
<y>149</y>
93+
</hint>
94+
</hints>
95+
</connection>
96+
</connections>
97+
<slots>
98+
<slot>on_cancel_button_clicked()</slot>
99+
</slots>
100+
</ui>

‎MLC/GUI/Autogenerated/mlc_qtcreator/mainwindow.ui‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,17 @@
256256
</action>
257257
</widget>
258258
<layoutdefault spacing="6" margin="11"/>
259+
<tabstops>
260+
<tabstop>new_button</tabstop>
261+
<tabstop>remove_button</tabstop>
262+
<tabstop>clone_button</tabstop>
263+
<tabstop>import_button</tabstop>
264+
<tabstop>export_button</tabstop>
265+
<tabstop>open_button</tabstop>
266+
<tabstop>rename_button</tabstop>
267+
<tabstop>experiment_list</tabstop>
268+
<tabstop>experiment_description</tabstop>
269+
</tabstops>
259270
<resources/>
260271
<connections>
261272
<connection>

‎MLC/GUI/Autogenerated/mlc_qtcreator/mlc_qtcreator.pro‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ FORMS += \
2929
arduinoconnectiontest.ui \
3030
pinout_design.ui \
3131
arduino_performance_test.ui \
32-
about.ui
32+
about.ui \
33+
generic_spinner.ui
3334

3435
DISTFILES +=

0 commit comments

Comments
 (0)