RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 10:42:36 +01:00
Code Issues Releases Wiki Activity

Qt: remove uncritical deprecated notes and titles

Browse Source 
This also fixes a savedata notes bug.
The detail section notes were always taken from the deprecated settings.
This commit is contained in:
Megamouse 2021-04-16 20:53:12 +02:00
parent bff938ccf5
commit 27975e9dfd
4 changed files with 11 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
rpcs3/rpcs3qt/game_list_frame.cpp
View File

@ -596,8 +596,8 @@ void game_list_frame::Refresh(const bool from_drive, const bool scroll_after)
const QString serial = qstr(game.serial); const QString serial = qstr(game.serial);
// Read persistent_settings values // Read persistent_settings values
QString note = m_persistent_settings->GetValue(gui::persistent::notes, serial, "").toString(); const QString note = m_persistent_settings->GetValue(gui::persistent::notes, serial, "").toString();
QString title = m_persistent_settings->GetValue(gui::persistent::titles, serial, "").toString().simplified(); const QString title = m_persistent_settings->GetValue(gui::persistent::titles, serial, "").toString().simplified();
QString last_played = m_persistent_settings->GetValue(gui::persistent::last_played, serial, "").toString(); QString last_played = m_persistent_settings->GetValue(gui::persistent::last_played, serial, "").toString();
quint64 playtime = m_persistent_settings->GetValue(gui::persistent::playtime, serial, 0).toULongLong(); quint64 playtime = m_persistent_settings->GetValue(gui::persistent::playtime, serial, 0).toULongLong();
@ -613,29 +613,6 @@ void game_list_frame::Refresh(const bool from_drive, const bool scroll_after)
playtime = m_gui_settings->GetValue(gui::persistent::playtime, serial, 0).toULongLong(); playtime = m_gui_settings->GetValue(gui::persistent::playtime, serial, 0).toULongLong();
m_gui_settings->RemoveValue(gui::persistent::playtime, serial); m_gui_settings->RemoveValue(gui::persistent::playtime, serial);
} }
// Deprecated values older than August 2nd 2020
if (note.isEmpty())
{
note = m_gui_settings->GetValue(gui::persistent::notes, serial, "").toString();
m_gui_settings->RemoveValue(gui::persistent::notes, serial);
// Move to persistent settings
if (!note.isEmpty())
{
m_persistent_settings->SetValue(gui::persistent::notes, serial, note);
}
}
if (title.isEmpty())
{
title = m_gui_settings->GetValue(gui::persistent::titles, serial, "").toString().simplified();
m_gui_settings->RemoveValue(gui::persistent::titles, serial);
// Move to persistent settings
if (!title.isEmpty())
{
m_persistent_settings->SetValue(gui::persistent::titles, serial, title);
}
}
// Set persistent_settings values if values exist // Set persistent_settings values if values exist
if (!last_played.isEmpty()) if (!last_played.isEmpty())

1
rpcs3/rpcs3qt/gui_settings.h
View File

@ -191,7 +191,6 @@ namespace gui
const gui_save m_currentConfig = gui_save(meta, "currentConfig", Settings); const gui_save m_currentConfig = gui_save(meta, "currentConfig", Settings);
const gui_save m_currentStylesheet = gui_save(meta, "currentStylesheet", DefaultStylesheet); const gui_save m_currentStylesheet = gui_save(meta, "currentStylesheet", DefaultStylesheet);
const gui_save m_saveNotes = gui_save(meta, "saveNotes", QVariantMap()); // Deprecated
const gui_save m_showDebugTab = gui_save(meta, "showDebugTab", false); const gui_save m_showDebugTab = gui_save(meta, "showDebugTab", false);
const gui_save m_enableUIColors = gui_save(meta, "enableUIColors", false); const gui_save m_enableUIColors = gui_save(meta, "enableUIColors", false);
const gui_save m_richPresence = gui_save(meta, "useRichPresence", true); const gui_save m_richPresence = gui_save(meta, "useRichPresence", true);

15
rpcs3/rpcs3qt/save_data_list_dialog.cpp
View File

@ -180,20 +180,7 @@ void save_data_list_dialog::UpdateList()
m_list->clearContents(); m_list->clearContents();
m_list->setRowCount(::narrow<int>(m_save_entries.size())); m_list->setRowCount(::narrow<int>(m_save_entries.size()));
QVariantMap notes = m_persistent_settings->GetValue(gui::persistent::save_notes).toMap(); const QVariantMap notes = m_persistent_settings->GetValue(gui::persistent::save_notes).toMap();
// Find deprecated values (older than August 2nd 2020)
if (notes.isEmpty())
{
notes = m_gui_settings->GetValue(gui::m_saveNotes).toMap();
m_gui_settings->RemoveValue(gui::m_saveNotes);
// Move to persistent settings
if (!notes.isEmpty())
{
m_persistent_settings->SetValue(gui::persistent::save_notes, notes);
}
}
int row = 0; int row = 0;
for (const SaveDataEntry& entry: m_save_entries) for (const SaveDataEntry& entry: m_save_entries)

17
rpcs3/rpcs3qt/save_manager_dialog.cpp
View File

@ -239,7 +239,7 @@ void save_manager_dialog::UpdateList()
m_list->clearContents(); m_list->clearContents();
m_list->setRowCount(static_cast<int>(m_save_entries.size())); m_list->setRowCount(static_cast<int>(m_save_entries.size()));
QVariantMap notes = m_persistent_settings->GetValue(gui::persistent::save_notes).toMap(); const QVariantMap notes = m_persistent_settings->GetValue(gui::persistent::save_notes).toMap();
if (m_gui_settings->GetValue(gui::m_enableUIColors).toBool()) if (m_gui_settings->GetValue(gui::m_enableUIColors).toBool())
{ {
@ -267,7 +267,7 @@ void save_manager_dialog::UpdateList()
return icon; return icon;
}; };
QList<QPixmap> icons = QtConcurrent::blockingMapped<QList<QPixmap>>(indices, get_icon); const QList<QPixmap> icons = QtConcurrent::blockingMapped<QList<QPixmap>>(indices, get_icon);
for (int i = 0; i < icons.count(); ++i) for (int i = 0; i < icons.count(); ++i)
{ {
@ -368,8 +368,7 @@ void save_manager_dialog::UpdateIcons()
for (int i = 0; i < m_list->rowCount() && i < scaled.count(); ++i) for (int i = 0; i < m_list->rowCount() && i < scaled.count(); ++i)
{ {
QTableWidgetItem* icon_item = m_list->item(i, 0); if (QTableWidgetItem* icon_item = m_list->item(i, 0))
if (icon_item)
icon_item->setData(Qt::DecorationRole, scaled[i]); icon_item->setData(Qt::DecorationRole, scaled[i]);
} }
@ -503,9 +502,7 @@ void save_manager_dialog::closeEvent(QCloseEvent *event)
void save_manager_dialog::UpdateDetails() void save_manager_dialog::UpdateDetails()
{ {
const int selected = m_list->selectionModel()->selectedRows().size(); if (const int selected = m_list->selectionModel()->selectedRows().size(); selected != 1)
if (selected != 1)
{ {
m_details_icon->setPixmap(QPixmap()); m_details_icon->setPixmap(QPixmap());
m_details_subtitle->setText(""); m_details_subtitle->setText("");
@ -545,9 +542,11 @@ void save_manager_dialog::UpdateDetails()
m_details_modified->setText(tr("Last modified: %1").arg(FormatTimestamp(save.mtime))); m_details_modified->setText(tr("Last modified: %1").arg(FormatTimestamp(save.mtime)));
m_details_details->setText(tr("Details:\n").append(qstr(save.details))); m_details_details->setText(tr("Details:\n").append(qstr(save.details)));
QString note = tr("Note:\n"); QString note = tr("Note:\n");
QVariantMap map = m_gui_settings->GetValue(gui::m_saveNotes).toMap(); if (const QVariantMap map = m_persistent_settings->GetValue(gui::persistent::save_notes).toMap();
if (map.contains(qstr(save.dirName))) map.contains(qstr(save.dirName)))
{
note.append(map[qstr(save.dirName)].toString()); note.append(map[qstr(save.dirName)].toString());
}
m_details_note->setText(note); m_details_note->setText(note);
m_button_delete->setDisabled(false); m_button_delete->setDisabled(false);