Browse Source

Merge remote-tracking branch 'origin/master'

hapi
Natascha 10 years ago
parent
commit
1bbbf89eff
5 changed files with 5 additions and 5 deletions
  1. +1
    -1
      src/main/resources/diagnose.fxml
  2. +1
    -1
      src/main/resources/fall.fxml
  3. +1
    -1
      src/main/resources/main.fxml
  4. +1
    -1
      src/main/resources/stationshistorie.fxml
  5. +1
    -1
      src/main/resources/untersuchungen.fxml

+ 1
- 1
src/main/resources/diagnose.fxml View File

@@ -6,7 +6,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>

<SplitPane dividerPositions="0.5" prefHeight="409.0" prefWidth="662.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.uniluebeck.mi.projmi6.controller.DiagnoseController">
<SplitPane dividerPositions="0.45" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.uniluebeck.mi.projmi6.controller.DiagnoseController">
<items>
<VBox>
<children>


+ 1
- 1
src/main/resources/fall.fxml View File

@@ -6,7 +6,7 @@
<?import java.lang.*?>
<?import javafx.scene.layout.*?>

<VBox fx:controller="de.uniluebeck.mi.projmi6.controller.FallController" prefHeight="318.0" prefWidth="606.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
<VBox fx:controller="de.uniluebeck.mi.projmi6.controller.FallController" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
<children>
<GridPane vgap="5.0">
<children>


+ 1
- 1
src/main/resources/main.fxml View File

@@ -6,7 +6,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>

<VBox fx:controller="de.uniluebeck.mi.projmi6.controller.MainController" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="784.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
<VBox fx:controller="de.uniluebeck.mi.projmi6.controller.MainController" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
<children>
<TabPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" side="LEFT" tabClosingPolicy="UNAVAILABLE" VBox.vgrow="ALWAYS">
<tabs>


+ 1
- 1
src/main/resources/stationshistorie.fxml View File

@@ -6,7 +6,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>

<SplitPane fx:controller="de.uniluebeck.mi.projmi6.controller.StationsHistorieController" dividerPositions="0.5" prefHeight="331.0" prefWidth="730.0" xmlns="http://javafx.com/javafx/8"
<SplitPane fx:controller="de.uniluebeck.mi.projmi6.controller.StationsHistorieController" dividerPositions="0.45" xmlns="http://javafx.com/javafx/8"
xmlns:fx="http://javafx.com/fxml/1">
<items>
<VBox>


+ 1
- 1
src/main/resources/untersuchungen.fxml View File

@@ -3,7 +3,7 @@
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<SplitPane xmlns:fx="http://javafx.com/fxml/1" dividerPositions="0.45" prefHeight="421.0" prefWidth="652.0"
<SplitPane xmlns:fx="http://javafx.com/fxml/1" dividerPositions="0.45"
xmlns="http://javafx.com/javafx/8" fx:controller="de.uniluebeck.mi.projmi6.controller.UntersuchungenController">
<items>
<VBox>


Loading…
Cancel
Save