Add keyboard layout support

Author: Tech-FZ

CHANGELOG.md

@@ -1,3 +1,12 @@
+# EmuGUI v0.9.0.5301_dev (based on v0.9.0.5300_dev)
+
+## Changes compared to v0.8.0.5206
+
+- The old feature list has been updated beforehand.
+- Also, the update file will now be created in your user directory (instead of in the root).
+- The database now supports the keyboard layout selection, which hasn't been implemented as of yet.
+- Also, this is the first release which is hosted on GitLab as well as Codeberg is not accessable in Belarus.
+
 # EmuGUI v0.9.0.5300_dev (based on v0.8.0.5206)
 
 ## Changes compared to v0.8.0.5206

dialogExecution/__pycache__/editVMNew.cpython-310.pyc

@@ -702,7 +702,8 @@ def finishCreation(self):
         win2k = {win2k}, dirbios = "{ext_bios_dir}", additionalargs = "{add_args}", sound = "{self.comboBox_10.currentText()}",
         linuxkernel = "{self.lineEdit_5.text()}", linuxinitrid = "{self.lineEdit_6.text()}", linuxcmd = "{self.lineEdit_7.text()}",
         mousetype = "{self.comboBox_5.currentText()}", cores = {self.spinBox_6.value()}, filebios = "{self.lineEdit_4.text()}",
-        keyboardtype = "{self.comboBox_6.currentText()}", usbsupport = {usb_support}, usbcontroller = "{self.comboBox_9.currentText()}"
+        keyboardtype = "{self.comboBox_6.currentText()}", usbsupport = {usb_support}, usbcontroller = "{self.comboBox_9.currentText()}",
+        kbdtype = "en-us"
         WHERE name = "{self.vmSpecs[0]}";
         """
 

dialogExecution/__pycache__/newVirtualMachine.cpython-310.pyc

@@ -537,7 +537,8 @@ def finishCreation(self):
             filebios,
             keyboardtype,
             usbsupport,
-            usbcontroller
+            usbcontroller,
+            kbdtype
         ) VALUES (
             "{self.lineEdit.text()}",
             "{self.comboBox.currentText()}",
@@ -560,7 +561,8 @@ def finishCreation(self):
             "{self.lineEdit_8.text()}",
             "{self.comboBox_16.currentText()}",
             {usb_support},
-            "{self.comboBox_17.currentText()}"
+            "{self.comboBox_17.currentText()}",
+            "en-us"
         );
         """
 

dialogExecution/__pycache__/startVirtualMachine.cpython-310.pyc

@@ -299,10 +299,10 @@ def start_virtual_machine(self):
             qemu_to_execute = result[0][0]
 
             if platform.system() == "Windows":
-                qemu_cmd = f"{qemu_to_execute} -m {self.vmSpecs[4]} -rtc base=\"{dateTimeForVM}\",clock=vm -smp {self.vmSpecs[17]}"
+                qemu_cmd = f"{qemu_to_execute} -m {self.vmSpecs[4]} -rtc base=\"{dateTimeForVM}\",clock=vm -smp {self.vmSpecs[17]} -k {self.vmSpecs[21]}"
 
             else:
-                qemu_cmd = f"{qemu_to_execute} -m {self.vmSpecs[4]} -rtc base={dateTimeForVM},clock=vm -smp {self.vmSpecs[17]}"
+                qemu_cmd = f"{qemu_to_execute} -m {self.vmSpecs[4]} -rtc base={dateTimeForVM},clock=vm -smp {self.vmSpecs[17]} -k {self.vmSpecs[21]}"
 
             if self.vmSpecs[5] != "NULL":
                 if magic.from_file(self.vmSpecs[5]) == "block special":

dialogExecution/editVMNew.py

@@ -42,7 +42,7 @@ def __init__(self, parent=None):
         self.connectSignalsSlots()
         self.timer = QTimer()
         self.timer.timeout.connect(self.updateVmList)
-        self.label_8.setText("EmuGUI v0.9.0.5300")
+        self.label_8.setText("EmuGUI v0.9.0.5301_dev (pre-release, not for production)")
         self.setWindowTitle("EmuGUI")
         self.languageInUse = "system"
 
@@ -52,7 +52,7 @@ def __init__(self, parent=None):
         except:
             pass
 
-        self.versionCode = 5300
+        self.versionCode = 5301
 
         if platform.system() == "Windows":
             self.connection = platformSpecific.windowsSpecific.setupWindowsBackend()
@@ -176,7 +176,8 @@ def prepareDatabase(self, connection):
             filebios TEXT DEFAULT "" NOT NULL,
             keyboardtype TEXT NOT NULL,
             usbsupport INT DEFAULT 0 NOT NULL,
-            usbcontroller TEXT DEFAULT "pci-ohci" NOT NULL
+            usbcontroller TEXT DEFAULT "pci-ohci" NOT NULL,
+            kbdtype TEXT DEFAULT "en-us" NOT NULL
         );
         """
 
@@ -212,6 +213,11 @@ def prepareDatabase(self, connection):
         SELECT usbcontroller FROM virtualmachines;
         """
 
+        # The v0.9 feature set
+        select09ColumnsVM = """
+        SELECT kbdtype FROM virtualmachines;
+        """
+
         insertSoundColVM = """
         ALTER TABLE virtualmachines
         ADD COLUMN sound TEXT DEFAULT "none" NOT NULL;
@@ -262,6 +268,11 @@ def prepareDatabase(self, connection):
         ADD COLUMN usbcontroller TEXT DEFAULT "pci-ohci" NOT NULL;
         """
 
+        insertKbdLayoutVM = """
+        ALTER TABLE virtualmachines
+        ADD COLUMN kbdtype TEXT DEFAULT "en-us" NOT NULL;
+        """
+
         insert_qemu_img = """
         INSERT INTO settings (
             name
@@ -1092,6 +1103,27 @@ def prepareDatabase(self, connection):
             except sqlite3.Error as e:
                 print(f"The SQLite module encountered an error: {e}.")
 
+        try:
+            cursor.execute(select09ColumnsVM)
+            connection.commit()
+            result = cursor.fetchall()
+
+            try:
+                qemu_img_slot = str(result[0])
+                print("The query was executed successfully. The v0.5 feature columns already are in the VM table.")
+
+            except:
+                pass
+        
+        except sqlite3.Error as e:
+            try:
+                cursor.execute(insertKbdLayoutVM)
+                connection.commit()
+                print("The queries were executed successfully. The missing features have been added to the database.")
+            
+            except sqlite3.Error as e:
+                print(f"The SQLite module encountered an error: {e}.")
+
         try:
             cursor.execute(debug_db_settings)
             connection.commit()
@@ -1158,7 +1190,7 @@ def startVM(self):
 
             get_vm_to_start = f"""
             SELECT architecture, machine, cpu, ram, hda, vga, net, usbtablet, win2k, dirbios, additionalargs, sound, linuxkernel,
-            linuxinitrid, linuxcmd, mousetype, cores, filebios, keyboardtype, usbsupport, usbcontroller FROM virtualmachines
+            linuxinitrid, linuxcmd, mousetype, cores, filebios, keyboardtype, usbsupport, usbcontroller, kbdtype FROM virtualmachines
             WHERE name = '{selectedVM}'
             """
 
@@ -1190,6 +1222,7 @@ def startVM(self):
                 kbd_type = result[0][18]
                 usb_support = result[0][19]
                 usb_controller = result[0][20]
+                kbd_layout = result[0][21]
 
             except sqlite3.Error as e:
                 print(f"The SQLite module encountered an error: {e}.")
@@ -1223,6 +1256,7 @@ def startVM(self):
                 tempVmDefFile.write(kbd_type + "\n")
                 tempVmDefFile.write(str(usb_support) + "\n")
                 tempVmDefFile.write(usb_controller + "\n")
+                tempVmDefFile.write(kbd_layout + "\n")
 
             if usbtablet_wanted == 1:
                 dialog3 = UsbTabletDepreciated(self)
@@ -1324,7 +1358,7 @@ def editVM(self):
 
             get_vm_to_start = f"""
             SELECT architecture, machine, cpu, ram, hda, vga, net, usbtablet, win2k, dirbios, additionalargs, sound, linuxkernel,
-            linuxinitrid, linuxcmd, mousetype, cores, filebios, keyboardtype, usbsupport, usbcontroller FROM virtualmachines
+            linuxinitrid, linuxcmd, mousetype, cores, filebios, keyboardtype, usbsupport, usbcontroller, kbdtype FROM virtualmachines
             WHERE name = '{selectedVM}'
             """
 
@@ -1356,6 +1390,7 @@ def editVM(self):
                 kbd_type = result[0][18]
                 usb_support = result[0][19]
                 usb_controller = result[0][20]
+                kbd_layout = result[0][21]
 
             except sqlite3.Error as e:
                 print(f"The SQLite module encountered an error: {e}.")
@@ -1389,6 +1424,7 @@ def editVM(self):
                 tempVmDefFile.write(kbd_type + "\n")
                 tempVmDefFile.write(str(usb_support) + "\n")
                 tempVmDefFile.write(usb_controller + "\n")
+                tempVmDefFile.write(kbd_layout + "\n")
 
             i = 0