diff --git a/src/main/java/com/r0r5chach/Manager.java b/src/main/java/com/r0r5chach/Manager.java index 4dd0256..2ee8227 100644 --- a/src/main/java/com/r0r5chach/Manager.java +++ b/src/main/java/com/r0r5chach/Manager.java @@ -4,11 +4,13 @@ import java.io.File; import javafx.application.Application; import java.io.IOException; +import com.r0r5chach.controllers.Controller; +import com.r0r5chach.controllers.EditController; import com.r0r5chach.controllers.MainController; +import com.r0r5chach.controllers.ViewController; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; -import javafx.stage.Popup; import javafx.stage.Stage; import javafx.scene.Scene; import static com.r0r5chach.CompetitorList.createErrorLog; @@ -16,11 +18,12 @@ import static com.r0r5chach.CompetitorList.createErrorLog; public class Manager extends Application { private static Scene scene; - private static Stage stage; - private static Popup filters; + public static Stage stage; + private static CompetitorList competitors; @Override public void start(Stage stage) throws IOException { + competitors = createList(); scene = new Scene(loadFXML("main"), 640, 480); Manager.stage = stage; Manager.stage.setScene(scene); @@ -36,11 +39,25 @@ public class Manager extends Application { scene.setRoot(loadFXML(fxml)); } - private static Parent loadFXML(String fxml) throws IOException { + public static Parent loadFXML(String fxml) throws IOException { FXMLLoader fxmlLoader = new FXMLLoader(Manager.class.getResource(fxml + ".fxml")); Parent root = fxmlLoader.load(); - MainController controller = fxmlLoader.getController(); - controller.setCompetitors(createList()); + Controller controller; + switch(fxml) { + case "main": + controller = fxmlLoader.getController(); + controller.setCompetitors(competitors); + break; + case "pages/edit": + controller = fxmlLoader.getController(); + controller.setCompetitors(competitors); + break; + case "pages/view": + controller = fxmlLoader.getController(); + controller.setCompetitors(competitors); + break; + } + return root; } @@ -63,16 +80,4 @@ public class Manager extends Application { } return competitors; } - - public static void filtersOpen() throws IOException { - filters = new Popup(); - FXMLLoader loader = new FXMLLoader(Manager.class.getResource("pages/filters.fxml")); - filters.getContent().add((Parent)loader.load()); - filters.show(Manager.stage); - } - - public static void filtersClose() { - filters.hide(); - } - } diff --git a/src/main/java/com/r0r5chach/controllers/Controller.java b/src/main/java/com/r0r5chach/controllers/Controller.java new file mode 100644 index 0000000..2e90c14 --- /dev/null +++ b/src/main/java/com/r0r5chach/controllers/Controller.java @@ -0,0 +1,60 @@ +package com.r0r5chach.controllers; + +import java.io.IOException; +import java.net.URL; +import java.util.ArrayList; +import java.util.ResourceBundle; + +import com.r0r5chach.CompetitorList; +import com.r0r5chach.Manager; +import com.r0r5chach.competitor.Competitor; + +import javafx.application.Platform; +import javafx.fxml.FXML; +import javafx.fxml.Initializable; +import javafx.scene.Parent; +import javafx.scene.layout.AnchorPane; + +public class Controller implements Initializable { + @FXML + protected AnchorPane editTab; + + @FXML + protected AnchorPane viewTab; + + protected CompetitorList competitors; + protected ArrayList competitorIds; + + public void setCompetitors(CompetitorList competitors) { + this.competitors = competitors; + } + + @Override + public void initialize(URL location, ResourceBundle resources) { + Platform.runLater(() -> { + loadCompetitors(); + + }); + } + + @FXML + protected void getEditTab() throws IOException { + Parent root = Manager.loadFXML("pages/edit"); + editTab.getChildren().clear(); + editTab.getChildren().add(root); + } + + @FXML + protected void getViewTab() throws IOException { + Parent root = Manager.loadFXML("pages/view"); + viewTab.getChildren().clear(); + viewTab.getChildren().add(root); + } + + protected void loadCompetitors(){ + competitorIds = new ArrayList(); + for (Competitor player : competitors.getCompetitors()) { + competitorIds.add(player.getPlayerNumber()); + } + } +} diff --git a/src/main/java/com/r0r5chach/controllers/EditController.java b/src/main/java/com/r0r5chach/controllers/EditController.java index 65de57b..c4d5fa6 100644 --- a/src/main/java/com/r0r5chach/controllers/EditController.java +++ b/src/main/java/com/r0r5chach/controllers/EditController.java @@ -1,5 +1,8 @@ package com.r0r5chach.controllers; +import java.net.URL; +import java.util.Arrays; +import java.util.ResourceBundle; import com.r0r5chach.competitor.Competitor; import com.r0r5chach.competitor.Name; import com.r0r5chach.competitor.Rank; @@ -9,65 +12,162 @@ import com.r0r5chach.competitor.r6.R6Player; import com.r0r5chach.competitor.valorant.ValorantAgent; import com.r0r5chach.competitor.valorant.ValorantPlayer; +import javafx.application.Platform; +import javafx.collections.FXCollections; +import javafx.fxml.FXML; +import javafx.scene.control.Button; import javafx.scene.control.ChoiceBox; +import javafx.scene.control.ListView; import javafx.scene.control.TextField; import javafx.scene.text.Text; -public class EditController { - public static void loadPlayer(Competitor player, TextField[] textFields, ChoiceBox level) { + +public class EditController extends Controller { + + @FXML + private ListView competitorsList; + + @FXML + private TextField playerNumber; + + @FXML + private TextField playerName; + + @FXML + private ChoiceBox playerLevel; + + @FXML + private Text favoriteCharacters; + + @FXML + private ChoiceBox favoriteAttacker; + + @FXML + private ChoiceBox favoriteAgent; + + @FXML + private ChoiceBox favoriteDefender; + + @FXML + private TextField scores0; + + @FXML + private TextField scores1; + + @FXML + private TextField scores2; + + @FXML + private TextField scores3; + + @FXML + private TextField scores4; + + @FXML + private TextField scores5; + + @FXML + private TextField overallScore; + + @FXML + private Button updateButton; + + private TextField[] textFields; + + private TextField[] scoreFields; + + @Override + public void initialize(URL location, ResourceBundle resources) { + Platform.runLater(() -> { + textFields = new TextField[]{playerNumber, playerName, overallScore}; + scoreFields = new TextField[]{scores0, scores1, scores2, scores3, scores4, scores5}; + loadCompetitors(); + loadEdit(); + }); + } + + + private void loadPlayer(Competitor player) { textFields[0].setText(String.valueOf(player.getPlayerNumber())); textFields[1].setText(player.getPlayerName().getFullName()); - level.getSelectionModel().select(player.getPlayerLevel());; + playerLevel.getSelectionModel().select(player.getPlayerLevel());; textFields[2].setText(String.valueOf(player.getOverallScore())); + loadFavoriteCharacters(player); + loadScores(player); } - public static void loadFavoriteCharacters(Competitor player, ChoiceBox attacker, ChoiceBox defender, ChoiceBox agent, Text field) { + private void loadFavoriteCharacters(Competitor player) { if (player instanceof R6Player) { - attacker.getSelectionModel().select(((R6Player) player).getFavoriteAttacker()); - defender.getSelectionModel().select((((R6Player) player).getFavoriteDefender())); - agent.visibleProperty().set(false); - attacker.visibleProperty().set(true); - defender.visibleProperty().set(true); - field.setText("Favorite Operators"); + favoriteAttacker.getSelectionModel().select(((R6Player) player).getFavoriteAttacker()); + favoriteDefender.getSelectionModel().select((((R6Player) player).getFavoriteDefender())); + favoriteAgent.visibleProperty().set(false); + favoriteAttacker.visibleProperty().set(true); + favoriteDefender.visibleProperty().set(true); + favoriteCharacters.setText("Favorite Operators"); } else if (player instanceof ValorantPlayer) { - agent.getSelectionModel().select(((ValorantPlayer) player).getFavoriteAgent()); - agent.visibleProperty().set(true); - attacker.visibleProperty().set(false); - defender.visibleProperty().set(false); - field.setText("Favorite Agent"); + favoriteAgent.getSelectionModel().select(((ValorantPlayer) player).getFavoriteAgent()); + favoriteAgent.visibleProperty().set(true); + favoriteAttacker.visibleProperty().set(false); + favoriteDefender.visibleProperty().set(false); + favoriteCharacters.setText("Favorite Agent"); } } - public static void loadScores(Competitor player, TextField[] fields) { + private void loadScores(Competitor player) { int[] playerScores = player.getScores(); for (int i = 0; i < playerScores.length; i++) { - fields[i].setText(String.valueOf(playerScores[i])); + scoreFields[i].setText(String.valueOf(playerScores[i])); } } - public static void updatePlayer(Competitor player, TextField[] fields, ChoiceBox level) { - player.setPlayerNumber(Integer.parseInt(fields[0].getText())); - player.setPlayerName(new Name(fields[1].getText())); - player.setPlayerLevel(level.getValue()); + private void updatePlayer(Competitor player) { + player.setPlayerNumber(Integer.parseInt(textFields[0].getText())); + player.setPlayerName(new Name(textFields[1].getText())); + player.setPlayerLevel(playerLevel.getValue()); + updateFavoriteCharacters(player); + updateScores(player); } - public static void updateFavoriteCharacters(Competitor player, ChoiceBox attacker, ChoiceBox defender, ChoiceBox agent) { + private void updateFavoriteCharacters(Competitor player) { if (player instanceof R6Player) { - ((R6Player) player).setFavoriteAttacker(attacker.getValue()); - ((R6Player) player).setFavoriteDefender(defender.getValue()); + ((R6Player) player).setFavoriteAttacker(favoriteAttacker.getValue()); + ((R6Player) player).setFavoriteDefender(favoriteDefender.getValue()); } else if (player instanceof ValorantPlayer) { - ((ValorantPlayer) player).setFavoriteAgent(agent.getValue()); + ((ValorantPlayer) player).setFavoriteAgent(favoriteAgent.getValue()); } } - public static void updateScores(Competitor player, TextField[] fields) { + private void updateScores(Competitor player) { int[] newScores = new int[6]; for (int i = 0; i < newScores.length; i++) { - newScores[i] = Integer.parseInt(fields[i].getText()); + newScores[i] = Integer.parseInt(scoreFields[i].getText()); } player.setScores(newScores); } -} + @FXML + private void getCompetitor() { + Competitor player = competitors.getCompetitors().get(competitorIds.indexOf(competitorsList.getSelectionModel().getSelectedItem())); + loadPlayer(player); + } + + @FXML + private void updateCompetitor() { + int playerIndex = competitorIds.indexOf(competitorsList.getSelectionModel().getSelectedItem()); + Competitor player = competitors.getCompetitors().get(playerIndex); + updatePlayer(player); + competitorIds.set(playerIndex, player.getPlayerNumber()); + loadEdit(); + loadPlayer(player); + } + + public void loadEdit() { + competitorsList.setItems(FXCollections.observableList(competitorIds)); + playerLevel.setItems(FXCollections.observableList(Arrays.asList(Rank.values()))); + favoriteAttacker.setItems(FXCollections.observableList(Arrays.asList(R6Attacker.values()))); + favoriteDefender.setItems(FXCollections.observableList(Arrays.asList(R6Defender.values()))); + favoriteAgent.setItems(FXCollections.observableList(Arrays.asList(ValorantAgent.values()))); + } +} \ No newline at end of file diff --git a/src/main/java/com/r0r5chach/controllers/FiltersController.java b/src/main/java/com/r0r5chach/controllers/FiltersController.java index 32af575..3ec4b15 100644 --- a/src/main/java/com/r0r5chach/controllers/FiltersController.java +++ b/src/main/java/com/r0r5chach/controllers/FiltersController.java @@ -1,6 +1,5 @@ package com.r0r5chach.controllers; -import com.r0r5chach.Manager; import com.r0r5chach.competitor.Rank; import com.r0r5chach.competitor.valorant.ValorantAgent; @@ -27,9 +26,4 @@ public class FiltersController { @FXML ChoiceBox agentFilter; - - @FXML - private void filterSave() { - Manager.filtersClose(); - } } diff --git a/src/main/java/com/r0r5chach/controllers/MainController.java b/src/main/java/com/r0r5chach/controllers/MainController.java index 2b3f2a7..947a35f 100644 --- a/src/main/java/com/r0r5chach/controllers/MainController.java +++ b/src/main/java/com/r0r5chach/controllers/MainController.java @@ -1,157 +1,5 @@ package com.r0r5chach.controllers; -import java.io.IOException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.ResourceBundle; +public class MainController extends Controller { -import com.r0r5chach.CompetitorList; -import com.r0r5chach.Manager; -import com.r0r5chach.competitor.Competitor; -import com.r0r5chach.competitor.Rank; -import com.r0r5chach.competitor.r6.R6Attacker; -import com.r0r5chach.competitor.r6.R6Defender; -import com.r0r5chach.competitor.valorant.ValorantAgent; -import com.r0r5chach.pages.CompetitorRow; -import javafx.application.Platform; -import javafx.collections.FXCollections; -import javafx.fxml.FXML; -import javafx.fxml.Initializable; -import javafx.scene.control.Button; -import javafx.scene.control.ChoiceBox; -import javafx.scene.control.ListView; -import javafx.scene.control.TableView; -import javafx.scene.control.TextField; -import javafx.scene.text.Text; - -import static com.r0r5chach.controllers.EditController.loadFavoriteCharacters; -import static com.r0r5chach.controllers.EditController.loadPlayer; -import static com.r0r5chach.controllers.EditController.loadScores; -import static com.r0r5chach.controllers.EditController.updateFavoriteCharacters; -import static com.r0r5chach.controllers.EditController.updatePlayer; -import static com.r0r5chach.controllers.EditController.updateScores; -import static com.r0r5chach.controllers.ViewController.generateTable; -import static com.r0r5chach.controllers.ViewController.loadTable; - -public class MainController implements Initializable { - private CompetitorList competitors; - private ArrayList competitorIds; - private TextField[] scores; - private TextField[] fields; - - @FXML - private ListView competitorsList; - - @FXML - private TextField playerNumber; - - @FXML - private TextField playerName; - - @FXML - private ChoiceBox playerLevel; - - @FXML - private Text favoriteCharacters; - - @FXML - private ChoiceBox favoriteAttacker; - - @FXML - private ChoiceBox favoriteAgent; - - @FXML - private ChoiceBox favoriteDefender; - - @FXML - private TextField scores0; - - @FXML - private TextField scores1; - - @FXML - private TextField scores2; - - @FXML - private TextField scores3; - - @FXML - private TextField scores4; - - @FXML - private TextField scores5; - - @FXML - private TextField overallScore; - - @FXML - private Button updateButton; - - @FXML - private TableView competitorTable; - - @Override - public void initialize(URL url, ResourceBundle rb) { - Platform.runLater(() -> { - scores = new TextField[]{scores0, scores1, scores2, scores3, scores4, scores5}; - fields = new TextField[]{playerNumber, playerName, overallScore}; - loadCompetitors(); - generateTable(competitorTable); - loadEdit(); - }); - - } - - public void setCompetitors(CompetitorList competitors) { - this.competitors = competitors; - } - - @FXML - private void getCompetitor() { - Competitor player = competitors.getCompetitors().get(competitorIds.indexOf(competitorsList.getSelectionModel().getSelectedItem())); - loadPlayer(player,fields, playerLevel); - loadFavoriteCharacters(player, favoriteAttacker, favoriteDefender, favoriteAgent, favoriteCharacters); - loadScores(player, scores); - } - - @FXML - private void updateCompetitor() { - int playerIndex = competitorIds.indexOf(competitorsList.getSelectionModel().getSelectedItem()); - Competitor player = competitors.getCompetitors().get(playerIndex); - updatePlayer(player, fields, playerLevel); - updateFavoriteCharacters(player, favoriteAttacker, favoriteDefender, favoriteAgent); - updateScores(player, scores); - competitorIds.set(playerIndex, player.getPlayerNumber()); - loadEdit(); - loadPlayer(player, fields, playerLevel); - loadFavoriteCharacters(player, favoriteAttacker, favoriteDefender, favoriteAgent, favoriteCharacters); - loadScores(player, scores); - } - - private void loadCompetitors(){ - competitorIds = new ArrayList(); - for (Competitor player : competitors.getCompetitors()) { - competitorIds.add(player.getPlayerNumber()); - } - } - - @FXML - private void loadEdit() { - competitorsList.setItems(FXCollections.observableList(competitorIds)); - playerLevel.setItems(FXCollections.observableList(Arrays.asList(Rank.values()))); - favoriteAttacker.setItems(FXCollections.observableList(Arrays.asList(R6Attacker.values()))); - favoriteDefender.setItems(FXCollections.observableList(Arrays.asList(R6Defender.values()))); - favoriteAgent.setItems(FXCollections.observableList(Arrays.asList(ValorantAgent.values()))); - } - - @FXML - private void loadView() { - competitorTable.setItems(loadTable(competitors.getCompetitors())); - } - - @FXML - private void filterPress() throws IOException { - Manager.filtersOpen(); - } } \ No newline at end of file diff --git a/src/main/java/com/r0r5chach/controllers/ViewController.java b/src/main/java/com/r0r5chach/controllers/ViewController.java index 1c74fb1..be656ba 100644 --- a/src/main/java/com/r0r5chach/controllers/ViewController.java +++ b/src/main/java/com/r0r5chach/controllers/ViewController.java @@ -1,48 +1,60 @@ package com.r0r5chach.controllers; +import java.io.IOException; +import java.net.URL; import java.util.ArrayList; +import java.util.ResourceBundle; import com.r0r5chach.CompetitorRow; +import com.r0r5chach.Manager; import com.r0r5chach.competitor.Competitor; import com.r0r5chach.competitor.Rank; import com.r0r5chach.competitor.r6.R6Player; import com.r0r5chach.competitor.valorant.ValorantPlayer; +import javafx.application.Platform; import javafx.collections.FXCollections; import javafx.collections.ObservableList; +import javafx.fxml.FXML; +import javafx.scene.Parent; +import javafx.scene.control.Button; import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; import javafx.scene.control.cell.PropertyValueFactory; +import javafx.stage.Popup; -public class ViewController { +public class ViewController extends Controller { + @FXML + private TableView competitorTable; - public static void generateTable(TableView table) { - TableColumn playerNumCol = new TableColumn("Player Number"); - TableColumn playerNameCol = new TableColumn("Player Name"); - TableColumn playerLevelCol = new TableColumn("Player Level"); - TableColumn scoresCol = new TableColumn("Player Scores"); - TableColumn favoriteCharsCol = new TableColumn("Favorite Characters"); - TableColumn favoriteAgentCol = new TableColumn("Agent"); - TableColumn favoriteAttackerCol = new TableColumn("Attacker"); - TableColumn favoriteDefenderCol = new TableColumn("Defender"); - playerNumCol.setCellValueFactory(new PropertyValueFactory("playerNumber")); - playerNameCol.setCellValueFactory(new PropertyValueFactory("playerName")); - playerLevelCol.setCellValueFactory(new PropertyValueFactory("playerLevel")); - scoresCol.setCellValueFactory(new PropertyValueFactory("scores")); - favoriteAgentCol.setCellValueFactory(new PropertyValueFactory("favoriteAgent")); - favoriteAttackerCol.setCellValueFactory(new PropertyValueFactory("favoriteAttacker")); - favoriteDefenderCol.setCellValueFactory(new PropertyValueFactory("favoriteDefender")); - table.getColumns().add(playerNumCol); - table.getColumns().add(playerNameCol); - table.getColumns().add(playerLevelCol); - table.getColumns().add(scoresCol); - favoriteCharsCol.getColumns().add(favoriteAgentCol); - favoriteCharsCol.getColumns().add(favoriteAttackerCol); - favoriteCharsCol.getColumns().add(favoriteDefenderCol); - table.getColumns().add(favoriteCharsCol); + @FXML Button filterButton; + + private TableColumn playerNumCol; + private TableColumn playerNameCol; + private TableColumn playerLevelCol; + private TableColumn scoresCol; + private TableColumn favoriteCharsCol; + private TableColumn favoriteAgentCol; + private TableColumn favoriteAttackerCol; + private TableColumn favoriteDefenderCol; + + private Popup filters; + + @Override + public void initialize(URL ul, ResourceBundle rb) { + Platform.runLater(() -> { + loadCompetitors(); + loadView(); + }); } - public static ObservableList loadTable(ArrayList list) { + public void generateTable() { + initColumns(); + setColumnCellValues(); + addColumns(); + } + + public ObservableList loadTable(ArrayList list) { ArrayList outputList = new ArrayList<>(); for(Competitor player: list) { if (player instanceof ValorantPlayer) { @@ -54,5 +66,64 @@ public class ViewController { } return FXCollections.observableArrayList(outputList); } - + + private void loadView() { + generateTable(); + competitorTable.setItems(loadTable(competitors.getCompetitors())); + } + + private void initColumns() { + playerNumCol = new TableColumn("Player Number"); + playerNameCol = new TableColumn("Player Name"); + playerLevelCol = new TableColumn("Player Level"); + scoresCol = new TableColumn("Player Scores"); + favoriteCharsCol = new TableColumn("Favorite Characters"); + favoriteAgentCol = new TableColumn("Agent"); + favoriteAttackerCol = new TableColumn("Attacker"); + favoriteDefenderCol = new TableColumn("Defender"); + } + + private void setColumnCellValues() { + playerNumCol.setCellValueFactory(new PropertyValueFactory("playerNumber")); + playerNameCol.setCellValueFactory(new PropertyValueFactory("playerName")); + playerLevelCol.setCellValueFactory(new PropertyValueFactory("playerLevel")); + scoresCol.setCellValueFactory(new PropertyValueFactory("scores")); + favoriteAgentCol.setCellValueFactory(new PropertyValueFactory("favoriteAgent")); + favoriteAttackerCol.setCellValueFactory(new PropertyValueFactory("favoriteAttacker")); + favoriteDefenderCol.setCellValueFactory(new PropertyValueFactory("favoriteDefender")); + } + + private void addColumns() { + competitorTable.getColumns().add(playerNumCol); + competitorTable.getColumns().add(playerNameCol); + competitorTable.getColumns().add(playerLevelCol); + competitorTable.getColumns().add(scoresCol); + favoriteCharsCol.getColumns().add(favoriteAgentCol); + favoriteCharsCol.getColumns().add(favoriteAttackerCol); + favoriteCharsCol.getColumns().add(favoriteDefenderCol); + competitorTable.getColumns().add(favoriteCharsCol); + } + + @FXML + private void filterPress() throws IOException { + switch(filterButton.getText().toLowerCase()) { + case "filters" -> filterDialog(); + case "save" -> saveFilters(); + } + + } + + private void filterDialog() throws IOException { + filters = new Popup(); + Parent root = Manager.loadFXML("pages/filters"); + filters.getContent().add(root); + filters.show(Manager.stage); + filterButton.setText("Save"); + } + + private void saveFilters() { + filters.hide(); + filterButton.setText("Filters"); + //TODO: filter implementation + } } \ No newline at end of file diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 85ebbf4..fa53a3d 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -4,7 +4,6 @@ module com.r0r5chach { requires javafx.fxml; opens com.r0r5chach to javafx.fxml; - opens com.r0r5chach.pages to javafx.base; opens com.r0r5chach.controllers to javafx.fxml; exports com.r0r5chach; exports com.r0r5chach.competitor; diff --git a/src/main/resources/com/r0r5chach/main.fxml b/src/main/resources/com/r0r5chach/main.fxml index dcabbb6..3fbc902 100644 --- a/src/main/resources/com/r0r5chach/main.fxml +++ b/src/main/resources/com/r0r5chach/main.fxml @@ -1,169 +1,23 @@ - - - - - - - - - - - - + - + - + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/com/r0r5chach/pages/edit.fxml b/src/main/resources/com/r0r5chach/pages/edit.fxml index e69de29..1d7273e 100644 --- a/src/main/resources/com/r0r5chach/pages/edit.fxml +++ b/src/main/resources/com/r0r5chach/pages/edit.fxml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/com/r0r5chach/pages/filters.fxml b/src/main/resources/com/r0r5chach/pages/filters.fxml index e8c54b1..2fe906b 100644 --- a/src/main/resources/com/r0r5chach/pages/filters.fxml +++ b/src/main/resources/com/r0r5chach/pages/filters.fxml @@ -1,7 +1,6 @@ - @@ -99,11 +98,6 @@ - diff --git a/src/main/resources/com/r0r5chach/pages/view.fxml b/src/main/resources/com/r0r5chach/pages/view.fxml index e69de29..0bd75ed 100644 --- a/src/main/resources/com/r0r5chach/pages/view.fxml +++ b/src/main/resources/com/r0r5chach/pages/view.fxml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + +