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

Apply suggestions from code review

Browse Source 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
This commit is contained in:
ADudeCalledLeo 2022-11-09 21:02:40 +02:00
parent 487e352642
commit 6043444e4e
No known key found for this signature in database
GPG Key ID: 2E08DA5D6AF36F3B
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/FileSystem.cpp
View File

@ -342,7 +342,7 @@ QString getDesktopDir()
// Cross-platform Shortcut creation
bool createShortcut(QString destination, QString target, QStringList args, QString name, QString icon)
{
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
destination = PathCombine(destination, name + ".desktop");
QFile f(destination);

12
launcher/ui/MainWindow.cpp
View File

@ -2099,23 +2099,21 @@ void MainWindow::on_actionCreateInstanceShortcut_triggered()
return;
}
#if defined(Q_OS_MACOS)
// macOSX
// TODO actually write this path
QMessageBox::critical(this, tr("Create instance shortcut"), tr("Not supported on macOSX yet!"));
return;
#ifdef Q_OS_MACOS
QMessageBox::critical(this, tr("Create instance shortcut"), tr("Not supported on macOS yet!"));
return;
#endif
auto icon = APPLICATION->icons()->icon(m_selectedInstance->iconKey());
QString iconPath;
bool iconGenerated = false;
#if defined(Q_OS_WIN)
#ifdef Q_OS_WIN
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 = QGuiApplication::windowIcon();
auto appIcon = Application::getThemedIcon("logo");
QFile iconFile(iconPath);
if (!iconFile.open(QFile::WriteOnly))