Enables global hotkeys

Author: UrsKR

Campaign_Scribe/src/main/java/net/sf/anathema/scribe/perspective/ScribePerspective.java

@@ -2,12 +2,12 @@
 
 import net.sf.anathema.framework.IApplicationModel;
 import net.sf.anathema.framework.environment.Environment;
+import net.sf.anathema.framework.environment.dependencies.Weight;
 import net.sf.anathema.framework.environment.fx.UiEnvironment;
 import net.sf.anathema.framework.view.perspective.Container;
 import net.sf.anathema.framework.view.perspective.Perspective;
 import net.sf.anathema.framework.view.perspective.PerspectiveAutoCollector;
 import net.sf.anathema.framework.view.perspective.PerspectiveToggle;
-import net.sf.anathema.framework.environment.dependencies.Weight;
 import net.sf.anathema.lib.file.RelativePath;
 import net.sf.anathema.scribe.perspective.model.ScribeModel;
 import net.sf.anathema.scribe.perspective.presenter.ScribePresenter;
@@ -25,7 +25,7 @@ public void configureToggle(PerspectiveToggle toggle) {
 
   @Override
   public void initContent(Container container, IApplicationModel applicationModel, Environment environment, UiEnvironment uiEnvironment) {
-    ScribeView view = new ScribeView();
+    ScribeView view = new ScribeView(uiEnvironment);
     ScribeModel scribeModel = new ScribeModel(applicationModel);
     new ScribePresenter(scribeModel, view, environment).initPresentation();
     container.setContent(view.perspectivePane.getNode());

Campaign_Scribe/src/main/java/net/sf/anathema/scribe/perspective/view/ScribeNavigation.java

@@ -1,13 +1,18 @@
 package net.sf.anathema.scribe.perspective.view;
 
 import javafx.scene.control.Button;
+import net.sf.anathema.interaction.AcceleratorMap;
 import net.sf.anathema.interaction.Command;
 import net.sf.anathema.platform.fx.Navigation;
 import net.sf.anathema.platform.tool.Execute;
 import net.sf.anathema.scribe.scroll.persistence.ScrollReference;
 
 public class ScribeNavigation extends Navigation {
 
+  public ScribeNavigation(AcceleratorMap acceleratorMap) {
+    super(acceleratorMap);
+  }
+
   public void addScroll(ScrollReference reference, Command command) {
     Button button = new Button(reference.printName);
     button.getStyleClass().add("scribe-navigation-button");

Campaign_Scribe/src/main/java/net/sf/anathema/scribe/perspective/view/ScribeView.java

@@ -1,14 +1,16 @@
 package net.sf.anathema.scribe.perspective.view;
 
+import net.sf.anathema.interaction.AcceleratorMap;
 import net.sf.anathema.platform.fx.PerspectivePane;
 import net.sf.anathema.scribe.editor.view.FxScrollView;
 
 public class ScribeView {
   public final PerspectivePane perspectivePane = new PerspectivePane("skin/scribe/scribe.css");
   public final FxScrollView scrollView = new FxScrollView();
-  public final ScribeNavigation scribeNavigation = new ScribeNavigation();
+  public final ScribeNavigation scribeNavigation;
 
-  public ScribeView() {
+  public ScribeView(AcceleratorMap acceleratorMap) {
+    scribeNavigation = new ScribeNavigation(acceleratorMap);
     perspectivePane.addStyleSheetClass("scribe-perspective");
     perspectivePane.setNavigationComponent(scribeNavigation.getNode());
     perspectivePane.setContentComponent(scrollView.getNode());

Character_Equipment/src/main/java/net/sf/anathema/character/equipment/item/view/fx/FxEquipmentDatabaseView.java

@@ -1,19 +1,20 @@
 package net.sf.anathema.character.equipment.item.view.fx;
 
 import net.sf.anathema.character.equipment.item.view.AgnosticEquipmentDatabaseView;
-import net.sf.anathema.framework.environment.fx.DialogFactory;
+import net.sf.anathema.framework.environment.fx.UiEnvironment;
 import net.sf.anathema.platform.fx.PerspectivePane;
 import net.sf.anathema.platform.fx.selection.ComboBoxSelectionFactory;
 
 public class FxEquipmentDatabaseView {
 
   public final PerspectivePane perspectivePane = new PerspectivePane("skin/equipment/equipment.css", "skin/platform/dotselector.css");
-  private final FxEquipmentNavigation navigation = new FxEquipmentNavigation();
+  private final FxEquipmentNavigation navigation;
   private final FxEquipmentDetails details;
   public final AgnosticEquipmentDatabaseView view;
 
-  public FxEquipmentDatabaseView(DialogFactory dialogFactory) {
-    this.details = new FxEquipmentDetails(new ComboBoxSelectionFactory(), dialogFactory);
+  public FxEquipmentDatabaseView(UiEnvironment uiEnvironment) {
+    this.details = new FxEquipmentDetails(new ComboBoxSelectionFactory(), uiEnvironment);
+    this.navigation = new FxEquipmentNavigation(uiEnvironment);
     this.view = new AgnosticEquipmentDatabaseView(navigation, details);
     initializePerspective();
   }

Character_Equipment/src/main/java/net/sf/anathema/character/equipment/item/view/fx/FxEquipmentNavigation.java

@@ -2,6 +2,7 @@
 
 import net.sf.anathema.character.equipment.item.view.EquipmentNavigation;
 import net.sf.anathema.framework.repository.tree.FxVetor;
+import net.sf.anathema.interaction.AcceleratorMap;
 import net.sf.anathema.interaction.Tool;
 import net.sf.anathema.lib.gui.list.veto.Vetor;
 import net.sf.anathema.lib.gui.selection.VetoableObjectSelectionView;
@@ -12,7 +13,8 @@ public class FxEquipmentNavigation extends Navigation implements EquipmentNaviga
 
   private ListSelectionView<String> listView = new ListSelectionView<>();
 
-  public FxEquipmentNavigation() {
+  public FxEquipmentNavigation(AcceleratorMap acceleratorMap) {
+    super(acceleratorMap);
     addContainerToNavigation(listView.getNode());
   }
 

Character_Main_FX/src/main/java/net/sf/anathema/fx/hero/perspective/CharacterSystemView.java

@@ -1,19 +1,19 @@
 package net.sf.anathema.fx.hero.perspective;
 
 import javafx.scene.Node;
-import net.sf.anathema.framework.environment.fx.DialogFactory;
+import net.sf.anathema.framework.environment.fx.UiEnvironment;
 import net.sf.anathema.hero.framework.perspective.CharacterGridView;
-import net.sf.anathema.platform.view.InteractionView;
 import net.sf.anathema.platform.fx.PerspectivePane;
+import net.sf.anathema.platform.view.InteractionView;
 
 public class CharacterSystemView {
 
   private final PerspectivePane pane = new PerspectivePane();
   private final StackView stackView = new StackView();
   private final FxCharacterNavigation navigation;
 
-  public CharacterSystemView(DialogFactory dialogFactory) {
-    this.navigation = new FxCharacterNavigation(dialogFactory);
+  public CharacterSystemView(UiEnvironment uiEnvironment) {
+    this.navigation = new FxCharacterNavigation(uiEnvironment);
     pane.setNavigationComponent(navigation.getNode());
     pane.setContentComponent(stackView.getComponent());
   }

Character_Main_FX/src/main/java/net/sf/anathema/fx/hero/perspective/FxCharacterNavigation.java

@@ -1,6 +1,6 @@
 package net.sf.anathema.fx.hero.perspective;
 
-import net.sf.anathema.framework.environment.fx.DialogFactory;
+import net.sf.anathema.framework.environment.fx.UiEnvironment;
 import net.sf.anathema.hero.creation.CharacterTemplateCreator;
 import net.sf.anathema.hero.framework.perspective.CharacterButtonDto;
 import net.sf.anathema.hero.framework.perspective.CharacterGridView;
@@ -13,8 +13,9 @@
 public class FxCharacterNavigation extends Navigation implements InteractionView, CharacterGridView {
   private final CharacterGridFxView gridView;
 
-  public FxCharacterNavigation(DialogFactory dialogFactory) {
-    this.gridView = new CharacterGridFxView(dialogFactory);
+  public FxCharacterNavigation(UiEnvironment uiEnvironment) {
+    super(uiEnvironment);
+    this.gridView = new CharacterGridFxView(uiEnvironment);
     addContainerToNavigation(gridView.getNode());
   }
 

Platform_FX/src/main/java/net/sf/anathema/platform/fx/Navigation.java

@@ -1,10 +1,10 @@
 package net.sf.anathema.platform.fx;
 
 import javafx.scene.Node;
-import javafx.scene.Scene;
 import javafx.scene.control.ToolBar;
 import net.miginfocom.layout.AC;
 import net.miginfocom.layout.CC;
+import net.sf.anathema.interaction.AcceleratorMap;
 import net.sf.anathema.interaction.ToggleTool;
 import net.sf.anathema.interaction.Tool;
 import net.sf.anathema.platform.tool.FxBaseTool;
@@ -19,8 +19,10 @@ public class Navigation {
   private MigPane pane = new MigPane(withoutInsets().gridGap("0", "2").wrapAfter(1), new AC().grow().fill(), new AC().fill());
   private MigPane navigation = new MigPane(withoutInsets().gridGap("0", "2").wrapAfter(1), new AC().grow().fill(), new AC().fill());
   private ToolBar toolBar = new ToolBar();
+  private final AcceleratorMap acceleratorMap;
 
-  public Navigation() {
+  public Navigation(AcceleratorMap acceleratorMap) {
+    this.acceleratorMap = acceleratorMap;
     pane.add(toolBar, new CC().width("100%").grow());
     pane.add(navigation, new CC().push());
   }
@@ -54,11 +56,8 @@ public Node getNode() {
     return pane;
   }
 
-  protected void addTool(final FxBaseTool fxButtonTool) {
+  protected void addTool(FxBaseTool fxButtonTool) {
     toolBar.getItems().add(fxButtonTool.getNode());
-    Scene scene = toolBar.getScene();
-        /*ObservableMap<KeyCombination, Runnable> accelerators = scene.getAccelerators();
-        FxAcceleratorMap acceleratorMap = new FxAcceleratorMap(accelerators);
-        fxButtonTool.registerHotkeyIn(acceleratorMap);*/
+    fxButtonTool.registerHotkeyIn(acceleratorMap);
   }
 }

Platform_Preferences/src/main/java/net/sf/anathema/framework/preferences/perspective/FxPreferencesNavigation.java

@@ -3,6 +3,7 @@
 import javafx.scene.control.Button;
 import net.sf.anathema.framework.preferences.elements.PreferenceView;
 import net.sf.anathema.initialization.InitializationException;
+import net.sf.anathema.interaction.AcceleratorMap;
 import net.sf.anathema.platform.fx.Navigation;
 import net.sf.anathema.platform.fx.NodeHolder;
 
@@ -12,7 +13,8 @@ public class FxPreferencesNavigation extends Navigation implements PreferencesNa
   private final ArrayList<PreferenceView> availableViews;
   private final FxPreferencesView preferencesView;
 
-  public FxPreferencesNavigation(ArrayList<PreferenceView> preferenceViews, FxPreferencesView preferencesView) {
+  public FxPreferencesNavigation(ArrayList<PreferenceView> preferenceViews, FxPreferencesView preferencesView, AcceleratorMap uiEnvironment) {
+    super(uiEnvironment);
     this.availableViews = preferenceViews;
     this.preferencesView = preferencesView;
   }

Platform_Preferences/src/main/java/net/sf/anathema/framework/preferences/perspective/PreferencesSystemView.java

@@ -15,7 +15,7 @@ public class PreferencesSystemView {
   public PreferencesSystemView(ObjectFactory objectFactory) {
     Collection<PreferenceView> views = objectFactory.instantiateAllImplementers(PreferenceView.class);
     this.preferencesView = new FxPreferencesView();
-    this.preferencesNavigation = new FxPreferencesNavigation(new ArrayList<>(views), preferencesView);
+    this.preferencesNavigation = new FxPreferencesNavigation(new ArrayList<>(views), preferencesView, null);
     perspectivePane.setNavigationComponent(preferencesNavigation.getNode());
     perspectivePane.setContentComponent(preferencesView.getNode());
   }