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

Backport fixes for lp1851993 to 2.2 #2372

Merged
merged 2 commits into from
Nov 26, 2019
Merged

Backport fixes for lp1851993 to 2.2 #2372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b43d70
User right group for "ViewMenu_ShowSkinSettings", fixes lp1851993.
daschuer Nov 15, 2019
4708ddf
Fix shortcut for ShowSkinSettings in kbd.cfg files
daschuer Nov 25, 2019
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
2 changes: 1 addition & 1 deletion res/keyboard/cs_CZ.kbd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion res/keyboard/da_DK.kbd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion res/keyboard/de_CH.kbd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion res/keyboard/de_DE.kbd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion res/keyboard/el_GR.kbd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion res/keyboard/en_US.kbd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion res/keyboard/es_ES.kbd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion res/keyboard/fi_FI.kbd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion res/keyboard/fr_CH.kbd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion res/keyboard/fr_FR.kbd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion res/keyboard/it_IT.kbd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion res/keyboard/ru_RU.kbd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/widget/wmainmenubar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down