Merge pull request #2372 from uklotzde/backport_lp1851993

Be-ing · web-flow · commit 017fdc403320 · 2019-11-26T06:07:05.000-06:00
Backport fixes for lp1851993 to 2.2
diff --git a/res/keyboard/cs_CZ.kbd.cfg b/res/keyboard/cs_CZ.kbd.cfg
@@ -132,7 +132,7 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
diff --git a/res/keyboard/da_DK.kbd.cfg b/res/keyboard/da_DK.kbd.cfg
@@ -132,7 +132,7 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
diff --git a/res/keyboard/de_CH.kbd.cfg b/res/keyboard/de_CH.kbd.cfg
@@ -129,7 +129,7 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
diff --git a/res/keyboard/de_DE.kbd.cfg b/res/keyboard/de_DE.kbd.cfg
@@ -132,7 +132,7 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
diff --git a/res/keyboard/el_GR.kbd.cfg b/res/keyboard/el_GR.kbd.cfg
@@ -132,7 +132,7 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
diff --git a/res/keyboard/en_US.kbd.cfg b/res/keyboard/en_US.kbd.cfg
@@ -129,7 +129,7 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
diff --git a/res/keyboard/es_ES.kbd.cfg b/res/keyboard/es_ES.kbd.cfg
@@ -132,7 +132,7 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
diff --git a/res/keyboard/fi_FI.kbd.cfg b/res/keyboard/fi_FI.kbd.cfg
@@ -132,7 +132,7 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
diff --git a/res/keyboard/fr_CH.kbd.cfg b/res/keyboard/fr_CH.kbd.cfg
@@ -129,7 +129,7 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
diff --git a/res/keyboard/fr_FR.kbd.cfg b/res/keyboard/fr_FR.kbd.cfg
@@ -132,7 +132,7 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
diff --git a/res/keyboard/it_IT.kbd.cfg b/res/keyboard/it_IT.kbd.cfg
@@ -132,7 +132,7 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
diff --git a/res/keyboard/ru_RU.kbd.cfg b/res/keyboard/ru_RU.kbd.cfg
@@ -132,7 +132,7 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
diff --git a/src/widget/wmainmenubar.cpp b/src/widget/wmainmenubar.cpp
@@ -181,7 +181,7 @@ void WMainMenuBar::initialize() {
     pViewShowSkinSettings->setCheckable(true);
     pViewShowSkinSettings->setShortcut(
         QKeySequence(m_pKbdConfig->getValue(
-            ConfigKey("[Master]", "ViewMenu_ShowSkinSettings"),
+            ConfigKey("[KeyboardShortcuts]", "ViewMenu_ShowSkinSettings"),
             tr("Ctrl+1", "Menubar|View|Show Skin Settings"))));
     pViewShowSkinSettings->setStatusTip(showSkinSettingsText);
     pViewShowSkinSettings->setWhatsThis(buildWhatsThis(showSkinSettingsTitle, showSkinSettingsText));
