Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-05-27 20:30:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions from review

Browse Source 
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
This commit is contained in:
Yihe Li 2025-05-22 23:09:29 +08:00
parent 3745bdb6f2
commit a89caf7362
No known key found for this signature in database
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/minecraft/ShortcutUtils.cpp
View File

@ -149,7 +149,7 @@ void createInstanceShortcut(const Shortcut& shortcut, const QString& filePath)
args.append({ "--launch", shortcut.instance->id() });
args.append(shortcut.extraArgs);
if (!FS::createShortcut(std::move(filePath), appPath, args, shortcut.name, iconPath)) {
if (!FS::createShortcut(filePath, appPath, args, shortcut.name, iconPath)) {
#if not defined(Q_OS_MACOS)
iconFile.remove();
#endif

15
launcher/ui/dialogs/CreateShortcutDialog.cpp
View File

@ -81,12 +81,12 @@ CreateShortcutDialog::CreateShortcutDialog(InstancePtr instance, QWidget* parent
QString applicationDir = FS::getApplicationsDir();
if (!desktopDir.isEmpty())
ui->saveTargetSelectionBox->addItem("Desktop", QVariant::fromValue(SaveTarget::Desktop));
ui->saveTargetSelectionBox->addItem(tr("Desktop"), QVariant::fromValue(SaveTarget::Desktop));
if (!applicationDir.isEmpty())
ui->saveTargetSelectionBox->addItem("Applications", QVariant::fromValue(SaveTarget::Applications));
ui->saveTargetSelectionBox->addItem(tr("Applications"), QVariant::fromValue(SaveTarget::Applications));
}
ui->saveTargetSelectionBox->addItem("Other...", QVariant::fromValue(SaveTarget::Other));
ui->saveTargetSelectionBox->addItem(tr("Other..."), QVariant::fromValue(SaveTarget::Other));
// Populate worlds
if (m_QuickJoinSupported) {
@ -105,7 +105,7 @@ CreateShortcutDialog::CreateShortcutDialog(InstancePtr instance, QWidget* parent
MinecraftAccountPtr defaultAccount = accounts->defaultAccount();
if (accounts->count() <= 0) {
ui->overrideAccountCheckbox->setEnabled(false);
} else
} else {
for (int i = 0; i < accounts->count(); i++) {
MinecraftAccountPtr account = accounts->at(i);
auto profileLabel = account->profileName();
@ -118,6 +118,7 @@ CreateShortcutDialog::CreateShortcutDialog(InstancePtr instance, QWidget* parent
if (defaultAccount == account)
ui->accountSelectionBox->setCurrentIndex(i);
}
}
}
CreateShortcutDialog::~CreateShortcutDialog()
@ -183,9 +184,11 @@ void CreateShortcutDialog::stateChanged()
ui->instNameTextBox->setPlaceholderText(result);
if (!ui->targetCheckbox->isChecked())
ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
else
else {
ui->buttonBox->button(QDialogButtonBox::Ok)
->setEnabled(ui->worldTarget->isChecked() || (ui->serverTarget->isChecked() && !ui->serverAddressBox->text().isEmpty()));
->setEnabled((ui->worldTarget->isChecked() && ui->worldSelectionBox->currentIndex() != -1) ||
(ui->serverTarget->isChecked() && !ui->serverAddressBox->text().isEmpty()));
}
}
// Real work