Skip to content

Commit fb0abf1

Browse files
Tech-FZTech-FZ
committed
Fix Start VM UI
1 parent d5f71c0 commit fb0abf1

File tree

5 files changed

+75
-43
lines changed

5 files changed

+75
-43
lines changed

‎CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
# EmuGUI v1.1.2.5410 "Sara Angeline" (based on v1.1.1.5409)
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.1.5409
8+
9+
- The Tab order has been corrected in the Start VM UI.
10+
- The Boot from combobox in the Start VM UI is now a little wider.
11+
112
# EmuGUI v1.1.1.5409 "Sara Angeline" (based on v1.1.0.5408)
213

314
## 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.1.5409\nCodename 'Sara Angeline'")
58-
self.setWindowTitle("EmuGUI v1.1.1.5409")
57+
self.label_8.setText("EmuGUI v1.1.2.5410\nCodename 'Sara Angeline'")
58+
self.setWindowTitle("EmuGUI v1.1.2.5410")
5959
self.languageInUse = "system"
6060

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

67-
self.versionCode = 5409
67+
self.versionCode = 5410
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.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()}")
108+
f"EmuGUI v1.1.2.5410\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/StartVM.ui‎

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -90,30 +90,6 @@
9090
</property>
9191
</widget>
9292
</item>
93-
<item row="4" column="1">
94-
<widget class="QComboBox" name="comboBox">
95-
<item>
96-
<property name="text">
97-
<string>c</string>
98-
</property>
99-
</item>
100-
<item>
101-
<property name="text">
102-
<string>a</string>
103-
</property>
104-
</item>
105-
<item>
106-
<property name="text">
107-
<string>d</string>
108-
</property>
109-
</item>
110-
<item>
111-
<property name="text">
112-
<string>Let QEMU decide</string>
113-
</property>
114-
</item>
115-
</widget>
116-
</item>
11793
<item row="6" column="0">
11894
<widget class="QLabel" name="label_4">
11995
<property name="text">
@@ -174,9 +150,45 @@
174150
</property>
175151
</widget>
176152
</item>
153+
<item row="4" column="1" colspan="2">
154+
<widget class="QComboBox" name="comboBox">
155+
<item>
156+
<property name="text">
157+
<string>c</string>
158+
</property>
159+
</item>
160+
<item>
161+
<property name="text">
162+
<string>a</string>
163+
</property>
164+
</item>
165+
<item>
166+
<property name="text">
167+
<string>d</string>
168+
</property>
169+
</item>
170+
<item>
171+
<property name="text">
172+
<string>Let QEMU decide</string>
173+
</property>
174+
</item>
175+
</widget>
176+
</item>
177177
</layout>
178178
</widget>
179179
</widget>
180+
<tabstops>
181+
<tabstop>lineEdit</tabstop>
182+
<tabstop>pushButton</tabstop>
183+
<tabstop>lineEdit_2</tabstop>
184+
<tabstop>pushButton_2</tabstop>
185+
<tabstop>comboBox</tabstop>
186+
<tabstop>lineEdit_3</tabstop>
187+
<tabstop>dateTimeEdit</tabstop>
188+
<tabstop>pushButton_5</tabstop>
189+
<tabstop>pushButton_3</tabstop>
190+
<tabstop>pushButton_4</tabstop>
191+
</tabstops>
180192
<resources/>
181193
<connections/>
182194
</ui>

‎uiScripts/__pycache__/ui_StartVM.cpython-310.pyc‎

156 Bytes
Binary file not shown.

‎uiScripts/ui_StartVM.py‎

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
################################################################################
44
## Form generated from reading UI file 'StartVM.ui'
55
##
6-
## Created by: Qt User Interface Compiler version 6.4.3
6+
## Created by: Qt User Interface Compiler version 6.5.0
77
##
88
## WARNING! All changes made in this file will be lost when recompiling UI file!
99
################################################################################
@@ -73,15 +73,6 @@ def setupUi(self, Dialog):
7373

7474
self.gridLayout.addWidget(self.pushButton_2, 2, 2, 1, 1)
7575

76-
self.comboBox = QComboBox(self.gridLayoutWidget)
77-
self.comboBox.addItem("")
78-
self.comboBox.addItem("")
79-
self.comboBox.addItem("")
80-
self.comboBox.addItem("")
81-
self.comboBox.setObjectName(u"comboBox")
82-
83-
self.gridLayout.addWidget(self.comboBox, 4, 1, 1, 1)
84-
8576
self.label_4 = QLabel(self.gridLayoutWidget)
8677
self.label_4.setObjectName(u"label_4")
8778

@@ -126,6 +117,24 @@ def setupUi(self, Dialog):
126117

127118
self.gridLayout.addWidget(self.label_7, 9, 0, 1, 3)
128119

120+
self.comboBox = QComboBox(self.gridLayoutWidget)
121+
self.comboBox.addItem("")
122+
self.comboBox.addItem("")
123+
self.comboBox.addItem("")
124+
self.comboBox.addItem("")
125+
self.comboBox.setObjectName(u"comboBox")
126+
127+
self.gridLayout.addWidget(self.comboBox, 4, 1, 1, 2)
128+
129+
QWidget.setTabOrder(self.lineEdit, self.pushButton)
130+
QWidget.setTabOrder(self.pushButton, self.lineEdit_2)
131+
QWidget.setTabOrder(self.lineEdit_2, self.pushButton_2)
132+
QWidget.setTabOrder(self.pushButton_2, self.comboBox)
133+
QWidget.setTabOrder(self.comboBox, self.lineEdit_3)
134+
QWidget.setTabOrder(self.lineEdit_3, self.dateTimeEdit)
135+
QWidget.setTabOrder(self.dateTimeEdit, self.pushButton_5)
136+
QWidget.setTabOrder(self.pushButton_5, self.pushButton_3)
137+
QWidget.setTabOrder(self.pushButton_3, self.pushButton_4)
129138

130139
self.retranslateUi(Dialog)
131140

@@ -141,16 +150,16 @@ def retranslateUi(self, Dialog):
141150
self.label_2.setText(QCoreApplication.translate("Dialog", u"cdrom", None))
142151
self.pushButton_5.setText(QCoreApplication.translate("Dialog", u"Set to system", None))
143152
self.pushButton_2.setText(QCoreApplication.translate("Dialog", u"Browse", None))
144-
self.comboBox.setItemText(0, QCoreApplication.translate("Dialog", u"c", None))
145-
self.comboBox.setItemText(1, QCoreApplication.translate("Dialog", u"a", None))
146-
self.comboBox.setItemText(2, QCoreApplication.translate("Dialog", u"d", None))
147-
self.comboBox.setItemText(3, QCoreApplication.translate("Dialog", u"Let QEMU decide", None))
148-
149153
self.label_4.setText(QCoreApplication.translate("Dialog", u"Date & Time", None))
150154
self.label.setText(QCoreApplication.translate("Dialog", u"fda", None))
151155
self.label_5.setText(QCoreApplication.translate("Dialog", u"Note: If the VM doesn't start within five minutes, then you should check the VM and QEMU settings.", None))
152156
self.label_3.setText(QCoreApplication.translate("Dialog", u"Boot from", None))
153157
self.pushButton_4.setText(QCoreApplication.translate("Dialog", u"Cancel", None))
154158
self.label_7.setText(QCoreApplication.translate("Dialog", u"Create the TPM from the terminal!", None))
159+
self.comboBox.setItemText(0, QCoreApplication.translate("Dialog", u"c", None))
160+
self.comboBox.setItemText(1, QCoreApplication.translate("Dialog", u"a", None))
161+
self.comboBox.setItemText(2, QCoreApplication.translate("Dialog", u"d", None))
162+
self.comboBox.setItemText(3, QCoreApplication.translate("Dialog", u"Let QEMU decide", None))
163+
155164
# retranslateUi
156165

0 commit comments

Comments
 (0)