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

Fix recent savestates menu #16615

Merged
merged 4 commits into from
Jan 25, 2025
Merged

Fix recent savestates menu #16615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4951aec
Qt: Fix recent savestates menu settings
Megamouse Jan 24, 2025
0c01425
Qt: fix recent savestate shortcuts
Megamouse Jan 24, 2025
cebcea2
Qt: Add path to recent game/savestate tooltip
Megamouse Jan 24, 2025
05d0953
Qt: Fix Recent savestate path
Megamouse Jan 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 28 additions & 16 deletions rpcs3/rpcs3qt/main_window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,17 +604,23 @@ void main_window::Boot(const std::string& path, const std::string& title_id, boo
{
gui_log.error("Boot failed: reason: %s, path: %s", error, path);
show_boot_error(error);
return;
}

if (is_savestate_compatible(path))
{
gui_log.success("Boot of savestate successful.");
AddRecentAction(gui::Recent_Game(QString::fromStdString(path), QString::fromStdString(Emu.GetTitleAndTitleID())), true);
}
else
{
gui_log.success("Boot successful.");
AddRecentAction(gui::Recent_Game(QString::fromStdString(Emu.GetBoot()), QString::fromStdString(Emu.GetTitleAndTitleID())), false);
}

AddRecentAction(gui::Recent_Game(qstr(Emu.GetBoot()), qstr(Emu.GetTitleAndTitleID())), is_savestate_compatible(path));

if (refresh_list)
{
m_game_list_frame->Refresh(true);
}
if (refresh_list)
{
m_game_list_frame->Refresh(true);
}
}

Expand Down Expand Up @@ -2242,8 +2248,8 @@ void main_window::BootRecentAction(const QAction* act, bool is_savestate)
// refill menu with actions
for (int i = 0; i < rgw.actions.count(); i++)
{
rgw.actions[i]->setShortcut(tr("Ctrl+%1").arg(i + 1));
rgw.actions[i]->setToolTip(::at32(rgw.entries, i).second);
rgw.actions[i]->setShortcut(QString("%0+%1").arg(is_savestate ? "Alt" : "Ctrl").arg(i + 1));
rgw.actions[i]->setToolTip(::at32(rgw.entries, i).second + "\n" + ::at32(rgw.entries, i).first);
menu->addAction(rgw.actions[i]);
}

Expand Down Expand Up @@ -2288,8 +2294,8 @@ QAction* main_window::CreateRecentAction(const q_string_pair& entry, u32 sc_idx,
// create new action
QAction* act = new QAction(shown_name, this);
act->setData(entry.first);
act->setToolTip(entry.second);
act->setShortcut(tr("Ctrl+%1").arg(sc_idx));
act->setToolTip(entry.second + "\n" + entry.first);
act->setShortcut(QString("%0+%1").arg(is_savestate ? "Alt" : "Ctrl").arg(sc_idx));

// truncate if too long
if (shown_name.length() > 60)
Expand Down Expand Up @@ -2360,8 +2366,8 @@ void main_window::AddRecentAction(const q_string_pair& entry, bool is_savestate)
// refill menu with actions
for (int i = 0; i < rgw.actions.count(); i++)
{
rgw.actions[i]->setShortcut(tr("Ctrl+%1").arg(i + 1));
rgw.actions[i]->setToolTip(::at32(rgw.entries, i).second);
rgw.actions[i]->setShortcut(QString("%0+%1").arg(is_savestate ? "Alt" : "Ctrl").arg(i + 1));
rgw.actions[i]->setToolTip(::at32(rgw.entries, i).second + "\n" + ::at32(rgw.entries, i).first);
menu->addAction(rgw.actions[i]);
}

Expand Down Expand Up @@ -4217,15 +4223,21 @@ void main_window::dropEvent(QDropEvent* event)
{
gui_log.error("Boot failed: reason: %s, path: %s", error, path);
show_boot_error(error);
return;
}

if (is_savestate_compatible(path))
{
gui_log.success("Savestate Boot from drag and drop done: %s", path);
AddRecentAction(gui::Recent_Game(QString::fromStdString(path), QString::fromStdString(Emu.GetTitleAndTitleID())), true);
}
else
{
gui_log.success("Elf Boot from drag and drop done: %s", path);

AddRecentAction(gui::Recent_Game(QString::fromStdString(path), QString::fromStdString(Emu.GetTitleAndTitleID())), is_savestate_compatible(path));

m_game_list_frame->Refresh(true);
AddRecentAction(gui::Recent_Game(QString::fromStdString(Emu.GetBoot()), QString::fromStdString(Emu.GetTitleAndTitleID())), false);
}

m_game_list_frame->Refresh(true);
break;
}
case drop_type::drop_rrc: // replay a rsx capture file
Expand Down
9 changes: 6 additions & 3 deletions rpcs3/rpcs3qt/main_window.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,6 @@
<addaction name="bootTestAct"/>
</widget>
<widget class="QMenu" name="bootRecentMenu">
<property name="enabled">
<bool>true</bool>
</property>
<property name="title">
<string>Boot Recent</string>
</property>
Expand Down Expand Up @@ -206,6 +203,9 @@
<property name="title">
<string>Boot Recent Savestate</string>
</property>
<property name="toolTipsVisible">
<bool>true</bool>
</property>
<addaction name="clearRecentSavestatesAct"/>
<addaction name="freezeRecentSavestatesAct"/>
<addaction name="separator"/>
Expand Down Expand Up @@ -1403,6 +1403,9 @@
</property>
</action>
<action name="freezeRecentSavestatesAct">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>List Freeze</string>
</property>
Expand Down