Skip to content

Commit

Permalink
Slightly improve Quark's UI
Browse files Browse the repository at this point in the history
  • Loading branch information
XorTroll committed Dec 22, 2019
1 parent 582f86c commit 92b99ac
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@

public class MainApplication extends Application
{
public static final Version QuarkVer = new Version(0, 2, 0);
public static final Version QuarkVer = new Version(0, 3, 0);
public static final Version MinGoldleafVer = new Version(0, 8, 0);

public MainController controller;
Expand Down Expand Up @@ -131,13 +131,13 @@ public void start(Stage primaryStage) throws Exception
Pane base = loader.load();
cfg = new Config();

scene = new Scene(base, 590, 390);
scene = new Scene(base, 900, 400);
scene.getStylesheets().add(getClass().getClassLoader().getResource("Main.css").toExternalForm());
controller = loader.getController();
primaryStage.getIcons().add(new Image(getClass().getClassLoader().getResource("Icon.png").toExternalForm()));
primaryStage.setResizable(false);
stage = primaryStage;
stage.setTitle("Quark v" + QuarkVer.toString() + " - Goldleaf USB client");
stage.setTitle("Quark v" + QuarkVer.toString() + " - Goldleaf's USB client");
stage.setScene(scene);

Task<Void> usbtask = new Task<Void>()
Expand Down
16 changes: 8 additions & 8 deletions Quark/src/main/resources/Main.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@

<VBox prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="xorTroll.goldleaf.quark.ui.MainController">
<children>
<Pane fx:id="MainPane" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0">
<Pane fx:id="MainPane" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="900.0">
<children>
<JFXProgressBar fx:id="ProgressBar" layoutX="35.0" layoutY="352.0" prefHeight="3.0" prefWidth="225.0" />
<Label fx:id="USBStatusLabel" layoutX="15.0" layoutY="375.0" text="Starting Quark..." />
<JFXTextArea fx:id="LogArea" editable="false" layoutX="14.0" layoutY="14.0" prefHeight="276.0" prefWidth="266.0" />
<JFXListView fx:id="PathList" layoutX="295.0" layoutY="53.0" prefHeight="318.0" prefWidth="291.0" />
<JFXButton fx:id="NewPathButton" layoutX="295.0" layoutY="14.0" prefHeight="32.0" prefWidth="119.0" text="Add new path" />
<JFXToggleButton fx:id="ShowLogsToggle" layoutX="-9.0" layoutY="294.0" prefHeight="3.0" prefWidth="175.0" text="Show logs" />
<JFXButton fx:id="PathRemoveButton" layoutX="424.0" layoutY="14.0" prefHeight="32.0" prefWidth="162.0" text="Remove selected path" />
<JFXProgressBar fx:id="ProgressBar" layoutX="29.0" layoutY="350.0" prefHeight="4.0" prefWidth="337.0" />
<Label fx:id="USBStatusLabel" layoutX="26.0" layoutY="369.0" text="Starting Quark..." />
<JFXTextArea fx:id="LogArea" editable="false" layoutX="14.0" layoutY="14.0" prefHeight="276.0" prefWidth="370.0" />
<JFXListView fx:id="PathList" layoutX="397.0" layoutY="58.0" prefHeight="320.0" prefWidth="485.0" />
<JFXButton fx:id="NewPathButton" layoutX="397.0" layoutY="14.0" prefHeight="32.0" prefWidth="220.0" text="Add new path" />
<JFXToggleButton fx:id="ShowLogsToggle" layoutX="-9.0" layoutY="292.0" prefHeight="3.0" prefWidth="175.0" text="Show logs" />
<JFXButton fx:id="PathRemoveButton" layoutX="630.0" layoutY="14.0" prefHeight="32.0" prefWidth="250.0" text="Remove selected path" />
</children>
</Pane>
</children>
Expand Down

0 comments on commit 92b99ac

Please sign in to comment.