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

rename Master output to Main output in user visible strings #2894

Merged
merged 5 commits into from
Jul 8, 2020

Conversation

Be-ing
Copy link
Contributor

@Be-ing Be-ing commented Jun 21, 2020

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.

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.
@uklotzde
Copy link
Contributor

This PR requires us to agree on an exception from string freeze for beta releases.

No dissent, just a formal note for the record.

@uklotzde uklotzde added this to the 2.3.0 milestone Jun 21, 2020
@uklotzde uklotzde added the ui label Jun 21, 2020
@daschuer
Copy link
Member

Let's retarget this to master.
We have no benefit if this leads to many untranslated strings in our release.

@Be-ing
Copy link
Contributor Author

Be-ing commented Jun 21, 2020

I'm okay with either.

@daschuer
Copy link
Member

The Schade lable is hand drawn.

@daschuer daschuer changed the base branch from 2.3 to master June 21, 2020 21:12
@daschuer daschuer modified the milestones: 2.3.0, 2.4.0 Jun 21, 2020
@@ -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>
Copy link
Member

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

Copy link
Contributor Author

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.

Copy link
Contributor Author

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.

@@ -154,7 +154,7 @@ QString AudioPath::getStringFromType(AudioPathType type) {
// handle this -- bkgood
return QStringLiteral("Invalid");
case MASTER:
return QStringLiteral("Master");
return QStringLiteral("Main");
Copy link
Member

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.

Copy link
Contributor Author

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

@Be-ing
Copy link
Contributor Author

Be-ing commented Jun 30, 2020

Ready for merge?

@daschuer
Copy link
Member

Can you take care of the Shade label as well? Otherwise I can issue a PR to your branch once I find time.

@Be-ing
Copy link
Contributor Author

Be-ing commented Jun 30, 2020

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.

@ronso0
Copy link
Member

ronso0 commented Jun 30, 2020

you can simply copy the lettets from other label images.

@Be-ing
Copy link
Contributor Author

Be-ing commented Jun 30, 2020

Really? @daschuer can you confirm that's the only way?

@daschuer
Copy link
Member

Confirmed. These are hand written fonts, pixel by pixel.

@Be-ing
Copy link
Contributor Author

Be-ing commented Jun 30, 2020

Okay I'll leave that for you to do.

@daschuer
Copy link
Member

daschuer commented Jul 7, 2020

Be-ing#48

Replace Master by Main in the Shade main mixing region
@daschuer
Copy link
Member

daschuer commented Jul 8, 2020

Thank you. LGTM.

@daschuer daschuer merged commit 105ee48 into mixxxdj:master Jul 8, 2020
@Be-ing Be-ing deleted the master_output_rename branch July 8, 2020 10:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants