nitro/G-Earth
1
0
Fork 0
mirror of https://github.com/sirjonasxx/G-Earth.git synced 2024-07-02 22:35:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

more refactoring

Browse Source
This commit is contained in:
sirjonasxx 2022-02-13 02:08:49 +01:00
parent 7a7da9835a
commit 33db81a8b5
65 changed files with 116 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
G-Earth/src/main/java/gearth/GEarth.java
View File

@ -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());
}

4
G-Earth/src/main/java/gearth/misc/AdminValidator.java
View File

@ -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();

4
G-Earth/src/main/java/gearth/misc/ConfirmationDialog.java
View File

@ -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

4
G-Earth/src/main/java/gearth/misc/UpdateChecker.java
View File

@ -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:");

4
G-Earth/src/main/java/gearth/protocol/connection/proxy/ProxyProviderFactory.java
View File

@ -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();

4
G-Earth/src/main/java/gearth/protocol/connection/proxy/flash/FlashProxyProvider.java
View File

@ -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();

4
G-Earth/src/main/java/gearth/protocol/connection/proxy/flash/NormalFlashProxyProvider.java
View File

@ -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);

4
G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/http/NitroHttpProxy.java
View File

@ -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();

4
G-Earth/src/main/java/gearth/protocol/memory/Rc4Obtainer.java
View File

@ -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:");

6
G-Earth/src/main/java/gearth/services/g_python/GPythonShell.java
View File

@ -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();

4
G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/GExtensionStoreLauncher.java
View File

@ -26,8 +26,8 @@ public class GExtensionStoreLauncher extends InternalExtensionFormLauncher<GExte
stage.setHeight(530);
stage.setScene(new Scene(root));
stage.getScene().getStylesheets().add(GEarthController.class.getResource(String.format("/gearth/themes/%s/styling.css", GEarth.theme)).toExternalForm());
stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", GEarth.theme))));
stage.getScene().getStylesheets().add(GEarthController.class.getResource(String.format("/gearth/ui/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))));
GExtensionStore gExtensionStore = new GExtensionStore();

9
G-Earth/src/main/java/gearth/services/internal_extensions/uilogger/UiLogger.java
View File

@ -2,17 +2,10 @@ package gearth.services.internal_extensions.uilogger;
import gearth.extensions.ExtensionForm;
import gearth.extensions.ExtensionInfo;
import gearth.services.packet_info.PacketInfoManager;
import gearth.protocol.HConnection;
import gearth.protocol.HMessage;
import gearth.protocol.HPacket;
import gearth.ui.logger.loggerdisplays.PacketLogger;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
import javafx.scene.Scene;
import javafx.scene.image.Image;
import javafx.stage.Modality;
import javafx.stage.Stage;
import gearth.ui.subforms.logger.loggerdisplays.PacketLogger;
@ExtensionInfo(
Title = "Packet Logger",

4
G-Earth/src/main/java/gearth/services/internal_extensions/uilogger/UiLoggerController.java
View File

@ -4,10 +4,9 @@ package gearth.services.internal_extensions.uilogger;
import gearth.misc.Cacher;
import gearth.services.internal_extensions.uilogger.hexdumper.Hexdump;
import gearth.services.packet_info.PacketInfo;
import gearth.services.packet_info.PacketInfoManager;
import gearth.protocol.HMessage;
import gearth.protocol.HPacket;
import gearth.ui.logger.loggerdisplays.PacketLogger;
import gearth.ui.subforms.logger.loggerdisplays.PacketLogger;
import javafx.application.Platform;
import javafx.event.ActionEvent;
import javafx.fxml.Initializable;
@ -18,7 +17,6 @@ import javafx.scene.layout.FlowPane;
import javafx.stage.Stage;
import org.fxmisc.flowless.VirtualizedScrollPane;
import org.fxmisc.richtext.StyleClassedTextArea;
import org.fxmisc.richtext.StyledTextArea;
import org.fxmisc.richtext.model.StyleSpansBuilder;
import java.io.BufferedWriter;

4
G-Earth/src/main/java/gearth/services/internal_extensions/uilogger/UiLoggerLauncher.java
View File

@ -19,10 +19,10 @@ public class UiLoggerLauncher extends InternalExtensionFormLauncher<UiLogger> {
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();

2
G-Earth/src/main/java/gearth/services/scheduler/Interval.java
View File

@ -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.

2
G-Earth/src/main/java/gearth/services/unity_tools/GUnityFileServer.java
View File

@ -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;

24
G-Earth/src/main/java/gearth/ui/GEarthController.java
View File

@ -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 {

2
G-Earth/src/main/java/gearth/ui/connection/ConnectionController.java → G-Earth/src/main/java/gearth/ui/subforms/connection/ConnectionController.java
View File

@ -1,4 +1,4 @@
package gearth.ui.connection;
package gearth.ui.subforms.connection;
import gearth.GEarth;
import gearth.misc.Cacher;

3
G-Earth/src/main/java/gearth/ui/extensions/ExtensionItemContainer.java → G-Earth/src/main/java/gearth/ui/subforms/extensions/ExtensionItemContainer.java
View File

@ -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.*;

2
G-Earth/src/main/java/gearth/ui/extensions/ExtensionItemContainerProducer.java → G-Earth/src/main/java/gearth/ui/subforms/extensions/ExtensionItemContainerProducer.java
View File

@ -1,4 +1,4 @@
package gearth.ui.extensions;
package gearth.ui.subforms.extensions;
import gearth.services.extension_handler.extensions.GEarthExtension;
import javafx.scene.Node;

4
G-Earth/src/main/java/gearth/ui/extensions/ExtensionsController.java → G-Earth/src/main/java/gearth/ui/subforms/extensions/ExtensionsController.java
View File

@ -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.*;

2
G-Earth/src/main/java/gearth/ui/extensions/logger/Element.java → G-Earth/src/main/java/gearth/ui/subforms/extensions/logger/Element.java
View File

@ -1,4 +1,4 @@
package gearth.ui.extensions.logger;
package gearth.ui.subforms.extensions.logger;
class Element {
final String text;

8
G-Earth/src/main/java/gearth/ui/extensions/logger/ExtensionLogger.java → G-Earth/src/main/java/gearth/ui/subforms/extensions/logger/ExtensionLogger.java
View File

@ -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);

3
G-Earth/src/main/java/gearth/ui/extensions/logger/ExtensionLoggerController.java → G-Earth/src/main/java/gearth/ui/subforms/extensions/logger/ExtensionLoggerController.java
View File

@ -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;

8
G-Earth/src/main/java/gearth/ui/extra/ExtraController.java → G-Earth/src/main/java/gearth/ui/subforms/extra/ExtraController.java
View File

@ -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();

4
G-Earth/src/main/java/gearth/ui/info/InfoController.java → G-Earth/src/main/java/gearth/ui/subforms/info/InfoController.java
View File

@ -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.

2
G-Earth/src/main/java/gearth/ui/injection/InjectedPackets.java → G-Earth/src/main/java/gearth/ui/subforms/injection/InjectedPackets.java
View File

@ -1,4 +1,4 @@
package gearth.ui.injection;
package gearth.ui.subforms.injection;
import gearth.misc.StringifyAble;
import gearth.protocol.HMessage;

5
G-Earth/src/main/java/gearth/ui/injection/InjectionController.java → G-Earth/src/main/java/gearth/ui/subforms/injection/InjectionController.java
View File

@ -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 {

6
G-Earth/src/main/java/gearth/ui/logger/LoggerController.java → G-Earth/src/main/java/gearth/ui/subforms/logger/LoggerController.java
View File

@ -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;

2
G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/LinuxTerminalLogger.java → G-Earth/src/main/java/gearth/ui/subforms/logger/loggerdisplays/LinuxTerminalLogger.java
View File

@ -1,4 +1,4 @@
package gearth.ui.logger.loggerdisplays;
package gearth.ui.subforms.logger.loggerdisplays;
import gearth.protocol.HMessage;
import gearth.protocol.HPacket;

2
G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/PacketLogger.java → G-Earth/src/main/java/gearth/ui/subforms/logger/loggerdisplays/PacketLogger.java
View File

@ -1,4 +1,4 @@
package gearth.ui.logger.loggerdisplays;
package gearth.ui.subforms.logger.loggerdisplays;
import gearth.protocol.HConnection;
import gearth.protocol.HMessage;

2
G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/PacketLoggerFactory.java → G-Earth/src/main/java/gearth/ui/subforms/logger/loggerdisplays/PacketLoggerFactory.java
View File

@ -1,4 +1,4 @@
package gearth.ui.logger.loggerdisplays;
package gearth.ui.subforms.logger.loggerdisplays;
import gearth.GEarth;
import gearth.extensions.InternalExtensionFormBuilder;

2
G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/SimpleTerminalLogger.java → G-Earth/src/main/java/gearth/ui/subforms/logger/loggerdisplays/SimpleTerminalLogger.java
View File

@ -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;

5
G-Earth/src/main/java/gearth/ui/scheduler/InteractableScheduleItem.java → G-Earth/src/main/java/gearth/ui/subforms/scheduler/InteractableScheduleItem.java
View File

@ -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 {

3
G-Earth/src/main/java/gearth/ui/scheduler/ScheduleItemContainer.java → G-Earth/src/main/java/gearth/ui/subforms/scheduler/ScheduleItemContainer.java
View File

@ -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;

5
G-Earth/src/main/java/gearth/ui/scheduler/SchedulerController.java → G-Earth/src/main/java/gearth/ui/subforms/scheduler/SchedulerController.java
View File

@ -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.

3
G-Earth/src/main/java/gearth/ui/tools/ToolsController.java → G-Earth/src/main/java/gearth/ui/subforms/tools/ToolsController.java
View File

@ -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;

1
G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java
View File

@ -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);

18
G-Earth/src/main/resources/gearth/ui/G-Earth.fxml
View File

@ -7,31 +7,31 @@
<!--maxHeight="19.0" minHeight="19.0"-->
<VBox id="main-window" prefWidth="650.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gearth.ui.GEarthController">
<VBox prefWidth="650.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gearth.ui.GEarthController">
<TabPane id="main-tab-pane" fx:id="tabBar" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="295.0" prefWidth="650.0" tabClosingPolicy="UNAVAILABLE">
<Tab text="Connection">
<fx:include fx:id="connection" source="connection/Connection.fxml" />
<fx:include fx:id="connection" source="subforms/connection/Connection.fxml" />
</Tab>
<Tab fx:id="tab_Logger" text="Logger">
<fx:include fx:id="logger" source="logger/Logger.fxml" />
<fx:include fx:id="logger" source="subforms/logger/Logger.fxml" />
</Tab>
<Tab text="Injection">
<fx:include fx:id="injection" source="injection/Injection.fxml" />
<fx:include fx:id="injection" source="subforms/injection/Injection.fxml" />
</Tab>
<Tab text="Tools">
<fx:include fx:id="tools" source="tools/Tools.fxml" />
<fx:include fx:id="tools" source="subforms/tools/Tools.fxml" />
</Tab>
<Tab text="Scheduler">
<fx:include fx:id="scheduler" source="scheduler/Scheduler.fxml" />
<fx:include fx:id="scheduler" source="subforms/scheduler/Scheduler.fxml" />
</Tab>
<Tab text="Extensions">
<fx:include fx:id="extensions" source="extensions/Extensions.fxml" />
<fx:include fx:id="extensions" source="subforms/extensions/Extensions.fxml" />
</Tab>
<Tab text="Extra">
<fx:include fx:id="extra" source="extra/Extra.fxml" />
<fx:include fx:id="extra" source="subforms/extra/Extra.fxml" />
</Tab>
<Tab text="Info">
<fx:include fx:id="info" source="info/Info.fxml" />
<fx:include fx:id="info" source="subforms/info/Info.fxml" />
</Tab>
</TabPane>

2
G-Earth/src/main/resources/gearth/ui/connection/Connection.fxml → G-Earth/src/main/resources/gearth/ui/subforms/connection/Connection.fxml
View File

@ -5,7 +5,7 @@
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
<GridPane alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="258.0" prefWidth="650.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gearth.ui.connection.ConnectionController">
<GridPane alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="258.0" prefWidth="650.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gearth.ui.subforms.connection.ConnectionController">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>

2
G-Earth/src/main/resources/gearth/ui/extensions/Extensions.fxml → G-Earth/src/main/resources/gearth/ui/subforms/extensions/Extensions.fxml
View File

@ -4,7 +4,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<GridPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="258.0" prefWidth="650.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gearth.ui.extensions.ExtensionsController">
<GridPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="258.0" prefWidth="650.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gearth.ui.subforms.extensions.ExtensionsController">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="1.7976931348623157E308" minWidth="10.0" prefWidth="277.0" />
</columnConstraints>

2
G-Earth/src/main/resources/gearth/ui/extensions/logger/ExtensionLogger.fxml → G-Earth/src/main/resources/gearth/ui/subforms/extensions/logger/ExtensionLogger.fxml
View File

@ -3,7 +3,7 @@
<?import javafx.geometry.*?>
<?import javafx.scene.layout.*?>
<BorderPane fx:id="borderPane" prefHeight="230.0" prefWidth="394.0" style="-fx-background-color: white;" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gearth.ui.extensions.logger.ExtensionLoggerController">
<BorderPane fx:id="borderPane" prefHeight="230.0" prefWidth="394.0" style="-fx-background-color: white;" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gearth.ui.subforms.extensions.logger.ExtensionLoggerController">
<padding>
<Insets bottom="1.0" left="5.0" right="1.0" top="5.0" />
</padding>

0
G-Earth/src/main/resources/gearth/ui/extensions/logger/logger.css → G-Earth/src/main/resources/gearth/ui/subforms/extensions/logger/logger.css
View File

2
G-Earth/src/main/resources/gearth/ui/extra/Extra.fxml → G-Earth/src/main/resources/gearth/ui/subforms/extra/Extra.fxml
View File

@ -4,7 +4,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<GridPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="258.0" prefWidth="650.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gearth.ui.extra.ExtraController">
<GridPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="258.0" prefWidth="650.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gearth.ui.subforms.extra.ExtraController">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="331.0" minWidth="10.0" prefWidth="318.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="390.0" minWidth="10.0" prefWidth="247.0" />

2
G-Earth/src/main/resources/gearth/ui/info/Info.fxml → G-Earth/src/main/resources/gearth/ui/subforms/info/Info.fxml
View File

@ -5,7 +5,7 @@
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
<GridPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="258.0" prefWidth="650.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gearth.ui.info.InfoController">
<GridPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="258.0" prefWidth="650.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gearth.ui.subforms.info.InfoController">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="1.7976931348623157E308" minWidth="10.0" prefWidth="332.0" />
</columnConstraints>

2
G-Earth/src/main/resources/gearth/ui/injection/Injection.fxml → G-Earth/src/main/resources/gearth/ui/subforms/injection/Injection.fxml
View File

@ -5,7 +5,7 @@
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
<GridPane prefHeight="258.0" prefWidth="650.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gearth.ui.injection.InjectionController">
<GridPane prefHeight="258.0" prefWidth="650.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gearth.ui.subforms.injection.InjectionController">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="180.0" minWidth="180.0" prefWidth="180.0" />

2
G-Earth/src/main/resources/gearth/ui/logger/Logger.fxml → G-Earth/src/main/resources/gearth/ui/subforms/logger/Logger.fxml
View File

@ -14,7 +14,7 @@
<GridPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="258.0" prefWidth="650.0"
xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="gearth.ui.logger.LoggerController">
fx:controller="gearth.ui.subforms.logger.LoggerController">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="293.0" minWidth="10.0" prefWidth="242.0"/>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="390.0" minWidth="10.0" prefWidth="323.0"/>

2
G-Earth/src/main/resources/gearth/ui/scheduler/Scheduler.fxml → G-Earth/src/main/resources/gearth/ui/subforms/scheduler/Scheduler.fxml
View File

@ -4,7 +4,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<GridPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="258.0" prefWidth="650.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gearth.ui.scheduler.SchedulerController">
<GridPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="258.0" prefWidth="650.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gearth.ui.subforms.scheduler.SchedulerController">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="1.7976931348623157E308" minWidth="10.0" prefWidth="277.0" />
</columnConstraints>

2
G-Earth/src/main/resources/gearth/ui/tools/Tools.fxml → G-Earth/src/main/resources/gearth/ui/subforms/tools/Tools.fxml
View File

@ -12,7 +12,7 @@
<GridPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="258.0" prefWidth="650.0"
xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="gearth.ui.tools.ToolsController">
fx:controller="gearth.ui.subforms.tools.ToolsController">
<rowConstraints>
<RowConstraints maxHeight="158.0" minHeight="10.0" prefHeight="134.0" vgrow="SOMETIMES"/>
<RowConstraints maxHeight="141.0" minHeight="10.0" prefHeight="128.0" vgrow="SOMETIMES"/>

0
G-Earth/src/main/resources/gearth/themes/G-Earth/logo.ico → G-Earth/src/main/resources/gearth/ui/themes/G-Earth/logo.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

0
G-Earth/src/main/resources/gearth/themes/G-Earth/logo.png → G-Earth/src/main/resources/gearth/ui/themes/G-Earth/logo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 569 KiB

After

Width:  |  Height:  |  Size: 569 KiB

0
G-Earth/src/main/resources/gearth/themes/G-Earth/logoSmall.png → G-Earth/src/main/resources/gearth/ui/themes/G-Earth/logoSmall.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

18
G-Earth/src/main/resources/gearth/themes/G-Earth/styling.css → G-Earth/src/main/resources/gearth/ui/themes/G-Earth/styling.css
View File

@ -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 {

0
G-Earth/src/main/resources/gearth/themes/G-Earth/themeButton.png → G-Earth/src/main/resources/gearth/ui/themes/G-Earth/themeButton.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

0
G-Earth/src/main/resources/gearth/themes/G-Earth_Dark/logo.ico → G-Earth/src/main/resources/gearth/ui/themes/G-Earth_Dark/logo.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

0
G-Earth/src/main/resources/gearth/themes/G-Earth_Dark/logo.png → G-Earth/src/main/resources/gearth/ui/themes/G-Earth_Dark/logo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 569 KiB

After

Width:  |  Height:  |  Size: 569 KiB

0
G-Earth/src/main/resources/gearth/themes/G-Earth_Dark/logoSmall.png → G-Earth/src/main/resources/gearth/ui/themes/G-Earth_Dark/logoSmall.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

18
G-Earth/src/main/resources/gearth/themes/G-Earth_Dark/styling.css → G-Earth/src/main/resources/gearth/ui/themes/G-Earth_Dark/styling.css
View File

@ -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 */

0
G-Earth/src/main/resources/gearth/themes/G-Earth_Dark/themeButton.png → G-Earth/src/main/resources/gearth/ui/themes/G-Earth_Dark/themeButton.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

0
G-Earth/src/main/resources/gearth/themes/Tanji/logo.ico → G-Earth/src/main/resources/gearth/ui/themes/Tanji/logo.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 361 KiB

After

Width:  |  Height:  |  Size: 361 KiB

0
G-Earth/src/main/resources/gearth/themes/Tanji/logo.png → G-Earth/src/main/resources/gearth/ui/themes/Tanji/logo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB

0
G-Earth/src/main/resources/gearth/themes/Tanji/logoSmall.png → G-Earth/src/main/resources/gearth/ui/themes/Tanji/logoSmall.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB

18
G-Earth/src/main/resources/gearth/themes/Tanji/styling.css → G-Earth/src/main/resources/gearth/ui/themes/Tanji/styling.css
View File

@ -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 {

0
G-Earth/src/main/resources/gearth/themes/Tanji/themeButton.png → G-Earth/src/main/resources/gearth/ui/themes/Tanji/themeButton.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

4
G-Earth/src/main/resources/gearth/ui/titlebar/Titlebar.fxml
View File

@ -20,7 +20,7 @@
</ImageView>
<ImageView id="icon" fitHeight="16.0" fitWidth="16.0" layoutX="7.0" layoutY="5.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../../themes/G-Earth/logoSmall.png" />
<Image url="@../themes/G-Earth/logoSmall.png" />
</image>
</ImageView>
<Label fx:id="titleLabel" layoutX="23.0" layoutY="5.0" text="G-Earth 1.5.1">
@ -30,6 +30,6 @@
</Label>
<ImageView id="theme-button" fitHeight="20.0" fitWidth="38.0" layoutX="505.0" layoutY="3.0" onMouseClicked="#toggleTheme" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../../themes/G-Earth/themeButton.png" />
<Image url="@../themes/G-Earth/themeButton.png" />
</image></ImageView>
</children></Pane>