diff options
| author | 2023-10-18 19:30:21 -0300 | |
|---|---|---|
| committer | 2023-10-18 19:30:21 -0300 | |
| commit | ae2130470effa72c3ea1ffc045e9b6b2a77b23d3 (patch) | |
| tree | 5ec65a3c7b1d281a6c4249b6b2040c05c672509b /src | |
| parent | TODO: Implement shortcut creation for Apple. (diff) | |
| download | yuzu-ae2130470effa72c3ea1ffc045e9b6b2a77b23d3.tar.gz yuzu-ae2130470effa72c3ea1ffc045e9b6b2a77b23d3.tar.xz yuzu-ae2130470effa72c3ea1ffc045e9b6b2a77b23d3.zip | |
Reverted dirty code in main.
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/main.cpp | 8 | ||||
| -rw-r--r-- | src/yuzu/main.h | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index ec3eb7536..73cd06478 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -2839,8 +2839,7 @@ void GMainWindow::OnGameListNavigateToGamedbEntry(u64 program_id, | |||
| 2839 | 2839 | ||
| 2840 | QDesktopServices::openUrl(QUrl(QStringLiteral("https://yuzu-emu.org/game/") + directory)); | 2840 | QDesktopServices::openUrl(QUrl(QStringLiteral("https://yuzu-emu.org/game/") + directory)); |
| 2841 | } | 2841 | } |
| 2842 | // TODO: Implement shortcut creation for macOS | 2842 | |
| 2843 | #if !defined(__APPLE__) | ||
| 2844 | bool GMainWindow::CreateShortcutLink(const std::filesystem::path& shortcut_path, | 2843 | bool GMainWindow::CreateShortcutLink(const std::filesystem::path& shortcut_path, |
| 2845 | const std::string& comment, | 2844 | const std::string& comment, |
| 2846 | const std::filesystem::path& icon_path, | 2845 | const std::filesystem::path& icon_path, |
| @@ -2998,11 +2997,9 @@ bool GMainWindow::MakeShortcutIcoPath(const u64 program_id, const std::string_vi | |||
| 2998 | : fmt::format("yuzu-{:016X}.{}", program_id, ico_extension)); | 2997 | : fmt::format("yuzu-{:016X}.{}", program_id, ico_extension)); |
| 2999 | return true; | 2998 | return true; |
| 3000 | } | 2999 | } |
| 3001 | #endif // !defined(__APPLE__) | 3000 | |
| 3002 | void GMainWindow::OnGameListCreateShortcut(u64 program_id, const std::string& game_path, | 3001 | void GMainWindow::OnGameListCreateShortcut(u64 program_id, const std::string& game_path, |
| 3003 | GameListShortcutTarget target) { | 3002 | GameListShortcutTarget target) { |
| 3004 | // TODO: Implement shortcut creation for macOS | ||
| 3005 | #if !defined(__APPLE__) | ||
| 3006 | std::string game_title; | 3003 | std::string game_title; |
| 3007 | QString qt_game_title; | 3004 | QString qt_game_title; |
| 3008 | std::filesystem::path out_icon_path; | 3005 | std::filesystem::path out_icon_path; |
| @@ -3096,7 +3093,6 @@ void GMainWindow::OnGameListCreateShortcut(u64 program_id, const std::string& ga | |||
| 3096 | } | 3093 | } |
| 3097 | GMainWindow::CreateShortcutMessagesGUI(this, GMainWindow::CREATE_SHORTCUT_MSGBOX_ERROR, | 3094 | GMainWindow::CreateShortcutMessagesGUI(this, GMainWindow::CREATE_SHORTCUT_MSGBOX_ERROR, |
| 3098 | qt_game_title); | 3095 | qt_game_title); |
| 3099 | #endif | ||
| 3100 | } | 3096 | } |
| 3101 | 3097 | ||
| 3102 | void GMainWindow::OnGameListOpenDirectory(const QString& directory) { | 3098 | void GMainWindow::OnGameListOpenDirectory(const QString& directory) { |
diff --git a/src/yuzu/main.h b/src/yuzu/main.h index 7a1a97f33..d203e5301 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h | |||
| @@ -441,8 +441,6 @@ private: | |||
| 441 | bool ConfirmShutdownGame(); | 441 | bool ConfirmShutdownGame(); |
| 442 | 442 | ||
| 443 | QString GetTasStateDescription() const; | 443 | QString GetTasStateDescription() const; |
| 444 | // TODO: Implement shortcut creation for macOS | ||
| 445 | #if !defined(__APPLE__) | ||
| 446 | bool CreateShortcutMessagesGUI(QWidget* parent, int imsg, const QString& game_title); | 444 | bool CreateShortcutMessagesGUI(QWidget* parent, int imsg, const QString& game_title); |
| 447 | bool MakeShortcutIcoPath(const u64 program_id, const std::string_view game_file_name, | 445 | bool MakeShortcutIcoPath(const u64 program_id, const std::string_view game_file_name, |
| 448 | std::filesystem::path& out_icon_path); | 446 | std::filesystem::path& out_icon_path); |
| @@ -451,7 +449,6 @@ private: | |||
| 451 | const std::filesystem::path& command, const std::string& arguments, | 449 | const std::filesystem::path& command, const std::string& arguments, |
| 452 | const std::string& categories, const std::string& keywords, | 450 | const std::string& categories, const std::string& keywords, |
| 453 | const std::string& name); | 451 | const std::string& name); |
| 454 | #endif | ||
| 455 | /** | 452 | /** |
| 456 | * Mimic the behavior of QMessageBox::question but link controller navigation to the dialog | 453 | * Mimic the behavior of QMessageBox::question but link controller navigation to the dialog |
| 457 | * The only difference is that it returns a boolean. | 454 | * The only difference is that it returns a boolean. |