mirror
/
osci-render
kopia lustrzana https://github.com/jameshball/osci-render
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Allow project select screen to be resized

pull/131/head
James Ball 2022-09-27 13:05:48 +01:00 zatwierdzone przez James H Ball
rodzic ba454bb8ed
commit 29a5c9f7b7
3 zmienionych plików z 63 dodań i 34 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
src/main/java/sh/ball/gui/Gui.java
Wyświetl plik

@ -100,7 +100,7 @@ public class Gui extends Application {
scene.getStylesheets().add(getClass().getResource("/css/main.css").toExternalForm());
stage.setScene(scene);
stage.setResizable(false);
stage.setResizable(true);
stage.setOnCloseRequest(t -> {
Platform.exit();

10
src/main/resources/fxml/main.fxml
Wyświetl plik

@ -18,7 +18,7 @@
<?import javafx.scene.layout.AnchorPane?>
<AnchorPane maxHeight="752.0" maxWidth="1046.0" minHeight="752.0" minWidth="1046.0" prefHeight="752.0" prefWidth="1046.0" stylesheets="@../css/main.css" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="sh.ball.gui.controller.MainController">
<MenuBar prefHeight="27.0" prefWidth="1046.0">
<MenuBar prefHeight="27.0" prefWidth="1046.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<menus>
<Menu mnemonicParsing="false" text="File">
<items>
@ -218,18 +218,18 @@
</Menu>
</menus>
</MenuBar>
<TitledPane animated="false" collapsible="false" layoutX="7.0" layoutY="33.0" minHeight="371.0" minWidth="378.0" prefHeight="371.0" prefWidth="416.0" text="Main settings">
<TitledPane animated="false" collapsible="false" layoutX="7.0" layoutY="33.0" minHeight="371.0" minWidth="378.0" prefHeight="371.0" prefWidth="416.0" text="Main settings" AnchorPane.leftAnchor="7.0" AnchorPane.topAnchor="33.0">
<fx:include fx:id="general" source="general.fxml" />
</TitledPane>
<AnchorPane fx:id="frequencyPane" layoutX="429.0" layoutY="692.0" prefHeight="53.0" prefWidth="610.0" styleClass="darkPane">
<AnchorPane fx:id="frequencyPane" layoutX="429.0" layoutY="692.0" prefHeight="53.0" prefWidth="610.0" styleClass="darkPane" AnchorPane.bottomAnchor="7.0" AnchorPane.rightAnchor="7.0">
<children>
<fx:include fx:id="image" layoutX="34.0" source="image.fxml" />
</children>
</AnchorPane>
<TitledPane animated="false" collapsible="false" layoutX="429.0" layoutY="33.0" prefHeight="652.0" prefWidth="610.0" text="Audio Effects">
<TitledPane animated="false" collapsible="false" layoutX="429.0" layoutY="33.0" prefHeight="652.0" prefWidth="610.0" text="Audio Effects" AnchorPane.bottomAnchor="67.0" AnchorPane.rightAnchor="7.0" AnchorPane.topAnchor="33.0">
<fx:include fx:id="effects" source="effects.fxml" />
</TitledPane>
<TitledPane fx:id="objTitledPane" animated="false" collapsible="false" layoutX="7.0" layoutY="411.0" prefHeight="334.0" prefWidth="416.0" text="3D .obj file settings">
<TitledPane fx:id="objTitledPane" animated="false" collapsible="false" layoutX="7.0" layoutY="411.0" prefHeight="334.0" prefWidth="416.0" text="3D .obj file settings" AnchorPane.bottomAnchor="7.0" AnchorPane.leftAnchor="7.0" AnchorPane.topAnchor="410.0">
<fx:include fx:id="obj" source="obj.fxml" />
</TitledPane>
<TitledPane fx:id="luaTitledPane" animated="false" collapsible="false" layoutX="7.0" layoutY="411.0" prefHeight="334.0" prefWidth="416.0" text=".lua file settings" visible="false">

85
src/main/resources/fxml/projectSelect.fxml
Wyświetl plik

@ -9,39 +9,68 @@
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.web.WebView?>
<AnchorPane prefHeight="752.0" prefWidth="1046.0" stylesheets="@../css/main.css" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="sh.ball.gui.controller.ProjectSelectController">
<AnchorPane layoutX="11.0" layoutY="12.0" prefHeight="727.0" prefWidth="1023.0" styleClass="darkPane">
<AnchorPane layoutX="11.0" layoutY="12.0" prefHeight="727.0" prefWidth="1023.0" styleClass="darkPane" AnchorPane.bottomAnchor="12.0" AnchorPane.leftAnchor="12.0" AnchorPane.rightAnchor="12.0" AnchorPane.topAnchor="12.0">
<children>
<ImageView fitHeight="247.0" fitWidth="252.0" layoutX="162.0" layoutY="3.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../images/osci.png" />
</image>
</ImageView>
<ListView fx:id="recentFilesListView" layoutX="28.0" layoutY="286.0" prefHeight="257.0" prefWidth="527.0" styleClass="darkPane">
<placeholder>
<Label text="No recent projects. Start a new project below." />
</placeholder>
</ListView>
<Button fx:id="newProjectButton" layoutX="222.0" layoutY="562.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="131.0" text="Start new project" />
<CheckBox fx:id="startMutedCheckBox" layoutX="240.0" layoutY="623.0" mnemonicParsing="false" text="Start muted" />
<Label layoutX="188.0" layoutY="247.0" styleClass="title" text="Recently opened projects" />
<Label layoutX="14.0" layoutY="700.0" text="v1.28.5" />
<Label layoutX="752.0" layoutY="19.0" styleClass="title" text="Changelog" />
<AnchorPane layoutX="582.0" layoutY="65.0" prefHeight="200.0" prefWidth="380.0">
<HBox alignment="TOP_CENTER" layoutX="-3.0" prefHeight="693.0" prefWidth="992.0" spacing="20.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="15.0" AnchorPane.rightAnchor="15.0" AnchorPane.topAnchor="0.0">
<children>
<WebView fx:id="changelogWebView" layoutX="2.0" layoutY="2.0" prefHeight="644.0" prefWidth="422.0" />
<VBox alignment="CENTER" prefHeight="603.0" prefWidth="563.0" spacing="20.0" HBox.hgrow="ALWAYS">
<children>
<VBox fx:id="imageVBox" alignment="TOP_CENTER" minHeight="10.0" minWidth="0.0" prefHeight="200.0" prefWidth="527.0">
<children>
<ImageView fitHeight="200.0" fitWidth="${imageVBox.height}" pickOnBounds="true" preserveRatio="true" VBox.vgrow="NEVER">
<image>
<Image url="@../images/osci.png" />
</image>
</ImageView>
</children>
</VBox>
<Label styleClass="title" text="Recently opened projects">
<VBox.margin>
<Insets top="-20.0" />
</VBox.margin>
</Label>
<ListView fx:id="recentFilesListView" prefHeight="257.0" prefWidth="527.0" styleClass="darkPane" VBox.vgrow="ALWAYS">
<placeholder>
<Label text="No recent projects. Start a new project below." />
</placeholder>
</ListView>
<Button fx:id="newProjectButton" mnemonicParsing="false" prefHeight="40.0" prefWidth="131.0" text="Start new project" />
<CheckBox fx:id="startMutedCheckBox" mnemonicParsing="false" text="Start muted" />
<HBox alignment="CENTER" spacing="20.0">
<children>
<Label minWidth="42.0" prefHeight="18.0" prefWidth="42.0" text="v1.28.5" />
<Label prefHeight="54.0" prefWidth="379.0" text="Email me at james@ball.sh or create an issue on GitHub for feature suggestions, issues, or opportunites I might be interested in!" textAlignment="CENTER" wrapText="true" />
<Button fx:id="logButton" minWidth="102.0" mnemonicParsing="false" prefWidth="102.0" text="Open log folder" />
</children>
</HBox>
</children>
</VBox>
<VBox alignment="TOP_CENTER" prefHeight="715.0" prefWidth="422.0" spacing="20.0" HBox.hgrow="ALWAYS">
<children>
<Label styleClass="title" text="Changelog" />
<AnchorPane prefHeight="679.0" prefWidth="442.0" VBox.vgrow="ALWAYS">
<children>
<WebView fx:id="changelogWebView" layoutX="-30.0" layoutY="-17.0" minWidth="50.0" prefHeight="719.0" prefWidth="525.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
</children>
<opaqueInsets>
<Insets />
</opaqueInsets>
<styleClass>
<String fx:value="white-border" />
<String fx:value="darkPane" />
</styleClass>
</AnchorPane>
</children>
<padding>
<Insets bottom="15.0" top="20.0" />
</padding>
</VBox>
</children>
<opaqueInsets>
<Insets />
</opaqueInsets>
<styleClass>
<String fx:value="white-border" />
<String fx:value="darkPane" />
</styleClass>
</AnchorPane>
<Label layoutX="66.0" layoutY="679.0" prefHeight="40.0" prefWidth="379.0" text="Email me at james@ball.sh or create an issue on GitHub for feature suggestions, issues, or opportunites I might be interested in!" textAlignment="CENTER" wrapText="true" />
<Button fx:id="logButton" layoutX="458.0" layoutY="686.0" mnemonicParsing="false" text="Open log folder" />
</HBox>
</children></AnchorPane>
</AnchorPane>