The-Homebrew-Cloud/Cemu
2
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2024-11-29 04:24:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Save icons to user data directory + use real path of AppImage for shortcuts (#894)

Browse Source
This commit is contained in:
capitalistspz 2023-07-09 22:53:00 +00:00 committed by GitHub
parent f1c200a016
commit bfbeeae6f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/gui/components/wxGameList.cpp
View File

@ -16,6 +16,7 @@
#include <wx/wfstream.h> #include <wx/wfstream.h>
#include <wx/imagpng.h> #include <wx/imagpng.h>
#include <wx/string.h> #include <wx/string.h>
#include <wx/utils.h>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/tokenizer.hpp> #include <boost/tokenizer.hpp>
@ -1230,7 +1231,13 @@ void wxGameList::DeleteCachedStrings()
void wxGameList::CreateShortcut(GameInfo2& gameInfo) { void wxGameList::CreateShortcut(GameInfo2& gameInfo) {
const auto title_id = gameInfo.GetBaseTitleId(); const auto title_id = gameInfo.GetBaseTitleId();
const auto title_name = gameInfo.GetTitleName(); const auto title_name = gameInfo.GetTitleName();
const auto exe_path = ActiveSettings::GetExecutablePath(); auto exe_path = ActiveSettings::GetExecutablePath();
// GetExecutablePath returns the AppImage's temporary mount location, instead of its actual path
wxString appimage_path;
if (wxGetEnv(("APPIMAGE"), &appimage_path)) {
exe_path = appimage_path.utf8_string();
}
#if BOOST_OS_LINUX #if BOOST_OS_LINUX
const wxString desktop_entry_name = wxString::Format("%s.desktop", title_name); const wxString desktop_entry_name = wxString::Format("%s.desktop", title_name);
@ -1263,15 +1270,23 @@ void wxGameList::CreateShortcut(GameInfo2& gameInfo) {
wxMessageBox("Icon is yet to load, so will not be used by the shortcut", "Warning", wxOK | wxCENTRE | wxICON_WARNING); wxMessageBox("Icon is yet to load, so will not be used by the shortcut", "Warning", wxOK | wxCENTRE | wxICON_WARNING);
} }
else { else {
const auto out_icon_dir = ActiveSettings::GetDataPath("icons"); const fs::path out_icon_dir = ActiveSettings::GetUserDataPath("icons");
fs::create_directories(out_icon_dir);
icon_path = out_icon_dir / fmt::format("{:016x}.png", gameInfo.GetBaseTitleId());
auto image = m_image_list->GetIcon(result_index.value()).ConvertToImage(); if (!fs::exists(out_icon_dir) && !fs::create_directories(out_icon_dir)){
wxMessageBox("Cannot access the icon directory, the shortcut will have no icon", "Warning", wxOK | wxCENTRE | wxICON_WARNING);
}
else {
icon_path = out_icon_dir / fmt::format("{:016x}.png", gameInfo.GetBaseTitleId());
wxFileOutputStream png_file(_pathToUtf8(icon_path.value())); auto image = m_image_list->GetIcon(result_index.value()).ConvertToImage();
wxPNGHandler pngHandler;
pngHandler.SaveFile(&image, png_file, false); wxFileOutputStream png_file(_pathToUtf8(icon_path.value()));
wxPNGHandler pngHandler;
if (!pngHandler.SaveFile(&image, png_file, false)) {
icon_path = std::nullopt;
wxMessageBox("The icon was unable to be saved, the shortcut will have no icon", "Warning", wxOK | wxCENTRE | wxICON_WARNING);
}
}
} }
} }
const auto desktop_entry_string = const auto desktop_entry_string =