PCSX2-WX: Add clear list option to ISO Selector #2080

RedPanda4552 · 2017-09-28T05:58:12Z

Adds "Clear ISO List" option to ISO Selector (Issue #2071).

A look at the UI before clearing, with all my iso and bin files: https://i.imgur.com/YnPCAXQ.png
I was kind enough to give users an opportunity to change their mind: https://i.imgur.com/VUVo5l0.png
And after clearning: https://i.imgur.com/Wvsdzfn.png

Closes #2071

lightningterror · 2017-09-28T12:51:38Z

Looks like you beat @ssakash to it 😆

Tested. Works properly.

ssakash · 2017-09-28T13:16:22Z

I'm wondering if it might be a good idea to remove/gray out the menu item when there are no ISOs present in the list. Any opinion? (Personally I'd prefer destroying and appending the item over graying it out using Enable())

Turtleli was a bit faster than me on adding that Changes translatable strings label. :/

lightningterror · 2017-09-28T13:25:12Z

I like your suggestion. If there are no isos then the button should disappear. Having it just grey out will make the list bigger for no reason when it's not needed.

avih · 2017-09-28T13:29:06Z

The original intent with the grayed out items was that you could put your ISOs on an external drive and plug it in or out, and you'll know when they're available. They should get out of the list anyway when you open new ISOs. But feel free to remove it.

pgert · 2017-09-28T15:53:48Z

Please have the Separator lines between "Always ask when booting",
"Browse..." and "Clear ISO list" removed.
The one between these optons and the ISO-list is enough.

RedPanda4552 · 2017-09-28T19:49:23Z

Latest commit makes the list item and separator generate in time with the ISO list itself instead of the entire sub menu.

One thing I would like to draw attention to is that doing so required MainFrame.h to be included in RecentIsoList.cpp, for the MenuIdentifiers enum to be visible. It feels dirty to include an entire header file for one enum. Is there a better way to go about this or is this an acceptable practice?

MrCK1 · 2017-09-28T19:58:23Z

@RedPanda4552 The recent ISO list is considered part of the mainframe. That's what all the Wx menu systems are based off of. Basically, it's necessary for compilation.

RedPanda4552 · 2017-09-28T20:16:22Z

That helps but also raises another question. Is there a known reason RecentIsoList.cpp didn't include MainFrame.h before these changes?

turtleli · 2017-09-29T00:37:14Z

I think you need to include App.h instead of MainFrame.h since that's where the enum actually is.

Anyway, the current behaviour isn't that nice if you clear the ISO list while a game is running. Test case:

Boot game.
Clear ISO list.
Pause.
Resume -> Cannot resume.

RedPanda4552 · 2017-09-29T01:25:33Z

Latest commit should resolve. The CurrentIso field in the ini was being wiped regardless of running state, which when the CDVD plugin is pausing and resuming, would understandably cause problems.

lightningterror · 2017-09-30T12:12:02Z

I think you can squash it if it's ready for merge.

RedPanda4552 · 2017-09-30T16:11:38Z

And squashed.

pcsx2/gui/MainMenuClicks.cpp

+	{
+		if (!SysHasValidState())
+			SysUpdateIsoSrcFile("");
+


pcsx2/gui/RecentIsoList.cpp

@@ -35,6 +36,8 @@ RecentIsoManager::RecentIsoManager( wxMenu* menu, int firstIdForMenuItems_or_wxI
 {
 	m_cursel	= 0;
 	m_Separator	= NULL;
+	m_ClearSeparator = NULL;
+	m_Clear = NULL;


pcsx2/gui/RecentIsoList.cpp

@@ -119,6 +134,9 @@ void RecentIsoManager::Repopulate()
 	//  but the menu is composed in reverse order such that the most recent item appears at the top.
 	for( int i=cnt-1; i>=0; --i )
 		InsertIntoMenu( i );
+
+	m_ClearSeparator = m_Menu->AppendSeparator();
+	m_Clear = m_Menu->Append(MenuIdentifiers::MenuId_IsoClear, _("Clear ISO list"), _("Clear the ISO list to get rid of unwanted ISO files."));


pcsx2/gui/MainMenuClicks.cpp

+	if (SysHasValidState())
+		dialog += dialog.Heading(_("(Your running ISO will remain in the list)"));
+
+	bool confirmed = (pxIssueConfirmation(dialog, MsgButtons().Yes().Cancel()) != wxID_CANCEL);


pcsx2/gui/MainMenuClicks.cpp

+	dialog += dialog.Heading(_("This will clear your entire ISO list. Continue?"));
+
+	if (SysHasValidState())
+		dialog += dialog.Heading(_("(Your running ISO will remain in the list)"));


pcsx2/gui/MainMenuClicks.cpp

+
+	if (confirmed)
+	{
+		if (!SysHasValidState())


RedPanda4552 · 2017-10-02T15:40:20Z

Review changes made and squashed.

pcsx2/gui/RecentIsoList.cpp

@@ -99,6 +102,18 @@ void RecentIsoManager::RemoveAllFromMenu()
 		m_Menu->Destroy( m_Separator );
 		m_Separator = NULL;
 	}
+
+	if ( m_ClearSeparator != NULL )


turtleli · 2017-10-03T23:48:20Z

Code seems fine to me.

The buttons being Yes+Cancel feels slightly odd (I generally expect Yes+No or Ok+Cancel) but maybe that's just me.

pcsx2/gui/MainMenuClicks.cpp

+	wxDialogWithHelpers dialog(this, _("Confirm clearing ISO list"));
+	dialog += dialog.Heading(_("This will clear the ISO list. If an ISO is running it will remain in the list. Continue?"));
+
+	bool confirmed = pxIssueConfirmation(dialog, MsgButtons().YesNo()) != wxID_CANCEL;


turtleli added the GUI/WX label Sep 28, 2017

lightningterror assigned ssakash Sep 28, 2017

turtleli added the Changes translatable strings label Sep 28, 2017

lightningterror changed the title ~~Add clear list option to ISO Selector~~ PCSX2-WX: Add clear list option to ISO Selector Sep 29, 2017

RedPanda4552 force-pushed the iso-clear branch from 8f2cb82 to 64b1a27 Compare September 29, 2017 01:23

RedPanda4552 force-pushed the iso-clear branch from 64b1a27 to 071a6d6 Compare September 29, 2017 01:37

RedPanda4552 force-pushed the iso-clear branch from 071a6d6 to d692ba1 Compare September 30, 2017 16:11

turtleli reviewed Oct 2, 2017

View reviewed changes

ssakash assigned turtleli Oct 2, 2017

RedPanda4552 force-pushed the iso-clear branch from 5c5aace to 4284097 Compare October 2, 2017 15:39

turtleli reviewed Oct 2, 2017

View reviewed changes

pcsx2/gui/RecentIsoList.cpp Outdated

@@ -99,6 +102,18 @@ void RecentIsoManager::RemoveAllFromMenu()

m_Menu->Destroy( m_Separator );

m_Separator = NULL;

}

if ( m_ClearSeparator != NULL )

This comment was marked as spam.

Sign in to view

RedPanda4552 force-pushed the iso-clear branch from 4284097 to ad39573 Compare October 2, 2017 16:27

RedPanda4552 force-pushed the iso-clear branch from ad39573 to 43091f4 Compare October 4, 2017 16:24

turtleli reviewed Oct 7, 2017

View reviewed changes

Add clear list option to ISO Selector

f572d95

ssakash added the Needs work label Oct 7, 2017

RedPanda4552 force-pushed the iso-clear branch from 43091f4 to f572d95 Compare October 8, 2017 03:46

turtleli removed the Needs work label Oct 9, 2017

turtleli merged commit 7a78441 into PCSX2:master Oct 10, 2017

RedPanda4552 deleted the iso-clear branch January 3, 2021 00:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PCSX2-WX: Add clear list option to ISO Selector #2080

PCSX2-WX: Add clear list option to ISO Selector #2080

RedPanda4552 commented Sep 28, 2017 •

edited by turtleli

Loading

lightningterror commented Sep 28, 2017

ssakash commented Sep 28, 2017

lightningterror commented Sep 28, 2017

avih commented Sep 28, 2017

pgert commented Sep 28, 2017

RedPanda4552 commented Sep 28, 2017

MrCK1 commented Sep 28, 2017 •

edited

Loading

RedPanda4552 commented Sep 28, 2017

turtleli commented Sep 29, 2017

RedPanda4552 commented Sep 29, 2017

lightningterror commented Sep 30, 2017

RedPanda4552 commented Sep 30, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

RedPanda4552 commented Oct 2, 2017

This comment was marked as spam.

turtleli commented Oct 3, 2017

This comment was marked as spam.

PCSX2-WX: Add clear list option to ISO Selector #2080

PCSX2-WX: Add clear list option to ISO Selector #2080

Conversation

RedPanda4552 commented Sep 28, 2017 • edited by turtleli Loading

lightningterror commented Sep 28, 2017

ssakash commented Sep 28, 2017

lightningterror commented Sep 28, 2017

avih commented Sep 28, 2017

pgert commented Sep 28, 2017

RedPanda4552 commented Sep 28, 2017

MrCK1 commented Sep 28, 2017 • edited Loading

RedPanda4552 commented Sep 28, 2017

turtleli commented Sep 29, 2017

RedPanda4552 commented Sep 29, 2017

lightningterror commented Sep 30, 2017

RedPanda4552 commented Sep 30, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

RedPanda4552 commented Oct 2, 2017

This comment was marked as spam.

turtleli commented Oct 3, 2017

This comment was marked as spam.

RedPanda4552 commented Sep 28, 2017 •

edited by turtleli

Loading

MrCK1 commented Sep 28, 2017 •

edited

Loading