undefined_name/School_Project
3
1
Fork 0
Code Issues 9 Pull Requests Projects 1 Releases 4 Wiki Activity

Merge pull request 'change acceuil to accueil' (#55) from Acceuil_to_Accueil into master
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Reviewed-on: #55
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
This commit is contained in:
Mat_02 2023-05-16 20:25:57 +02:00
commit 3d4730cfc0
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/school_project/Controller.java
View File

@ -7,7 +7,7 @@ import javafx.scene.Scene;
import javafx.scene.input.KeyCombination; import javafx.scene.input.KeyCombination;
import javafx.stage.Screen; import javafx.stage.Screen;
import javafx.stage.Stage; import javafx.stage.Stage;
import school_project.Menu.MenuAcceuil; import school_project.Menu.MenuAccueil;
import java.io.IOException; import java.io.IOException;
@ -32,7 +32,7 @@ public class Controller extends Application {
stage.setFullScreenExitHint(""); stage.setFullScreenExitHint("");
primaryStage.setFullScreenExitKeyCombination(KeyCombination.NO_MATCH); primaryStage.setFullScreenExitKeyCombination(KeyCombination.NO_MATCH);
root = new MenuAcceuil(); root = new MenuAccueil();
switchRoot(root); switchRoot(root);
stage.show(); stage.show();

4
app/src/main/java/school_project/GameUI.java
View File

@ -2,7 +2,7 @@ package school_project;
import javafx.scene.Group; import javafx.scene.Group;
import javafx.scene.input.MouseButton; import javafx.scene.input.MouseButton;
import school_project.Menu.MenuAcceuil; import school_project.Menu.MenuAccueil;
import school_project.Utils.MatrixShape; import school_project.Utils.MatrixShape;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
@ -72,7 +72,7 @@ public class GameUI extends Group{
_piece.setLayoutY(grid.getLayoutY() + p.getPosition().x * (SEGMENT_SIZE+SPACE_SIZE)); _piece.setLayoutY(grid.getLayoutY() + p.getPosition().x * (SEGMENT_SIZE+SPACE_SIZE));
} }
if(level.gameDone()){ if(level.gameDone()){
Controller.switchRoot(new MenuAcceuil()); Controller.switchRoot(new MenuAccueil());
} }
} }
}); });

4
app/src/main/java/school_project/Menu/MenuAcceuil.java → app/src/main/java/school_project/Menu/MenuAccueil.java
View File

@ -7,10 +7,10 @@ import javafx.scene.layout.BorderPane;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;
import javafx.scene.text.Font; import javafx.scene.text.Font;
import school_project.Controller; import school_project.Controller;
public class MenuAcceuil extends BorderPane { public class MenuAccueil extends BorderPane {
public MenuAcceuil(){ public MenuAccueil(){
super(); super();
//create all the objet that i need //create all the objet that i need
Button Play = new Button("Play"); Button Play = new Button("Play");

2
app/src/main/java/school_project/Menu/MenuLevel.java
View File

@ -18,7 +18,7 @@ public class MenuLevel extends GridPane {
Button[] Days = new Button[3]; Button[] Days = new Button[3];
Button BckMenu = new Button("Back to menu"); Button BckMenu = new Button("Back to menu");
BckMenu.setOnAction(event -> Controller.switchRoot(new MenuAcceuil())); BckMenu.setOnAction(event -> Controller.switchRoot(new MenuAccueil()));
setHalignment(BckMenu,HPos.CENTER); setHalignment(BckMenu,HPos.CENTER);
add(BckMenu,2,4); add(BckMenu,2,4);