Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Game List: Keep custom name when adding/removing game-specific config #6219

Merged
merged 2 commits into from Jul 18, 2019
Merged

Game List: Keep custom name when adding/removing game-specific config #6219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f11d813
Keep custom name when adding/removing game-specific config
MSuih Jul 17, 2019
398573c
Tiny typo fix
MSuih Jul 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion rpcs3/rpcs3qt/emu_settings.cpp
View file
Open in desktop
Expand Up @@ -205,7 +205,7 @@ emu_settings::Render_Creator::Render_Creator()
if (thread_running)
{
LOG_ERROR(GENERAL, "Vulkan device enumeration timed out");
auto button = QMessageBox::critical(nullptr, tr("Vulkan check timeout"),
auto button = QMessageBox::critical(nullptr, tr("Vulkan Check Timeout"),
tr("Querying for Vulkan-compatible devices is taking too long. This is usually caused by malfunctioning "
"graphics drivers, reinstalling them could fix the issue.\n\n"
"Selecting ignore starts the emulator without Vulkan support."),
Expand Down
9 changes: 6 additions & 3 deletions rpcs3/rpcs3qt/game_list_frame.cpp
View file
Open in desktop
Expand Up @@ -1064,7 +1064,7 @@ bool game_list_frame::RemoveCustomConfiguration(const std::string& title_id, gam

bool game_list_frame::RemoveCustomPadConfiguration(const std::string& title_id, game_info game, bool is_interactive)
{
const std::string config_dir = Emulator::GetCustomConfigPath(title_id);
const std::string config_dir = Emulator::GetCustomInputConfigDir(title_id);

if (!fs::is_dir(config_dir))
return true;
Expand Down Expand Up @@ -1534,10 +1534,13 @@ void game_list_frame::ShowCustomConfigIcon(QTableWidgetItem* item)

if (!m_isListLayout)
{
const QString custom_title = m_titles[QString::fromStdString(game->info.serial)];
const QString title = custom_title.isEmpty() ? qstr(game->info.name) : custom_title;
const QColor color = getGridCompatibilityColor(game->compat.color);

game->pxmap = PaintedPixmap(game->icon, game->hasCustomConfig, game->hasCustomPadConfig, color);
int r = m_xgrid->currentItem()->row(), c = m_xgrid->currentItem()->column();
m_xgrid->addItem(game->pxmap, qstr(game->info.name).simplified(), r, c);
m_xgrid->addItem(game->pxmap, title.simplified(), r, c);
m_xgrid->item(r, c)->setData(gui::game_role, QVariant::fromValue(game));
}
else if (game->hasCustomConfig && game->hasCustomPadConfig)
Expand All @@ -1547,7 +1550,7 @@ void game_list_frame::ShowCustomConfigIcon(QTableWidgetItem* item)
else if (game->hasCustomPadConfig)
m_gameList->item(item->row(), gui::column_name)->setIcon(QIcon(":/Icons/controllers.png"));
else
m_gameList->setItem(item->row(), gui::column_name, new custom_table_widget_item(game->info.name));
MSuih marked this conversation as resolved.
Show resolved Hide resolved
m_gameList->item(item->row(), gui::column_name)->setIcon(QIcon());
}

void game_list_frame::ResizeIcons(const int& sliderPos)
Expand Down