This commit is contained in:
dada513 2022-03-28 20:55:03 +02:00
parent 424f4a72ff
commit 3a7eeff135
No known key found for this signature in database
GPG Key ID: 403448C14FA4B33E
7 changed files with 26 additions and 70 deletions

View File

@ -1139,6 +1139,16 @@ std::vector<ITheme *> Application::getValidApplicationThemes()
return ret; return ret;
} }
bool Application::isFlatpak()
{
#ifdef Q_OS_LINUX
QFileInfo check_file("/.flatpak-info");
return check_file.exists();
#else
return false;
#endif
}
void Application::setApplicationTheme(const QString& name, bool initial) void Application::setApplicationTheme(const QString& name, bool initial)
{ {
auto systemPalette = qApp->palette(); auto systemPalette = qApp->palette();

View File

@ -104,6 +104,8 @@ public:
QIcon getThemedIcon(const QString& name); QIcon getThemedIcon(const QString& name);
bool isFlatpak();
void setIconTheme(const QString& name); void setIconTheme(const QString& name);
std::vector<ITheme *> getValidApplicationThemes(); std::vector<ITheme *> getValidApplicationThemes();

View File

@ -582,8 +582,6 @@ SET(LAUNCHER_SOURCES
ApplicationMessage.cpp ApplicationMessage.cpp
# GUI - general utilities # GUI - general utilities
Flatpak.h
Flatpak.cpp
DesktopServices.h DesktopServices.h
DesktopServices.cpp DesktopServices.cpp
VersionProxyModel.h VersionProxyModel.h

View File

@ -37,7 +37,7 @@
#include <QDesktopServices> #include <QDesktopServices>
#include <QProcess> #include <QProcess>
#include <QDebug> #include <QDebug>
#include "Flatpak.h" #include "Application.h"
/** /**
* This shouldn't exist, but until QTBUG-9328 and other unreported bugs are fixed, it needs to be a thing. * This shouldn't exist, but until QTBUG-9328 and other unreported bugs are fixed, it needs to be a thing.
@ -119,7 +119,7 @@ bool openDirectory(const QString &path, bool ensureExists)
return QDesktopServices::openUrl(QUrl::fromLocalFile(dir.absolutePath())); return QDesktopServices::openUrl(QUrl::fromLocalFile(dir.absolutePath()));
}; };
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
if(!Flatpak::IsFlatpak()) if(!APPLICATION->isFlatpak())
{ {
return IndirectOpen(f); return IndirectOpen(f);
} }
@ -140,7 +140,7 @@ bool openFile(const QString &path)
return QDesktopServices::openUrl(QUrl::fromLocalFile(path)); return QDesktopServices::openUrl(QUrl::fromLocalFile(path));
}; };
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
if(!Flatpak::IsFlatpak()) if(!APPLICATION->isFlatpak())
{ {
return IndirectOpen(f); return IndirectOpen(f);
} }
@ -158,7 +158,7 @@ bool openFile(const QString &application, const QString &path, const QString &wo
qDebug() << "Opening file" << path << "using" << application; qDebug() << "Opening file" << path << "using" << application;
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
// FIXME: the pid here is fake. So if something depends on it, it will likely misbehave // FIXME: the pid here is fake. So if something depends on it, it will likely misbehave
if(!Flatpak::IsFlatpak()) if(!APPLICATION->isFlatpak())
{ {
return IndirectOpen([&]() return IndirectOpen([&]()
{ {
@ -178,7 +178,7 @@ bool run(const QString &application, const QStringList &args, const QString &wor
{ {
qDebug() << "Running" << application << "with args" << args.join(' '); qDebug() << "Running" << application << "with args" << args.join(' ');
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
if(!Flatpak::IsFlatpak()) if(!APPLICATION->isFlatpak())
{ {
// FIXME: the pid here is fake. So if something depends on it, it will likely misbehave // FIXME: the pid here is fake. So if something depends on it, it will likely misbehave
return IndirectOpen([&]() return IndirectOpen([&]()
@ -203,7 +203,7 @@ bool openUrl(const QUrl &url)
return QDesktopServices::openUrl(url); return QDesktopServices::openUrl(url);
}; };
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
if(!Flatpak::IsFlatpak()) if(!APPLICATION->isFlatpak())
{ {
return IndirectOpen(f); return IndirectOpen(f);
} }

View File

@ -1,31 +0,0 @@
// SPDX-License-Identifier: GPL-3.0-only
/*
* PolyMC - Minecraft Launcher
* Copyright (C) 2022 dada513 <dada513@protonmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include <QFileInfo>
namespace Flatpak
{
bool IsFlatpak()
{
#ifdef Q_OS_LINUX
QFileInfo check_file("/.flatpak-info");
return check_file.exists();
#else
return false;
#endif
}
}

View File

@ -1,21 +0,0 @@
// SPDX-License-Identifier: GPL-3.0-only
/*
* PolyMC - Minecraft Launcher
* Copyright (C) 2022 dada513 <dada513@protonmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
namespace Flatpak
{
bool IsFlatpak();
}

View File

@ -49,7 +49,6 @@
#include "Application.h" #include "Application.h"
#include "BuildConfig.h" #include "BuildConfig.h"
#include "ui/themes/ITheme.h" #include "ui/themes/ITheme.h"
#include "Flatpak.h"
#include <QApplication> #include <QApplication>
#include <QProcess> #include <QProcess>
@ -136,28 +135,27 @@ void LauncherPage::on_instDirBrowseBtn_clicked()
warning.setInformativeText( warning.setInformativeText(
tr("Do you really want to use this path? " tr("Do you really want to use this path? "
"Selecting \"No\" will close this and not alter your instance path.")); "Selecting \"No\" will close this and not alter your instance path."));
warning.setStandardButtons(QMessageBox::Yes | QMessageBox::No); warning.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
int result = warning.exec(); int result = warning.exec();
if (result == QMessageBox::Yes) if (result == QMessageBox::Ok)
{ {
ui->instDirTextBox->setText(cooked_dir); ui->instDirTextBox->setText(cooked_dir);
} }
} }
else if(Flatpak::IsFlatpak() && raw_dir.startsWith("/run/user")) else if(APPLICATION->isFlatpak() && raw_dir.startsWith("/run/user"))
{ {
QMessageBox warning; QMessageBox warning;
warning.setText(tr("You're trying to specify an instance folder " warning.setText(tr("You're trying to specify an instance folder "
"which was granted temporaily via Flatpak.\n" "which was granted temporaily via Flatpak.\n"
"This is known to cause problems, " "This is known to cause problems. "
"after a restart the launcher might break, " "After a restart the launcher might break, "
"because it will no longer have access to that directory.\n\n" "because it will no longer have access to that directory.\n\n"
"Granting PolyMC access to it via Flatseal is recommended.")); "Granting PolyMC access to it via Flatseal is recommended."));
warning.setInformativeText( warning.setInformativeText(
tr("Do you really want to use this path?\n" tr("Do you want to proceed anyway?"));
"Selecting \"No\" will close this and not alter your instance path.")); warning.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
warning.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
int result = warning.exec(); int result = warning.exec();
if (result == QMessageBox::Yes) if (result == QMessageBox::Ok)
{ {
ui->instDirTextBox->setText(cooked_dir); ui->instDirTextBox->setText(cooked_dir);
} }