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.

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

Add Change Disc option to the right-click menu in the game list. #532

Merged
merged 1 commit into from Jun 30, 2014

Conversation

zhuowei
Copy link
Contributor

@zhuowei zhuowei commented Jun 24, 2014

For issue 7411.

I didn't test this thoroughly since I don't have any game that needs this option, but changing to the active game's disc doesn't do anything, just like the change disc option in the file menu, so I think this works.

@MayImilae
Copy link
Contributor

Can someone build this so me and JMC can test this?

@RachelBryk
Copy link
Member

@dolphin-emu-bot rebuild

@lioncash
Copy link
Member

@zhuowei Can you rebase this so it can be merged in the future after testing?

@JMC47
Copy link
Contributor

JMC47 commented Jun 28, 2014

This works for GC games (Metal Gear Solid: Twin Snakes) and Wii games (System Menu switching) without issues for me, it's just a lot faster. Thank you for actually taking the time to implement it!

@zhuowei
Copy link
Contributor Author

zhuowei commented Jun 28, 2014

Rebased.

@lioncash
Copy link
Member

@dolphin-emu-bot rebuild

@lioncash
Copy link
Member

You're going to need to reinclude DVDInterface, since it was removed in a recent commit. (Reinclude it alphabetically though or you'll trip the lint builder).

@MayImilae
Copy link
Contributor

Yea... this let's you select things that aren't discs. Hitting "change disc" on a virtual console game brings a "Unable to read the disc" error in the disc channel. This isn't exactly the fault of this PR however - doing change disc from the menu allows you to use change disc on anything as well. So it's a preexisting problem. Someone needs to fix it though, especially since this PR improves discoverability.

Other than that, this works great.

@JMC47
Copy link
Contributor

JMC47 commented Jun 29, 2014

I don't think that should block this from being merged though, it's a pre-existing flaw, and if you insert garbage into the Wii it says the same thing.

@zhuowei
Copy link
Contributor Author

zhuowei commented Jun 29, 2014

@MaJoRoesch I can try to make this only show for discs.

@MayImilae
Copy link
Contributor

It would be best to just fix Change Disc... This is a preexisting problem after all.

@JMC47
Copy link
Contributor

JMC47 commented Jun 29, 2014

What do you limit it to, though? WBFS, ISO, CISO, GCM?

@lioncash
Copy link
Member

This can also be fixed in a new pull request too if need be. This is simply a GUI PR

@MayImilae
Copy link
Contributor

I agree with Lioncash. I (the non-coder) say we can just merge this and fix Change Disc in another PR.

@zhuowei
Copy link
Contributor Author

zhuowei commented Jun 30, 2014

Re-rebased; fixed the missing header error, change disc now only shows up for GameCube and Wii discs in the right click menu.

@@ -903,6 +905,11 @@ void CGameListCtrl::OnRightClick(wxMouseEvent& event)
{
popupMenu->Append(IDM_LIST_INSTALLWAD, _("Install to Wii Menu"));
}
if (selected_iso->GetPlatform() == GameListItem::GAMECUBE_DISC ||
selected_iso->GetPlatform() == GameListItem::WII_DISC) {

This comment was marked as off-topic.

@JMC47
Copy link
Contributor

JMC47 commented Jun 30, 2014

Everything is functionally good. Once the code passes, I think it's ready. Thanks for the work on making changing discs much simpler!

@zhuowei
Copy link
Contributor Author

zhuowei commented Jun 30, 2014

@lioncash brace placement fixed.

lioncash added a commit that referenced this pull request Jun 30, 2014
Add Change Disc option to the right-click menu in the game list.
@lioncash lioncash merged commit aec4cc7 into dolphin-emu:master Jun 30, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
5 participants