--- qtemu-git-5af7395da.old/src/machineconfig/machineconfighardwaretabs.cpp +++ qtemu-git-5af7395da/src/machineconfig/machineconfighardwaretabs.cpp @@ -204,7 +204,9 @@ */ int ProcessorConfigTab::getMaxHotCPU() { - return this->m_maxHotCPUSpinBox->value(); + int nn = this->m_maxHotCPUSpinBox->value(); + if (nn == 0) return this->m_CPUCountSpinBox->value(); + return nn; } /** --- qtemu-git-5af7395da.old/src/mainwindow.cpp +++ qtemu-git-5af7395da/src/mainwindow.cpp @@ -32,7 +32,7 @@ { this->setWindowTitle("QtEmu"); this->setWindowIcon(QIcon::fromTheme("qtemu", QIcon(":/images/qtemu.png"))); - this->setMinimumSize(700, 500); + this->setMinimumSize(800, 500); // Close the application when all windows are closed qApp->setQuitOnLastWindowClosed(true); @@ -208,18 +208,16 @@ this, &MainWindow::quitApp); // Actions for Machine menu - m_newMachineAction = new QAction(QIcon::fromTheme("project-development-new-template", - QIcon(QPixmap(":/images/icons/breeze/32x32/project-development-new-template.svg"))), - tr("New Machine"), - this); - connect(m_newMachineAction, &QAction::triggered, + m_newMachineAction = new QAction (QIcon (QPixmap ("__META_PREFIX__/data/new-machine.svg" )) , +tr ("New machine"), this); + m_newMachineAction->setToolTip (tr ("New machine")); + connect (m_newMachineAction, &QAction::triggered, this, &MainWindow::createNewMachine); - m_settingsMachineAction = new QAction(QIcon::fromTheme("configure", - QIcon(QPixmap(":/images/icons/breeze/32x32/settings-configure.svg"))), - tr("Machine Settings"), - this); - connect(m_settingsMachineAction, &QAction::triggered, + m_settingsMachineAction = new QAction (QIcon (QPixmap ("__META_PREFIX__/data/machine-settings.svg" )) , +tr ("Machine settings"), this); + m_settingsMachineAction->setToolTip (tr ("Machine settings")); + connect (m_settingsMachineAction, &QAction::triggered, this, &MainWindow::machineOptions); m_exportMachineAction = new QAction(QIcon::fromTheme("document-export", @@ -274,6 +272,18 @@ m_aboutwidget, &QWidget::show); // Actions for Machine toolbar + x_newMachineAction = new QAction (this); + x_newMachineAction->setIcon (QIcon (QPixmap ("__META_PREFIX__/data/new-machine.svg"))); + x_newMachineAction->setToolTip (tr ("New machine")); + connect (x_newMachineAction, &QAction::triggered, + this, &MainWindow::createNewMachine); + + x_settingsMachineAction = new QAction (this); + x_settingsMachineAction->setIcon (QIcon (QPixmap ("__META_PREFIX__/data/machine-settings.svg"))); + x_settingsMachineAction->setToolTip (tr ("Machine settings")); + connect (x_settingsMachineAction, &QAction::triggered, + this, &MainWindow::machineOptions); + m_startMachineAction = new QAction(this); m_startMachineAction->setIcon(QIcon::fromTheme("media-playback-start", QIcon(QPixmap(":/images/icons/breeze/32x32/start.svg")))); @@ -312,8 +322,8 @@ m_mainToolBar->setToolButtonStyle(Qt::ToolButtonFollowStyle); m_mainToolBar->setMovable(false); - m_mainToolBar->addAction(this->m_newMachineAction); - m_mainToolBar->addAction(this->m_settingsMachineAction); + m_mainToolBar->addAction(this->x_newMachineAction); + m_mainToolBar->addAction(this->x_settingsMachineAction); m_mainToolBar->addSeparator(); m_mainToolBar->addAction(this->m_startMachineAction); m_mainToolBar->addAction(this->m_stopMachineAction); --- qtemu-git-5af7395da.old/src/mainwindow.h +++ qtemu-git-5af7395da/src/mainwindow.h @@ -109,6 +109,9 @@ QAction *m_removeMachineAction; QAction *m_groupMachineAction; + QAction *x_newMachineAction; + QAction *x_settingsMachineAction; + QAction *m_helpQuickHelpAction; QAction *m_helpQtEmuWebsiteAction; QAction *m_helpQtEmuBugTrackerAction; --- qtemu-git-5af7395da.old/src/utils/systemutils.cpp +++ qtemu-git-5af7395da/src/utils/systemutils.cpp @@ -92,6 +92,8 @@ */ void SystemUtils::setCPUTypesx86(QComboBox *CPUType) { + CPUType->addItem("Host", QString("host")); + // Intel among many others...IBM, Texas Instruments, AMD, Cyrix... CPUType->addItem("486", QString("486")); ==== end of patch ====