-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
rename Master output to Main output in user visible strings #2894
Conversation
There is still more work to remove this terminology from the code. "Master" is still used in Shade but I do not know how to change that because it is in a raster graphic in res/skins/Shade/style/style_bg_mixer_panel_main.png and I do not know what font to use to replace it.
This PR requires us to agree on an exception from string freeze for beta releases. No dissent, just a formal note for the record. |
Let's retarget this to master. |
I'm okay with either. |
The Schade lable is hand drawn. |
@@ -148,7 +148,7 @@ | |||
<item row="11" column="0"> | |||
<widget class="QLabel" name="masterDelayLabel"> | |||
<property name="text"> | |||
<string>Master Delay</string> | |||
<string>Main Output Delay</string> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should either omit Output here or add Output also to Headphone and Booth Delay
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think "Main Delay" by itself would be a bit unclear what it is referring to.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll add "Output" to the rest of the delay labels for consistency.
src/soundio/soundmanagerutil.cpp
Outdated
@@ -154,7 +154,7 @@ QString AudioPath::getStringFromType(AudioPathType type) { | |||
// handle this -- bkgood | |||
return QStringLiteral("Invalid"); | |||
case MASTER: | |||
return QStringLiteral("Master"); | |||
return QStringLiteral("Main"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since this is the programmatic name, I am afraid this likely breaks the user config.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
okay I see the comment above the function explaining that now
Otherwise, users would have to reconfigure their Main output when upgrading.
Ready for merge? |
Can you take care of the Shade label as well? Otherwise I can issue a PR to your branch once I find time. |
I don't know how to. I have no idea what font that is. |
you can simply copy the lettets from other label images. |
Really? @daschuer can you confirm that's the only way? |
Confirmed. These are hand written fonts, pixel by pixel. |
Okay I'll leave that for you to do. |
Replace Master by Main in the Shade main mixing region
Thank you. LGTM. |
There is still more work to remove this terminology from the code.
"Master" is still used in Shade but I do not know how to change
that because it is in a raster graphic in
res/skins/Shade/style/style_bg_mixer_panel_main.png and I do not
know what font to use to replace it.