From 6a9a61ec687f3814ad820b91bb4cb996493f3694 Mon Sep 17 00:00:00 2001 From: RedDevilus Date: Wed, 19 Aug 2020 23:55:58 +0200 Subject: [PATCH] MemoryCards-gui: Update descriptions/tooltips. Auto-Eject checkbox is a failsave for broken saves. Card (file)name to Memory Card (like a real PS2 you need to plug a memory card in port 1 to work). Add usable to formatted to be obvious if you can use the memory card. Changed default column width. --- pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp | 13 ++++++++----- pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp | 9 +++++++-- pcsx2/gui/Dialogs/McdConfigDialog.cpp | 4 ++-- pcsx2/gui/Panels/MemoryCardListView.cpp | 16 ++++++++-------- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp b/pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp index 19ce1c773e..1e1034c51e 100644 --- a/pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp +++ b/pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp @@ -84,15 +84,18 @@ Dialogs::ConvertMemoryCardDialog::ConvertMemoryCardDialog( wxWindow* parent, con void Dialogs::ConvertMemoryCardDialog::CreateControls( const MemoryCardType sourceType ) { m_text_filenameInput = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); - RadioPanelItem toFile8MB = RadioPanelItem( _( "8MB File" ), pxE( L"Convert this memory card to a standard 8 MB Memory Card .ps2 file." ) ) + RadioPanelItem toFile8MB = RadioPanelItem( _( "8 MB File (most compatible)" ), pxE( L"Convert this memory card to a standard 8 MB Memory Card .ps2 file." ) ) .SetInt( MemoryCardConversionType::MemoryCardConversion_File_8MB ); - RadioPanelItem toFile16MB = RadioPanelItem( _( "16MB File" ), pxE( L"Convert this memory card to a 16 MB Memory Card .ps2 file." ) ) + RadioPanelItem toFile16MB = RadioPanelItem( _( "16 MB File" ), pxE( L"Convert this memory card to a 16 MB Memory Card .ps2 file." ) ) .SetInt( MemoryCardConversionType::MemoryCardConversion_File_16MB ); - RadioPanelItem toFile32MB = RadioPanelItem( _( "32MB File" ), pxE( L"Convert this memory card to a 32 MB Memory Card .ps2 file." ) ) + RadioPanelItem toFile32MB = RadioPanelItem( _( "32 MB File" ), pxE( L"Convert this memory card to a 32 MB Memory Card .ps2 file." ) ) .SetInt( MemoryCardConversionType::MemoryCardConversion_File_32MB ); - RadioPanelItem toFile64MB = RadioPanelItem( _( "64MB File" ), pxE( L"Convert this memory card to a 64 MB Memory Card .ps2 file." ) ) + RadioPanelItem toFile64MB = RadioPanelItem( _( "64 MB File" ), pxE( L"Convert this memory card to a 64 MB Memory Card .ps2 file." ) ) .SetInt( MemoryCardConversionType::MemoryCardConversion_File_64MB ); - RadioPanelItem toFolder = RadioPanelItem( _( "Folder" ), _( "Convert this memory card to a folder of individual saves." ) ) + RadioPanelItem toFolder = RadioPanelItem( _( "Folder" ), _( + "Convert this memory card to a folder of individual saves. " + "Unlimited capacity for saving and is not compatible with other PS2 emulators. " + "Allows direct access to the saves which makes it easy to view and back-up per game." ) ) .SetInt( MemoryCardConversionType::MemoryCardConversion_Folder ); const RadioPanelItem tblForFile[] = { toFolder }; diff --git a/pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp b/pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp index ef9a132f98..41152a0ce0 100644 --- a/pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp +++ b/pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp @@ -252,8 +252,13 @@ void Dialogs::CreateMemoryCardDialog::CreateControls() . SetToolTip(_t("Use at your own risk. Erratic memory card behavior is possible (though unlikely).")) . SetInt(64), - RadioPanelItem(_("Folder [experimental]"), _("Store memory card contents in the host filesystem instead of a file.")) - . SetToolTip(_t("Automatically manages memory card contents so that the console only sees files related to the currently running software. Allows you to drag-and-drop files in and out of the memory card with your standard file explorer. This is still experimental, so use at your own risk!")) + RadioPanelItem(_("Folder [Recommended]"), _("Store memory card contents in the host filesystem instead of a file.")) + . SetToolTip(_t("Dynamically allocate and store memory card contents in a folder.\n" + "Only exposes the save files for the running game, rather than the whole memory card.\n" + "You can see the structure and the saves with your File Explorer.\n" + "Can be used to back-up individual saves instead of all saves on a memcard.\n" + "Incompatible with PS2 memory card editing tools or savegame managers (such as MyMC, MyMCPlus).\n" + "You can always convert back between folder type and single memcard file.\n")) . SetInt(0), RadioPanelItem(_("128 KiB (PSX)"), _("This is the standard Sony-provisioned size PSX memory card, only compatible with PSX games.")) diff --git a/pcsx2/gui/Dialogs/McdConfigDialog.cpp b/pcsx2/gui/Dialogs/McdConfigDialog.cpp index eda669a6dc..168cfea36b 100644 --- a/pcsx2/gui/Dialogs/McdConfigDialog.cpp +++ b/pcsx2/gui/Dialogs/McdConfigDialog.cpp @@ -36,13 +36,13 @@ Panels::McdConfigPanel_Toggles::McdConfigPanel_Toggles(wxWindow *parent) { m_check_Ejection = new pxCheckBox( this, _("Auto-eject memory cards when loading savestates"), - pxE( L"Avoids memory card corruption by forcing games to re-index card contents after loading from savestates. May not be compatible with all games (Guitar Hero)." + pxE( L"Avoids broken memory card saves. May not work with some games such as Guitar Hero." ) ); m_folderAutoIndex = new pxCheckBox( this, _( "Automatically manage saves based on running game" ), - pxE( L"(Folder type only) Re-index memory card content every time the running software changes. This prevents the memory card from running out of space for saves." + pxE( L"(Folder type only / Card size: Auto) Loads only the relevant booted game saves, ignoring others. Avoids running out of space for saves." ) ); diff --git a/pcsx2/gui/Panels/MemoryCardListView.cpp b/pcsx2/gui/Panels/MemoryCardListView.cpp index 5be2690874..5280d71895 100644 --- a/pcsx2/gui/Panels/MemoryCardListView.cpp +++ b/pcsx2/gui/Panels/MemoryCardListView.cpp @@ -96,14 +96,14 @@ const ListViewColumnInfo& MemoryCardListView_Simple::GetDefaultColumnInfo( uint { static const ListViewColumnInfo columns[] = { - { _("PS2 Port") , 170 , wxLIST_FORMAT_LEFT }, + { _("PS2 Port") , 160 , wxLIST_FORMAT_LEFT }, //{ _("Port status") , 80 , wxLIST_FORMAT_LEFT }, - { _("Card (file) name") , 145 , wxLIST_FORMAT_LEFT }, - { _("Card size") , 65 , wxLIST_FORMAT_LEFT }, - { _("Formatted") , 80 , wxLIST_FORMAT_LEFT }, - { _("Type") , 60 , wxLIST_FORMAT_LEFT }, + { _("Memory card") , 145 , wxLIST_FORMAT_LEFT }, + { _("Card size") , 60 , wxLIST_FORMAT_LEFT }, + { _("Usable / Formatted") , 115 , wxLIST_FORMAT_LEFT }, + { _("Type") , 45 , wxLIST_FORMAT_LEFT }, { _("Last Modified"), 90 , wxLIST_FORMAT_LEFT }, - { _("Created on") , 90 , wxLIST_FORMAT_LEFT }, + { _("Created on") , 80 , wxLIST_FORMAT_LEFT }, }; pxAssertDev( idx < ArraySize(columns), "ListView column index is out of bounds." ); @@ -162,9 +162,9 @@ wxString MemoryCardListView_Simple::OnGetItemText(long item, long column) const // it cannot access GetMcdProvider() which isn't (and shouldn't be) const. //so.. a plain old cast does the trick. Hope it's not too bad. - avih. if (((MemoryCardListView_Simple*)this)->GetMcdProvider().IsNonEmptyFilesystemCards()) - return _("[-- Unused cards --]"); + return _("[-- Disabled cards --]"); else - return _("[-- No unused cards --]"); + return _("[-- No cards --]"); } wxDirName filepath( it.Filename.GetPath() );