Skip to content
Snippets Groups Projects
Commit 396eec02 authored by Tobias Ullerich's avatar Tobias Ullerich
Browse files

Fix key shortcut null display issue

parent 9525caa5
No related branches found
No related tags found
No related merge requests found
...@@ -152,7 +152,7 @@ public abstract class MenuToolbarViewController extends NVC { ...@@ -152,7 +152,7 @@ public abstract class MenuToolbarViewController extends NVC {
public abstract void loadKeybinding(KeyCollection keys); public abstract void loadKeybinding(KeyCollection keys);
public void setKeyBindingForMenu(MenuItem menuItem, Key key) { public void setKeyBindingForMenu(MenuItem menuItem, Key key) {
if (key != null && !key.getKeyCode().isEmpty()) { if (key != null && key.getKey() != null && !key.getKeyCode().isEmpty()) {
KeyCombination keyCode = KeyCombination.valueOf(key.getKeyCode()); KeyCombination keyCode = KeyCombination.valueOf(key.getKeyCode());
menuItem.setAccelerator(keyCode); menuItem.setAccelerator(keyCode);
} }
......
...@@ -6,6 +6,7 @@ import de.tobias.playpad.PlayPadPlugin; ...@@ -6,6 +6,7 @@ import de.tobias.playpad.PlayPadPlugin;
import de.tobias.playpad.plugin.MainWindowListener; import de.tobias.playpad.plugin.MainWindowListener;
import de.tobias.playpad.plugin.playout.PlayoutLogPlugin; import de.tobias.playpad.plugin.playout.PlayoutLogPlugin;
import de.tobias.playpad.plugin.playout.Strings; import de.tobias.playpad.plugin.playout.Strings;
import de.tobias.playpad.settings.keys.Key;
import de.tobias.playpad.settings.keys.KeyCollection; import de.tobias.playpad.settings.keys.KeyCollection;
import de.tobias.playpad.view.main.MenuType; import de.tobias.playpad.view.main.MenuType;
import de.tobias.playpad.viewcontroller.main.IMainViewController; import de.tobias.playpad.viewcontroller.main.IMainViewController;
...@@ -39,7 +40,11 @@ public class MainViewControllerListener implements MainWindowListener { ...@@ -39,7 +40,11 @@ public class MainViewControllerListener implements MainWindowListener {
public void loadMenuKeyBinding() { public void loadMenuKeyBinding() {
final KeyCollection keyCollection = PlayPadPlugin.getInstance().getGlobalSettings().getKeyCollection(); final KeyCollection keyCollection = PlayPadPlugin.getInstance().getGlobalSettings().getKeyCollection();
final MenuToolbarViewController menuToolbarController = PlayPadPlugin.getInstance().getMainViewController().getMenuToolbarController(); final MenuToolbarViewController menuToolbarController = PlayPadPlugin.getInstance().getMainViewController().getMenuToolbarController();
menuToolbarController.setKeyBindingForMenu(menuItem, keyCollection.getKey(PlayoutLogPlugin.KEY_COLLECTION_PLAYOUT));
final Key key = keyCollection.getKey(PlayoutLogPlugin.KEY_COLLECTION_PLAYOUT);
if (key != null) {
menuToolbarController.setKeyBindingForMenu(menuItem, key);
}
menuItem.setDisable(false); menuItem.setDisable(false);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment