143 lines
5.3 KiB
Diff
143 lines
5.3 KiB
Diff
--- a/src/machine.cpp 2019-07-27 09:34:51.000000000 +0200
|
|
+++ b/src/machine.cpp 2023-10-23 23:25:31.240013828 +0200
|
|
@@ -99,7 +99,6 @@
|
|
* @brief Get the operating system version of the machine
|
|
*
|
|
* Get the operating system version of the machine.
|
|
- * Ex: Debian, Mageia, Arch Linux...
|
|
*/
|
|
QString Machine::getOSVersion() const
|
|
{
|
|
@@ -110,7 +109,6 @@
|
|
* @brief Set the operating system version of the machine
|
|
*
|
|
* Set the operating system version of the machine.
|
|
- * Ex: Debian, Mageia, Arch Linux...
|
|
*/
|
|
void Machine::setOSVersion(const QString &value)
|
|
{
|
|
@@ -145,7 +143,6 @@
|
|
* @brief Get the machine path
|
|
*
|
|
* Get the machine path
|
|
- * Ex: /home/xexio/Vms/Debian
|
|
*/
|
|
QString Machine::getPath() const
|
|
{
|
|
@@ -156,7 +153,6 @@
|
|
* @brief Set the machine path
|
|
*
|
|
* Set the machine path
|
|
- * Ex: /home/xexio/Vms/Debian
|
|
*/
|
|
void Machine::setPath(const QString &value)
|
|
{
|
|
@@ -951,7 +947,7 @@
|
|
audioCards.append(audioIterator.next());
|
|
}
|
|
|
|
- qemuCommand << "-soundhw";
|
|
+ qemuCommand << "-device";
|
|
qemuCommand << audioCards;
|
|
|
|
QString bootOrder;
|
|
--- a/src/machineconfig/machineconfiggeneraltabs.cpp 2019-07-27 09:34:51.000000000 +0200
|
|
+++ b/src/machineconfig/machineconfiggeneraltabs.cpp 2023-10-24 10:27:39.790232094 +0200
|
|
@@ -47,7 +47,6 @@
|
|
m_OSType->setEnabled(enableFields);
|
|
|
|
m_OSType->addItem("GNU/Linux");
|
|
- m_OSType->addItem("Microsoft Windows");
|
|
m_OSType->addItem("BSD");
|
|
m_OSType->addItem(tr("Other"));
|
|
m_OSType->setCurrentText(machine->getOSType());
|
|
@@ -103,32 +102,11 @@
|
|
this->m_OSVersion->clear();
|
|
|
|
if (OSSelected == "GNU/Linux") {
|
|
- this->m_OSVersion->addItem(tr("Debian"));
|
|
- this->m_OSVersion->addItem(tr("Ubuntu"));
|
|
- this->m_OSVersion->addItem(tr("Fedora"));
|
|
- this->m_OSVersion->addItem(tr("OpenSuse"));
|
|
- this->m_OSVersion->addItem(tr("Mageia"));
|
|
- this->m_OSVersion->addItem(tr("Gentoo"));
|
|
- this->m_OSVersion->addItem(tr("Arch Linux"));
|
|
- this->m_OSVersion->addItem(tr("Linux"));
|
|
- } else if (OSSelected == "Microsoft Windows") {
|
|
- this->m_OSVersion->addItem(tr("Microsoft 95"));
|
|
- this->m_OSVersion->addItem(tr("Microsoft 98"));
|
|
- this->m_OSVersion->addItem(tr("Microsoft 2000"));
|
|
- this->m_OSVersion->addItem(tr("Microsoft XP"));
|
|
- this->m_OSVersion->addItem(tr("Microsoft Vista"));
|
|
- this->m_OSVersion->addItem(tr("Microsoft 7"));
|
|
- this->m_OSVersion->addItem(tr("Microsoft 8"));
|
|
- this->m_OSVersion->addItem(tr("Microsoft 10"));
|
|
+ this->m_OSVersion->addItem(tr("Generic GNU/Linux"));
|
|
} else if (OSSelected == "BSD") {
|
|
- this->m_OSVersion->addItem(tr("FreeBSD"));
|
|
- this->m_OSVersion->addItem(tr("OpenBSD"));
|
|
- this->m_OSVersion->addItem(tr("NetBSD"));
|
|
+ this->m_OSVersion->addItem(tr("HyperbolaBSD"));
|
|
} else {
|
|
- this->m_OSVersion->addItem(tr("Debian GNU Hurd"));
|
|
- this->m_OSVersion->addItem(tr("Arch Hurd"));
|
|
- this->m_OSVersion->addItem(tr("Redox"));
|
|
- this->m_OSVersion->addItem(tr("ReactOS"));
|
|
+ this->m_OSVersion->addItem(tr("Unknown"));
|
|
}
|
|
}
|
|
|
|
@@ -193,7 +171,6 @@
|
|
* @return version of the operating system
|
|
*
|
|
* Get the opearting system version
|
|
- * Ex: Debian, Mageia, FreeBSD, OpenBSD...
|
|
*/
|
|
QString BasicTab::getMachineVersion() const
|
|
{
|
|
--- a/src/newmachine/generalpage.cpp 2019-07-27 09:34:51.000000000 +0200
|
|
+++ b/src/newmachine/generalpage.cpp 2023-10-24 10:36:58.970236276 +0200
|
|
@@ -45,7 +45,6 @@
|
|
m_OSTypeLabel = new QLabel(tr("Type") + ":", this);
|
|
m_OSType = new QComboBox(this);
|
|
m_OSType->addItem("GNU/Linux");
|
|
- m_OSType->addItem("Microsoft Windows");
|
|
m_OSType->addItem("BSD");
|
|
m_OSType->addItem(tr("Other"));
|
|
|
|
@@ -97,32 +96,11 @@
|
|
this->m_OSVersion->clear();
|
|
|
|
if (OSSelected == 0) {
|
|
- this->m_OSVersion->addItem(tr("Debian"));
|
|
- this->m_OSVersion->addItem(tr("Ubuntu"));
|
|
- this->m_OSVersion->addItem(tr("Fedora"));
|
|
- this->m_OSVersion->addItem(tr("OpenSuse"));
|
|
- this->m_OSVersion->addItem(tr("Mageia"));
|
|
- this->m_OSVersion->addItem(tr("Gentoo"));
|
|
- this->m_OSVersion->addItem(tr("Arch Linux"));
|
|
- this->m_OSVersion->addItem(tr("Linux"));
|
|
+ this->m_OSVersion->addItem(tr("Generic GNU/Linux"));
|
|
} else if (OSSelected == 1) {
|
|
- this->m_OSVersion->addItem(tr("Microsoft 95"));
|
|
- this->m_OSVersion->addItem(tr("Microsoft 98"));
|
|
- this->m_OSVersion->addItem(tr("Microsoft 2000"));
|
|
- this->m_OSVersion->addItem(tr("Microsoft XP"));
|
|
- this->m_OSVersion->addItem(tr("Microsoft Vista"));
|
|
- this->m_OSVersion->addItem(tr("Microsoft 7"));
|
|
- this->m_OSVersion->addItem(tr("Microsoft 8"));
|
|
- this->m_OSVersion->addItem(tr("Microsoft 10"));
|
|
+ this->m_OSVersion->addItem(tr("HyperbolaBSD"));
|
|
} else if (OSSelected == 2) {
|
|
- this->m_OSVersion->addItem(tr("FreeBSD"));
|
|
- this->m_OSVersion->addItem(tr("OpenBSD"));
|
|
- this->m_OSVersion->addItem(tr("NetBSD"));
|
|
- } else if (OSSelected == 3) {
|
|
- this->m_OSVersion->addItem(tr("Debian GNU Hurd"));
|
|
- this->m_OSVersion->addItem(tr("Arch Hurd"));
|
|
- this->m_OSVersion->addItem(tr("Redox"));
|
|
- this->m_OSVersion->addItem(tr("ReactOS"));
|
|
+ this->m_OSVersion->addItem(tr("Unknown"));
|
|
}
|
|
}
|
|
|