claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5904 from lemondrops/manager-2

Browse Source 
Manager: Replace system location in the new machine wizard with display name
This commit is contained in:
Miran Grča
2025-08-07 23:05:55 +02:00
committed by GitHub
parent e3c704326e fcf85d40a6
commit 1c628b29b1
4 changed files with 74 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/qt/qt_vmmanager_addmachine.cpp
View File

@@ -223,6 +223,7 @@ WithExistingConfigPage::isComplete() const
NameAndLocationPage::
NameAndLocationPage(QWidget *parent)
{
#ifdef CUSTOM_SYSTEM_LOCATION
setTitle(tr("System name and location"));
#if defined(_WIN32)
@@ -234,6 +235,10 @@ NameAndLocationPage(QWidget *parent)
#endif
const auto topLabel = new QLabel(tr("Enter the name of the system and choose the location"));
#else
setTitle(tr("System name"));
const auto topLabel = new QLabel(tr("Enter the name of the system"));
#endif
topLabel->setWordWrap(true);
const auto chooseDirectoryButton = new QPushButton();
@@ -246,6 +251,7 @@ NameAndLocationPage(QWidget *parent)
registerField("systemName*", systemName);
systemNameValidation = new QLabel();
#ifdef CUSTOM_SYSTEM_LOCATION
const auto systemLocationLabel = new QLabel(tr("System Location"));
systemLocation = new QLineEdit();
// TODO: FIXME: This is using the CLI arg and needs to instead use a proper variable
@@ -253,6 +259,13 @@ NameAndLocationPage(QWidget *parent)
registerField("systemLocation*", systemLocation);
systemLocationValidation = new QLabel();
systemLocationValidation->setWordWrap(true);
#endif
const auto displayNameLabel = new QLabel(tr("Display Name (optional)"));
displayName = new QLineEdit();
// Special event filter to override enter key
displayName->installEventFilter(this);
registerField("displayName*", displayName);
const auto layout = new QGridLayout();
layout->addWidget(topLabel, 0, 0, 1, -1);
@@ -265,6 +278,7 @@ NameAndLocationPage(QWidget *parent)
// Set height on validation because it may not always be present
layout->setRowMinimumHeight(3, 20);
#ifdef CUSTOM_SYSTEM_LOCATION
// Another spacer
layout->setRowMinimumHeight(4, 20);
layout->addWidget(systemLocationLabel, 5, 0);
@@ -273,11 +287,18 @@ NameAndLocationPage(QWidget *parent)
// Validation text
layout->addWidget(systemLocationValidation, 6, 0, 1, -1);
layout->setRowMinimumHeight(6, 20);
#endif
// Another spacer
layout->setRowMinimumHeight(7, 20);
layout->addWidget(displayNameLabel, 8, 0);
layout->addWidget(displayName, 8, 1);
setLayout(layout);
#ifdef CUSTOM_SYSTEM_LOCATION
connect(chooseDirectoryButton, &QPushButton::clicked, this, &NameAndLocationPage::chooseDirectoryLocation);
#endif
}
int
@@ -286,6 +307,7 @@ NameAndLocationPage::nextId() const
return VMManagerAddMachine::Page_Conclusion;
}
#ifdef CUSTOM_SYSTEM_LOCATION
void
NameAndLocationPage::chooseDirectoryLocation()
{
@@ -294,23 +316,31 @@ NameAndLocationPage::chooseDirectoryLocation()
systemLocation->setText(QDir::toNativeSeparators(directory));
emit completeChanged();
}
#endif
bool
NameAndLocationPage::isComplete() const
{
bool nameValid = false;
#ifdef CUSTOM_SYSTEM_LOCATION
bool locationValid = false;
#endif
// return true if complete
if (systemName->text().isEmpty()) {
systemNameValidation->setText(tr("Please enter a system name"));
#ifdef CUSTOM_SYSTEM_LOCATION
} else if (!systemName->text().contains(dirValidate)) {
systemNameValidation->setText(tr("System name cannot contain certain characters"));
} else if (const QDir newDir = QDir::cleanPath(systemLocation->text() + "/" + systemName->text()); newDir.exists()) {
#else
} else if (const QDir newDir = QDir::cleanPath(QString(vmm_path) + "/" + systemName->text()); newDir.exists()) {
#endif
systemNameValidation->setText(tr("System name already exists"));
} else {
systemNameValidation->clear();
nameValid = true;
}
#ifdef CUSTOM_SYSTEM_LOCATION
if (systemLocation->text().isEmpty()) {
systemLocationValidation->setText(tr("Please enter a directory for the system"));
} else if (const auto dir = QDir(systemLocation->text()); !dir.exists()) {
@@ -321,6 +351,9 @@ NameAndLocationPage::isComplete() const
}
return nameValid && locationValid;
#else
return nameValid;
#endif
}
bool
NameAndLocationPage::eventFilter(QObject *watched, QEvent *event)
@@ -354,17 +387,27 @@ ConclusionPage(QWidget *parent)
const auto systemNameLabel = new QLabel(tr("System name:"));
systemNameLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
systemName = new QLabel();
#ifdef CUSTOM_SYSTEM_LOCATION
const auto systemLocationLabel = new QLabel(tr("System location:"));
systemLocationLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
systemLocation = new QLabel();
#endif
displayNameLabel = new QLabel(tr("Display name:"));
displayNameLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
displayName = new QLabel();
const auto layout = new QGridLayout();
layout->addWidget(topLabel, 0, 0, 1, -1);
layout->setRowMinimumHeight(1, 20);
layout->addWidget(systemNameLabel, 2, 0);
layout->addWidget(systemName, 2, 1);
#ifdef CUSTOM_SYSTEM_LOCATION
layout->addWidget(systemLocationLabel, 3, 0);
layout->addWidget(systemLocation, 3, 1);
#endif
layout->addWidget(displayNameLabel, 4, 0);
layout->addWidget(displayName, 4, 1);
setLayout(layout);
}
@@ -373,10 +416,21 @@ ConclusionPage(QWidget *parent)
void
ConclusionPage::initializePage()
{
#ifdef CUSTOM_SYSTEM_LOCATION
const auto finalPath = QDir::cleanPath(field("systemLocation").toString() + "/" + field("systemName").toString());
const auto nativePath = QDir::toNativeSeparators(finalPath);
#endif
const auto systemNameDisplay = field("systemName").toString();
const auto displayNameDisplay = field("displayName").toString();
systemName->setText(systemNameDisplay);
#ifdef CUSTOM_SYSTEM_LOCATION
systemLocation->setText(nativePath);
#endif
if (!displayNameDisplay.isEmpty())
displayName->setText(displayNameDisplay);
else {
displayNameLabel->setVisible(false);
displayName->setVisible(false);
}
}

9
src/qt/qt_vmmanager_addmachine.hpp
View File

@@ -90,12 +90,17 @@ public:
[[nodiscard]] int nextId() const override;
private:
QLineEdit *systemName;
#ifdef CUSTOM_SYSTEM_LOCATION
QLineEdit *systemLocation;
#endif
QLineEdit *displayName;
QLabel *systemNameValidation;
#ifdef CUSTOM_SYSTEM_LOCATION
QLabel *systemLocationValidation;
QRegularExpression dirValidate;
private slots:
void chooseDirectoryLocation();
#endif
protected:
[[nodiscard]] bool isComplete() const override;
bool eventFilter(QObject *watched, QEvent *event) override;
@@ -109,7 +114,11 @@ public:
private:
QLabel *topLabel;
QLabel *systemName;
#ifdef CUSTOM_SYSTEM_LOCATION
QLabel *systemLocation;
#endif
QLabel *displayNameLabel;
QLabel *displayName;
protected:
void initializePage() override;
};

11
src/qt/qt_vmmanager_main.cpp
View File

@@ -349,14 +349,19 @@ VMManagerMain::newMachineWizard()
const auto wizard = new VMManagerAddMachine(this);
if (wizard->exec() == QDialog::Accepted) {
const auto newName = wizard->field("systemName").toString();
#ifdef CUSTOM_SYSTEM_LOCATION
const auto systemDir = wizard->field("systemLocation").toString();
#else
const auto systemDir = QDir(vmm_path).path();
#endif
const auto existingConfiguration = wizard->field("existingConfiguration").toString();
addNewSystem(newName, systemDir, existingConfiguration);
const auto displayName = wizard->field("displayName").toString();
addNewSystem(newName, systemDir, displayName, existingConfiguration);
}
}
void
VMManagerMain::addNewSystem(const QString &name, const QString &dir, const QString &configFile)
VMManagerMain::addNewSystem(const QString &name, const QString &dir, const QString &displayName, const QString &configFile)
{
const auto newSytemDirectory = QDir(QDir::cleanPath(dir + "/" + name));
@@ -419,6 +424,8 @@ VMManagerMain::addNewSystem(const QString &name, const QString &dir, const QStri
delete new_system;
return;
}
auto added_system = vm_model->getConfigObjectForIndex(created_object);
added_system->setDisplayName(displayName);
// Get the index of the newly-created system and select it
const QModelIndex mapped_index = proxy_model->mapFromSource(created_object);
ui->listView->setCurrentIndex(mapped_index);

2
src/qt/qt_vmmanager_main.hpp
View File

@@ -70,7 +70,7 @@ public slots:
void shutdownForceButtonPressed() const;
void searchSystems(const QString &text) const;
void newMachineWizard();
void addNewSystem(const QString &name, const QString &dir, const QString &configFile = {});
void addNewSystem(const QString &name, const QString &dir, const QString &displayName = QString(), const QString &configFile = {});
#if __GNUC__ >= 11
[[nodiscard]] QStringList getSearchCompletionList() const;
#else