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

Unrevert "Create wmainmenubar controls in coreservices so they are available to controllers on startup" #4661

Merged
merged 4 commits into from
Feb 5, 2022

Conversation

ywwg
Copy link
Member

@ywwg ywwg commented Feb 4, 2022

Reverts #4660,
Includes fix

@ywwg ywwg requested a review from daschuer February 4, 2022 13:54

m_uiControls.reserve(uiKeys.size());
for (const auto& key : uiKeys) {
m_uiControls.emplace_back(std::make_unique<ControlPushButton>(
Copy link
Member

Choose a reason for hiding this comment

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

persist = true already fetches the last value from the config.
The default value is used as a default if there is not yet anything stored.

UserSettingsPointer pConfig = s_pUserConfig;

Copy link
Member Author

Choose a reason for hiding this comment

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

ah got it. Fixed.

Copy link
Member Author

Choose a reason for hiding this comment

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

Hm, does that mean we need to pick the first-run defaults here? Seems so

@ywwg
Copy link
Member Author

ywwg commented Feb 4, 2022

Tested first-run case by moving ~/.mixxx aside, looks good

Copy link
Member

@daschuer daschuer left a comment

Choose a reason for hiding this comment

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

Thank you.

@daschuer daschuer merged commit b519aba into main Feb 5, 2022
{ConfigKey(VINYL_PREF_KEY, "show_vinylcontrol"), true, false},
{ConfigKey("[PreviewDeck]", "show_previewdeck"), true, true},
{ConfigKey("[Library]", "show_coverart"), true, true},
{ConfigKey("[Master]", "maximize_library"), true, false},
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
{ConfigKey("[Master]", "maximize_library"), true, false},
{ConfigKey("[Master]", "maximize_library"), false, false},

This is not persistent with official skins anyway.

{ConfigKey("[Master]", "skin_settings"), false, false},
{ConfigKey("[Microphone]", "show_microphone"), true, true},
{ConfigKey(VINYL_PREF_KEY, "show_vinylcontrol"), true, false},
{ConfigKey("[PreviewDeck]", "show_previewdeck"), true, true},
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
{ConfigKey("[PreviewDeck]", "show_previewdeck"), true, true},
{ConfigKey("[PreviewDeck]", "show_previewdeck"), true, false},

hidden by default in all official skins.
Do we need to change that?

};
const std::vector<UIControlConfig> uiControls = {
{ConfigKey("[Master]", "skin_settings"), false, false},
{ConfigKey("[Microphone]", "show_microphone"), true, true},
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
{ConfigKey("[Microphone]", "show_microphone"), true, true},
{ConfigKey("[Microphone]", "show_microphone"), true, false},

{ConfigKey("[PreviewDeck]", "show_previewdeck"), true, true},
{ConfigKey("[Library]", "show_coverart"), true, true},
{ConfigKey("[Master]", "maximize_library"), true, false},
{ConfigKey("[Samplers]", "show_samplers"), true, true},
Copy link
Member

@ronso0 ronso0 Feb 5, 2022

Choose a reason for hiding this comment

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

Hidden by default, shown in Deere.
Should we unify that to visible? (maybe) Edit Nope: Shade always shows the samplers play buttons in the decks row, 'show_samplers' would toggle the samplers row below the decks. Though other skins could show the
If so, do we need a menu bar button?

If we add this and 'Show Effect Rack' the View menu would be complete, wouldn't it?

@ronso0
Copy link
Member

ronso0 commented Feb 5, 2022

Ha! A few minutes too late...

@daschuer
Copy link
Member

daschuer commented Feb 5, 2022

Oh Sorry. It could be a nice GitHub feature to see if there are unpublished reviews ...

@ronso0
Copy link
Member

ronso0 commented Feb 6, 2022

I could have sel-requested a review, but I only announced it in Zulip.

Anyway, we can discuss my review comments and based on the outcome I can open a follow-up PR.

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.

4 participants