0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor #if checks

Browse Source 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
This commit is contained in:
ADudeCalledLeo 2022-11-12 20:41:52 +02:00
parent f7d7d76ee8
commit b813c867b5
No known key found for this signature in database
GPG Key ID: 2E08DA5D6AF36F3B
2 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/FileSystem.cpp
View File

@ -395,7 +395,7 @@ bool createShortcut(QString destination, QString target, QStringList args, QStri
f.setPermissions(f.permissions() | QFileDevice::ExeOwner | QFileDevice::ExeGroup | QFileDevice::ExeOther);
return true;
#elif defined Q_OS_WIN
#elif defined(Q_OS_WIN)
QFileInfo targetInfo(target);
if (!targetInfo.exists())

46
launcher/ui/MainWindow.cpp
View File

@ -2099,13 +2099,13 @@ void MainWindow::on_actionCreateInstanceShortcut_triggered()
return;
}
#ifdef Q_OS_MACOS
#if defined(Q_OS_MACOS)
// handle macOS bundle weirdness
QFileInfo appFileInfo(QApplication::applicationFilePath()));
QString appName = appFileInfo.baseName();
QString exeName = FS::PathCombine(appFileInfo.filePath(), "Contents/MacOS/" + appName);
if (FS::createShortcut(FS::PathCombine(desktopPath, m_selectedInstance->name()),
if (FS::createShortcut(FS::PathCombine(desktopPath, m_selectedInstance->name()),
exeName, { "--launch", m_selectedInstance->id() }, m_selectedInstance->name(), "")) {
QMessageBox::information(this, tr("Create instance shortcut"), tr("Created a shortcut to this instance on your desktop!"));
}
@ -2113,17 +2113,22 @@ void MainWindow::on_actionCreateInstanceShortcut_triggered()
{
QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create instance shortcut!"));
}
return;
#endif
#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
auto icon = APPLICATION->icons()->icon(m_selectedInstance->iconKey());
QString iconPath;
bool iconGenerated = false;
#ifdef Q_OS_WIN
iconPath = FS::PathCombine(m_selectedInstance->instanceRoot(), "icon.ico");
if (FS::createShortcut(FS::PathCombine(desktopPath, m_selectedInstance->name()),
QApplication::applicationFilePath(), { "--launch", m_selectedInstance->id() }, m_selectedInstance->name(), icon->getFilePath())) {
QMessageBox::information(this, tr("Create instance shortcut"), tr("Created a shortcut to this instance on your desktop!"));
}
else
{
QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create instance shortcut!"));
}
#elif defined(Q_OS_WIN)
auto icon = APPLICATION->icons()->icon(m_selectedInstance->iconKey());
QString iconPath = FS::PathCombine(m_selectedInstance->instanceRoot(), "icon.ico");
// part of fix for weird bug involving the window icon being replaced
// dunno why it happens, but this 2-line fix seems to be enough, so w/e
auto appIcon = APPLICATION->getThemedIcon("logo");
@ -2140,31 +2145,24 @@ void MainWindow::on_actionCreateInstanceShortcut_triggered()
// restore original window icon
QGuiApplication::setWindowIcon(appIcon);
if (success)
{
iconGenerated = true;
}
else
if (!success)
{
iconFile.remove();
QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create instance shortcut!"));
return;
}
#else
iconPath = icon->getFilePath();
#endif
if (FS::createShortcut(FS::PathCombine(desktopPath, m_selectedInstance->name()),
QApplication::applicationFilePath(), { "--launch", m_selectedInstance->id() }, m_selectedInstance->name(), iconPath)) {
QMessageBox::information(this, tr("Create instance shortcut"), tr("Created a shortcut to this instance on your desktop!"));
}
else
{
if (iconGenerated)
{
QFile::remove(iconPath);
}
QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create instance shortcut!"));
}
#else
QMessageBox::critical(this, tr("Create instance shortcut"), tr("Not supported on your platform!"));
#endif
}
}