Merge remote-tracking branch 'origin/0100-Termine_anzeigen' into 0100-Termine_anzeigen
# Conflicts: # hellofx/app/build/resources/main/client/main-view.fxml
This commit is contained in:
commit
2944c44d1d
6
.gitignore
vendored
6
.gitignore
vendored
@ -70,5 +70,7 @@ crashlytics-build.properties
|
|||||||
|
|
||||||
# by github https://github.com/github/gitignore/blob/master/Java.gitignore
|
# by github https://github.com/github/gitignore/blob/master/Java.gitignore
|
||||||
|
|
||||||
client/.gradle/
|
hellofx/.gradle/
|
||||||
client/build/
|
hellofx/app/build/
|
||||||
|
hellofx/data/build/
|
||||||
|
hellofx/.gradle/buildOutputCleanup/
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
|||||||
#Sun Nov 14 15:59:12 CET 2021
|
|
||||||
gradle.version=6.0
|
|
Binary file not shown.
@ -1,122 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
|
|
||||||
<?import javafx.geometry.*?>
|
|
||||||
<?import javafx.scene.*?>
|
|
||||||
<?import javafx.scene.control.*?>
|
|
||||||
<?import javafx.scene.image.*?>
|
|
||||||
<?import javafx.scene.layout.*?>
|
|
||||||
|
|
||||||
<GridPane gridLinesVisible="true" style="-fx-background-color: #424242;" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="client.MainController">
|
|
||||||
<columnConstraints>
|
|
||||||
<ColumnConstraints hgrow="NEVER" maxWidth="60.0" minWidth="60.0" />
|
|
||||||
<ColumnConstraints hgrow="ALWAYS" />
|
|
||||||
</columnConstraints>
|
|
||||||
<rowConstraints>
|
|
||||||
<RowConstraints vgrow="SOMETIMES" />
|
|
||||||
</rowConstraints>
|
|
||||||
<VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0" style="-fx-background-color: #333333;">
|
|
||||||
<ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
|
|
||||||
</ImageView>
|
|
||||||
<Button mnemonicParsing="false" onAction="#onAddBtnClick" prefHeight="50" prefWidth="50" styleClass="main-btn" text="ADD">
|
|
||||||
</Button>
|
|
||||||
<Button mnemonicParsing="false" prefHeight="50" prefWidth="50" style="-fx-background-color: #424242;" textAlignment="CENTER" textFill="WHITE">
|
|
||||||
ADD
|
|
||||||
<cursor>
|
|
||||||
<Cursor fx:constant="HAND" />
|
|
||||||
</cursor>
|
|
||||||
</Button>
|
|
||||||
<Button mnemonicParsing="false" prefHeight="50" prefWidth="50" style="-fx-background-color: #424242;" textAlignment="CENTER" textFill="WHITE">
|
|
||||||
ADD
|
|
||||||
<cursor>
|
|
||||||
<Cursor fx:constant="HAND" />
|
|
||||||
</cursor>
|
|
||||||
</Button>
|
|
||||||
</VBox>
|
|
||||||
<GridPane fx:id="calendarGrid" gridLinesVisible="true" GridPane.columnIndex="1">
|
|
||||||
<columnConstraints>
|
|
||||||
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
|
|
||||||
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
|
|
||||||
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
|
|
||||||
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
|
|
||||||
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
|
|
||||||
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
|
|
||||||
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
|
|
||||||
</columnConstraints>
|
|
||||||
<rowConstraints>
|
|
||||||
<RowConstraints maxHeight="25.0" minHeight="25.0" vgrow="NEVER" />
|
|
||||||
<RowConstraints maxHeight="25.0" minHeight="25.0" vgrow="NEVER" />
|
|
||||||
<RowConstraints vgrow="ALWAYS" />
|
|
||||||
</rowConstraints>
|
|
||||||
<Label textFill="WHITE">
|
|
||||||
Monat
|
|
||||||
<padding>
|
|
||||||
<Insets left="5" />
|
|
||||||
</padding>
|
|
||||||
</Label>
|
|
||||||
|
|
||||||
<Label textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="1">
|
|
||||||
Mo
|
|
||||||
<padding>
|
|
||||||
<Insets left="5" />
|
|
||||||
</padding>
|
|
||||||
</Label>
|
|
||||||
<Label textFill="WHITE" GridPane.columnIndex="1" GridPane.rowIndex="1">
|
|
||||||
Di
|
|
||||||
<padding>
|
|
||||||
<Insets left="5" />
|
|
||||||
</padding>
|
|
||||||
</Label>
|
|
||||||
<Label textFill="WHITE" GridPane.columnIndex="2" GridPane.rowIndex="1">
|
|
||||||
Mi
|
|
||||||
<padding>
|
|
||||||
<Insets left="5" />
|
|
||||||
</padding>
|
|
||||||
</Label>
|
|
||||||
<Label textFill="WHITE" GridPane.columnIndex="3" GridPane.rowIndex="1">
|
|
||||||
Do
|
|
||||||
<padding>
|
|
||||||
<Insets left="5" />
|
|
||||||
</padding>
|
|
||||||
</Label>
|
|
||||||
<Label textFill="WHITE" GridPane.columnIndex="4" GridPane.rowIndex="1">
|
|
||||||
Fr
|
|
||||||
<padding>
|
|
||||||
<Insets left="5" />
|
|
||||||
</padding>
|
|
||||||
</Label>
|
|
||||||
<Label textFill="WHITE" GridPane.columnIndex="5" GridPane.rowIndex="1">
|
|
||||||
Sa
|
|
||||||
<padding>
|
|
||||||
<Insets left="5" />
|
|
||||||
</padding>
|
|
||||||
</Label>
|
|
||||||
<Label textFill="WHITE" GridPane.columnIndex="6" GridPane.rowIndex="1">
|
|
||||||
So
|
|
||||||
<padding>
|
|
||||||
<Insets left="5" />
|
|
||||||
</padding>
|
|
||||||
</Label>
|
|
||||||
|
|
||||||
<VBox fx:id="vBoxMon" spacing="5.0" GridPane.columnIndex="0" GridPane.rowIndex="2">
|
|
||||||
|
|
||||||
</VBox>
|
|
||||||
<VBox fx:id="vBoxTue" spacing="5.0" GridPane.columnIndex="1" GridPane.rowIndex="2">
|
|
||||||
|
|
||||||
</VBox>
|
|
||||||
<VBox fx:id="vBoxWen" spacing="5.0" GridPane.columnIndex="2" GridPane.rowIndex="2">
|
|
||||||
|
|
||||||
</VBox>
|
|
||||||
<VBox fx:id="vBoxThu" spacing="5.0" GridPane.columnIndex="3" GridPane.rowIndex="2">
|
|
||||||
|
|
||||||
</VBox>
|
|
||||||
<VBox fx:id="vBoxFri" spacing="5.0" GridPane.columnIndex="4" GridPane.rowIndex="2">
|
|
||||||
|
|
||||||
</VBox>
|
|
||||||
<VBox fx:id="vBoxSat" spacing="5.0" GridPane.columnIndex="5" GridPane.rowIndex="2">
|
|
||||||
|
|
||||||
</VBox>
|
|
||||||
<VBox fx:id="vBoxSun" spacing="5.0" GridPane.columnIndex="6" GridPane.rowIndex="2">
|
|
||||||
|
|
||||||
</VBox>
|
|
||||||
</GridPane>
|
|
||||||
</GridPane>
|
|
@ -1,2 +0,0 @@
|
|||||||
Manifest-Version: 1.0
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user