From be68ea4dad8166c22c6ba7816e50dc5beba5bb96 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sun, 17 Sep 2023 17:40:44 +0200 Subject: [PATCH 1/7] refactor(coreservices): Move skin controls to `[Skin]` group --- src/controllers/controlpickermenu.cpp | 6 +-- src/coreservices.cpp | 74 ++++++++++++++++++++++----- src/test/co_dumps/co_dump_inital.csv | 2 +- src/widget/wmainmenubar.cpp | 4 +- src/widget/wwidgetstack.cpp | 2 +- 5 files changed, 69 insertions(+), 19 deletions(-) diff --git a/src/controllers/controlpickermenu.cpp b/src/controllers/controlpickermenu.cpp index cbf3f08146d..7a32588bcef 100644 --- a/src/controllers/controlpickermenu.cpp +++ b/src/controllers/controlpickermenu.cpp @@ -1254,7 +1254,7 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent) tr("4 Effect Units Show/Hide"), tr("Switches between showing 2 and 4 effect units"), guiMenu); - addControl("[Master]", + addControl("[Skin]", "show_mixer", tr("Mixer Show/Hide"), tr("Show or hide the mixer."), @@ -1264,8 +1264,8 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent) tr("Cover Art Show/Hide (Library)"), tr("Show/hide cover art in the library"), guiMenu); - addControl("[Master]", - "maximize_library", + addControl("[Skin]", + "show_maximized_library", tr("Library Maximize/Restore"), tr("Maximize the track library to take up all the available screen " "space."), diff --git a/src/coreservices.cpp b/src/coreservices.cpp index f78d702a56c..8097d9b6fa5 100644 --- a/src/coreservices.cpp +++ b/src/coreservices.cpp @@ -436,28 +436,78 @@ void CoreServices::initialize(QApplication* pApp) { struct UIControlConfig { ConfigKey key; + ConfigKey aliasKey; bool persist; bool defaultValue; }; const std::vector uiControls = { - {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}, - {ConfigKey("[Library]", "show_coverart"), true, true}, - {ConfigKey("[Master]", "maximize_library"), true, false}, - {ConfigKey("[Samplers]", "show_samplers"), true, true}, - {ConfigKey("[EffectRack1]", "show"), true, true}, - {ConfigKey("[Skin]", "show_4effectunits"), true, false}, - {ConfigKey("[Master]", "show_mixer"), true, true}, - {ConfigKey("[Skin]", "show_spinnies"), true, true}, - {ConfigKey("[Skin]", "show_coverart"), true, true}, + {ConfigKey( + QStringLiteral("[Skin]"), QStringLiteral("show_settings")), + ConfigKey(), + false, + false}, + {ConfigKey(QStringLiteral("[Microphone]"), + QStringLiteral("show_microphone")), + ConfigKey(), + true, + true}, + {ConfigKey(VINYL_PREF_KEY, QStringLiteral("show_vinylcontrol")), + ConfigKey(), + true, + false}, + {ConfigKey(QStringLiteral("[PreviewDeck]"), + QStringLiteral("show_previewdeck")), + ConfigKey(), + true, + true}, + {ConfigKey(QStringLiteral("[Library]"), + QStringLiteral("show_coverart")), + ConfigKey(), + true, + true}, + {ConfigKey(QStringLiteral("[Skin]"), + QStringLiteral("show_maximized_library")), + ConfigKey(QStringLiteral("[Master]"), + QStringLiteral("maximize_library")), + true, + false}, + {ConfigKey(QStringLiteral("[Samplers]"), + QStringLiteral("show_samplers")), + ConfigKey(), + true, + true}, + {ConfigKey(QStringLiteral("[EffectRack1]"), QStringLiteral("show")), + ConfigKey(), + true, + true}, + {ConfigKey(QStringLiteral("[Skin]"), + QStringLiteral("show_4effectunits")), + ConfigKey(), + true, + false}, + {ConfigKey(QStringLiteral("[Skin]"), QStringLiteral("show_mixer")), + ConfigKey(), + true, + true}, + {ConfigKey( + QStringLiteral("[Skin]"), QStringLiteral("show_spinnies")), + ConfigKey(), + true, + true}, + {ConfigKey( + QStringLiteral("[Skin]"), QStringLiteral("show_coverart")), + ConfigKey(), + true, + true}, }; m_uiControls.reserve(uiControls.size()); for (const auto& row : uiControls) { m_uiControls.emplace_back(std::make_unique( row.key, row.persist, row.defaultValue)); m_uiControls.back()->setButtonMode(ControlPushButton::TOGGLE); + if (row.aliasKey.isValid()) { + m_uiControls.back()->addAlias(row.aliasKey); + } } // Load tracks in args.qlMusicFiles (command line arguments) into player diff --git a/src/test/co_dumps/co_dump_inital.csv b/src/test/co_dumps/co_dump_inital.csv index ca5f0486b07..9eabd5a3f8a 100644 --- a/src/test/co_dumps/co_dump_inital.csv +++ b/src/test/co_dumps/co_dump_inital.csv @@ -6631,7 +6631,7 @@ [Channel2],hotcue_16_clear,0 [Sampler1],bpm_up_small,0 [EqualizerRack1_[Channel1]],num_effectslots,1 -[Master],maximize_library,0 +[Skin],show_maximized_library,0 [Auxiliary4],PeakIndicator_toggle,0 [EffectRack1_EffectUnit1_Effect1],parameter15_set_zero,0 [EffectRack1_EffectUnit2_Effect1],parameter16_set_zero,0 diff --git a/src/widget/wmainmenubar.cpp b/src/widget/wmainmenubar.cpp index b0ff900c1c3..84e96852d4a 100644 --- a/src/widget/wmainmenubar.cpp +++ b/src/widget/wmainmenubar.cpp @@ -209,7 +209,7 @@ void WMainMenuBar::initialize() { tr("Ctrl+1", "Menubar|View|Show Skin Settings")))); pViewShowSkinSettings->setStatusTip(showSkinSettingsText); pViewShowSkinSettings->setWhatsThis(buildWhatsThis(showSkinSettingsTitle, showSkinSettingsText)); - createVisibilityControl(pViewShowSkinSettings, ConfigKey("[Master]", "skin_settings")); + createVisibilityControl(pViewShowSkinSettings, ConfigKey("[Skin]", "show_settings")); pViewMenu->addAction(pViewShowSkinSettings); // Microphone Section @@ -284,7 +284,7 @@ void WMainMenuBar::initialize() { tr("Space", "Menubar|View|Maximize Library")))); pViewMaximizeLibrary->setStatusTip(maximizeLibraryText); pViewMaximizeLibrary->setWhatsThis(buildWhatsThis(maximizeLibraryTitle, maximizeLibraryText)); - createVisibilityControl(pViewMaximizeLibrary, ConfigKey("[Master]", "maximize_library")); + createVisibilityControl(pViewMaximizeLibrary, ConfigKey("[Skin]", "show_maximized_library")); pViewMenu->addAction(pViewMaximizeLibrary); pViewMenu->addSeparator(); diff --git a/src/widget/wwidgetstack.cpp b/src/widget/wwidgetstack.cpp index 532078c903f..183a68975ef 100644 --- a/src/widget/wwidgetstack.cpp +++ b/src/widget/wwidgetstack.cpp @@ -169,7 +169,7 @@ void WWidgetStack::slotSetIndex(int index) { // index widget re-focus that widget. // For now, its only purpose is to keep the keyboard focus on // library widgets in the Library singleton when toggling - // [Master],maximize_library + // [Skin],show_maximized_library QWidget* prevFocusWidget = QApplication::focusWidget(); setCurrentIndex(index); if (currentWidget()->isAncestorOf(prevFocusWidget)) { From 9617d2226894c260c13495bd4eccf4a297921751 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sun, 17 Sep 2023 17:42:09 +0200 Subject: [PATCH 2/7] chore(skins): Update skin controls and use new names --- res/skins/Deere (64 Samplers)/skin.xml | 8 +++--- .../Deere (64 Samplers)/skin_settings.xml | 6 ++--- res/skins/Deere/library.xml | 2 +- res/skins/Deere/mixer.xml | 2 +- res/skins/Deere/skin.xml | 10 +++---- res/skins/Deere/skin_settings.xml | 4 +-- res/skins/Deere/tool_bar.xml | 8 +++--- .../helpers/skin_settings_samplers.xml | 2 +- res/skins/LateNight (64 Samplers)/skin.xml | 8 +++--- res/skins/LateNight/decks/deck.xml | 4 +-- .../helpers/skin_settings_samplers.xml | 2 +- res/skins/LateNight/library.xml | 2 +- res/skins/LateNight/mixer.xml | 4 +-- res/skins/LateNight/skin.xml | 8 +++--- res/skins/LateNight/skin_settings.xml | 26 +++++++++---------- res/skins/LateNight/toolbar.xml | 10 +++---- res/skins/Shade/decks_row_small.xml | 2 +- res/skins/Shade/skin.xml | 2 +- res/skins/Shade/srcrow.xml | 2 +- res/skins/Tango (64 Samplers)/skin.xml | 10 +++---- .../Tango (64 Samplers)/skin_settings.xml | 14 +++++----- res/skins/Tango/decks/deck_left.xml | 6 ++--- res/skins/Tango/decks/deck_right.xml | 6 ++--- res/skins/Tango/decks/row_overview_left.xml | 2 +- res/skins/Tango/decks/row_overview_right.xml | 2 +- .../Tango/helpers/size_detector_stars.xml | 4 +-- res/skins/Tango/helpers/spacer_center.xml | 4 +-- res/skins/Tango/library.xml | 4 +-- res/skins/Tango/mixer/vumeter_main.xml | 4 +-- res/skins/Tango/skin.xml | 10 +++---- res/skins/Tango/skin_settings.xml | 14 +++++----- res/skins/Tango/topbar.xml | 12 ++++----- 32 files changed, 102 insertions(+), 102 deletions(-) diff --git a/res/skins/Deere (64 Samplers)/skin.xml b/res/skins/Deere (64 Samplers)/skin.xml index 67baa70cfa4..17e2f62d8ef 100644 --- a/res/skins/Deere (64 Samplers)/skin.xml +++ b/res/skins/Deere (64 Samplers)/skin.xml @@ -24,7 +24,7 @@ 1 0 - 1 + 1 1 1 1 @@ -51,7 +51,7 @@ 1 - 0 + 0 0 1 @@ -187,7 +187,7 @@ - [Master],maximize_library + [Skin],show_maximized_library visible @@ -441,13 +441,13 @@ icon/ic_settings_48px.svg - [Master],skin_settings + [Skin],show_settings LeftButton - [Master],skin_settings + [Skin],show_settings visible diff --git a/res/skins/LateNight (64 Samplers)/helpers/skin_settings_samplers.xml b/res/skins/LateNight (64 Samplers)/helpers/skin_settings_samplers.xml index 0d0afa12668..863898bb2d0 100644 --- a/res/skins/LateNight (64 Samplers)/helpers/skin_settings_samplers.xml +++ b/res/skins/LateNight (64 Samplers)/helpers/skin_settings_samplers.xml @@ -10,7 +10,7 @@ Description: diff --git a/res/skins/LateNight (64 Samplers)/skin.xml b/res/skins/LateNight (64 Samplers)/skin.xml index 89c47cf5359..bc85742bc4c 100644 --- a/res/skins/LateNight (64 Samplers)/skin.xml +++ b/res/skins/LateNight (64 Samplers)/skin.xml @@ -73,7 +73,7 @@ 1 - 1 + 1 1 1 1 @@ -92,7 +92,7 @@ 0 - 0 + 0 1 0 1 @@ -404,7 +404,7 @@ - + - + vertical me,me diff --git a/res/skins/LateNight/decks/deck.xml b/res/skins/LateNight/decks/deck.xml index 44b457d08fe..e1448f152d3 100644 --- a/res/skins/LateNight/decks/deck.xml +++ b/res/skins/LateNight/decks/deck.xml @@ -10,7 +10,7 @@ [Channel] - + @@ -47,7 +47,7 @@ - + horizontal diff --git a/res/skins/LateNight/helpers/skin_settings_samplers.xml b/res/skins/LateNight/helpers/skin_settings_samplers.xml index 0c5397d74bd..d773abdc17f 100644 --- a/res/skins/LateNight/helpers/skin_settings_samplers.xml +++ b/res/skins/LateNight/helpers/skin_settings_samplers.xml @@ -10,7 +10,7 @@ Description: diff --git a/res/skins/LateNight/library.xml b/res/skins/LateNight/library.xml index 2295a08b2f5..aa019719085 100644 --- a/res/skins/LateNight/library.xml +++ b/res/skins/LateNight/library.xml @@ -56,7 +56,7 @@ maximize_library LibExpand 18f,18me - [Master],maximize_library + [Skin],show_maximized_library diff --git a/res/skins/LateNight/mixer.xml b/res/skins/LateNight/mixer.xml index a8e47aec42f..e2f963d258c 100644 --- a/res/skins/LateNight/mixer.xml +++ b/res/skins/LateNight/mixer.xml @@ -33,7 +33,7 @@ - [Master],show_mixer + [Skin],show_mixer visible @@ -64,7 +64,7 @@ - [Master],show_mixer + [Skin],show_mixer visible diff --git a/res/skins/LateNight/skin.xml b/res/skins/LateNight/skin.xml index 52b9a535608..5735be30ebe 100644 --- a/res/skins/LateNight/skin.xml +++ b/res/skins/LateNight/skin.xml @@ -73,7 +73,7 @@ 1 - 1 + 1 1 1 1 @@ -92,7 +92,7 @@ 0 - 0 + 0 1 0 1 @@ -404,7 +404,7 @@ - + - + vertical me,me diff --git a/res/skins/LateNight/skin_settings.xml b/res/skins/LateNight/skin_settings.xml index d99b1189ee6..4808869c969 100644 --- a/res/skins/LateNight/skin_settings.xml +++ b/res/skins/LateNight/skin_settings.xml @@ -82,7 +82,7 @@ Description: - [Master],maximize_library + [Skin],show_maximized_library visible @@ -108,12 +108,12 @@ Description: left - [Master],show_mixer + [Skin],show_mixer LeftButton - [Master],show_mixer + [Skin],show_mixer visible @@ -156,10 +156,10 @@ Description: when switching deck size --> horizontal - + - + @@ -189,7 +189,7 @@ Description: - + horizontal @@ -49,7 +49,7 @@ 48f,20f MIXER MIXER - [Master],show_mixer + [Skin],show_mixer diff --git a/res/skins/Deere/vinylcontrol.xml b/res/skins/Deere/vinylcontrol.xml index 143044b583e..8dd97bba6bc 100644 --- a/res/skins/Deere/vinylcontrol.xml +++ b/res/skins/Deere/vinylcontrol.xml @@ -66,7 +66,7 @@ - [VinylControl],show_vinylcontrol + [Skin],show_vinylcontrol visible diff --git a/res/skins/LateNight (64 Samplers)/helpers/skin_settings_samplers.xml b/res/skins/LateNight (64 Samplers)/helpers/skin_settings_samplers.xml index 863898bb2d0..1c57964ee8f 100644 --- a/res/skins/LateNight (64 Samplers)/helpers/skin_settings_samplers.xml +++ b/res/skins/LateNight (64 Samplers)/helpers/skin_settings_samplers.xml @@ -24,7 +24,7 @@ Description: 0me,0f @@ -37,7 +37,7 @@ Description: @@ -94,7 +94,7 @@ Description: diff --git a/res/skins/LateNight (64 Samplers)/samplers_rack.xml b/res/skins/LateNight (64 Samplers)/samplers_rack.xml index 52abe99ebe5..8d2a73ead1d 100644 --- a/res/skins/LateNight (64 Samplers)/samplers_rack.xml +++ b/res/skins/LateNight (64 Samplers)/samplers_rack.xml @@ -262,7 +262,7 @@ - [Samplers],show_samplers + [Skin],show_samplers visible diff --git a/res/skins/LateNight (64 Samplers)/skin.xml b/res/skins/LateNight (64 Samplers)/skin.xml index bc85742bc4c..d8ad1f5caf5 100644 --- a/res/skins/LateNight (64 Samplers)/skin.xml +++ b/res/skins/LateNight (64 Samplers)/skin.xml @@ -54,7 +54,7 @@ 1 0 - 0 + 0 @@ -80,22 +80,22 @@ 1 1 - 1 + 1 0 0 - 0 + 0 1 0 0 0 - 0 + 0 0 1 - 0 - 1 + 0 + 1 0 diff --git a/res/skins/LateNight/decks/preview_deck.xml b/res/skins/LateNight/decks/preview_deck.xml index 042f97c0ec3..dbaf8e6070e 100644 --- a/res/skins/LateNight/decks/preview_deck.xml +++ b/res/skins/LateNight/decks/preview_deck.xml @@ -173,7 +173,7 @@ - [PreviewDeck],show_previewdeck + [Skin],show_previewdecks visible diff --git a/res/skins/LateNight/decks/vinyl_controls.xml b/res/skins/LateNight/decks/vinyl_controls.xml index 18e19f528d9..93001120776 100644 --- a/res/skins/LateNight/decks/vinyl_controls.xml +++ b/res/skins/LateNight/decks/vinyl_controls.xml @@ -85,7 +85,7 @@ - [VinylControl],show_vinylcontrol + [Skin],show_vinylcontrol visible diff --git a/res/skins/LateNight/fx_rack.xml b/res/skins/LateNight/fx_rack.xml index 529e848ddbe..00a0de503ff 100644 --- a/res/skins/LateNight/fx_rack.xml +++ b/res/skins/LateNight/fx_rack.xml @@ -152,7 +152,7 @@ - [EffectRack1],show + [Skin],show_effectrack visible diff --git a/res/skins/LateNight/helpers/skin_settings_compact_deck.xml b/res/skins/LateNight/helpers/skin_settings_compact_deck.xml index 67a4d1dd646..dc06f25ff4b 100644 --- a/res/skins/LateNight/helpers/skin_settings_compact_deck.xml +++ b/res/skins/LateNight/helpers/skin_settings_compact_deck.xml @@ -63,7 +63,7 @@ Description: diff --git a/res/skins/LateNight/helpers/skin_settings_full_deck.xml b/res/skins/LateNight/helpers/skin_settings_full_deck.xml index 63dac3b213d..084a9c73a5e 100644 --- a/res/skins/LateNight/helpers/skin_settings_full_deck.xml +++ b/res/skins/LateNight/helpers/skin_settings_full_deck.xml @@ -116,7 +116,7 @@ Description: 0me,5f diff --git a/res/skins/LateNight/helpers/skin_settings_samplers.xml b/res/skins/LateNight/helpers/skin_settings_samplers.xml index d773abdc17f..08d3f8704c2 100644 --- a/res/skins/LateNight/helpers/skin_settings_samplers.xml +++ b/res/skins/LateNight/helpers/skin_settings_samplers.xml @@ -24,7 +24,7 @@ Description: @@ -34,7 +34,7 @@ Description: @@ -75,7 +75,7 @@ Description: diff --git a/res/skins/LateNight/library.xml b/res/skins/LateNight/library.xml index aa019719085..7f489b19a76 100644 --- a/res/skins/LateNight/library.xml +++ b/res/skins/LateNight/library.xml @@ -96,7 +96,7 @@ - [Library],show_coverart + [Skin],show_library_coverart visible diff --git a/res/skins/LateNight/mic_aux_rack.xml b/res/skins/LateNight/mic_aux_rack.xml index 3cb78351e4b..481ac1f4675 100644 --- a/res/skins/LateNight/mic_aux_rack.xml +++ b/res/skins/LateNight/mic_aux_rack.xml @@ -153,7 +153,7 @@ - [Microphone],show_microphone + [Skin],show_microphones visible diff --git a/res/skins/LateNight/samplers_rack.xml b/res/skins/LateNight/samplers_rack.xml index 6c8f82612a0..bf818f1d400 100644 --- a/res/skins/LateNight/samplers_rack.xml +++ b/res/skins/LateNight/samplers_rack.xml @@ -73,7 +73,7 @@ - [Samplers],show_samplers + [Skin],show_samplers visible diff --git a/res/skins/LateNight/skin.xml b/res/skins/LateNight/skin.xml index 5735be30ebe..044a567bebc 100644 --- a/res/skins/LateNight/skin.xml +++ b/res/skins/LateNight/skin.xml @@ -54,7 +54,7 @@ 1 0 - 0 + 0 @@ -80,22 +80,22 @@ 1 1 - 1 + 1 0 0 - 0 + 0 1 0 0 0 - 0 + 0 0 1 - 0 - 1 + 0 + 1 0 diff --git a/res/skins/LateNight/skin_settings.xml b/res/skins/LateNight/skin_settings.xml index 4808869c969..45596f5bac8 100644 --- a/res/skins/LateNight/skin_settings.xml +++ b/res/skins/LateNight/skin_settings.xml @@ -380,7 +380,7 @@ Description: @@ -391,7 +391,7 @@ Description: @@ -426,7 +426,7 @@ Description: diff --git a/res/skins/Shade/deck_effect.xml b/res/skins/Shade/deck_effect.xml index 394f6cfa65e..bcc09b16fcf 100644 --- a/res/skins/Shade/deck_effect.xml +++ b/res/skins/Shade/deck_effect.xml @@ -22,7 +22,7 @@ 2,0 - [EffectRack1],show + [Skin],show_effectrack diff --git a/res/skins/Shade/deck_transport.xml b/res/skins/Shade/deck_transport.xml index d698231d651..9b663588561 100644 --- a/res/skins/Shade/deck_transport.xml +++ b/res/skins/Shade/deck_transport.xml @@ -22,7 +22,7 @@ 5,0 - [Microphone],show_microphone + [Skin],show_microphones @@ -87,7 +87,7 @@ 53,0 - [Samplers],show_samplers + [Skin],show_samplers diff --git a/res/skins/Shade/library.xml b/res/skins/Shade/library.xml index 6a7cb89cb9b..11f1f214e63 100644 --- a/res/skins/Shade/library.xml +++ b/res/skins/Shade/library.xml @@ -40,7 +40,7 @@ 16,16 me,me - [Library],show_coverart + [Skin],show_library_coverart visible diff --git a/res/skins/Shade/preview_deck.xml b/res/skins/Shade/preview_deck.xml index fa076011c06..20e9dc5501c 100644 --- a/res/skins/Shade/preview_deck.xml +++ b/res/skins/Shade/preview_deck.xml @@ -276,7 +276,7 @@ - [PreviewDeck],show_previewdeck + [Skin],show_previewdecks visible diff --git a/res/skins/Shade/samplerrow.xml b/res/skins/Shade/samplerrow.xml index d64410eebe2..bc4db361a22 100644 --- a/res/skins/Shade/samplerrow.xml +++ b/res/skins/Shade/samplerrow.xml @@ -262,7 +262,7 @@ - [Samplers],show_samplers + [Skin],show_samplers visible diff --git a/res/skins/Shade/skin.xml b/res/skins/Shade/skin.xml index 460f8e7e365..b7e80c3471a 100644 --- a/res/skins/Shade/skin.xml +++ b/res/skins/Shade/skin.xml @@ -64,14 +64,14 @@ 1 1 - 0 + 0 0 0 - 0 - 0 - 0 - 0 - 0 + 0 + 0 + 0 + 0 + 0 0 1 diff --git a/res/skins/Shade/srcrow.xml b/res/skins/Shade/srcrow.xml index f3836282711..a5c426c2700 100644 --- a/res/skins/Shade/srcrow.xml +++ b/res/skins/Shade/srcrow.xml @@ -46,7 +46,7 @@ - [Microphone],show_microphone + [Skin],show_microphones visible diff --git a/res/skins/Shade/vinylcontrol.xml b/res/skins/Shade/vinylcontrol.xml index 6d0dcc2fa2c..a1f852a5fbd 100644 --- a/res/skins/Shade/vinylcontrol.xml +++ b/res/skins/Shade/vinylcontrol.xml @@ -109,7 +109,7 @@ - [VinylControl],show_vinylcontrol + [Skin],show_vinylcontrol visible diff --git a/res/skins/Tango (64 Samplers)/sampler_rack.xml b/res/skins/Tango (64 Samplers)/sampler_rack.xml index b7fbe3d84dd..447c00e6681 100644 --- a/res/skins/Tango (64 Samplers)/sampler_rack.xml +++ b/res/skins/Tango (64 Samplers)/sampler_rack.xml @@ -331,7 +331,7 @@ - [Samplers],show_samplers + [Skin],show_samplers visible diff --git a/res/skins/Tango (64 Samplers)/skin.xml b/res/skins/Tango (64 Samplers)/skin.xml index 8918a9323c7..259d447b33a 100644 --- a/res/skins/Tango (64 Samplers)/skin.xml +++ b/res/skins/Tango (64 Samplers)/skin.xml @@ -79,11 +79,11 @@ 1 1 - 1 + 1 0 0 - 0 + 0 4 0 @@ -95,12 +95,12 @@ 0 0 - 0 + 0 0 - 0 - 1 + 0 + 1 0 0 diff --git a/res/skins/Tango (64 Samplers)/skin_settings.xml b/res/skins/Tango (64 Samplers)/skin_settings.xml index 62f5c906857..9d1e6eaad36 100644 --- a/res/skins/Tango (64 Samplers)/skin_settings.xml +++ b/res/skins/Tango (64 Samplers)/skin_settings.xml @@ -624,7 +624,7 @@ Description: Big Effect Units 120f,18f - [EffectRack1],show + [Skin],show_effectrack 3f,1min @@ -636,7 +636,7 @@ Description: SubmenuCover 40f,20f - [EffectRack1],show + [Skin],show_effectrack visible @@ -676,7 +676,7 @@ Description: SubmenuCover 182f,13me - [EffectRack1],show + [Skin],show_effectrack visible @@ -710,12 +710,12 @@ Description: @@ -727,7 +727,7 @@ Description: 3f,1min @@ -744,7 +744,7 @@ Description: 112,20 me,me - [Samplers],show_samplers + [Skin],show_samplers visible diff --git a/res/skins/Tango/decks/preview_deck.xml b/res/skins/Tango/decks/preview_deck.xml index ac1fb6f006b..b3966fc3336 100644 --- a/res/skins/Tango/decks/preview_deck.xml +++ b/res/skins/Tango/decks/preview_deck.xml @@ -170,7 +170,7 @@ Variables: - [PreviewDeck],show_previewdeck + [Skin],show_previewdecks visible diff --git a/res/skins/Tango/fx_units_12.xml b/res/skins/Tango/fx_units_12.xml index f3f6bbc3d0f..f74c2afaf8c 100644 --- a/res/skins/Tango/fx_units_12.xml +++ b/res/skins/Tango/fx_units_12.xml @@ -56,7 +56,7 @@ Description: - [EffectRack1],show + [Skin],show_effectrack visible @@ -98,7 +98,7 @@ Description: - [EffectRack1],show + [Skin],show_effectrack visible diff --git a/res/skins/Tango/fx_units_34.xml b/res/skins/Tango/fx_units_34.xml index 47cbe621a6c..ac04a387879 100644 --- a/res/skins/Tango/fx_units_34.xml +++ b/res/skins/Tango/fx_units_34.xml @@ -56,7 +56,7 @@ Description: - [EffectRack1],show + [Skin],show_effectrack visible @@ -98,7 +98,7 @@ Description: - [EffectRack1],show + [Skin],show_effectrack visible diff --git a/res/skins/Tango/library.xml b/res/skins/Tango/library.xml index b3b1f4f477d..a038d6f7f6a 100644 --- a/res/skins/Tango/library.xml +++ b/res/skins/Tango/library.xml @@ -49,7 +49,7 @@ Description: 1me,5f - [PreviewDeck],show_previewdeck + [Skin],show_previewdecks visible @@ -100,7 +100,7 @@ Description: 30min,30min - [Library],show_coverart + [Skin],show_library_coverart visible diff --git a/res/skins/Tango/mic_aux_rack.xml b/res/skins/Tango/mic_aux_rack.xml index 4ceebecb1b6..8790fea4b85 100644 --- a/res/skins/Tango/mic_aux_rack.xml +++ b/res/skins/Tango/mic_aux_rack.xml @@ -160,7 +160,7 @@ Description: - [Microphone],show_microphone + [Skin],show_microphones visible diff --git a/res/skins/Tango/sampler_rack.xml b/res/skins/Tango/sampler_rack.xml index 3f8849f13ab..0472deb08a9 100644 --- a/res/skins/Tango/sampler_rack.xml +++ b/res/skins/Tango/sampler_rack.xml @@ -82,7 +82,7 @@ - [Samplers],show_samplers + [Skin],show_samplers visible diff --git a/res/skins/Tango/skin.xml b/res/skins/Tango/skin.xml index 9b907419847..1b20ec494bd 100644 --- a/res/skins/Tango/skin.xml +++ b/res/skins/Tango/skin.xml @@ -79,22 +79,22 @@ 1 1 - 1 + 1 0 0 - 0 + 0 1 0 0 - 0 + 0 0 - 0 - 1 + 0 + 1 0 0 diff --git a/res/skins/Tango/skin_settings.xml b/res/skins/Tango/skin_settings.xml index 42bd37d501e..66ec93269da 100644 --- a/res/skins/Tango/skin_settings.xml +++ b/res/skins/Tango/skin_settings.xml @@ -616,7 +616,7 @@ Description: Big Effect Units 120f,18f - [EffectRack1],show + [Skin],show_effectrack 3f,1min @@ -628,7 +628,7 @@ Description: SubmenuCover 40f,20f - [EffectRack1],show + [Skin],show_effectrack visible @@ -670,7 +670,7 @@ Description: vertical 182f,13me - [EffectRack1],show + [Skin],show_effectrack visible @@ -697,12 +697,12 @@ Description: @@ -714,7 +714,7 @@ Description: 3f,1min @@ -731,7 +731,7 @@ Description: 112,20 me,me - [Samplers],show_samplers + [Skin],show_samplers visible diff --git a/res/skins/Tango/topbar.xml b/res/skins/Tango/topbar.xml index 04cb6d505fe..93349db492d 100644 --- a/res/skins/Tango/topbar.xml +++ b/res/skins/Tango/topbar.xml @@ -181,7 +181,7 @@ Description: 30f,20f FX FX - [EffectRack1],show + [Skin],show_effectrack 3f,1min @@ -192,7 +192,7 @@ Description: 30f,20f samplers_off.svg samplers_on.svg - [Samplers],show_samplers + [Skin],show_samplers 3f,1min @@ -203,7 +203,7 @@ Description: 30f,20f mic_aux_off.svg mic_aux_on.svg - [Microphone],show_microphone + [Skin],show_microphones 10f,1min diff --git a/src/test/co_dumps/co_dump_inital.csv b/src/test/co_dumps/co_dump_inital.csv index 9eabd5a3f8a..f5b483b39b8 100644 --- a/src/test/co_dumps/co_dump_inital.csv +++ b/src/test/co_dumps/co_dump_inital.csv @@ -293,7 +293,7 @@ [Channel1],hotcue_22_goto,0 [EffectRack1_EffectUnit4_Effect1],parameter6_set_minus_one,0 [Auxiliary3],VuMeterL_down_small,0 -[VinylControl],show_vinylcontrol,0 +[Skin],show_vinylcontrol,0 [EffectRack1_EffectUnit3_Effect3],parameter7_minus_toggle,0 [Sampler3],hotcue_13_goto,0 [Sampler3],beatjump_0.5_forward,0 @@ -2095,7 +2095,7 @@ [Channel3],hotcue_1_goto,0 [Channel1],beatjump_0.03125_backward,0 [Sampler4],loop_move_2_forward,0 -[PreviewDeck],show_previewdeck,0 +[Skin],show_previewdecks,0 [EffectRack1_EffectUnit1_Effect2],parameter8_set_minus_one,0 [QuickEffectRack1_[Channel2]_Effect1],parameter14_toggle,0 [Channel3],volume_set_default,0 @@ -2204,7 +2204,7 @@ [Sampler2],loop_move_2_forward,0 [Microphone],pregain_up_small,0 [Sampler2],beatjump_32_backward,0 -[Microphone],show_microphone,0 +[Skin],show_microphones,0 [Channel2],beatjump_64_backward,0 [PreviewDeck1],beatloop_1_toggle,0 [PreviewDeck1],hotcue_37_gotoandplay,0 @@ -6565,7 +6565,7 @@ [EqualizerRack1_[Channel2]_Effect1],parameter12_up,0 [QuickEffectRack1_[Channel2]_Effect1],button_parameter7_type,0 [EffectRack1_EffectUnit3],insertion_type,0 -[Samplers],show_samplers,0 +[Skin],show_samplers,0 [EffectRack1_EffectUnit4_Effect1],button_parameter3_type,0 [Channel4],orientation_left,0 [Sampler2],hotcue_5_clear,0 @@ -7190,7 +7190,7 @@ [EffectRack1_EffectUnit2_Effect2],button_parameter16_type,0 [EqualizerRack1_[Channel2]_Effect1],parameter15_down_small,0 [Master],PeakIndicator_set_zero,0 -[EffectRack1],show,1 +[Skin],show_effectrack,1 [EffectRack1_EffectUnit2_Effect3],parameter8_set_default,0 [EffectRack1_EffectUnit3_Effect2],parameter6_down,0 [EffectRack1_EffectUnit3_Effect2],parameter2_down_small,0 @@ -14053,7 +14053,7 @@ [Microphone],VuMeter_up,0 [QuickEffectRack1_[Channel1]],clear,0 [Channel4],hotcue_9_gotoandstop,0 -[Library],show_coverart,1 +[Skin],show_library_coverart,1 [Sampler3],waveform_zoom_toggle,0 [Channel1],hotcue_8_activate_preview,0 [PreviewDeck1],rateSearch,0 @@ -14617,7 +14617,6 @@ [EffectRack1_EffectUnit4_Effect1],parameter7_set_minus_one,0 [Channel4],beats_translate_match_alignment,0 [EffectRack1_EffectUnit4],group_[Microphone3]_enable,0 -[Vinylcontrol],show_vinylcontrol,0 [EffectRack1_EffectUnit2_Effect4],parameter1_set_one,0 [EffectRack1_EffectUnit3_Effect2],parameter16_set_zero,0 [EffectRack1_EffectUnit3_Effect2],parameter8_up,0 diff --git a/src/widget/wmainmenubar.cpp b/src/widget/wmainmenubar.cpp index 84e96852d4a..9cec33421ad 100644 --- a/src/widget/wmainmenubar.cpp +++ b/src/widget/wmainmenubar.cpp @@ -14,6 +14,7 @@ namespace { constexpr int kMaxLoadToDeckActions = 4; +const QString kSkinGroup = QStringLiteral("[Skin]"); QString buildWhatsThis(const QString& title, const QString& text) { QString preparedTitle = title; @@ -209,7 +210,8 @@ void WMainMenuBar::initialize() { tr("Ctrl+1", "Menubar|View|Show Skin Settings")))); pViewShowSkinSettings->setStatusTip(showSkinSettingsText); pViewShowSkinSettings->setWhatsThis(buildWhatsThis(showSkinSettingsTitle, showSkinSettingsText)); - createVisibilityControl(pViewShowSkinSettings, ConfigKey("[Skin]", "show_settings")); + createVisibilityControl(pViewShowSkinSettings, + ConfigKey(kSkinGroup, QStringLiteral("show_settings"))); pViewMenu->addAction(pViewShowSkinSettings); // Microphone Section @@ -224,7 +226,8 @@ void WMainMenuBar::initialize() { tr("Ctrl+2", "Menubar|View|Show Microphone Section")))); pViewShowMicrophone->setStatusTip(showMicrophoneText); pViewShowMicrophone->setWhatsThis(buildWhatsThis(showMicrophoneTitle, showMicrophoneText)); - createVisibilityControl(pViewShowMicrophone, ConfigKey("[Microphone]", "show_microphone")); + createVisibilityControl(pViewShowMicrophone, + ConfigKey(kSkinGroup, QStringLiteral("show_microphones"))); pViewMenu->addAction(pViewShowMicrophone); #ifdef __VINYLCONTROL__ @@ -239,7 +242,8 @@ void WMainMenuBar::initialize() { tr("Ctrl+3", "Menubar|View|Show Vinyl Control Section")))); pViewVinylControl->setStatusTip(showVinylControlText); pViewVinylControl->setWhatsThis(buildWhatsThis(showVinylControlTitle, showVinylControlText)); - createVisibilityControl(pViewVinylControl, ConfigKey(VINYL_PREF_KEY, "show_vinylcontrol")); + createVisibilityControl(pViewVinylControl, + ConfigKey(kSkinGroup, QStringLiteral("show_vinylcontrol"))); pViewMenu->addAction(pViewVinylControl); #endif @@ -254,7 +258,8 @@ void WMainMenuBar::initialize() { tr("Ctrl+4", "Menubar|View|Show Preview Deck")))); pViewShowPreviewDeck->setStatusTip(showPreviewDeckText); pViewShowPreviewDeck->setWhatsThis(buildWhatsThis(showPreviewDeckTitle, showPreviewDeckText)); - createVisibilityControl(pViewShowPreviewDeck, ConfigKey("[PreviewDeck]", "show_previewdeck")); + createVisibilityControl(pViewShowPreviewDeck, + ConfigKey(kSkinGroup, QStringLiteral("show_previewdecks"))); pViewMenu->addAction(pViewShowPreviewDeck); @@ -269,7 +274,8 @@ void WMainMenuBar::initialize() { tr("Ctrl+6", "Menubar|View|Show Cover Art")))); pViewShowCoverArt->setStatusTip(showCoverArtText); pViewShowCoverArt->setWhatsThis(buildWhatsThis(showCoverArtTitle, showCoverArtText)); - createVisibilityControl(pViewShowCoverArt, ConfigKey("[Library]", "show_coverart")); + createVisibilityControl(pViewShowCoverArt, + ConfigKey(kSkinGroup, QStringLiteral("show_library_coverart"))); pViewMenu->addAction(pViewShowCoverArt); @@ -284,7 +290,8 @@ void WMainMenuBar::initialize() { tr("Space", "Menubar|View|Maximize Library")))); pViewMaximizeLibrary->setStatusTip(maximizeLibraryText); pViewMaximizeLibrary->setWhatsThis(buildWhatsThis(maximizeLibraryTitle, maximizeLibraryText)); - createVisibilityControl(pViewMaximizeLibrary, ConfigKey("[Skin]", "show_maximized_library")); + createVisibilityControl(pViewMaximizeLibrary, + ConfigKey(kSkinGroup, QStringLiteral("show_maximized_library"))); pViewMenu->addAction(pViewMaximizeLibrary); pViewMenu->addSeparator();