VERY experimental Nintendo Switch 2 emulator
C++
Merge branch 'master' into new-shortcut
Franco Mc8b3dc740a65
diff --cc src/yuzu/main.cppindex 73cd064782,91aba118a4..c8efd19178--- a/src/yuzu/main.cpp+++ b/src/yuzu/main.cpp@@@ -2840,149 -2843,82 +2843,149 @@@ void GMainWindow::OnGameListNavigateToGQDesktopServices::openUrl(QUrl(QStringLiteral("https://yuzu-emu.org/game/") + directory));}-void GMainWindow::OnGameListCreateShortcut(u64 program_id, const std::string& game_path,- GameListShortcutTarget target) {- // Get path to yuzu executable- const QStringList args = QApplication::arguments();- std::filesystem::path yuzu_command = args[0].toStdString();-- // If relative path, make it an absolute path- if (yuzu_command.c_str()[0] == '.') {- yuzu_command = Common::FS::GetCurrentDir() / yuzu_command;+bool GMainWindow::CreateShortcutLink(const std::filesystem::path& shortcut_path,+ const std::string& comment,+ const std::filesystem::path& icon_path,+ const std::filesystem::path& command,+ const std::string& arguments, const std::string& categories,+ const std::string& keywords, const std::string& name) try {+#if defined(__linux__) || defined(__FreeBSD__) // Linux and FreeBSD+ std::filesystem::path shortcut_path_full = shortcut_path / (name + ".desktop");+ std::ofstream shortcut_stream(shortcut_path_full, std::ios::binary | std::ios::trunc);+ if (!shortcut_stream.is_open()) {+ LOG_ERROR(Frontend, "Failed to create shortcut");+ return false;}--#if defined(__linux__)- // Warn once if we are making a shortcut to a volatile AppImage- const std::string appimage_ending =- std::string(Common::g_scm_rev).substr(0, 9).append(".AppImage");- if (yuzu_command.string().ends_with(appimage_ending) &&- !UISettings::values.shortcut_already_warned) {- if (QMessageBox::warning(this, tr("Create Shortcut"),- tr("This will create a shortcut to the current AppImage. This may "- "not work well if you update. Continue?"),- QMessageBox::StandardButton::Ok |- QMessageBox::StandardButton::Cancel) ==- QMessageBox::StandardButton::Cancel) {- return;+ fmt::print(shortcut_stream, "[Desktop Entry]\n");+ fmt::print(shortcut_stream, "Type=Application\n");+ fmt::print(shortcut_stream, "Version=1.0\n");+ fmt::print(shortcut_stream, "Name={}\n", name);+ if (!comment.empty()) {+ fmt::print(shortcut_stream, "Comment={}\n", comment);+ }+ if (std::filesystem::is_regular_file(icon_path)) {+ fmt::print(shortcut_stream, "Icon={}\n", icon_path.string());+ }+ fmt::print(shortcut_stream, "TryExec={}\n", command.string());+ fmt::print(shortcut_stream, "Exec={} {}\n", command.string(), arguments);+ if (!categories.empty()) {+ fmt::print(shortcut_stream, "Categories={}\n", categories);+ }+ if (!keywords.empty()) {+ fmt::print(shortcut_stream, "Keywords={}\n", keywords);+ }+ return true;+#elif defined(_WIN32) // Windows+ HRESULT hr = CoInitialize(nullptr);+ if (FAILED(hr)) {+ LOG_ERROR(Frontend, "CoInitialize failed");+ return false;+ }+ SCOPE_EXIT({ CoUninitialize(); });+ IShellLinkW* ps1 = nullptr;+ IPersistFile* persist_file = nullptr;+ SCOPE_EXIT({+ if (persist_file != nullptr) {+ persist_file->Release();}- UISettings::values.shortcut_already_warned = true;+ if (ps1 != nullptr) {+ ps1->Release();+ }+ });+ HRESULT hres = CoCreateInstance(CLSID_ShellLink, nullptr, CLSCTX_INPROC_SERVER, IID_IShellLinkW,+ reinterpret_cast<void**>(&ps1));+ if (FAILED(hres)) {+ LOG_ERROR(Frontend, "Failed to create IShellLinkW instance");+ return false;}-#endif // __linux__-- std::filesystem::path target_directory{};-- switch (target) {- case GameListShortcutTarget::Desktop: {- const QString desktop_path =- QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);- target_directory = desktop_path.toUtf8().toStdString();- break;+ hres = ps1->SetPath(command.c_str());+ if (FAILED(hres)) {+ LOG_ERROR(Frontend, "Failed to set path");+ return false;}- case GameListShortcutTarget::Applications: {- const QString applications_path =- QStandardPaths::writableLocation(QStandardPaths::ApplicationsLocation);- if (applications_path.isEmpty()) {- const char* home = std::getenv("HOME");- if (home != nullptr) {- target_directory = std::filesystem::path(home) / ".local/share/applications";- }- } else {- target_directory = applications_path.toUtf8().toStdString();+ if (!arguments.empty()) {+ hres = ps1->SetArguments(Common::UTF8ToUTF16W(arguments).data());+ if (FAILED(hres)) {+ LOG_ERROR(Frontend, "Failed to set arguments");+ return false;}- break;}- default:- return;+ if (!comment.empty()) {+ hres = ps1->SetDescription(Common::UTF8ToUTF16W(comment).data());+ if (FAILED(hres)) {+ LOG_ERROR(Frontend, "Failed to set description");+ return false;+ }}-- const QDir dir(QString::fromStdString(target_directory.generic_string()));- if (!dir.exists()) {- QMessageBox::critical(this, tr("Create Shortcut"),- tr("Cannot create shortcut. Path \"%1\" does not exist.")- .arg(QString::fromStdString(target_directory.generic_string())),- QMessageBox::StandardButton::Ok);- return;+ if (std::filesystem::is_regular_file(icon_path)) {+ hres = ps1->SetIconLocation(icon_path.c_str(), 0);+ if (FAILED(hres)) {+ LOG_ERROR(Frontend, "Failed to set icon location");+ return false;+ }}+ hres = ps1->QueryInterface(IID_IPersistFile, reinterpret_cast<void**>(&persist_file));+ if (FAILED(hres)) {+ LOG_ERROR(Frontend, "Failed to get IPersistFile interface");+ return false;+ }+ hres = persist_file->Save(std::filesystem::path{shortcut_path / (name + ".lnk")}.c_str(), TRUE);+ if (FAILED(hres)) {+ LOG_ERROR(Frontend, "Failed to save shortcut");+ return false;+ }+ return true;+#else // Unsupported platform+ return false;+#endif+} catch (const std::exception& e) {+ LOG_ERROR(Frontend, "Failed to create shortcut: {}", e.what());+ return false;+}+// Messages in pre-defined message boxes for less code spaghetti+bool GMainWindow::CreateShortcutMessagesGUI(QWidget* parent, int imsg, const QString& game_title) {+ int result = 0;+ QMessageBox::StandardButtons buttons;+ switch (imsg) {+ case GMainWindow::CREATE_SHORTCUT_MSGBOX_FULLSCREEN_YES:+ buttons = QMessageBox::Yes | QMessageBox::No;+ result =+ QMessageBox::information(parent, tr("Create Shortcut"),+ tr("Do you want to launch the game in fullscreen?"), buttons);+ return result == QMessageBox::Yes;+ case GMainWindow::CREATE_SHORTCUT_MSGBOX_SUCCESS:+ QMessageBox::information(parent, tr("Create Shortcut"),+ tr("Successfully created a shortcut to %1").arg(game_title));+ return false;+ case GMainWindow::CREATE_SHORTCUT_MSGBOX_APPVOLATILE_WARNING:+ buttons = QMessageBox::StandardButton::Ok | QMessageBox::StandardButton::Cancel;+ result =+ QMessageBox::warning(this, tr("Create Shortcut"),+ tr("This will create a shortcut to the current AppImage. This may "+ "not work well if you update. Continue?"),+ buttons);+ return result == QMessageBox::Ok;+ default:+ buttons = QMessageBox::Ok;+ QMessageBox::critical(parent, tr("Create Shortcut"),+ tr("Failed to create a shortcut to %1").arg(game_title), buttons);+ return false;+ }+}- const std::string game_file_name = std::filesystem::path(game_path).filename().string();- // Determine full paths for icon and shortcut-#if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__)- const char* home = std::getenv("HOME");- const std::filesystem::path home_path = (home == nullptr ? "~" : home);- const char* xdg_data_home = std::getenv("XDG_DATA_HOME");-- std::filesystem::path system_icons_path =- (xdg_data_home == nullptr ? home_path / ".local/share/"- : std::filesystem::path(xdg_data_home)) /- "icons/hicolor/256x256";- if (!Common::FS::CreateDirs(system_icons_path)) {+bool GMainWindow::MakeShortcutIcoPath(const u64 program_id, const std::string_view game_file_name,+ std::filesystem::path& out_icon_path) {+ // Get path to Yuzu icons directory & icon extension+ std::string ico_extension = "png";+#if defined(_WIN32)+ out_icon_path = Common::FS::GetYuzuPath(Common::FS::YuzuPath::ConfigDir) / "icons";+ ico_extension = "ico";+#elif defined(__linux__) || defined(__FreeBSD__)+ out_icon_path = Common::FS::GetDataDirectory("XDG_DATA_HOME") / "icons/hicolor/256x256";+#endif-+++ // Create icons directory if it doesn't exist+ if (!Common::FS::CreateDirs(out_icon_path)) {QMessageBox::critical(this, tr("Create Icon"),tr("Cannot create icon file. Path \"%1\" does not exist and cannot be created.")diff --cc src/yuzu/main.hindex d203e5301c,f9c6efe4fa..f67c4cfda7--- a/src/yuzu/main.h+++ b/src/yuzu/main.h@@@ -6,9 -6,9 +6,10 @@@#include <memory>#include <optional>+#include <filesystem>#include <QMainWindow>#include <QMessageBox>+ #include <QPushButton>#include <QTimer>#include <QTranslator>