diff --git a/G-Earth/src/main/java/gearth/GEarth.java b/G-Earth/src/main/java/gearth/GEarth.java index 9c98f6b..fff1a18 100644 --- a/G-Earth/src/main/java/gearth/GEarth.java +++ b/G-Earth/src/main/java/gearth/GEarth.java @@ -12,7 +12,6 @@ import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.scene.Scene; import javafx.scene.image.Image; -import javafx.scene.paint.Color; import javafx.stage.Stage; import javafx.stage.StageStyle; @@ -90,15 +89,15 @@ public class GEarth extends Application { GEarth.theme = theme; stage.getScene().getStylesheets().clear(); - stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/themes/%s/styling.css", theme)).toExternalForm()); + stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/ui/themes/%s/styling.css", theme)).toExternalForm()); stage.getIcons().clear(); - stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", theme)))); + stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/ui/themes/%s/logoSmall.png", theme)))); stage.setTitle(theme.split("_")[0] + " " + GEarth.version); titleBar.setTitle(stage.getTitle()); - controller.infoController.img_logo.setImage(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/themes/%s/logo.png", theme)))); + controller.infoController.img_logo.setImage(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/ui/themes/%s/logo.png", theme)))); controller.infoController.version.setText(stage.getTitle()); } diff --git a/G-Earth/src/main/java/gearth/misc/AdminValidator.java b/G-Earth/src/main/java/gearth/misc/AdminValidator.java index 338b89f..a19e6d7 100644 --- a/G-Earth/src/main/java/gearth/misc/AdminValidator.java +++ b/G-Earth/src/main/java/gearth/misc/AdminValidator.java @@ -48,8 +48,8 @@ public class AdminValidator { Platform.runLater(() -> { Alert alert = new Alert(Alert.AlertType.WARNING, "G-Earth needs admin privileges in order to work on Flash, please restart G-Earth with admin permissions unless you're using Unity", ButtonType.OK); Stage stage = (Stage) alert.getDialogPane().getScene().getWindow(); - stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", GEarth.theme)))); - stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/themes/%s/styling.css", GEarth.theme)).toExternalForm()); + stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/ui/themes/%s/logoSmall.png", GEarth.theme)))); + stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/ui/themes/%s/styling.css", GEarth.theme)).toExternalForm()); alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE); alert.setResizable(false); alert.show(); diff --git a/G-Earth/src/main/java/gearth/misc/ConfirmationDialog.java b/G-Earth/src/main/java/gearth/misc/ConfirmationDialog.java index d607e04..4c10bc8 100644 --- a/G-Earth/src/main/java/gearth/misc/ConfirmationDialog.java +++ b/G-Earth/src/main/java/gearth/misc/ConfirmationDialog.java @@ -27,8 +27,8 @@ public class ConfirmationDialog { // Need to force the alert to layout in order to grab the graphic, // as we are replacing the dialog pane with a custom pane Stage stage = (Stage) alert.getDialogPane().getScene().getWindow(); - stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", GEarth.theme)))); - stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/themes/%s/styling.css", GEarth.theme)).toExternalForm()); + stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/ui/themes/%s/logoSmall.png", GEarth.theme)))); + stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/ui/themes/%s/styling.css", GEarth.theme)).toExternalForm()); alert.getDialogPane().applyCss(); Node graphic = alert.getDialogPane().getGraphic(); // Create a new dialog pane that has a checkbox instead of the hide/show details button diff --git a/G-Earth/src/main/java/gearth/misc/UpdateChecker.java b/G-Earth/src/main/java/gearth/misc/UpdateChecker.java index 5fd42e3..b43f49e 100644 --- a/G-Earth/src/main/java/gearth/misc/UpdateChecker.java +++ b/G-Earth/src/main/java/gearth/misc/UpdateChecker.java @@ -38,8 +38,8 @@ public class UpdateChecker { Alert alert = new Alert(isForcedUpdate ? Alert.AlertType.ERROR : Alert.AlertType.INFORMATION, "G-Earth is outdated!", ButtonType.OK); Stage stage = (Stage) alert.getDialogPane().getScene().getWindow(); - stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", GEarth.theme)))); - stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/themes/%s/styling.css", GEarth.theme)).toExternalForm()); + stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/ui/themes/%s/logoSmall.png", GEarth.theme)))); + stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/ui/themes/%s/styling.css", GEarth.theme)).toExternalForm()); FlowPane fp = new FlowPane(); Label lbl = new Label("A new version of G-Earth has been found ("+gitv+")" + System.lineSeparator()+ System.lineSeparator() + "Update to the latest version:"); diff --git a/G-Earth/src/main/java/gearth/protocol/connection/proxy/ProxyProviderFactory.java b/G-Earth/src/main/java/gearth/protocol/connection/proxy/ProxyProviderFactory.java index da9f8b7..92796f5 100644 --- a/G-Earth/src/main/java/gearth/protocol/connection/proxy/ProxyProviderFactory.java +++ b/G-Earth/src/main/java/gearth/protocol/connection/proxy/ProxyProviderFactory.java @@ -109,8 +109,8 @@ public class ProxyProviderFactory { "Due to current limitations you can only connect one session per hotel to G-Earth in Raw IP mode on Windows.\n\n" + "You can bypass this by using a SOCKS proxy [Extra -> Advanced -> SOCKS]", ButtonType.OK); Stage stage = (Stage) alert.getDialogPane().getScene().getWindow(); - stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", GEarth.theme)))); - stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/themes/%s/styling.css", GEarth.theme)).toExternalForm()); + stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/ui/themes/%s/logoSmall.png", GEarth.theme)))); + stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/ui/themes/%s/styling.css", GEarth.theme)).toExternalForm()); alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE); alert.setResizable(false); alert.show(); diff --git a/G-Earth/src/main/java/gearth/protocol/connection/proxy/flash/FlashProxyProvider.java b/G-Earth/src/main/java/gearth/protocol/connection/proxy/flash/FlashProxyProvider.java index 8740163..55d3a06 100644 --- a/G-Earth/src/main/java/gearth/protocol/connection/proxy/flash/FlashProxyProvider.java +++ b/G-Earth/src/main/java/gearth/protocol/connection/proxy/flash/FlashProxyProvider.java @@ -125,8 +125,8 @@ public abstract class FlashProxyProvider implements ProxyProvider { Platform.runLater(() -> { Alert alert = new Alert(Alert.AlertType.ERROR, "You entered invalid connection information, G-Earth could not connect", ButtonType.OK); Stage stage = (Stage) alert.getDialogPane().getScene().getWindow(); - stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", GEarth.theme)))); - stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/themes/%s/styling.css", GEarth.theme)).toExternalForm()); + stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/ui/themes/%s/logoSmall.png", GEarth.theme)))); + stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/ui/themes/%s/styling.css", GEarth.theme)).toExternalForm()); alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE); alert.setResizable(false); alert.show(); diff --git a/G-Earth/src/main/java/gearth/protocol/connection/proxy/flash/NormalFlashProxyProvider.java b/G-Earth/src/main/java/gearth/protocol/connection/proxy/flash/NormalFlashProxyProvider.java index 4cf7b5f..21d9730 100644 --- a/G-Earth/src/main/java/gearth/protocol/connection/proxy/flash/NormalFlashProxyProvider.java +++ b/G-Earth/src/main/java/gearth/protocol/connection/proxy/flash/NormalFlashProxyProvider.java @@ -110,8 +110,8 @@ public class NormalFlashProxyProvider extends FlashProxyProvider { Alert a = new Alert(Alert.AlertType.ERROR, "The port is in use by " + processName, ButtonType.OK); Stage stage = (Stage) a.getDialogPane().getScene().getWindow(); - stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", GEarth.theme)))); - stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/themes/%s/styling.css", GEarth.theme)).toExternalForm()); + stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/ui/themes/%s/logoSmall.png", GEarth.theme)))); + stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/ui/themes/%s/styling.css", GEarth.theme)).toExternalForm()); a.showAndWait(); }); throw new IOException(e); diff --git a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/http/NitroHttpProxy.java b/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/http/NitroHttpProxy.java index ad9f575..dbe319e 100644 --- a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/http/NitroHttpProxy.java +++ b/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/http/NitroHttpProxy.java @@ -57,8 +57,8 @@ public class NitroHttpProxy { ButtonType.YES, ButtonType.NO ); Stage stage = (Stage) alert.getDialogPane().getScene().getWindow(); - stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", GEarth.theme)))); - stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/themes/%s/styling.css", GEarth.theme)).toExternalForm()); + stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/ui/themes/%s/logoSmall.png", GEarth.theme)))); + stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/ui/themes/%s/styling.css", GEarth.theme)).toExternalForm()); shouldInstall.set(alert.showAndWait().filter(t -> t == ButtonType.YES).isPresent()); waitForDialog.release(); diff --git a/G-Earth/src/main/java/gearth/protocol/memory/Rc4Obtainer.java b/G-Earth/src/main/java/gearth/protocol/memory/Rc4Obtainer.java index 1066821..f342683 100644 --- a/G-Earth/src/main/java/gearth/protocol/memory/Rc4Obtainer.java +++ b/G-Earth/src/main/java/gearth/protocol/memory/Rc4Obtainer.java @@ -83,8 +83,8 @@ public class Rc4Obtainer { Platform.runLater(() -> { Alert alert = new Alert(Alert.AlertType.WARNING, "Something went wrong!", ButtonType.OK); Stage stage = (Stage) alert.getDialogPane().getScene().getWindow(); - stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", GEarth.theme)))); - stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/themes/%s/styling.css", GEarth.theme)).toExternalForm()); + stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/ui/themes/%s/logoSmall.png", GEarth.theme)))); + stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/ui/themes/%s/styling.css", GEarth.theme)).toExternalForm()); FlowPane fp = new FlowPane(); Label lbl = new Label("G-Earth has experienced an issue" + System.lineSeparator()+ System.lineSeparator() + "Head over to our Troubleshooting page to solve the problem:"); diff --git a/G-Earth/src/main/java/gearth/services/g_python/GPythonShell.java b/G-Earth/src/main/java/gearth/services/g_python/GPythonShell.java index 0012ff2..76bfd66 100644 --- a/G-Earth/src/main/java/gearth/services/g_python/GPythonShell.java +++ b/G-Earth/src/main/java/gearth/services/g_python/GPythonShell.java @@ -1,7 +1,7 @@ package gearth.services.g_python; import gearth.GEarth; -import gearth.ui.extra.ExtraController; +import gearth.ui.subforms.extra.ExtraController; import javafx.application.Platform; import javafx.scene.control.Alert; import javafx.scene.control.ButtonType; @@ -171,8 +171,8 @@ public class GPythonShell { Platform.runLater(() -> { Alert alert = new Alert(Alert.AlertType.ERROR, "G-Python error", ButtonType.OK); Stage stage = (Stage) alert.getDialogPane().getScene().getWindow(); - stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", GEarth.theme)))); - stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/themes/%s/styling.css", GEarth.theme)).toExternalForm()); + stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/ui/themes/%s/logoSmall.png", GEarth.theme)))); + stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/ui/themes/%s/styling.css", GEarth.theme)).toExternalForm()); alert.setTitle("G-Python error"); FlowPane fp = new FlowPane(); diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/GExtensionStoreLauncher.java b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/GExtensionStoreLauncher.java index 5e94d67..42eda93 100644 --- a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/GExtensionStoreLauncher.java +++ b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/GExtensionStoreLauncher.java @@ -26,8 +26,8 @@ public class GExtensionStoreLauncher extends InternalExtensionFormLauncher { Parent root = loader.load(); stage.setTitle(String.format("%s | Packet Logger", GEarth.theme)); stage.initModality(Modality.NONE); - stage.getIcons().add(new Image(getClass().getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", GEarth.theme)))); + stage.getIcons().add(new Image(getClass().getResourceAsStream(String.format("/gearth/ui/themes/%s/logoSmall.png", GEarth.theme)))); Scene scene = new Scene(root); - scene.getStylesheets().add(String.format("/gearth/themes/%s/styling.css", GEarth.theme)); + scene.getStylesheets().add(String.format("/gearth/ui/themes/%s/styling.css", GEarth.theme)); scene.getStylesheets().add("/gearth/services/internal_extensions/uilogger/logger.css"); UiLoggerController controller = loader.getController(); diff --git a/G-Earth/src/main/java/gearth/services/scheduler/Interval.java b/G-Earth/src/main/java/gearth/services/scheduler/Interval.java index 5ff49bb..2c15c15 100644 --- a/G-Earth/src/main/java/gearth/services/scheduler/Interval.java +++ b/G-Earth/src/main/java/gearth/services/scheduler/Interval.java @@ -1,6 +1,6 @@ package gearth.services.scheduler; -import gearth.ui.scheduler.SchedulerController; +import gearth.ui.subforms.scheduler.SchedulerController; /** * Created by Jonas on 11/04/18. diff --git a/G-Earth/src/main/java/gearth/services/unity_tools/GUnityFileServer.java b/G-Earth/src/main/java/gearth/services/unity_tools/GUnityFileServer.java index 4a00d9a..ba8b4e6 100644 --- a/G-Earth/src/main/java/gearth/services/unity_tools/GUnityFileServer.java +++ b/G-Earth/src/main/java/gearth/services/unity_tools/GUnityFileServer.java @@ -135,7 +135,7 @@ public class GUnityFileServer extends HttpServlet private void getLogo(HttpServletResponse response) throws IOException { OutputStream out = response.getOutputStream(); - InputStream in = GEarth.class.getResourceAsStream(String.format("/gearth/themes/%s/logo.png", GEarth.theme)); + InputStream in = GEarth.class.getResourceAsStream(String.format("/gearth/ui/themes/%s/logo.png", GEarth.theme)); byte[] bytes = new byte[4096]; int bytesRead; diff --git a/G-Earth/src/main/java/gearth/ui/GEarthController.java b/G-Earth/src/main/java/gearth/ui/GEarthController.java index 2106a99..a7725a1 100644 --- a/G-Earth/src/main/java/gearth/ui/GEarthController.java +++ b/G-Earth/src/main/java/gearth/ui/GEarthController.java @@ -1,27 +1,21 @@ package gearth.ui; -import gearth.GEarth; import gearth.protocol.connection.proxy.ProxyProviderFactory; import gearth.protocol.connection.proxy.SocksConfiguration; -import gearth.ui.logger.loggerdisplays.PacketLoggerFactory; -import javafx.application.Platform; +import gearth.ui.subforms.logger.loggerdisplays.PacketLoggerFactory; import javafx.scene.control.*; -import javafx.scene.image.Image; -import javafx.scene.input.MouseEvent; -import javafx.scene.layout.Pane; import javafx.stage.Stage; import gearth.protocol.HConnection; -import gearth.ui.connection.ConnectionController; -import gearth.ui.extensions.ExtensionsController; -import gearth.ui.info.InfoController; -import gearth.ui.injection.InjectionController; -import gearth.ui.logger.LoggerController; -import gearth.ui.scheduler.SchedulerController; -import gearth.ui.extra.ExtraController; -import gearth.ui.tools.ToolsController; +import gearth.ui.subforms.connection.ConnectionController; +import gearth.ui.subforms.extensions.ExtensionsController; +import gearth.ui.subforms.info.InfoController; +import gearth.ui.subforms.injection.InjectionController; +import gearth.ui.subforms.logger.LoggerController; +import gearth.ui.subforms.scheduler.SchedulerController; +import gearth.ui.subforms.extra.ExtraController; +import gearth.ui.subforms.tools.ToolsController; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; public class GEarthController { diff --git a/G-Earth/src/main/java/gearth/ui/connection/ConnectionController.java b/G-Earth/src/main/java/gearth/ui/subforms/connection/ConnectionController.java similarity index 99% rename from G-Earth/src/main/java/gearth/ui/connection/ConnectionController.java rename to G-Earth/src/main/java/gearth/ui/subforms/connection/ConnectionController.java index 4afa7c1..3add757 100644 --- a/G-Earth/src/main/java/gearth/ui/connection/ConnectionController.java +++ b/G-Earth/src/main/java/gearth/ui/subforms/connection/ConnectionController.java @@ -1,4 +1,4 @@ -package gearth.ui.connection; +package gearth.ui.subforms.connection; import gearth.GEarth; import gearth.misc.Cacher; diff --git a/G-Earth/src/main/java/gearth/ui/extensions/ExtensionItemContainer.java b/G-Earth/src/main/java/gearth/ui/subforms/extensions/ExtensionItemContainer.java similarity index 99% rename from G-Earth/src/main/java/gearth/ui/extensions/ExtensionItemContainer.java rename to G-Earth/src/main/java/gearth/ui/subforms/extensions/ExtensionItemContainer.java index b6f6c24..8413663 100644 --- a/G-Earth/src/main/java/gearth/ui/extensions/ExtensionItemContainer.java +++ b/G-Earth/src/main/java/gearth/ui/subforms/extensions/ExtensionItemContainer.java @@ -1,4 +1,4 @@ -package gearth.ui.extensions; +package gearth.ui.subforms.extensions; import gearth.services.extension_handler.extensions.ExtensionType; import gearth.services.extension_handler.extensions.GEarthExtension; @@ -9,7 +9,6 @@ import javafx.geometry.Pos; import javafx.scene.control.*; import javafx.scene.input.MouseEvent; import javafx.scene.layout.*; -import javafx.scene.paint.Paint; import javafx.scene.text.Font; import gearth.misc.ConfirmationDialog; import gearth.ui.buttons.*; diff --git a/G-Earth/src/main/java/gearth/ui/extensions/ExtensionItemContainerProducer.java b/G-Earth/src/main/java/gearth/ui/subforms/extensions/ExtensionItemContainerProducer.java similarity index 97% rename from G-Earth/src/main/java/gearth/ui/extensions/ExtensionItemContainerProducer.java rename to G-Earth/src/main/java/gearth/ui/subforms/extensions/ExtensionItemContainerProducer.java index 6bc2a2e..d183e6d 100644 --- a/G-Earth/src/main/java/gearth/ui/extensions/ExtensionItemContainerProducer.java +++ b/G-Earth/src/main/java/gearth/ui/subforms/extensions/ExtensionItemContainerProducer.java @@ -1,4 +1,4 @@ -package gearth.ui.extensions; +package gearth.ui.subforms.extensions; import gearth.services.extension_handler.extensions.GEarthExtension; import javafx.scene.Node; diff --git a/G-Earth/src/main/java/gearth/ui/extensions/ExtensionsController.java b/G-Earth/src/main/java/gearth/ui/subforms/extensions/ExtensionsController.java similarity index 97% rename from G-Earth/src/main/java/gearth/ui/extensions/ExtensionsController.java rename to G-Earth/src/main/java/gearth/ui/subforms/extensions/ExtensionsController.java index 979b073..d51f7fd 100644 --- a/G-Earth/src/main/java/gearth/ui/extensions/ExtensionsController.java +++ b/G-Earth/src/main/java/gearth/ui/subforms/extensions/ExtensionsController.java @@ -1,4 +1,4 @@ -package gearth.ui.extensions; +package gearth.ui.subforms.extensions; import gearth.services.extension_handler.ExtensionHandler; import gearth.services.extension_handler.extensions.ExtensionListener; @@ -9,7 +9,7 @@ import gearth.services.extension_handler.extensions.implementations.network.exec import gearth.services.extension_handler.extensions.implementations.network.executer.ExtensionRunnerFactory; import gearth.services.g_python.GPythonShell; import gearth.ui.SubForm; -import gearth.ui.extensions.logger.ExtensionLogger; +import gearth.ui.subforms.extensions.logger.ExtensionLogger; import javafx.application.Platform; import javafx.event.ActionEvent; import javafx.scene.control.*; diff --git a/G-Earth/src/main/java/gearth/ui/extensions/logger/Element.java b/G-Earth/src/main/java/gearth/ui/subforms/extensions/logger/Element.java similarity index 80% rename from G-Earth/src/main/java/gearth/ui/extensions/logger/Element.java rename to G-Earth/src/main/java/gearth/ui/subforms/extensions/logger/Element.java index 6dee891..5b91a98 100644 --- a/G-Earth/src/main/java/gearth/ui/extensions/logger/Element.java +++ b/G-Earth/src/main/java/gearth/ui/subforms/extensions/logger/Element.java @@ -1,4 +1,4 @@ -package gearth.ui.extensions.logger; +package gearth.ui.subforms.extensions.logger; class Element { final String text; diff --git a/G-Earth/src/main/java/gearth/ui/extensions/logger/ExtensionLogger.java b/G-Earth/src/main/java/gearth/ui/subforms/extensions/logger/ExtensionLogger.java similarity index 89% rename from G-Earth/src/main/java/gearth/ui/extensions/logger/ExtensionLogger.java rename to G-Earth/src/main/java/gearth/ui/subforms/extensions/logger/ExtensionLogger.java index bd435b2..19bffe8 100644 --- a/G-Earth/src/main/java/gearth/ui/extensions/logger/ExtensionLogger.java +++ b/G-Earth/src/main/java/gearth/ui/subforms/extensions/logger/ExtensionLogger.java @@ -1,4 +1,4 @@ -package gearth.ui.extensions.logger; +package gearth.ui.subforms.extensions.logger; import gearth.GEarth; import javafx.fxml.FXMLLoader; @@ -21,7 +21,7 @@ public class ExtensionLogger { volatile boolean isVisible = false; public ExtensionLogger() { - FXMLLoader loader = new FXMLLoader(getClass().getResource("/gearth/ui/extensions/logger/ExtensionLogger.fxml")); + FXMLLoader loader = new FXMLLoader(getClass().getResource("/gearth/ui/subforms/extensions/logger/ExtensionLogger.fxml")); try { Parent root = loader.load(); @@ -37,13 +37,13 @@ public class ExtensionLogger { stage = new Stage(); stage.setTitle(String.format("%s | Extension Console", GEarth.theme)); stage.initModality(Modality.NONE); - stage.getIcons().add(new Image(getClass().getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", GEarth.theme)))); + stage.getIcons().add(new Image(getClass().getResourceAsStream(String.format("/gearth/ui/themes/%s/logoSmall.png", GEarth.theme)))); stage.setAlwaysOnTop(true); stage.setMinHeight(235); stage.setMinWidth(370); Scene scene = new Scene(root); - scene.getStylesheets().add(String.format("/gearth/themes/%s/styling.css", GEarth.theme)); + scene.getStylesheets().add(String.format("/gearth/ui/themes/%s/styling.css", GEarth.theme)); scene.getStylesheets().add("/gearth/ui/extensions/logger/logger.css"); ExtensionLoggerController controller = loader.getController(); controller.setStage(stage); diff --git a/G-Earth/src/main/java/gearth/ui/extensions/logger/ExtensionLoggerController.java b/G-Earth/src/main/java/gearth/ui/subforms/extensions/logger/ExtensionLoggerController.java similarity index 97% rename from G-Earth/src/main/java/gearth/ui/extensions/logger/ExtensionLoggerController.java rename to G-Earth/src/main/java/gearth/ui/subforms/extensions/logger/ExtensionLoggerController.java index 58f88a6..9b00886 100644 --- a/G-Earth/src/main/java/gearth/ui/extensions/logger/ExtensionLoggerController.java +++ b/G-Earth/src/main/java/gearth/ui/subforms/extensions/logger/ExtensionLoggerController.java @@ -1,8 +1,7 @@ -package gearth.ui.extensions.logger; +package gearth.ui.subforms.extensions.logger; import javafx.application.Platform; import javafx.fxml.Initializable; -import javafx.scene.control.ScrollPane; import javafx.scene.layout.BorderPane; import javafx.stage.Stage; import org.fxmisc.flowless.VirtualizedScrollPane; diff --git a/G-Earth/src/main/java/gearth/ui/extra/ExtraController.java b/G-Earth/src/main/java/gearth/ui/subforms/extra/ExtraController.java similarity index 96% rename from G-Earth/src/main/java/gearth/ui/extra/ExtraController.java rename to G-Earth/src/main/java/gearth/ui/subforms/extra/ExtraController.java index 0705892..d502d8d 100644 --- a/G-Earth/src/main/java/gearth/ui/extra/ExtraController.java +++ b/G-Earth/src/main/java/gearth/ui/subforms/extra/ExtraController.java @@ -1,4 +1,4 @@ -package gearth.ui.extra; +package gearth.ui.subforms.extra; import gearth.GEarth; import gearth.misc.Cacher; @@ -9,7 +9,7 @@ import gearth.protocol.connection.proxy.SocksConfiguration; import gearth.services.always_admin.AdminService; import gearth.services.g_python.GPythonVersionUtils; import gearth.ui.SubForm; -import gearth.ui.info.InfoController; +import gearth.ui.subforms.info.InfoController; import javafx.application.Platform; import javafx.event.ActionEvent; import javafx.scene.control.*; @@ -176,8 +176,8 @@ public class ExtraController extends SubForm implements SocksConfiguration { Platform.runLater(() -> { Alert alert = new Alert(Alert.AlertType.ERROR, "G-Python installation", ButtonType.OK); Stage stage = (Stage) alert.getDialogPane().getScene().getWindow(); - stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", GEarth.theme)))); - stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/themes/%s/styling.css", GEarth.theme)).toExternalForm()); + stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/ui/themes/%s/logoSmall.png", GEarth.theme)))); + stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/ui/themes/%s/styling.css", GEarth.theme)).toExternalForm()); alert.setTitle("G-Python installation"); FlowPane fp = new FlowPane(); diff --git a/G-Earth/src/main/java/gearth/ui/info/InfoController.java b/G-Earth/src/main/java/gearth/ui/subforms/info/InfoController.java similarity index 96% rename from G-Earth/src/main/java/gearth/ui/info/InfoController.java rename to G-Earth/src/main/java/gearth/ui/subforms/info/InfoController.java index 38965c8..dcefbc3 100644 --- a/G-Earth/src/main/java/gearth/ui/info/InfoController.java +++ b/G-Earth/src/main/java/gearth/ui/subforms/info/InfoController.java @@ -1,14 +1,12 @@ -package gearth.ui.info; +package gearth.ui.subforms.info; import gearth.GEarth; import javafx.event.ActionEvent; import javafx.scene.control.*; import gearth.ui.SubForm; -import javafx.scene.image.Image; import javafx.scene.image.ImageView; import javafx.scene.layout.Region; import javafx.scene.web.WebView; -import javafx.stage.Stage; /** * Created by Jonas on 06/04/18. diff --git a/G-Earth/src/main/java/gearth/ui/injection/InjectedPackets.java b/G-Earth/src/main/java/gearth/ui/subforms/injection/InjectedPackets.java similarity index 98% rename from G-Earth/src/main/java/gearth/ui/injection/InjectedPackets.java rename to G-Earth/src/main/java/gearth/ui/subforms/injection/InjectedPackets.java index 44208ef..45f8219 100644 --- a/G-Earth/src/main/java/gearth/ui/injection/InjectedPackets.java +++ b/G-Earth/src/main/java/gearth/ui/subforms/injection/InjectedPackets.java @@ -1,4 +1,4 @@ -package gearth.ui.injection; +package gearth.ui.subforms.injection; import gearth.misc.StringifyAble; import gearth.protocol.HMessage; diff --git a/G-Earth/src/main/java/gearth/ui/injection/InjectionController.java b/G-Earth/src/main/java/gearth/ui/subforms/injection/InjectionController.java similarity index 98% rename from G-Earth/src/main/java/gearth/ui/injection/InjectionController.java rename to G-Earth/src/main/java/gearth/ui/subforms/injection/InjectionController.java index 8267791..3ad4317 100644 --- a/G-Earth/src/main/java/gearth/ui/injection/InjectionController.java +++ b/G-Earth/src/main/java/gearth/ui/subforms/injection/InjectionController.java @@ -1,4 +1,4 @@ -package gearth.ui.injection; +package gearth.ui.subforms.injection; import gearth.misc.Cacher; import gearth.services.packet_info.PacketInfoManager; @@ -8,8 +8,6 @@ import javafx.application.Platform; import javafx.event.ActionEvent; import javafx.scene.control.*; import javafx.scene.input.MouseButton; -import javafx.scene.input.MouseEvent; -import javafx.scene.layout.GridPane; import javafx.scene.paint.Color; import javafx.scene.paint.Paint; import javafx.scene.text.Text; @@ -20,7 +18,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedList; import java.util.List; -import java.util.function.Predicate; import java.util.stream.Collectors; public class InjectionController extends SubForm { diff --git a/G-Earth/src/main/java/gearth/ui/logger/LoggerController.java b/G-Earth/src/main/java/gearth/ui/subforms/logger/LoggerController.java similarity index 96% rename from G-Earth/src/main/java/gearth/ui/logger/LoggerController.java rename to G-Earth/src/main/java/gearth/ui/subforms/logger/LoggerController.java index 1eba104..4f8c581 100644 --- a/G-Earth/src/main/java/gearth/ui/logger/LoggerController.java +++ b/G-Earth/src/main/java/gearth/ui/subforms/logger/LoggerController.java @@ -1,4 +1,4 @@ -package gearth.ui.logger; +package gearth.ui.subforms.logger; import gearth.protocol.connection.HState; import javafx.application.Platform; @@ -12,8 +12,8 @@ import javafx.scene.text.Text; import javafx.scene.text.TextFlow; import gearth.protocol.HMessage; import gearth.ui.SubForm; -import gearth.ui.logger.loggerdisplays.PacketLogger; -import gearth.ui.logger.loggerdisplays.PacketLoggerFactory; +import gearth.ui.subforms.logger.loggerdisplays.PacketLogger; +import gearth.ui.subforms.logger.loggerdisplays.PacketLoggerFactory; import java.util.Calendar; diff --git a/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/LinuxTerminalLogger.java b/G-Earth/src/main/java/gearth/ui/subforms/logger/loggerdisplays/LinuxTerminalLogger.java similarity index 98% rename from G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/LinuxTerminalLogger.java rename to G-Earth/src/main/java/gearth/ui/subforms/logger/loggerdisplays/LinuxTerminalLogger.java index 0b125a5..d6f7946 100644 --- a/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/LinuxTerminalLogger.java +++ b/G-Earth/src/main/java/gearth/ui/subforms/logger/loggerdisplays/LinuxTerminalLogger.java @@ -1,4 +1,4 @@ -package gearth.ui.logger.loggerdisplays; +package gearth.ui.subforms.logger.loggerdisplays; import gearth.protocol.HMessage; import gearth.protocol.HPacket; diff --git a/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/PacketLogger.java b/G-Earth/src/main/java/gearth/ui/subforms/logger/loggerdisplays/PacketLogger.java similarity index 94% rename from G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/PacketLogger.java rename to G-Earth/src/main/java/gearth/ui/subforms/logger/loggerdisplays/PacketLogger.java index a2e1770..195f844 100644 --- a/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/PacketLogger.java +++ b/G-Earth/src/main/java/gearth/ui/subforms/logger/loggerdisplays/PacketLogger.java @@ -1,4 +1,4 @@ -package gearth.ui.logger.loggerdisplays; +package gearth.ui.subforms.logger.loggerdisplays; import gearth.protocol.HConnection; import gearth.protocol.HMessage; diff --git a/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/PacketLoggerFactory.java b/G-Earth/src/main/java/gearth/ui/subforms/logger/loggerdisplays/PacketLoggerFactory.java similarity index 96% rename from G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/PacketLoggerFactory.java rename to G-Earth/src/main/java/gearth/ui/subforms/logger/loggerdisplays/PacketLoggerFactory.java index 82c8281..b4c93a9 100644 --- a/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/PacketLoggerFactory.java +++ b/G-Earth/src/main/java/gearth/ui/subforms/logger/loggerdisplays/PacketLoggerFactory.java @@ -1,4 +1,4 @@ -package gearth.ui.logger.loggerdisplays; +package gearth.ui.subforms.logger.loggerdisplays; import gearth.GEarth; import gearth.extensions.InternalExtensionFormBuilder; diff --git a/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/SimpleTerminalLogger.java b/G-Earth/src/main/java/gearth/ui/subforms/logger/loggerdisplays/SimpleTerminalLogger.java similarity index 97% rename from G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/SimpleTerminalLogger.java rename to G-Earth/src/main/java/gearth/ui/subforms/logger/loggerdisplays/SimpleTerminalLogger.java index b8aaf4e..0489a01 100644 --- a/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/SimpleTerminalLogger.java +++ b/G-Earth/src/main/java/gearth/ui/subforms/logger/loggerdisplays/SimpleTerminalLogger.java @@ -1,4 +1,4 @@ -package gearth.ui.logger.loggerdisplays; +package gearth.ui.subforms.logger.loggerdisplays; import gearth.services.packet_info.PacketInfoManager; import gearth.protocol.HConnection; diff --git a/G-Earth/src/main/java/gearth/ui/scheduler/InteractableScheduleItem.java b/G-Earth/src/main/java/gearth/ui/subforms/scheduler/InteractableScheduleItem.java similarity index 95% rename from G-Earth/src/main/java/gearth/ui/scheduler/InteractableScheduleItem.java rename to G-Earth/src/main/java/gearth/ui/subforms/scheduler/InteractableScheduleItem.java index 471fab2..7651cd6 100644 --- a/G-Earth/src/main/java/gearth/ui/scheduler/InteractableScheduleItem.java +++ b/G-Earth/src/main/java/gearth/ui/subforms/scheduler/InteractableScheduleItem.java @@ -1,17 +1,14 @@ -package gearth.ui.scheduler; +package gearth.ui.subforms.scheduler; import gearth.misc.StringifyAble; import gearth.misc.listenerpattern.Observable; import gearth.protocol.HMessage; -import gearth.protocol.HPacket; import gearth.services.scheduler.Interval; import gearth.services.scheduler.ScheduleItem; import gearth.services.scheduler.listeners.OnBeingUpdatedListener; import gearth.services.scheduler.listeners.OnDeleteListener; import gearth.services.scheduler.listeners.OnEditListener; import gearth.services.scheduler.listeners.OnUpdatedListener; -import javafx.beans.property.SimpleObjectProperty; -import javafx.beans.property.SimpleStringProperty; public class InteractableScheduleItem extends ScheduleItem implements StringifyAble { diff --git a/G-Earth/src/main/java/gearth/ui/scheduler/ScheduleItemContainer.java b/G-Earth/src/main/java/gearth/ui/subforms/scheduler/ScheduleItemContainer.java similarity index 98% rename from G-Earth/src/main/java/gearth/ui/scheduler/ScheduleItemContainer.java rename to G-Earth/src/main/java/gearth/ui/subforms/scheduler/ScheduleItemContainer.java index 8907793..d041313 100644 --- a/G-Earth/src/main/java/gearth/ui/scheduler/ScheduleItemContainer.java +++ b/G-Earth/src/main/java/gearth/ui/subforms/scheduler/ScheduleItemContainer.java @@ -1,6 +1,5 @@ -package gearth.ui.scheduler; +package gearth.ui.subforms.scheduler; -import gearth.services.scheduler.ScheduleItem; import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.control.Label; diff --git a/G-Earth/src/main/java/gearth/ui/scheduler/SchedulerController.java b/G-Earth/src/main/java/gearth/ui/subforms/scheduler/SchedulerController.java similarity index 98% rename from G-Earth/src/main/java/gearth/ui/scheduler/SchedulerController.java rename to G-Earth/src/main/java/gearth/ui/subforms/scheduler/SchedulerController.java index 2eef5a1..0f1ea75 100644 --- a/G-Earth/src/main/java/gearth/ui/scheduler/SchedulerController.java +++ b/G-Earth/src/main/java/gearth/ui/subforms/scheduler/SchedulerController.java @@ -1,8 +1,7 @@ -package gearth.ui.scheduler; +package gearth.ui.subforms.scheduler; import com.tulskiy.keymaster.common.Provider; import gearth.services.scheduler.Interval; -import gearth.services.scheduler.ScheduleItem; import gearth.services.scheduler.Scheduler; import javafx.application.Platform; import javafx.event.ActionEvent; @@ -17,9 +16,7 @@ import gearth.ui.SubForm; import javax.swing.*; import java.io.*; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Set; /** * Created by Jonas on 06/04/18. diff --git a/G-Earth/src/main/java/gearth/ui/tools/ToolsController.java b/G-Earth/src/main/java/gearth/ui/subforms/tools/ToolsController.java similarity index 98% rename from G-Earth/src/main/java/gearth/ui/tools/ToolsController.java rename to G-Earth/src/main/java/gearth/ui/subforms/tools/ToolsController.java index 701174c..bd27506 100644 --- a/G-Earth/src/main/java/gearth/ui/tools/ToolsController.java +++ b/G-Earth/src/main/java/gearth/ui/subforms/tools/ToolsController.java @@ -1,7 +1,6 @@ -package gearth.ui.tools; +package gearth.ui.subforms.tools; import gearth.services.packet_info.PacketInfoManager; -import gearth.protocol.HMessage; import javafx.event.ActionEvent; import javafx.scene.control.Button; import javafx.scene.control.TextArea; diff --git a/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java b/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java index c2709c0..1806086 100644 --- a/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java +++ b/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java @@ -34,6 +34,7 @@ public class TitleBarController { Parent parent = stage.getScene().getRoot(); VBox newParent = new VBox(root, parent); + newParent.setId("titlebar-main-container"); stage.getScene().setRoot(newParent); parent.getScene().setFill(Color.TRANSPARENT); 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 9f9f0d3..8976b77 100644 --- a/G-Earth/src/main/resources/gearth/ui/G-Earth.fxml +++ b/G-Earth/src/main/resources/gearth/ui/G-Earth.fxml @@ -7,31 +7,31 @@ - + - + - + - + - + - + - + - + - + diff --git a/G-Earth/src/main/resources/gearth/ui/connection/Connection.fxml b/G-Earth/src/main/resources/gearth/ui/subforms/connection/Connection.fxml similarity index 99% rename from G-Earth/src/main/resources/gearth/ui/connection/Connection.fxml rename to G-Earth/src/main/resources/gearth/ui/subforms/connection/Connection.fxml index d01b5c4..923279c 100644 --- a/G-Earth/src/main/resources/gearth/ui/connection/Connection.fxml +++ b/G-Earth/src/main/resources/gearth/ui/subforms/connection/Connection.fxml @@ -5,7 +5,7 @@ - + diff --git a/G-Earth/src/main/resources/gearth/ui/extensions/Extensions.fxml b/G-Earth/src/main/resources/gearth/ui/subforms/extensions/Extensions.fxml similarity index 98% rename from G-Earth/src/main/resources/gearth/ui/extensions/Extensions.fxml rename to G-Earth/src/main/resources/gearth/ui/subforms/extensions/Extensions.fxml index c5539f5..0614878 100644 --- a/G-Earth/src/main/resources/gearth/ui/extensions/Extensions.fxml +++ b/G-Earth/src/main/resources/gearth/ui/subforms/extensions/Extensions.fxml @@ -4,7 +4,7 @@ - + diff --git a/G-Earth/src/main/resources/gearth/ui/extensions/logger/ExtensionLogger.fxml b/G-Earth/src/main/resources/gearth/ui/subforms/extensions/logger/ExtensionLogger.fxml similarity index 86% rename from G-Earth/src/main/resources/gearth/ui/extensions/logger/ExtensionLogger.fxml rename to G-Earth/src/main/resources/gearth/ui/subforms/extensions/logger/ExtensionLogger.fxml index 0fcd89f..f98429a 100644 --- a/G-Earth/src/main/resources/gearth/ui/extensions/logger/ExtensionLogger.fxml +++ b/G-Earth/src/main/resources/gearth/ui/subforms/extensions/logger/ExtensionLogger.fxml @@ -3,7 +3,7 @@ - + diff --git a/G-Earth/src/main/resources/gearth/ui/extensions/logger/logger.css b/G-Earth/src/main/resources/gearth/ui/subforms/extensions/logger/logger.css similarity index 100% rename from G-Earth/src/main/resources/gearth/ui/extensions/logger/logger.css rename to G-Earth/src/main/resources/gearth/ui/subforms/extensions/logger/logger.css diff --git a/G-Earth/src/main/resources/gearth/ui/extra/Extra.fxml b/G-Earth/src/main/resources/gearth/ui/subforms/extra/Extra.fxml similarity index 99% rename from G-Earth/src/main/resources/gearth/ui/extra/Extra.fxml rename to G-Earth/src/main/resources/gearth/ui/subforms/extra/Extra.fxml index 7368aba..f16dba0 100644 --- a/G-Earth/src/main/resources/gearth/ui/extra/Extra.fxml +++ b/G-Earth/src/main/resources/gearth/ui/subforms/extra/Extra.fxml @@ -4,7 +4,7 @@ - + diff --git a/G-Earth/src/main/resources/gearth/ui/info/Info.fxml b/G-Earth/src/main/resources/gearth/ui/subforms/info/Info.fxml similarity index 98% rename from G-Earth/src/main/resources/gearth/ui/info/Info.fxml rename to G-Earth/src/main/resources/gearth/ui/subforms/info/Info.fxml index e19c71d..12d7e97 100644 --- a/G-Earth/src/main/resources/gearth/ui/info/Info.fxml +++ b/G-Earth/src/main/resources/gearth/ui/subforms/info/Info.fxml @@ -5,7 +5,7 @@ - + diff --git a/G-Earth/src/main/resources/gearth/ui/injection/Injection.fxml b/G-Earth/src/main/resources/gearth/ui/subforms/injection/Injection.fxml similarity index 98% rename from G-Earth/src/main/resources/gearth/ui/injection/Injection.fxml rename to G-Earth/src/main/resources/gearth/ui/subforms/injection/Injection.fxml index 1f57489..d615c13 100644 --- a/G-Earth/src/main/resources/gearth/ui/injection/Injection.fxml +++ b/G-Earth/src/main/resources/gearth/ui/subforms/injection/Injection.fxml @@ -5,7 +5,7 @@ - + diff --git a/G-Earth/src/main/resources/gearth/ui/logger/Logger.fxml b/G-Earth/src/main/resources/gearth/ui/subforms/logger/Logger.fxml similarity index 98% rename from G-Earth/src/main/resources/gearth/ui/logger/Logger.fxml rename to G-Earth/src/main/resources/gearth/ui/subforms/logger/Logger.fxml index 67f8dc5..41988da 100644 --- a/G-Earth/src/main/resources/gearth/ui/logger/Logger.fxml +++ b/G-Earth/src/main/resources/gearth/ui/subforms/logger/Logger.fxml @@ -14,7 +14,7 @@ + fx:controller="gearth.ui.subforms.logger.LoggerController"> diff --git a/G-Earth/src/main/resources/gearth/ui/scheduler/Scheduler.fxml b/G-Earth/src/main/resources/gearth/ui/subforms/scheduler/Scheduler.fxml similarity index 99% rename from G-Earth/src/main/resources/gearth/ui/scheduler/Scheduler.fxml rename to G-Earth/src/main/resources/gearth/ui/subforms/scheduler/Scheduler.fxml index bdbb415..50abd20 100644 --- a/G-Earth/src/main/resources/gearth/ui/scheduler/Scheduler.fxml +++ b/G-Earth/src/main/resources/gearth/ui/subforms/scheduler/Scheduler.fxml @@ -4,7 +4,7 @@ - + diff --git a/G-Earth/src/main/resources/gearth/ui/tools/Tools.fxml b/G-Earth/src/main/resources/gearth/ui/subforms/tools/Tools.fxml similarity index 99% rename from G-Earth/src/main/resources/gearth/ui/tools/Tools.fxml rename to G-Earth/src/main/resources/gearth/ui/subforms/tools/Tools.fxml index e876daa..55f0241 100644 --- a/G-Earth/src/main/resources/gearth/ui/tools/Tools.fxml +++ b/G-Earth/src/main/resources/gearth/ui/subforms/tools/Tools.fxml @@ -12,7 +12,7 @@ + fx:controller="gearth.ui.subforms.tools.ToolsController"> diff --git a/G-Earth/src/main/resources/gearth/themes/G-Earth/logo.ico b/G-Earth/src/main/resources/gearth/ui/themes/G-Earth/logo.ico similarity index 100% rename from G-Earth/src/main/resources/gearth/themes/G-Earth/logo.ico rename to G-Earth/src/main/resources/gearth/ui/themes/G-Earth/logo.ico diff --git a/G-Earth/src/main/resources/gearth/themes/G-Earth/logo.png b/G-Earth/src/main/resources/gearth/ui/themes/G-Earth/logo.png similarity index 100% rename from G-Earth/src/main/resources/gearth/themes/G-Earth/logo.png rename to G-Earth/src/main/resources/gearth/ui/themes/G-Earth/logo.png diff --git a/G-Earth/src/main/resources/gearth/themes/G-Earth/logoSmall.png b/G-Earth/src/main/resources/gearth/ui/themes/G-Earth/logoSmall.png similarity index 100% rename from G-Earth/src/main/resources/gearth/themes/G-Earth/logoSmall.png rename to G-Earth/src/main/resources/gearth/ui/themes/G-Earth/logoSmall.png diff --git a/G-Earth/src/main/resources/gearth/themes/G-Earth/styling.css b/G-Earth/src/main/resources/gearth/ui/themes/G-Earth/styling.css similarity index 98% rename from G-Earth/src/main/resources/gearth/themes/G-Earth/styling.css rename to G-Earth/src/main/resources/gearth/ui/themes/G-Earth/styling.css index 56493f5..bc70a61 100644 --- a/G-Earth/src/main/resources/gearth/themes/G-Earth/styling.css +++ b/G-Earth/src/main/resources/gearth/ui/themes/G-Earth/styling.css @@ -1,4 +1,4 @@ -#main-window { +#titlebar-main-container { -fx-body-color : transparent; -fx-background-radius: 15; -fx-outer-border : #cecece; @@ -921,27 +921,27 @@ VBox > .split-menu-button.last > .arrow-button { } #close-button { - -fx-image: url("../../ui/titlebar/files/closeButton.png"); + -fx-image: url("../../titlebar/files/closeButton.png"); } #close-button:hover { - -fx-image: url("../../ui/titlebar/files/closeButtonHover.png"); + -fx-image: url("../../titlebar/files/closeButtonHover.png"); } #close-button:pressed { - -fx-image: url("../../ui/titlebar/files/closeButtonPressed.png"); + -fx-image: url("../../titlebar/files/closeButtonPressed.png"); } #minimize-button { - -fx-image: url("../../ui/titlebar/files/minimizeButton.png"); + -fx-image: url("../../titlebar/files/minimizeButton.png"); } #minimize-button:hover { - -fx-image: url("../../ui/titlebar/files/minimizeButtonHover.png"); + -fx-image: url("../../titlebar/files/minimizeButtonHover.png"); } #minimize-button:pressed { - -fx-image: url("../../ui/titlebar/files/minimizeButtonPressed.png"); + -fx-image: url("../../titlebar/files/minimizeButtonPressed.png"); } #main-tab-pane, #main-tab-pane > * { @@ -949,11 +949,11 @@ VBox > .split-menu-button.last > .arrow-button { } #icon { - -fx-image: url("./logoSmall.png"); + -fx-image: url("logoSmall.png"); } #theme-button { - -fx-image: url("./themeButton.png"); + -fx-image: url("themeButton.png"); } .corrupted-label { diff --git a/G-Earth/src/main/resources/gearth/themes/G-Earth/themeButton.png b/G-Earth/src/main/resources/gearth/ui/themes/G-Earth/themeButton.png similarity index 100% rename from G-Earth/src/main/resources/gearth/themes/G-Earth/themeButton.png rename to G-Earth/src/main/resources/gearth/ui/themes/G-Earth/themeButton.png diff --git a/G-Earth/src/main/resources/gearth/themes/G-Earth_Dark/logo.ico b/G-Earth/src/main/resources/gearth/ui/themes/G-Earth_Dark/logo.ico similarity index 100% rename from G-Earth/src/main/resources/gearth/themes/G-Earth_Dark/logo.ico rename to G-Earth/src/main/resources/gearth/ui/themes/G-Earth_Dark/logo.ico diff --git a/G-Earth/src/main/resources/gearth/themes/G-Earth_Dark/logo.png b/G-Earth/src/main/resources/gearth/ui/themes/G-Earth_Dark/logo.png similarity index 100% rename from G-Earth/src/main/resources/gearth/themes/G-Earth_Dark/logo.png rename to G-Earth/src/main/resources/gearth/ui/themes/G-Earth_Dark/logo.png diff --git a/G-Earth/src/main/resources/gearth/themes/G-Earth_Dark/logoSmall.png b/G-Earth/src/main/resources/gearth/ui/themes/G-Earth_Dark/logoSmall.png similarity index 100% rename from G-Earth/src/main/resources/gearth/themes/G-Earth_Dark/logoSmall.png rename to G-Earth/src/main/resources/gearth/ui/themes/G-Earth_Dark/logoSmall.png diff --git a/G-Earth/src/main/resources/gearth/themes/G-Earth_Dark/styling.css b/G-Earth/src/main/resources/gearth/ui/themes/G-Earth_Dark/styling.css similarity index 98% rename from G-Earth/src/main/resources/gearth/themes/G-Earth_Dark/styling.css rename to G-Earth/src/main/resources/gearth/ui/themes/G-Earth_Dark/styling.css index 5bb9e90..6d12ffe 100644 --- a/G-Earth/src/main/resources/gearth/themes/G-Earth_Dark/styling.css +++ b/G-Earth/src/main/resources/gearth/ui/themes/G-Earth_Dark/styling.css @@ -1,4 +1,4 @@ -#main-window { +#titlebar-main-container { -fx-body-color : transparent; -fx-background-radius: 15; -fx-outer-border: #222222; @@ -960,31 +960,31 @@ VBox > .split-menu-button.last > .arrow-button { } #close-button { - -fx-image: url("../../ui/titlebar/files/closeButtonDark.png"); + -fx-image: url("../../titlebar/files/closeButtonDark.png"); -fx-padding: 10; -fx-background-color: firebrick; } #close-button:hover { - -fx-image: url("../../ui/titlebar/files/closeButtonHover.png"); + -fx-image: url("../../titlebar/files/closeButtonHover.png"); -fx-background-color: #e81123; } #close-button:pressed { - -fx-image: url("../../ui/titlebar/files/closeButtonPressed.png"); + -fx-image: url("../../titlebar/files/closeButtonPressed.png"); -fx-background-color: rgba(232, 17, 35, 0.8); } #minimize-button { - -fx-image: url("../../ui/titlebar/files/minimizeButtonDark.png"); + -fx-image: url("../../titlebar/files/minimizeButtonDark.png"); } #minimize-button:hover { - -fx-image: url("../../ui/titlebar/files/minimizeButtonDarkHover.png"); + -fx-image: url("../../titlebar/files/minimizeButtonDarkHover.png"); } #minimize-button:pressed { - -fx-image: url("../../ui/titlebar/files/minimizeButtonDarkPressed.png"); + -fx-image: url("../../titlebar/files/minimizeButtonDarkPressed.png"); } #main-tab-pane, #main-tab-pane > * { @@ -992,11 +992,11 @@ VBox > .split-menu-button.last > .arrow-button { } #icon { - -fx-image: url("./logoSmall.png"); + -fx-image: url("logoSmall.png"); } #theme-button { - -fx-image: url("./themeButton.png"); + -fx-image: url("themeButton.png"); } /* Error window */ diff --git a/G-Earth/src/main/resources/gearth/themes/G-Earth_Dark/themeButton.png b/G-Earth/src/main/resources/gearth/ui/themes/G-Earth_Dark/themeButton.png similarity index 100% rename from G-Earth/src/main/resources/gearth/themes/G-Earth_Dark/themeButton.png rename to G-Earth/src/main/resources/gearth/ui/themes/G-Earth_Dark/themeButton.png diff --git a/G-Earth/src/main/resources/gearth/themes/Tanji/logo.ico b/G-Earth/src/main/resources/gearth/ui/themes/Tanji/logo.ico similarity index 100% rename from G-Earth/src/main/resources/gearth/themes/Tanji/logo.ico rename to G-Earth/src/main/resources/gearth/ui/themes/Tanji/logo.ico diff --git a/G-Earth/src/main/resources/gearth/themes/Tanji/logo.png b/G-Earth/src/main/resources/gearth/ui/themes/Tanji/logo.png similarity index 100% rename from G-Earth/src/main/resources/gearth/themes/Tanji/logo.png rename to G-Earth/src/main/resources/gearth/ui/themes/Tanji/logo.png diff --git a/G-Earth/src/main/resources/gearth/themes/Tanji/logoSmall.png b/G-Earth/src/main/resources/gearth/ui/themes/Tanji/logoSmall.png similarity index 100% rename from G-Earth/src/main/resources/gearth/themes/Tanji/logoSmall.png rename to G-Earth/src/main/resources/gearth/ui/themes/Tanji/logoSmall.png diff --git a/G-Earth/src/main/resources/gearth/themes/Tanji/styling.css b/G-Earth/src/main/resources/gearth/ui/themes/Tanji/styling.css similarity index 98% rename from G-Earth/src/main/resources/gearth/themes/Tanji/styling.css rename to G-Earth/src/main/resources/gearth/ui/themes/Tanji/styling.css index 386f8e5..26c68e8 100644 --- a/G-Earth/src/main/resources/gearth/themes/Tanji/styling.css +++ b/G-Earth/src/main/resources/gearth/ui/themes/Tanji/styling.css @@ -1,4 +1,4 @@ -#main-window { +#titlebar-main-container { -fx-body-color : transparent; -fx-background-radius: 15; -fx-outer-border : #cecece; @@ -921,27 +921,27 @@ VBox > .split-menu-button.last > .arrow-button { } #close-button { - -fx-image: url("../../ui/titlebar/files/closeButton.png"); + -fx-image: url("../../titlebar/files/closeButton.png"); } #close-button:hover { - -fx-image: url("../../ui/titlebar/files/closeButtonHover.png"); + -fx-image: url("../../titlebar/files/closeButtonHover.png"); } #close-button:pressed { - -fx-image: url("../../ui/titlebar/files/closeButtonPressed.png"); + -fx-image: url("../../titlebar/files/closeButtonPressed.png"); } #minimize-button { - -fx-image: url("../../ui/titlebar/files/minimizeButton.png"); + -fx-image: url("../../titlebar/files/minimizeButton.png"); } #minimize-button:hover { - -fx-image: url("../../ui/titlebar/files/minimizeButtonHover.png"); + -fx-image: url("../../titlebar/files/minimizeButtonHover.png"); } #minimize-button:pressed { - -fx-image: url("../../ui/titlebar/files/minimizeButtonPressed.png"); + -fx-image: url("../../titlebar/files/minimizeButtonPressed.png"); } #main-tab-pane, #main-tab-pane > * { @@ -949,11 +949,11 @@ VBox > .split-menu-button.last > .arrow-button { } #icon { - -fx-image: url("./logoSmall.png"); + -fx-image: url("logoSmall.png"); } #theme-button { - -fx-image: url("./themeButton.png"); + -fx-image: url("themeButton.png"); } .corrupted-label { diff --git a/G-Earth/src/main/resources/gearth/themes/Tanji/themeButton.png b/G-Earth/src/main/resources/gearth/ui/themes/Tanji/themeButton.png similarity index 100% rename from G-Earth/src/main/resources/gearth/themes/Tanji/themeButton.png rename to G-Earth/src/main/resources/gearth/ui/themes/Tanji/themeButton.png diff --git a/G-Earth/src/main/resources/gearth/ui/titlebar/Titlebar.fxml b/G-Earth/src/main/resources/gearth/ui/titlebar/Titlebar.fxml index e0c1e34..76aafba 100644 --- a/G-Earth/src/main/resources/gearth/ui/titlebar/Titlebar.fxml +++ b/G-Earth/src/main/resources/gearth/ui/titlebar/Titlebar.fxml @@ -20,7 +20,7 @@ - + - + \ No newline at end of file