Skip to content

Commit 63fd437

Browse files
committed
Correct Tab Order in Main UI
1 parent adf96d2 commit 63fd437

File tree

5 files changed

+93
-4
lines changed

5 files changed

+93
-4
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
# EmuGUI v1.1.1.5409 "Sara Angeline" (based on v1.1.0.5408)
2+
3+
## WARNING
4+
5+
Ubuntu 20.04 LTS and derivates will be no longer supported as EmuGUI hosts from 8th July, 2023. You would then need at least Ubuntu 22.04 LTS or one of its derivates.
6+
7+
## Changes compared to v1.1.0.5408
8+
9+
- The Tab order has been corrected in the Main UI.
10+
111
# EmuGUI v1.1.0.5408 "Sara Angeline" (based on v1.1.0.5407_b2)
212

313
## WARNING

emugui.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ def __init__(self, parent=None):
5454
self.connectSignalsSlots()
5555
self.timer = QTimer()
5656
self.timer.timeout.connect(self.updateVmList)
57-
self.label_8.setText("EmuGUI v1.1.0.5408\nCodename 'Sara Angeline'")
58-
self.setWindowTitle("EmuGUI v1.1.0.5408")
57+
self.label_8.setText("EmuGUI v1.1.1.5409\nCodename 'Sara Angeline'")
58+
self.setWindowTitle("EmuGUI v1.1.1.5409")
5959
self.languageInUse = "system"
6060

6161
try:
@@ -64,7 +64,7 @@ def __init__(self, parent=None):
6464
except:
6565
pass
6666

67-
self.versionCode = 5408
67+
self.versionCode = 5409
6868

6969
if platform.system() == "Windows":
7070
self.connection = platformSpecific.windowsSpecific.setupWindowsBackend()
@@ -105,7 +105,7 @@ def __init__(self, parent=None):
105105
dialog.exec()
106106

107107
self.label_8.setText(
108-
f"EmuGUI v1.1.0.5408\nCodename 'Sara Angeline'\nYour OS is no longer supported by EmuGUI. You should upgrade at least to Windows 10. You're currently running Windows {platform.release()}")
108+
f"EmuGUI v1.1.1.5409\nCodename 'Sara Angeline'\nYour OS is no longer supported by EmuGUI. You should upgrade at least to Windows 10. You're currently running Windows {platform.release()}")
109109

110110
def resizeEvent(self, event: QtGui.QResizeEvent):
111111
super().resizeEvent(event)

ui/Main.ui

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,47 @@
584584
</widget>
585585
<widget class="QStatusBar" name="statusbar"/>
586586
</widget>
587+
<tabstops>
588+
<tabstop>tabWidget</tabstop>
589+
<tabstop>listView</tabstop>
590+
<tabstop>pushButton_8</tabstop>
591+
<tabstop>pushButton_9</tabstop>
592+
<tabstop>pushButton_10</tabstop>
593+
<tabstop>pushButton_11</tabstop>
594+
<tabstop>tabWidget_2</tabstop>
595+
<tabstop>comboBox_4</tabstop>
596+
<tabstop>comboBox_5</tabstop>
597+
<tabstop>pushButton_15</tabstop>
598+
<tabstop>lineEdit_5</tabstop>
599+
<tabstop>pushButton</tabstop>
600+
<tabstop>lineEdit_4</tabstop>
601+
<tabstop>pushButton_2</tabstop>
602+
<tabstop>lineEdit_3</tabstop>
603+
<tabstop>pushButton_3</tabstop>
604+
<tabstop>lineEdit_2</tabstop>
605+
<tabstop>pushButton_4</tabstop>
606+
<tabstop>lineEdit</tabstop>
607+
<tabstop>pushButton_5</tabstop>
608+
<tabstop>lineEdit_6</tabstop>
609+
<tabstop>pushButton_7</tabstop>
610+
<tabstop>lineEdit_7</tabstop>
611+
<tabstop>pushButton_12</tabstop>
612+
<tabstop>lineEdit_8</tabstop>
613+
<tabstop>pushButton_16</tabstop>
614+
<tabstop>lineEdit_9</tabstop>
615+
<tabstop>pushButton_17</tabstop>
616+
<tabstop>lineEdit_10</tabstop>
617+
<tabstop>pushButton_18</tabstop>
618+
<tabstop>lineEdit_11</tabstop>
619+
<tabstop>pushButton_19</tabstop>
620+
<tabstop>lineEdit_12</tabstop>
621+
<tabstop>pushButton_13</tabstop>
622+
<tabstop>lineEdit_13</tabstop>
623+
<tabstop>pushButton_14</tabstop>
624+
<tabstop>pushButton_6</tabstop>
625+
<tabstop>pushButton_20</tabstop>
626+
<tabstop>pushButton_21</tabstop>
627+
</tabstops>
587628
<resources/>
588629
<connections/>
589630
</ui>
697 Bytes
Binary file not shown.

uiScripts/ui_Main.py

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,44 @@ def setupUi(self, MainWindow):
414414
self.statusbar = QStatusBar(MainWindow)
415415
self.statusbar.setObjectName(u"statusbar")
416416
MainWindow.setStatusBar(self.statusbar)
417+
QWidget.setTabOrder(self.tabWidget, self.listView)
418+
QWidget.setTabOrder(self.listView, self.pushButton_8)
419+
QWidget.setTabOrder(self.pushButton_8, self.pushButton_9)
420+
QWidget.setTabOrder(self.pushButton_9, self.pushButton_10)
421+
QWidget.setTabOrder(self.pushButton_10, self.pushButton_11)
422+
QWidget.setTabOrder(self.pushButton_11, self.tabWidget_2)
423+
QWidget.setTabOrder(self.tabWidget_2, self.comboBox_4)
424+
QWidget.setTabOrder(self.comboBox_4, self.comboBox_5)
425+
QWidget.setTabOrder(self.comboBox_5, self.pushButton_15)
426+
QWidget.setTabOrder(self.pushButton_15, self.lineEdit_5)
427+
QWidget.setTabOrder(self.lineEdit_5, self.pushButton)
428+
QWidget.setTabOrder(self.pushButton, self.lineEdit_4)
429+
QWidget.setTabOrder(self.lineEdit_4, self.pushButton_2)
430+
QWidget.setTabOrder(self.pushButton_2, self.lineEdit_3)
431+
QWidget.setTabOrder(self.lineEdit_3, self.pushButton_3)
432+
QWidget.setTabOrder(self.pushButton_3, self.lineEdit_2)
433+
QWidget.setTabOrder(self.lineEdit_2, self.pushButton_4)
434+
QWidget.setTabOrder(self.pushButton_4, self.lineEdit)
435+
QWidget.setTabOrder(self.lineEdit, self.pushButton_5)
436+
QWidget.setTabOrder(self.pushButton_5, self.lineEdit_6)
437+
QWidget.setTabOrder(self.lineEdit_6, self.pushButton_7)
438+
QWidget.setTabOrder(self.pushButton_7, self.lineEdit_7)
439+
QWidget.setTabOrder(self.lineEdit_7, self.pushButton_12)
440+
QWidget.setTabOrder(self.pushButton_12, self.lineEdit_8)
441+
QWidget.setTabOrder(self.lineEdit_8, self.pushButton_16)
442+
QWidget.setTabOrder(self.pushButton_16, self.lineEdit_9)
443+
QWidget.setTabOrder(self.lineEdit_9, self.pushButton_17)
444+
QWidget.setTabOrder(self.pushButton_17, self.lineEdit_10)
445+
QWidget.setTabOrder(self.lineEdit_10, self.pushButton_18)
446+
QWidget.setTabOrder(self.pushButton_18, self.lineEdit_11)
447+
QWidget.setTabOrder(self.lineEdit_11, self.pushButton_19)
448+
QWidget.setTabOrder(self.pushButton_19, self.lineEdit_12)
449+
QWidget.setTabOrder(self.lineEdit_12, self.pushButton_13)
450+
QWidget.setTabOrder(self.pushButton_13, self.lineEdit_13)
451+
QWidget.setTabOrder(self.lineEdit_13, self.pushButton_14)
452+
QWidget.setTabOrder(self.pushButton_14, self.pushButton_6)
453+
QWidget.setTabOrder(self.pushButton_6, self.pushButton_20)
454+
QWidget.setTabOrder(self.pushButton_20, self.pushButton_21)
417455

418456
self.retranslateUi(MainWindow)
419457

0 commit comments

Comments
 (0)