Sync with upstream

This commit is contained in:
Frank Schiebel 2024-03-12 17:34:56 +01:00
parent 39a2f13410
commit 66e8fa72bf
135 changed files with 38902 additions and 37757 deletions

View file

@ -10,7 +10,7 @@
<?import javafx.scene.input.KeyCodeCombination?>
<?import javafx.scene.layout.VBox?>
<VBox prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
<VBox prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1">
<children>
<MenuBar VBox.vgrow="NEVER">
<menus>
@ -65,7 +65,7 @@
<CheckMenuItem fx:id="mOptionKnotenwerte" mnemonicParsing="false" onAction="#mChangeOptionKnotenwerte" text="Knotenwerte anzeigen" />
<CheckMenuItem fx:id="mOptionKnotenname" mnemonicParsing="false" onAction="#mChangeOptionKnotenname" text="Knotennamen anzeigen" />
<CheckMenuItem fx:id="mOptionKnoteninfo" mnemonicParsing="false" onAction="#mChangeOptionKnoteninfo" text="Knoteninfo anzeigen" />
<CheckMenuItem fx:id="mOptionKantengewichte" mnemonicParsing="false" onAction="#mChangeOptionKantengewichte" text="Kantengewichte anzeigen" />
<CheckMenuItem fx:id="mOptionKantengewichte" mnemonicParsing="false" onAction="#mChangeOptionKantengewichte" text="Kantenwerte anzeigen" />
<CheckMenuItem fx:id="mOptionBild" mnemonicParsing="false" onAction="#mChangeOptionBild" text="Bild anzeigen" />
</items>
</Menu>

View file

@ -31,7 +31,7 @@
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</VBox.margin>
</Label>
<ListView fx:id="lvAuswahl" prefHeight="200.0" VBox.vgrow="ALWAYS" />
<ListView fx:id="lvAuswahl" onContextMenuRequested="#toDoContextMenu" prefHeight="200.0" VBox.vgrow="ALWAYS" />
<HBox spacing="10.0" VBox.vgrow="NEVER">
<children>
<Button maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="40.0" mnemonicParsing="false" onAction="#bAnfang" prefHeight="30.0">

View file

@ -6,18 +6,20 @@
<?import javafx.scene.control.ComboBox?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.Slider?>
<?import javafx.scene.control.SplitPane?>
<?import javafx.scene.control.TreeView?>
<?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.text.Font?>
<VBox xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
<VBox xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1">
<children>
<HBox VBox.vgrow="ALWAYS">
<children>
<VBox prefHeight="200.0" prefWidth="100.0" />
<GraphPlotter fx:id="viewer" HBox.hgrow="ALWAYS" />
<SplitPane dividerPositions="0.8" VBox.vgrow="ALWAYS">
<items>
<GraphPlotter fx:id="viewer" prefHeight="1000.0" prefWidth="1358.0" />
<VBox prefHeight="200.0" prefWidth="100.0" spacing="5.0">
<children>
<Label minWidth="-Infinity" text="Algorithmen">
@ -41,7 +43,8 @@
<Image url="@step.png" />
</image>
</ImageView>
</graphic></Button>
</graphic>
</Button>
<Button fx:id="bStart" minWidth="-Infinity" mnemonicParsing="false" onAction="#mStart" HBox.hgrow="ALWAYS">
<HBox.margin>
<Insets />
@ -70,17 +73,33 @@
<Image url="@reset.png" />
</image>
</ImageView>
</graphic></Button>
</graphic>
</Button>
</children>
<VBox.margin>
<Insets top="10.0" />
</VBox.margin>
</HBox>
<Label fx:id="lAblauf" text="Ablauf des Algorithmus" visible="false">
<font>
<Font name="System Bold" size="12.0" />
</font>
<VBox.margin>
<Insets bottom="3.0" top="20.0" />
</VBox.margin>
</Label>
<TreeView fx:id="tvAblauf" prefHeight="200.0" prefWidth="200.0" visible="false" VBox.vgrow="ALWAYS" />
<AnchorPane>
<children>
<Button fx:id="bClipboard" mnemonicParsing="false" onAction="#bCopyClicked" text="In Zwischenablage kopieren" visible="false" AnchorPane.bottomAnchor="2.0" AnchorPane.rightAnchor="2.0" AnchorPane.topAnchor="2.0" />
</children>
</AnchorPane>
</children>
<HBox.margin>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</HBox.margin></VBox>
</children>
</HBox>
<padding>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</padding>
</VBox>
</items>
</SplitPane>
</children>
</VBox>