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.

Sign up for GitHub

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
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
54f3108
Revert "Revert "Create wmainmenubar controls in coreservices so they …
ywwg Feb 4, 2022
92bae19
Load coreservices controls values from settings
ywwg Feb 4, 2022
03e1408
Establish first-run defaults for ui controls
ywwg Feb 4, 2022
d318988
const
ywwg Feb 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions src/coreservices.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,34 @@ void CoreServices::initialize(QApplication* pApp) {

m_pTouchShift = std::make_unique<ControlPushButton>(ConfigKey("[Controls]", "touch_shift"));

// The following UI controls must be created here so that controllers can bind to them
// on startup.
m_uiControls.clear();

struct UIControlConfig {
ConfigKey key;
bool persist;
bool defaultValue;
};
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(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?

{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("[Samplers]", "show_samplers"), true, true},
Copy link
Member

@ronso0 ronso0 Feb 5, 2022 •
edited
Loading

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?

{ConfigKey("[EffectRack1]", "show"), true, true},
{ConfigKey("[Skin]", "show_4effectunits"), true, false},
{ConfigKey("[Master]", "show_mixer"), true, true},
};
m_uiControls.reserve(uiControls.size());
for (const auto& row : uiControls) {
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.

mixxx/src/control/control.cpp

Line 65 in c7b4dbb

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

row.key, row.persist, row.defaultValue));
m_uiControls.back()->setButtonMode(ControlPushButton::TOGGLE);
}

// Load tracks in args.qlMusicFiles (command line arguments) into player
// 1 and 2:
const QList<QString>& musicFiles = m_cmdlineArgs.getMusicFiles();
Expand Down Expand Up @@ -597,6 +625,8 @@ void CoreServices::finalize() {

m_pTouchShift.reset();

m_uiControls.clear();

m_pControlIndicatorTimer.reset();

t.elapsed(true);
Expand Down
1 change: 1 addition & 0 deletions src/coreservices.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ class CoreServices : public QObject {

std::shared_ptr<mixxx::ScreensaverManager> m_pScreensaverManager;

std::vector<std::unique_ptr<ControlPushButton>> m_uiControls;
std::unique_ptr<ControlPushButton> m_pTouchShift;

Timer m_runtime_timer;
Expand Down