From e557206bce180096e6d57f6177f6941bd710f369 Mon Sep 17 00:00:00 2001
From: iMoHax <born19th@gmail.com>
Date: Mon, 5 Dec 2016 16:58:00 +0300
Subject: [PATCH] add Edit to context menu on PowerPlay screen

---
 .../controllers/PowerPlayController.java      | 28 +++++++++----
 client/src/main/resources/view/powerplay.fxml | 41 ++++++-------------
 2 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/client/src/main/java/ru/trader/controllers/PowerPlayController.java b/client/src/main/java/ru/trader/controllers/PowerPlayController.java
index 32e0c2c..4e1da9a 100644
--- a/client/src/main/java/ru/trader/controllers/PowerPlayController.java
+++ b/client/src/main/java/ru/trader/controllers/PowerPlayController.java
@@ -414,25 +414,37 @@ public class PowerPlayController {
         historySystems.getItems().clear();
     }
 
-
-    @FXML
-    private void copySystemToClipboard(){
-        SystemModel starSystem = null;
-        if (historySystems.isFocused()) starSystem = historySystems.getSelectionModel().getSelectedItem();
-        if (controlSystems.isFocused()) starSystem = controlSystems.getSelectionModel().getSelectedItem();
+    private SystemModel getFocusedSystem(){
+        if (historySystems.isFocused()) return historySystems.getSelectionModel().getSelectedItem();
+        if (controlSystems.isFocused()) return controlSystems.getSelectionModel().getSelectedItem();
         if (tblResults.isFocused()){
             ResultEntry entry = tblResults.getSelectionModel().getSelectedItem();
-            starSystem = entry != null ? entry.starSystem : null;
+            return entry != null ? entry.starSystem : null;
         }
         if (tblDetail.isFocused()){
             ResultEntry entry = tblDetail.getSelectionModel().getSelectedItem();
-            starSystem = entry != null ? entry.starSystem : null;
+            return entry != null ? entry.starSystem : null;
         }
+        return null;
+    }
+
+    @FXML
+    private void copySystemToClipboard(){
+        SystemModel starSystem = getFocusedSystem();
         if (starSystem != null){
             Main.copyToClipboard(starSystem.getName());
         }
     }
 
+    @FXML
+    private void editSystem(){
+        SystemModel starSystem = getFocusedSystem();
+        if (starSystem != null){
+            Screeners.showSystemsEditor(starSystem);
+        }
+    }
+
+
     public class ResultEntry {
         private final SystemModel starSystem;
         private final ReadOnlyStringProperty nearStations;
diff --git a/client/src/main/resources/view/powerplay.fxml b/client/src/main/resources/view/powerplay.fxml
index 96160ea..deaf1b5 100644
--- a/client/src/main/resources/view/powerplay.fxml
+++ b/client/src/main/resources/view/powerplay.fxml
@@ -14,6 +14,15 @@
       prefHeight="500"  >
     <fx:define><Insets fx:id="tablePadding" left="0" right="0" top="0" bottom="0" /></fx:define>
     <fx:define><Insets fx:id="summPadding" left="4" right="4" top="4" bottom="4" /></fx:define>
+    <fx:define>
+        <ContextMenu fx:id="ctxMenu">
+            <items>
+                <MenuItem text="%dialog.button.copy" accelerator="Shortcut+C" onAction="#copySystemToClipboard" />
+                <MenuItem text="%dialog.button.edit" accelerator="Shortcut+E" onAction="#editSystem" />
+            </items>
+        </ContextMenu>
+    </fx:define>
+
     <TitledPane text="%powerplay.analyze.title" collapsible="false">
     <HBox spacing="50" alignment="CENTER" minHeight="230" maxHeight="230">
         <VBox minWidth="250" maxWidth="250" spacing="4">
@@ -24,13 +33,7 @@
             </HBox>
             <HBox spacing="4" alignment="CENTER" VBox.vgrow="ALWAYS" HBox.hgrow="ALWAYS">
                 <ListView fx:id="historySystems" HBox.hgrow="ALWAYS">
-                    <contextMenu>
-                        <ContextMenu>
-                            <items>
-                                <MenuItem text="%dialog.button.copy" accelerator="Shortcut+C" onAction="#copySystemToClipboard" />
-                            </items>
-                        </ContextMenu>
-                    </contextMenu>
+                    <contextMenu><fx:reference source="ctxMenu"/></contextMenu>
                 </ListView>
                 <VBox spacing="4">
                     <Button prefWidth="30" onAction="#addHistorySystem"><graphic><Glyph text="FontAwesome|PLUS"/></graphic></Button>
@@ -71,13 +74,7 @@
             </HBox>
             <HBox spacing="4" alignment="CENTER" VBox.vgrow="ALWAYS" HBox.hgrow="ALWAYS">
                 <ListView fx:id="controlSystems" HBox.hgrow="ALWAYS">
-                    <contextMenu>
-                        <ContextMenu>
-                            <items>
-                                <MenuItem text="%dialog.button.copy" accelerator="Shortcut+C" onAction="#copySystemToClipboard" />
-                            </items>
-                        </ContextMenu>
-                    </contextMenu>
+                    <contextMenu><fx:reference source="ctxMenu"/></contextMenu>
                 </ListView>
                 <VBox spacing="4">
                     <Button prefWidth="30" onAction="#addControlSystem"><graphic><Glyph text="FontAwesome|PLUS"/></graphic></Button>
@@ -150,13 +147,7 @@
                 <columnResizePolicy>
                     <TableView fx:constant="UNCONSTRAINED_RESIZE_POLICY"/>
                 </columnResizePolicy>
-                <contextMenu>
-                    <ContextMenu>
-                        <items>
-                            <MenuItem text="%dialog.button.copy" accelerator="Shortcut+C" onAction="#copySystemToClipboard" />
-                        </items>
-                    </ContextMenu>
-                </contextMenu>
+                <contextMenu><fx:reference source="ctxMenu"/></contextMenu>
             </TableView>
                 <ScrollPane minHeight="50">
                     <VBox spacing="4" padding="$summPadding">
@@ -210,13 +201,7 @@
                 <columnResizePolicy>
                     <TableView fx:constant="UNCONSTRAINED_RESIZE_POLICY"/>
                 </columnResizePolicy>
-                <contextMenu>
-                    <ContextMenu>
-                        <items>
-                            <MenuItem text="%dialog.button.copy" accelerator="Shortcut+C" onAction="#copySystemToClipboard" />
-                        </items>
-                    </ContextMenu>
-                </contextMenu>
+                <contextMenu><fx:reference source="ctxMenu"/></contextMenu>
             </TableView>
                 <ScrollPane minHeight="50">
                     <VBox spacing="4" padding="$summPadding">