From 97eef8592ac0e54a5dfa56992795b4dfa4becfca Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Mon, 4 Oct 2021 23:07:06 +0200
Subject: [PATCH] always create [Library],maximize_library, use global const,
 add alias

---
 res/skins/Deere (64 Samplers)/skin.xml |  6 +++---
 res/skins/Deere/library.xml            |  2 +-
 res/skins/Deere/skin.xml               |  6 +++---
 res/skins/Deere/tool_bar.xml           |  2 +-
 res/skins/LateNight/library.xml        |  2 +-
 res/skins/LateNight/skin.xml           |  8 ++++----
 res/skins/LateNight/skin_settings.xml  | 14 +++++++-------
 res/skins/LateNight/toolbar.xml        |  6 +++---
 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 |  8 ++++----
 res/skins/Tango/library.xml            |  4 ++--
 res/skins/Tango/skin.xml               |  8 ++++----
 res/skins/Tango/topbar.xml             |  4 ++--
 src/controllers/controlpickermenu.cpp  |  2 +-
 src/coreservices.cpp                   |  7 +++++++
 src/coreservices.h                     |  1 +
 src/util/defs.h                        |  4 ++++
 src/widget/wmainmenubar.cpp            |  3 ++-
 src/widget/wwidgetstack.cpp            |  2 +-
 21 files changed, 54 insertions(+), 41 deletions(-)

diff --git a/res/skins/Deere (64 Samplers)/skin.xml b/res/skins/Deere (64 Samplers)/skin.xml
index e8fcfe88c57e..19e3d532dd48 100644
--- a/res/skins/Deere (64 Samplers)/skin.xml	
+++ b/res/skins/Deere (64 Samplers)/skin.xml	
@@ -51,7 +51,7 @@
 
       <!-- Library -->
       <attribute config_key="[Skin],show_library">1</attribute>
-      <attribute config_key="[Master],maximize_library">0</attribute>
+      <attribute config_key="[Library],maximize_library">0</attribute>
       <attribute persist="true" config_key="[PreviewDeck],show_previewdeck">0</attribute>
       <attribute persist="true" config_key="[Library],show_coverart">1</attribute>
       <!--Disable hidden effect routing Buttons-->
@@ -187,7 +187,7 @@
         <Template src="skin:../Deere/tool_bar.xml"/>
 
         <!-- regular or maximized library -->
-        <WidgetStack currentpage="[Master],maximize_library">
+        <WidgetStack currentpage="[Library],maximize_library">
           <Children>
 
             <!-- regular library with decks etc. -->
@@ -221,7 +221,7 @@
             </Splitter><!-- regular library with decks etc. -->
 
             <!-- maximized Library with minimal decks -->
-            <WidgetGroup trigger="[Master],maximize_library" on_hide_select="0">
+            <WidgetGroup trigger="[Library],maximize_library" on_hide_select="0">
               <Layout>vertical</Layout>
               <SizePolicy>me,me</SizePolicy>
               <Children>
diff --git a/res/skins/Deere/library.xml b/res/skins/Deere/library.xml
index d327477f6d41..00f27c4cfa89 100644
--- a/res/skins/Deere/library.xml
+++ b/res/skins/Deere/library.xml
@@ -37,7 +37,7 @@
                       <Template src="skin:hide_show_button.xml">
                         <SetVariable name="TooltipId">maximize_library</SetVariable>
                         <SetVariable name="object_name">LibraryToggle</SetVariable>
-                        <SetVariable name="control">[Master],maximize_library</SetVariable>
+                        <SetVariable name="control">[Library],maximize_library</SetVariable>
                       </Template>
                     </Children>
                   </WidgetGroup>
diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
index 2edc824f9cf7..3c917a20ab68 100644
--- a/res/skins/Deere/skin.xml
+++ b/res/skins/Deere/skin.xml
@@ -50,7 +50,7 @@
 
       <!-- Library -->
       <attribute config_key="[Skin],show_library">1</attribute>
-      <attribute config_key="[Master],maximize_library">0</attribute>
+      <attribute config_key="[Library],maximize_library">0</attribute>
       <attribute persist="true" config_key="[PreviewDeck],show_previewdeck">0</attribute>
       <attribute persist="true" config_key="[Library],show_coverart">1</attribute>
       <!--Disable hidden effect routing Buttons-->
@@ -186,7 +186,7 @@
         <Template src="skin:../Deere/tool_bar.xml"/>
 
         <!-- regular or maximized library -->
-        <WidgetStack currentpage="[Master],maximize_library">
+        <WidgetStack currentpage="[Library],maximize_library">
           <Children>
 
             <!-- regular library with decks etc. -->
@@ -220,7 +220,7 @@
             </Splitter><!-- regular library with decks etc. -->
 
             <!-- maximized Library with minimal decks -->
-            <WidgetGroup trigger="[Master],maximize_library" on_hide_select="0">
+            <WidgetGroup trigger="[Library],maximize_library" on_hide_select="0">
               <Layout>vertical</Layout>
               <SizePolicy>me,me</SizePolicy>
               <Children>
diff --git a/res/skins/Deere/tool_bar.xml b/res/skins/Deere/tool_bar.xml
index 207059f3a3ed..ca254ddaac54 100644
--- a/res/skins/Deere/tool_bar.xml
+++ b/res/skins/Deere/tool_bar.xml
@@ -403,7 +403,7 @@
               </Template>
             </Children>
             <Connection>
-              <ConfigKey>[Master],maximize_library</ConfigKey>
+              <ConfigKey>[Library],maximize_library</ConfigKey>
               <BindProperty>visible</BindProperty>
               <Transform><Not/></Transform>
             </Connection>
diff --git a/res/skins/LateNight/library.xml b/res/skins/LateNight/library.xml
index 8b2c6abefc86..8d0a9892a152 100644
--- a/res/skins/LateNight/library.xml
+++ b/res/skins/LateNight/library.xml
@@ -57,7 +57,7 @@
                             <SetVariable name="TooltipId">maximize_library</SetVariable>
                             <SetVariable name="ObjectName">LibExpand</SetVariable>
                             <SetVariable name="Size">16f,18me</SetVariable>
-                            <SetVariable name="ConfigKey">[Master],maximize_library</SetVariable>
+                            <SetVariable name="ConfigKey">[Library],maximize_library</SetVariable>
                           </Template>
                         </Children>
                       </WidgetGroup><!-- LibExpandBox -->
diff --git a/res/skins/LateNight/skin.xml b/res/skins/LateNight/skin.xml
index 6757ad9704bc..2f0c5ca227a4 100644
--- a/res/skins/LateNight/skin.xml
+++ b/res/skins/LateNight/skin.xml
@@ -89,7 +89,7 @@
     <!-- Mic / Aux -->
       <attribute persist="true" config_key="[Microphone],show_microphone">0</attribute>
     <!-- Library -->
-      <attribute config_key="[Master],maximize_library">0</attribute>
+      <attribute config_key="[Library],maximize_library">0</attribute>
       <attribute persist="true" config_key="[LateNight],max_lib_show_decks">1</attribute>
       <attribute persist="true" config_key="[PreviewDeck],show_previewdeck">0</attribute>
       <attribute persist="true" config_key="[Library],show_coverart">1</attribute>
@@ -393,7 +393,7 @@
     <!-- Some helpers to show widgets and switch layouts
         depending on the skin configuration.
         Apparently putting those here keeps i.e. the spinny
-        config when [Master],maximize_library is toggled. -->
+        config when [Library],maximize_library is toggled. -->
         <Template src="skin:/helpers/skin_helper_mic_ducking.xml"/>
         <Template src="skin:/helpers/skin_helper_spinny-cover.xml"/>
 
@@ -406,7 +406,7 @@
           <Children>
 
             <!-- regular or maximized library -->
-            <WidgetStack currentpage="[Master],maximize_library">
+            <WidgetStack currentpage="[Library],maximize_library">
               <Children>
 
                 <!-- Waveforms, Decks, Effects... /  Library
@@ -472,7 +472,7 @@
                 <!-- Decks, Effects, Samplers, Mic/Aux, Library -->
 
                 <!-- Maximized Library & mini decks only -->
-                <WidgetGroup trigger="[Master],maximize_library" on_hide_select="0">
+                <WidgetGroup trigger="[Library],maximize_library" on_hide_select="0">
                   <Layout>vertical</Layout>
                   <SizePolicy>me,me</SizePolicy>
                   <Children>
diff --git a/res/skins/LateNight/skin_settings.xml b/res/skins/LateNight/skin_settings.xml
index 74789acb5088..7737fac472e9 100644
--- a/res/skins/LateNight/skin_settings.xml
+++ b/res/skins/LateNight/skin_settings.xml
@@ -82,7 +82,7 @@ Description:
                     <Children>
                     </Children>
                     <Connection>
-                      <ConfigKey>[Master],maximize_library</ConfigKey>
+                      <ConfigKey>[Library],maximize_library</ConfigKey>
                       <BindProperty>visible</BindProperty>
                     </Connection>
                     <Connection>
@@ -156,7 +156,7 @@ Description:
               when switching deck size -->
             <Layout>horizontal</Layout>
             <Children>
-              <WidgetStack currentpage="[Master],maximize_library">
+              <WidgetStack currentpage="[Library],maximize_library">
                 <Children>
               <!-- regular library -->
                   <WidgetStack currentpage="[Master],show_mixer" persist="true" on_hide_select="0">
@@ -198,7 +198,7 @@ Description:
                     </Children>
                   </WidgetStack>
               <!-- maximized library -->
-                  <WidgetGroup trigger="[Master],maximize_library" on_hide_select="0">
+                  <WidgetGroup trigger="[Library],maximize_library" on_hide_select="0">
                     <Layout>stacked</Layout>
                     <Children>
                       <!-- translucent cover when there are no decks above BIG Library-->
@@ -229,7 +229,7 @@ Description:
             <Children>
               <!-- translucent cover when Library is not maximized -->
               <Template src="skin:/helpers/skin_settings_cover.xml">
-                <SetVariable name="Setting">[Master],maximize_library</SetVariable>
+                <SetVariable name="Setting">[Library],maximize_library</SetVariable>
               </Template>
 
               <WidgetGroup>
@@ -285,7 +285,7 @@ Description:
             <Children>
               <!-- translucent cover when Library is maximized -->
               <Template src="skin:/helpers/skin_settings_cover.xml">
-                <SetVariable name="Setting">[Master],maximize_library</SetVariable>
+                <SetVariable name="Setting">[Library],maximize_library</SetVariable>
               </Template>
 
               <WidgetGroup>
@@ -367,7 +367,7 @@ Description:
             <Children>
               <!-- translucent cover when Library is maximized -->
               <Template src="skin:/helpers/skin_settings_cover.xml">
-                <SetVariable name="Setting">[Master],maximize_library</SetVariable>
+                <SetVariable name="Setting">[Library],maximize_library</SetVariable>
               </Template>
 
               <WidgetGroup>
@@ -453,7 +453,7 @@ Description:
             <Children>
               <!-- translucent cover when Library is maximized -->
               <Template src="skin:/helpers/skin_settings_cover.xml">
-                <SetVariable name="Setting">[Master],maximize_library</SetVariable>
+                <SetVariable name="Setting">[Library],maximize_library</SetVariable>
               </Template>
 
               <WidgetGroup>
diff --git a/res/skins/LateNight/toolbar.xml b/res/skins/LateNight/toolbar.xml
index 86d46fab71ad..c027666b9fe1 100644
--- a/res/skins/LateNight/toolbar.xml
+++ b/res/skins/LateNight/toolbar.xml
@@ -11,7 +11,7 @@
         <SetVariable name="Size">80f,20f</SetVariable>
         <SetVariable name="state_0_text">BIG LIBRARY</SetVariable>
         <SetVariable name="state_1_text">BIG LIBRARY</SetVariable>
-        <SetVariable name="ConfigKey">[Master],maximize_library</SetVariable>
+        <SetVariable name="ConfigKey">[Library],maximize_library</SetVariable>
       </Template>
 
       <WidgetGroup>
@@ -81,7 +81,7 @@
 
         </Children>
         <Connection>
-          <ConfigKey>[Master],maximize_library</ConfigKey>
+          <ConfigKey>[Library],maximize_library</ConfigKey>
           <Transform><Not/></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
@@ -113,7 +113,7 @@
 
         </Children>
         <Connection>
-          <ConfigKey>[Master],maximize_library</ConfigKey>
+          <ConfigKey>[Library],maximize_library</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup><!-- GUI toggles with maximized library -->
diff --git a/res/skins/Shade/decks_row_small.xml b/res/skins/Shade/decks_row_small.xml
index 6484b460ef56..72491e0ee4df 100644
--- a/res/skins/Shade/decks_row_small.xml
+++ b/res/skins/Shade/decks_row_small.xml
@@ -23,7 +23,7 @@
       </WidgetGroup>
     </Children>
     <Connection>
-      <ConfigKey>[Master],maximize_library</ConfigKey>
+      <ConfigKey>[Library],maximize_library</ConfigKey>
       <BindProperty>visible</BindProperty>
     </Connection>
   </WidgetGroup>
diff --git a/res/skins/Shade/skin.xml b/res/skins/Shade/skin.xml
index 20998cdb9802..d3893bf7f8f7 100644
--- a/res/skins/Shade/skin.xml
+++ b/res/skins/Shade/skin.xml
@@ -396,7 +396,7 @@
 
           </Children>
           <Connection>
-            <ConfigKey>[Master],maximize_library</ConfigKey>
+            <ConfigKey>[Library],maximize_library</ConfigKey>
             <BindProperty>visible</BindProperty>
             <Transform><Not/></Transform>
           </Connection>
diff --git a/res/skins/Shade/srcrow.xml b/res/skins/Shade/srcrow.xml
index a7b7552a051e..80266f1f35e0 100644
--- a/res/skins/Shade/srcrow.xml
+++ b/res/skins/Shade/srcrow.xml
@@ -52,7 +52,7 @@
 		</WidgetGroup>
 	  </Children>
 	   <Connection>
-		   <ConfigKey>[Master],maximize_library</ConfigKey>
+		   <ConfigKey>[Library],maximize_library</ConfigKey>
 		   <BindProperty>visible</BindProperty>
 		   <Transform>
 		     <Not/>
diff --git a/res/skins/Tango (64 Samplers)/skin.xml b/res/skins/Tango (64 Samplers)/skin.xml
index 9312221172d7..9c7faba1b485 100644
--- a/res/skins/Tango (64 Samplers)/skin.xml	
+++ b/res/skins/Tango (64 Samplers)/skin.xml	
@@ -98,7 +98,7 @@
       <attribute persist="true" config_key="[Microphone],show_microphone">0</attribute>
 
       <!-- Library -->
-      <attribute config_key="[Master],maximize_library">0</attribute>
+      <attribute config_key="[Library],maximize_library">0</attribute>
       <attribute persist="true" config_key="[PreviewDeck],show_previewdeck">0</attribute>
       <attribute persist="true" config_key="[Library],show_coverart">1</attribute>
       <!--Disable hidden effect routing Buttons-->
@@ -407,7 +407,7 @@
                 <Template src="skin:../Tango/topbar.xml"/>
 
                 <!-- regular / maximized library -->
-                <WidgetStack currentpage="[Master],maximize_library">
+                <WidgetStack currentpage="[Library],maximize_library">
                   <Children>
                     <!-- regular library
                         [stacked  waveforms]
@@ -421,7 +421,7 @@
                       <SplitSizesConfigKey>[Skin],stackedWaveforms_splitSize</SplitSizesConfigKey>
                       <Collapsible>0,0</Collapsible>
                       <Connection>
-                        <ConfigKey>[Master],maximize_library</ConfigKey>
+                        <ConfigKey>[Library],maximize_library</ConfigKey>
                         <Transform><Not/></Transform>
                         <BindProperty>visible</BindProperty>
                       </Connection>
@@ -509,7 +509,7 @@
                       <Layout>vertical</Layout>
                       <SizePolicy>me,me</SizePolicy>
                       <Connection>
-                        <ConfigKey>[Master],maximize_library</ConfigKey>
+                        <ConfigKey>[Library],maximize_library</ConfigKey>
                         <BindProperty>visible</BindProperty>
                       </Connection>
                       <Children>
diff --git a/res/skins/Tango/library.xml b/res/skins/Tango/library.xml
index d9c11faa9a08..901415f5eec8 100644
--- a/res/skins/Tango/library.xml
+++ b/res/skins/Tango/library.xml
@@ -24,7 +24,7 @@ Description:
           <WidgetGroup>
             <Size>1me,2f</Size>
             <Connection>
-              <ConfigKey persist="true">[Master],maximize_library</ConfigKey>
+              <ConfigKey persist="true">[Library],maximize_library</ConfigKey>
               <BindProperty>visible</BindProperty>
             </Connection>
           </WidgetGroup>
@@ -82,7 +82,7 @@ Description:
                                   <Template src="skin:../Tango/controls/button_2state_persist.xml">
                                     <SetVariable name="ObjectName">LibMiniMaxiButton</SetVariable>
                                     <SetVariable name="Size">19f,15f</SetVariable>
-                                    <SetVariable name="ConfigKey">[Master],maximize_library</SetVariable>
+                                    <SetVariable name="ConfigKey">[Library],maximize_library</SetVariable>
                                   </Template>
                                 </Children>
                               </WidgetGroup>
diff --git a/res/skins/Tango/skin.xml b/res/skins/Tango/skin.xml
index fbdf04e53f06..aa748d5912e2 100644
--- a/res/skins/Tango/skin.xml
+++ b/res/skins/Tango/skin.xml
@@ -92,7 +92,7 @@
       <attribute persist="true" config_key="[Microphone],show_microphone">0</attribute>
 
       <!-- Library -->
-      <attribute config_key="[Master],maximize_library">0</attribute>
+      <attribute config_key="[Library],maximize_library">0</attribute>
       <attribute persist="true" config_key="[PreviewDeck],show_previewdeck">0</attribute>
       <attribute persist="true" config_key="[Library],show_coverart">1</attribute>
       <!--Disable hidden effect routing Buttons-->
@@ -401,7 +401,7 @@
                 <Template src="skin:../Tango/topbar.xml"/>
 
                 <!-- regular / maximized library -->
-                <WidgetStack currentpage="[Master],maximize_library">
+                <WidgetStack currentpage="[Library],maximize_library">
                   <Children>
                     <!-- regular library
                         [stacked  waveforms]
@@ -415,7 +415,7 @@
                       <SplitSizesConfigKey>[Skin],stackedWaveforms_splitSize</SplitSizesConfigKey>
                       <Collapsible>0,0</Collapsible>
                       <Connection>
-                        <ConfigKey>[Master],maximize_library</ConfigKey>
+                        <ConfigKey>[Library],maximize_library</ConfigKey>
                         <Transform><Not/></Transform>
                         <BindProperty>visible</BindProperty>
                       </Connection>
@@ -503,7 +503,7 @@
                       <Layout>vertical</Layout>
                       <SizePolicy>me,me</SizePolicy>
                       <Connection>
-                        <ConfigKey>[Master],maximize_library</ConfigKey>
+                        <ConfigKey>[Library],maximize_library</ConfigKey>
                         <BindProperty>visible</BindProperty>
                       </Connection>
                       <Children>
diff --git a/res/skins/Tango/topbar.xml b/res/skins/Tango/topbar.xml
index fb435cd5ebfe..e74f0566dcd2 100644
--- a/res/skins/Tango/topbar.xml
+++ b/res/skins/Tango/topbar.xml
@@ -128,7 +128,7 @@ Description:
           </WidgetGroup>
         </Children>
         <Connection>
-          <ConfigKey>[Master],maximize_library</ConfigKey>
+          <ConfigKey>[Library],maximize_library</ConfigKey>
           <Transform><Not/></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
@@ -239,7 +239,7 @@ Description:
               </Template>
             </Children>
             <Connection>
-              <ConfigKey>[Master],maximize_library</ConfigKey>
+              <ConfigKey>[Library],maximize_library</ConfigKey>
               <Transform><Not/></Transform>
               <BindProperty>visible</BindProperty>
             </Connection>
diff --git a/src/controllers/controlpickermenu.cpp b/src/controllers/controlpickermenu.cpp
index ecef8b161e4c..2f6415733756 100644
--- a/src/controllers/controlpickermenu.cpp
+++ b/src/controllers/controlpickermenu.cpp
@@ -1155,7 +1155,7 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent)
             tr("Cover Art Show/Hide (Library)"),
             tr("Show/hide cover art in the library"),
             guiMenu);
-    addControl("[Master]",
+    addControl("[Library]",
             "maximize_library",
             tr("Library Maximize/Restore"),
             tr("Maximize the track library to take up all the available screen "
diff --git a/src/coreservices.cpp b/src/coreservices.cpp
index eddcf83598f4..e3f83bf56163 100644
--- a/src/coreservices.cpp
+++ b/src/coreservices.cpp
@@ -28,6 +28,7 @@
 #include "soundio/soundmanager.h"
 #include "sources/soundsourceproxy.h"
 #include "util/db/dbconnectionpooled.h"
+#include "util/defs.h"
 #include "util/font.h"
 #include "util/logger.h"
 #include "util/screensaver.h"
@@ -438,6 +439,11 @@ void CoreServices::initialize(QApplication* pApp) {
     m_pPlayerManager->loadSamplers();
 
     m_pTouchShift = std::make_unique<ControlPushButton>(ConfigKey("[Controls]", "touch_shift"));
+    m_pMaximizeLibrary = std::make_unique<ControlPushButton>(kMaximizeLibraryConfigKey);
+    m_pMaximizeLibrary->setButtonMode(ControlPushButton::TOGGLE);
+    ControlDoublePrivate::insertAlias(
+            ConfigKey("[Master]", "maximize_library"),
+            kMaximizeLibraryConfigKey);
 
     // Load tracks in args.qlMusicFiles (command line arguments) into player
     // 1 and 2:
@@ -612,6 +618,7 @@ void CoreServices::finalize() {
     m_pDbConnectionPool.reset(); // should drop the last reference
 
     m_pTouchShift.reset();
+    m_pMaximizeLibrary.reset();
 
     m_pControlIndicatorTimer.reset();
 
diff --git a/src/coreservices.h b/src/coreservices.h
index b45a80cf6e0b..92854b876ba9 100644
--- a/src/coreservices.h
+++ b/src/coreservices.h
@@ -152,6 +152,7 @@ class CoreServices : public QObject {
     std::shared_ptr<mixxx::ScreensaverManager> m_pScreensaverManager;
 
     std::unique_ptr<ControlPushButton> m_pTouchShift;
+    std::unique_ptr<ControlPushButton> m_pMaximizeLibrary;
 
     Timer m_runtime_timer;
     const CmdlineArgs& m_cmdlineArgs;
diff --git a/src/util/defs.h b/src/util/defs.h
index 6c758c656c31..b12112102b5b 100644
--- a/src/util/defs.h
+++ b/src/util/defs.h
@@ -1,7 +1,11 @@
 #pragma once
 
+#include "preferences/configobject.h"
+
 // Maximum buffer length to each EngineObject::process call.
 //TODO: Replace this with mixxx::AudioParameters::bufferSize()
 constexpr unsigned int MAX_BUFFER_LEN = 160000;
 
 constexpr int kMaxNumberOfDecks = 4;
+
+const ConfigKey kMaximizeLibraryConfigKey = ConfigKey("[Library]", "maximize_library");
diff --git a/src/widget/wmainmenubar.cpp b/src/widget/wmainmenubar.cpp
index 04656686a7c6..efb344508f5e 100644
--- a/src/widget/wmainmenubar.cpp
+++ b/src/widget/wmainmenubar.cpp
@@ -9,6 +9,7 @@
 #include "mixer/playermanager.h"
 #include "moc_wmainmenubar.cpp"
 #include "util/cmdlineargs.h"
+#include "util/defs.h"
 #include "util/experiment.h"
 #include "vinylcontrol/defs_vinylcontrol.h"
 
@@ -282,7 +283,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, kMaximizeLibraryConfigKey);
     pViewMenu->addAction(pViewMaximizeLibrary);
 
     pViewMenu->addSeparator();
diff --git a/src/widget/wwidgetstack.cpp b/src/widget/wwidgetstack.cpp
index 532078c903f1..b9cb7cf6d516 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
+    // [Library],maximize_library
     QWidget* prevFocusWidget = QApplication::focusWidget();
     setCurrentIndex(index);
     if (currentWidget()->isAncestorOf(prevFocusWidget)) {