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

DolphinQt: Minor consistency fixes for the Settings window #10025

Merged
merged 1 commit into from Aug 30, 2021

Conversation

mbc07
Copy link
Contributor

@mbc07 mbc07 commented Aug 14, 2021

During the (ongoing) review of the Brazilian Portuguese translation, I noticed various minor consistency issues with the main Settings window, and this PR fixes all of them. Here's a breakdown of what changed (with screenshots):

General tab

  • Fixed Fallback region dropdown list misalignment in comparison to the other dropdown lists from this tab

    Before

    GeneralBefore

    After

    GeneralAfter

Audio tab

  • Fixed inconsistent usage of the ms and percent units (e.g. 20ms and 100 % instead of 20 ms and 100%)

  • Removed ms abbreviation from the latency tooltip, to make it consistent with the buffer size tooltip where it's not abbreviated

    Before

    AudioBefore

    After

    AudioAfter

GameCube tab

  • Made the dropdown lists use all available horizontal space, making them consistent with the dropdown lists of other Dolphin tabs/windows using similar single column layouts

  • Reworded the Skip Main Menu tooltip from "Put Main Menu roms in User/GC/{region}." to "Put IPL ROMs in User/GC/<region>." (not shown in the screenshot)

    Before

    GCBefore

    After

    GCAfter

Broadband Adapter settings dialog

The bulk of this PR is there. Initial goal was to just hide the useless help button from the window title and to make the XLink Kai URL clickable. This dialog was previously implemented with a simple QInputDialog::getText function call, but it couldn't achieve the clickable URL with that since the dialog generated by the function is very simple and not much customizable, so I had to implement a new one from scratch.

Since I had already got my hands dirty at this point, I also implemented input validation for the MAC address (didn't add any for the XLink Kai address since you apparently can use URLs instead of just IP addresses -- didn't test that, though). Also, both BBA types now has a clickable URL, XLink Kai adapters point to the URL that was already there on master, while TAP-based adapters now point to the relevant Dolphin Wiki page. Oh, the window titles were also reworded as the previous ones were too big to be fully displayed.

Before (TAP Adapter)

BBABefore

After (TAP Adapter)

BBAAfter

Input validation error (new)

BBANew

Before (XLink Kai)

XLinkBefore

After (XLink Kai)

XLinkAfter

Wii tab

  • Changed "Wii Remote Rumble" to "Enable Rumble". All other checkboxes from this tab and most checkboxes from other Dolphin windows are worded like <action> <something> (enable this, use that, allow something, etc.), this checkbox didn't follow that. Plus, it's now consistent with the same checkbox found in the GC Adapter for Wii U settings dialog.

    Before

    WiiBefore

    After

    WiiAfter

USB Whitelist dialog

  • Made all validation popups use the same window title and same alert type. It was a bit strange and inconsistent having a warning type popup named "USB Whitelist Error"

    Before

    USBBefore

    After

    USBAfter

Advanced tab

  • Made the CPU Emulation Engine dropdown use all available horizontal space, making it consistent with the dropdown lists of other Dolphin tabs/windows using similar single column layouts

  • Fixed inconsistent usage of the MB and percent units (e.g. 24MB and 100 % instead of 24 MB and 100%)

    Before

    AdvancedBefore

    After

    AdvancedAfter


And that's it. For whoever reviews this, please double check the new BroadbandAdapterSettingsDialog.cpp/.h files, I read the contributing guide twice but I'm still not sure if I've missed something...

@mbc07
Copy link
Contributor Author

mbc07 commented Aug 14, 2021

Just pushed a small fix. On a fresh install, the BBA Address will be empty until you launch a game, and there wasn't any indication of the MAC address format expected, which could result in some validation popups screaming at you until you figured out the expected format. To address that, I've added placeholders to the input field:

BBAAfter2
XLinkAfter2

bba_current_address = QString::fromStdString(SConfig::GetInstance().m_bba_xlink_ip);
bba_description =
new QLabel(tr("For setup instructions, <a "
"href=\"https://www.teamxlink.co.uk/wiki/Dolphin\">refer to this page</a>."));
Copy link
Contributor

Choose a reason for hiding this comment

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

There's not much information on that page. I think we should link to https://www.teamxlink.co.uk/wiki/Dolphin_Gamecube_XLink_BBA_Tutorial instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's an external website, not controlled by us. I would rather keep linking to the current URL, which is generic, than to link directly to a specific page which can be moved or renamed anytime...

@mbc07
Copy link
Contributor Author

mbc07 commented Aug 28, 2021

Ping

@leoetlino leoetlino merged commit 8ecb044 into dolphin-emu:master Aug 30, 2021
11 checks passed
@mbc07 mbc07 deleted the gui-fixes-settings branch August 31, 2021 01:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
6 participants