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

gui: swap out device icon and text as new block device detected #525

Merged
merged 1 commit into from Sep 2, 2021

Conversation

KrahJohlito
Copy link
Member

@KrahJohlito KrahJohlito commented Aug 31, 2021

Pull Request checklist

Note: these are not necessarily requirements

  • I reformatted the code with clang-format
  • I checked to make sure my submission worked
  • I am the author of submission or have permission from the original author
  • Requires update of the PS2SDK
  • Requires update of the gsKit
  • Others (please specify below)

Pull Request description

Last one from me for a little while, while looking at MCs & DIR I accidentally figured out what I was doing wrong here earlier.. so might as well finish it.

The BDM Icon and text will now be rendered in the gui for usb/ilink/mx4sio depending on which device is detected.. should work when hot swapping etc but unfortunately I only have usb to test with atm..

To maintain theme compatibility the icons are as follows

BDM: usb.png
USB: usb_bd.png
ILINK: ilk_bd.png
MX4SIO: m4s_bd.png

so themes can add the separate block device icons if they want.

@KrahJohlito
Copy link
Member Author

@rickgaiser I think this is good, but if there are any issues let me know and I'll just close it for now and come back to it when I can spend more time for testing etc

@J013k
Copy link
Contributor

J013k commented Aug 31, 2021

Nice.
Before connecting any BDM device:
https://i.postimg.cc/FFZr755Z/nice-1.png
When I start a (USB) device:
https://i.postimg.cc/rmfH293S/nice-2.png

Will we need to translate additional strings for this? E.g. USB Games, FireWire...

@gledson999
Copy link

gledson999 commented Aug 31, 2021

This is awesome, update, @J013k We need update all language too

String 282: USB Games
String 283: FireWire Games
String 284: MX4SIO Games.

I will update my translation when this commit is merged!

I'll update my themes and put this images too, I'm very excited with the success of mx4sio and about every update of OPL.

BDM: usb.png
USB: usb_bd.png
FIREWIRE: ilk_bd.png
MX4SIO: m4s_bd.png

@KrahJohlito
Copy link
Member Author

just forgot to update the firewire gfx..thought i did it ages ago, we decided to have the text in the graphic as FW, since that will match the other icons BDM/USB/SD/FW/UDP/IDE/SMB/APPS .. iLink just looked out of place, this is now ready for review

Copy link
Member

@rickgaiser rickgaiser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To make the FireWire/iLink/IEEE1394 more consistent, I think we should only use 1 version:

  • iLink / ILINK / ILK

Can you change the following?:

  • _STR_FIREWIRE_GAMES -> _STR_ILINK_GAMES
  • FIREWIRE_ICON -> ILINK_ICON
  • "FireWire Games" -> "iLink Games"

The rest of these changes look good. Thank you.

EDIT: I see we're posting conflicting messages at the same time. I don't really care about the exact name, as long as it's consistent.

See: https://en.wikipedia.org/wiki/IEEE_1394
"It was developed in the late 1980s and early 1990s by Apple in cooperation with a number of companies, primarily Sony and Panasonic. Apple called the interface FireWire. It is also known by the brands i.LINK (Sony)"

I'm not sure what the name should be now... even ps2sdk is not consisten, naming it both iLink and IEEE1394:
https://github.com/ps2dev/ps2sdk/tree/master/iop/iLink

@KrahJohlito
Copy link
Member Author

KrahJohlito commented Sep 1, 2021

To make the FireWire/iLink/IEEE1394 more consistent, I think we should only use 1 version:

  • iLink / ILINK / ILK

Can you change the following?:

  • _STR_FIREWIRE_GAMES -> _STR_ILINK_GAMES
  • FIREWIRE_ICON -> ILINK_ICON
  • "FireWire Games" -> "iLink Games"

The rest of these changes look good. Thank you.

I agree with consistency, currently in the GUI its FireWire when enabling and I like that for the acronym (FW) just because it matches the rest but reading your edit.. yea I'm not sure which to use either..

Most places I called it FireWire, I think its just the png file itself and the modules that are different..oh and BDM_ILK_MODE.. your call

@rickgaiser
Copy link
Member

Most places I called it FireWire, I think its just the png file itself and the modules that are different..oh and BDM_ILK_MODE.. your call

It's many places actually:

So I think it's best keep it at iLink/i.LINK/ILINK/ILK. If you can change those I'll merge the PR.

@KrahJohlito
Copy link
Member Author

Yea sorry I was just talking about within the gui in OPL (not sdk) I referred to it as FW mostly gEnableFW for example https://github.com/ps2homebrew/Open-PS2-Loader/search?q=gEnableFW&type= And this PR changes the image text to be FW..

I can change all this, probably makes more sense since this is a Sony console to be iLink going by the info you provided. Thanks

Change all references of FireWire to iLink/ILK
@rickgaiser
Copy link
Member

Thanks, merging.

@rickgaiser rickgaiser merged commit 0e84563 into ps2homebrew:master Sep 2, 2021
@KrahJohlito KrahJohlito deleted the bdm-gui branch September 20, 2021 02:52
AKuHAK pushed a commit that referenced this pull request Sep 30, 2021
gui: swap out device icon and text as new block device detected
citronalco pushed a commit to citronalco/OPL-Daily-Builds that referenced this pull request Sep 10, 2023
gui: swap out device icon and text as new block device detected
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants