Explorar el Código

MenuItems ready for assigning actions to them.
Added the menu items, which we still needed, to the menu bar and created
the back-end for assigning actions to them.

Julian Ohl hace 8 años
padre
commit
e856d10225

+ 54 - 3
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/GUIController.java

@@ -16,6 +16,7 @@ import javafx.fxml.Initializable;
 import javafx.scene.control.Button;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
+import javafx.scene.control.MenuItem;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.TableCell;
 import javafx.scene.control.TableColumn;
@@ -72,7 +73,34 @@ public class GUIController implements Initializable {
 	public TableColumn<KeyValuePair, String> propertiesStringColumn;
 	@FXML
 	public TableColumn propertiesObjectColumn;
-
+	
+	
+	//The different menu items in the menu bar at the top
+	@FXML
+	public MenuItem newFileMenuItem;
+	
+	@FXML
+	public MenuItem openFileMenuItem;
+	
+	@FXML
+	public MenuItem saveFileMenuItem;
+	
+	@FXML
+	public MenuItem saveAsFileMenuItem;
+	
+	@FXML
+	public MenuItem deleteMenuItem;
+	
+	@FXML
+	public MenuItem undoMenuItem;
+	
+	@FXML
+	public MenuItem selectNodeMenuItem;
+	
+	@FXML
+	public MenuItem selectEdgeMenuItem;
+	
+	
 	/**
 	 * Initializes all the references to the UI elements specified in the FXML
 	 * file. Gets called during FXML loading. Asserts the correct injection of
@@ -100,7 +128,16 @@ public class GUIController implements Initializable {
 
 		assert propertiesStringColumn != null : "fx:id=\"propertiesString\" was not injected: check your FXML file 'NewBetterCoolerWindowTest.fxml'.";
 		assert propertiesObjectColumn != null : "fx:id=\"propertiesObject\" was not injected: check your FXML file 'NewBetterCoolerWindowTest.fxml'.";
-
+		
+		assert newFileMenuItem != null : "fx:id=\"newFileMenuItem\" was not injected: check your FXML file 'NewBetterCoolerWindowTest.fxml'.";
+		assert openFileMenuItem != null : "fx:id=\"openFileMenuItem\" was not injected: check your FXML file 'NewBetterCoolerWindowTest.fxml'.";
+		assert saveFileMenuItem != null : "fx:id=\"saveFileMenuItem\" was not injected: check your FXML file 'NewBetterCoolerWindowTest.fxml'.";
+		assert saveAsFileMenuItem != null : "fx:id=\"saveAsFileMenuItem\" was not injected: check your FXML file 'NewBetterCoolerWindowTest.fxml'.";
+		assert deleteMenuItem != null : "fx:id=\"deleteMenuItem\" was not injected: check your FXML file 'NewBetterCoolerWindowTest.fxml'.";
+		assert undoMenuItem != null : "fx:id=\"undoMenuItem\" was not injected: check your FXML file 'NewBetterCoolerWindowTest.fxml'.";
+		assert selectNodeMenuItem != null : "fx:id=\"selectNodeMenuItem\" was not injected: check your FXML file 'NewBetterCoolerWindowTest.fxml'.";
+		assert selectEdgeMenuItem != null : "fx:id=\"selectEdgeMenuItem\" was not injected: check your FXML file 'NewBetterCoolerWindowTest.fxml'.";
+		
 		initializeToolbox();
 		initializeProperties();
 		
@@ -115,11 +152,25 @@ public class GUIController implements Initializable {
 		GraphManager.setGuiController(this);
 
 		// Bind all the handlers to their corresponding UI elements
+		initializeMenuBarItems();
 		initializeZoomButtons();
 		initializeCreateButtons();
 		initializeDisplayPane();
 	}
-
+	
+	/**
+	 * Sets the handlers for the items of the menu bar
+	 */
+	private void initializeMenuBarItems(){
+		newFileMenuItem.setOnAction(MenuBarManager.newFileHandler);
+		openFileMenuItem.setOnAction(MenuBarManager.openFileHandler);
+		saveFileMenuItem.setOnAction(MenuBarManager.saveFileHandler);
+		saveAsFileMenuItem.setOnAction(MenuBarManager.saveAsFileHandler);
+		deleteMenuItem.setOnAction(MenuBarManager.deleteHandler);
+		undoMenuItem.setOnAction(MenuBarManager.undoHandler);
+		
+	}
+	
 	/**
 	 * Sets the handlers for the zoomin and zoomout buttons.
 	 */

+ 46 - 9
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/MenuBarManager.java

@@ -4,22 +4,59 @@ import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 
 public class MenuBarManager {
+
 	
-	// Handler for NewFile MenuItem
 	public static EventHandler<ActionEvent> newFileHandler = new EventHandler<ActionEvent>() {
-		
+
 		@Override
-        public void handle(ActionEvent t) {
-			
-        }
+		public void handle(ActionEvent t) {
+
+		}
 	};
+
 	
-	// Handler for OpenFile MenuItem
 	public static EventHandler<ActionEvent> openFileHandler = new EventHandler<ActionEvent>() {
-		
+
 		@Override
-        public void handle(ActionEvent t) {
+		public void handle(ActionEvent t) {
+
+		}
+	};
+
 	
-        }
+	public static EventHandler<ActionEvent> saveFileHandler = new EventHandler<ActionEvent>() {
+
+		@Override
+		public void handle(ActionEvent t) {
+
+		}
 	};
+
+	
+	public static EventHandler<ActionEvent> saveAsFileHandler = new EventHandler<ActionEvent>() {
+
+		@Override
+		public void handle(ActionEvent t) {
+			
+		}
+	};
+
+	
+	public static EventHandler<ActionEvent> deleteHandler = new EventHandler<ActionEvent>() {
+
+		@Override
+		public void handle(ActionEvent t) {
+
+		}
+	};
+
+	
+	public static EventHandler<ActionEvent> undoHandler = new EventHandler<ActionEvent>() {
+
+		@Override
+		public void handle(ActionEvent t) {
+
+		}
+	};
+
 }

+ 9 - 6
scopviz/src/main/resources/NewBetterCoolerWindowTest.fxml

@@ -20,13 +20,13 @@
       <menus>
         <Menu mnemonicParsing="false" text="File">
           <items>
-            <MenuItem mnemonicParsing="false" text="New" />
-            <MenuItem mnemonicParsing="false" text="Open…" />
+            <MenuItem fx:id="newFileMenuItem" mnemonicParsing="false" text="New" />
+            <MenuItem fx:id="openFileMenuItem" mnemonicParsing="false" text="Open…" />
             <Menu mnemonicParsing="false" text="Open Recent" />
             <SeparatorMenuItem mnemonicParsing="false" />
             <MenuItem mnemonicParsing="false" text="Close" />
-            <MenuItem mnemonicParsing="false" text="Save" />
-            <MenuItem mnemonicParsing="false" text="Save As…" />
+            <MenuItem fx:id="saveFileMenuItem" mnemonicParsing="false" text="Save" />
+            <MenuItem fx:id="saveAsFileMenuItem" mnemonicParsing="false" text="Save As…" />
             <MenuItem mnemonicParsing="false" text="Revert" />
             <SeparatorMenuItem mnemonicParsing="false" />
             <MenuItem mnemonicParsing="false" text="Preferences…" />
@@ -36,13 +36,16 @@
         </Menu>
         <Menu mnemonicParsing="false" text="Edit">
           <items>
-            <MenuItem mnemonicParsing="false" text="Undo" />
+            <MenuItem fx:id="undoMenuItem" mnemonicParsing="false" text="Undo" />
             <MenuItem mnemonicParsing="false" text="Redo" />
             <SeparatorMenuItem mnemonicParsing="false" />
             <MenuItem mnemonicParsing="false" text="Cut" />
             <MenuItem mnemonicParsing="false" text="Copy" />
             <MenuItem mnemonicParsing="false" text="Paste" />
-            <MenuItem mnemonicParsing="false" text="Delete" />
+            <MenuItem fx:id="deleteMenuItem" mnemonicParsing="false" text="Delete" />
+            <SeparatorMenuItem mnemonicParsing="false" />
+            <MenuItem fx:id="selectNodeMenuItem" mnemonicParsing="false" text="Knotenmodus" />
+            <MenuItem fx:id="selectEdgeMenuItem" mnemonicParsing="false" text="Kantenmodus" />
             <SeparatorMenuItem mnemonicParsing="false" />
             <MenuItem mnemonicParsing="false" text="Select All" />
             <MenuItem mnemonicParsing="false" text="Unselect All" />