Merge branch 'PENGUIN' into 'main'
added the penguin SELF MADE Closes #63 See merge request cse1105/2025-2026/teams/csep-team-76!59
This commit is contained in:
commit
caecab5f41
4 changed files with 21 additions and 0 deletions
|
|
@ -5,16 +5,26 @@ import client.scenes.MainCtrl;
|
||||||
import client.utils.ServerUtils;
|
import client.utils.ServerUtils;
|
||||||
import com.google.inject.Injector;
|
import com.google.inject.Injector;
|
||||||
import javafx.application.Application;
|
import javafx.application.Application;
|
||||||
|
import javafx.scene.image.Image;
|
||||||
import javafx.stage.Stage;
|
import javafx.stage.Stage;
|
||||||
|
|
||||||
|
|
||||||
import static com.google.inject.Guice.createInjector;
|
import static com.google.inject.Guice.createInjector;
|
||||||
|
|
||||||
public class UI extends Application {
|
public class UI extends Application {
|
||||||
private static final Injector INJECTOR = createInjector(new MyModule());
|
private static final Injector INJECTOR = createInjector(new MyModule());
|
||||||
private static final MyFXML FXML = new MyFXML(INJECTOR);
|
private static final MyFXML FXML = new MyFXML(INJECTOR);
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void start(Stage primaryStage) throws Exception {
|
public void start(Stage primaryStage) throws Exception {
|
||||||
|
|
||||||
|
primaryStage.getIcons().add(
|
||||||
|
new Image(getClass().getResourceAsStream("/Penguin.png"))
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
var serverUtils = INJECTOR.getInstance(ServerUtils.class);
|
var serverUtils = INJECTOR.getInstance(ServerUtils.class);
|
||||||
if (!serverUtils.isServerAvailable()) {
|
if (!serverUtils.isServerAvailable()) {
|
||||||
var msg = "Server needs to be started before the client, but it does not seem to be available. Shutting down.";
|
var msg = "Server needs to be started before the client, but it does not seem to be available. Shutting down.";
|
||||||
|
|
|
||||||
BIN
client/src/main/resources/Penguin.png
Normal file
BIN
client/src/main/resources/Penguin.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
BIN
client/src/main/resources/Penguina.png
Normal file
BIN
client/src/main/resources/Penguina.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
|
|
@ -15,6 +15,9 @@
|
||||||
<?import javafx.scene.layout.VBox?>
|
<?import javafx.scene.layout.VBox?>
|
||||||
<?import javafx.scene.text.Font?>
|
<?import javafx.scene.text.Font?>
|
||||||
<?import javafx.scene.control.ToggleButton?>
|
<?import javafx.scene.control.ToggleButton?>
|
||||||
|
<?import javafx.scene.image.Image?>
|
||||||
|
<?import javafx.scene.image.ImageView?>
|
||||||
|
|
||||||
|
|
||||||
<?import javafx.scene.control.ComboBox?>
|
<?import javafx.scene.control.ComboBox?>
|
||||||
<BorderPane prefHeight="800.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="client.scenes.FoodpalApplicationCtrl">
|
<BorderPane prefHeight="800.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="client.scenes.FoodpalApplicationCtrl">
|
||||||
|
|
@ -25,6 +28,14 @@
|
||||||
<padding>
|
<padding>
|
||||||
<Insets bottom="10" left="10" right="10" top="10" />
|
<Insets bottom="10" left="10" right="10" top="10" />
|
||||||
</padding>
|
</padding>
|
||||||
|
|
||||||
|
|
||||||
|
<ImageView fitWidth="80" fitHeight="80" preserveRatio="true">
|
||||||
|
<image>
|
||||||
|
<Image url="@/Penguina.png"/>
|
||||||
|
</image>
|
||||||
|
</ImageView>
|
||||||
|
|
||||||
<Label prefHeight="56.0" prefWidth="158.0" text="FoodPal">
|
<Label prefHeight="56.0" prefWidth="158.0" text="FoodPal">
|
||||||
<font>
|
<font>
|
||||||
<Font name="System Bold" size="29.0" />
|
<Font name="System Bold" size="29.0" />
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue