Commit 6ff43a96 authored by Peining Li's avatar Peining Li

Merge branch 'ihm-main/develop' into 'develop'

Ihm main/develop

See merge request qdruault/lo23-project!186
parents 39742e9e ff3c062e
......@@ -15,6 +15,10 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLDecoder;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
......@@ -55,11 +59,7 @@ public class IHMMain {
primaryStage.setMinHeight(600);
// Load the font for the css
try {
Font.loadFont(new FileInputStream(new File("./target/classes/styles/space_age.ttf")), 10);
} catch (FileNotFoundException ex) {
Logger.getLogger(PlayerListController.class.getName()).log(Level.SEVERE, null, ex);
}
//load all scenes when app starts
for(SceneName scenename : SceneName.values()){
......@@ -71,7 +71,7 @@ public class IHMMain {
primaryStage.setTitle("Battle Ship");
toNetworkInterfaceChoice();
stage.show();
//add onClose event handler which handle the event when user clicks X
stage.setOnCloseRequest(new EventHandler<WindowEvent>() {
@Override
......
......@@ -228,7 +228,12 @@
-fx-border-color: #ef8d00;
}
#statGrid {
#stat {
-fx-border-radius: 15px;
-fx-border-color: #ef8d00;
-fx-border-color: #ef8d00;
}
#gridBorderChart {
-fx-border-radius: 15px;
-fx-border-color: #ef8d00;
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment