diff --git a/G-Earth/src/main/java/gearth/ui/GEarthController.java b/G-Earth/src/main/java/gearth/ui/GEarthController.java index 27ceb3f..05d700b 100644 --- a/G-Earth/src/main/java/gearth/ui/GEarthController.java +++ b/G-Earth/src/main/java/gearth/ui/GEarthController.java @@ -12,12 +12,11 @@ import gearth.ui.info.Info; import gearth.ui.injection.Injection; import gearth.ui.logger.Logger; import gearth.ui.scheduler.Scheduler; -import gearth.ui.settings.Settings; +import gearth.ui.extra.Extra; import gearth.ui.tools.Tools; public class GEarthController { - public Tab tab_Settings; public Tab tab_Logger; public TabPane tabBar; private Stage stage = null; @@ -28,7 +27,7 @@ public class GEarthController { public Logger loggerController; public Tools toolsController; public Scheduler schedulerController; - public Settings settingsController; + public Extra extraController; public Info infoController; public Extensions extensionsController; @@ -44,12 +43,10 @@ public class GEarthController { loggerController.setParentController(this); toolsController.setParentController(this); schedulerController.setParentController(this); - settingsController.setParentController(this); + extraController.setParentController(this); infoController.setParentController(this); extensionsController.setParentController(this); - tabBar.getTabs().remove(tab_Settings); - if (PacketLoggerFactory.usesUIlogger()) { tabBar.getTabs().remove(tab_Logger); } diff --git a/G-Earth/src/main/java/gearth/ui/settings/Settings.java b/G-Earth/src/main/java/gearth/ui/extra/Extra.java similarity index 51% rename from G-Earth/src/main/java/gearth/ui/settings/Settings.java rename to G-Earth/src/main/java/gearth/ui/extra/Extra.java index 2ae0c2a..ac511dd 100644 --- a/G-Earth/src/main/java/gearth/ui/settings/Settings.java +++ b/G-Earth/src/main/java/gearth/ui/extra/Extra.java @@ -1,9 +1,9 @@ -package gearth.ui.settings; +package gearth.ui.extra; import gearth.ui.SubForm; /** * Created by Jonas on 06/04/18. */ -public class Settings extends SubForm { +public class Extra extends SubForm { } diff --git a/G-Earth/src/main/resources/gearth/ui/G-Earth.fxml b/G-Earth/src/main/resources/gearth/ui/G-Earth.fxml index 26bf3a3..3a7fc67 100644 --- a/G-Earth/src/main/resources/gearth/ui/G-Earth.fxml +++ b/G-Earth/src/main/resources/gearth/ui/G-Earth.fxml @@ -27,12 +27,12 @@ - - - + + + diff --git a/G-Earth/src/main/resources/gearth/ui/extra/Extra.fxml b/G-Earth/src/main/resources/gearth/ui/extra/Extra.fxml new file mode 100644 index 0000000..91e825b --- /dev/null +++ b/G-Earth/src/main/resources/gearth/ui/extra/Extra.fxml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +