Skip to content

Commit

Permalink
Merge pull request #1 from mikyll/new_features
Browse files Browse the repository at this point in the history
New features
  • Loading branch information
mikyll authored Jul 21, 2021
2 parents cd4c8c1 + 7365cf2 commit dda1b22
Show file tree
Hide file tree
Showing 22 changed files with 1,510 additions and 92 deletions.
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,9 @@ src/*.jar
hs_err_pid*

*.mkv
deploy
deploy

/extra

# scriptino per creare la jre per fx
Create fxjre.bat
685 changes: 685 additions & 0 deletions Domande.txt

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions mods/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/application/
/gui/
/model/
/application/
/persistence/
/model/
/gfx/
Binary file added mods/gfx/icon_back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/gfx/icon_qmark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/gfx/icon_settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion mods/gui/ViewQuiz.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>

<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="480.0" prefWidth="768.0" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gui.Controller">
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="480.0" prefWidth="768.0" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1">
<children>
<VBox alignment="CENTER" layoutX="50.0" layoutY="50.0" prefHeight="350.0" prefWidth="500.0">
<children>
Expand Down
26 changes: 22 additions & 4 deletions src/application/Main.java
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package application;

import java.io.IOException;

import gui.ControllerMenu;
import javafx.application.Application;
import javafx.fxml.FXMLLoader;
import javafx.stage.Stage;
import persistence.BadFileFormatException;
import javafx.scene.Scene;
import javafx.scene.layout.AnchorPane;


public class Main extends Application {

/*
// To load directly the quiz
@Override
public void start(Stage stage) throws IOException, BadFileFormatException
public void start(Stage stage)
{
try {
FXMLLoader loader = new FXMLLoader(Main.class.getResource("/gui/ViewQuiz.fxml"));
Expand All @@ -26,6 +26,24 @@ public void start(Stage stage) throws IOException, BadFileFormatException
} catch(Exception e) {
e.printStackTrace();
}
}*/

@Override
public void start(Stage stage)
{
try {
FXMLLoader loader = new FXMLLoader(Main.class.getResource("/gui/ViewMenu.fxml"));
AnchorPane menu = (AnchorPane) loader.load();
ControllerMenu controller = loader.getController();
controller.setHostServices(getHostServices());
Scene scene = new Scene(menu);
scene.getStylesheets().add(getClass().getResource("application.css").toExternalForm());
stage.setTitle("ROQuiz");
stage.setScene(scene);
stage.show();
} catch(Exception e) {
e.printStackTrace();
}
}

public static void main(String[] args)
Expand Down
Binary file added src/gfx/icon_back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/gfx/icon_qmark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/gfx/icon_settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit dda1b22

Please sign in to comment.