RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-12-06 07:12:28 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix wrong resolved conflict

Browse source
This commit is contained in:
digant73 2025-12-01 22:29:48 +01:00
parent f23097327c
commit 1a991b244f
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
rpcs3/rpcs3qt/game_list_frame.cpp
View file

@ -1373,7 +1373,7 @@ void game_list_frame::ShowSingleSelectionContextMenu(const game_info& gameinfo,
// Manage Game menu // Manage Game menu
QMenu* manage_game_menu = menu.addMenu(tr("&Manage Game")); QMenu* manage_game_menu = menu.addMenu(tr("&Manage Game"));
// Create game shortcut // Create game shortcuts
QAction* create_desktop_shortcut = manage_game_menu->addAction(tr("&Create Desktop Shortcut")); QAction* create_desktop_shortcut = manage_game_menu->addAction(tr("&Create Desktop Shortcut"));
connect(create_desktop_shortcut, &QAction::triggered, this, [this, gameinfo]() connect(create_desktop_shortcut, &QAction::triggered, this, [this, gameinfo]()
{ {
@ -1918,7 +1918,7 @@ void game_list_frame::ShowMultiSelectionContextMenu(const std::vector<game_info>
// Manage Game menu // Manage Game menu
QMenu* manage_game_menu = menu.addMenu(tr("&Manage Game")); QMenu* manage_game_menu = menu.addMenu(tr("&Manage Game"));
// Create game shortcut // Create game shortcuts
QAction* create_desktop_shortcut = manage_game_menu->addAction(tr("&Create Desktop Shortcut")); QAction* create_desktop_shortcut = manage_game_menu->addAction(tr("&Create Desktop Shortcut"));
connect(create_desktop_shortcut, &QAction::triggered, this, [this, games]() connect(create_desktop_shortcut, &QAction::triggered, this, [this, games]()
{ {
@ -2079,8 +2079,7 @@ void game_list_frame::ClearContentList(bool refresh)
serials_to_remove_from_yml.push_back(removedDisc); serials_to_remove_from_yml.push_back(removedDisc);
} }
// Finally, refresh the game list. // Finally, refresh the game list
// Hidden list in "GuiConfigs/CurrentSettings.ini" file is also properly updated (title removed) if needed
Refresh(true, serials_to_remove_from_yml); Refresh(true, serials_to_remove_from_yml);
} }

2
rpcs3/rpcs3qt/game_list_frame.h
View file

@ -111,7 +111,7 @@ public Q_SLOTS:
void SetContentList(u16 content_types, const content_info& content_info); void SetContentList(u16 content_types, const content_info& content_info);
void BatchRemoveContentLists(const std::vector<game_info>& games = {}, bool is_interactive = false); void BatchRemoveContentLists(const std::vector<game_info>& games = {}, bool is_interactive = false);
void SetListMode(const bool& is_list); void SetListMode(bool is_list);
void SetSearchText(const QString& text); void SetSearchText(const QString& text);
void SetShowCompatibilityInGrid(bool show); void SetShowCompatibilityInGrid(bool show);
void SetPreferGameDataIcons(bool enabled); void SetPreferGameDataIcons(bool enabled);