diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/configuration/Converter.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/configuration/Converter.java index 957d889..f6336d0 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/gui/configuration/Converter.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/configuration/Converter.java @@ -13,7 +13,7 @@ import java.io.IOException; * This class uses the configuration creator which converts json configuration into normal binary proto file */ public class Converter { - private final static String DEFAULT_OUTPUT_PATH = "configuration.bin"; + private final static String DEFAULT_OUTPUT_PATH = "configuration- old but gold.bin"; private final static String DEFAULT_CONFIGURATION_PATH = "VotingBoothConfiguration.json"; private final static String CONVERTER_DESCRIPTION = "Welcome to simple voting booth " + "configuration converter (which converts json voting booth configuration into " + diff --git a/voting-booth-gui/src/main/resources/configuration/VotingBoothConfiguration.json b/voting-booth-gui/src/main/resources/configuration/VotingBoothConfiguration.json index d3bd1ce..ed73683 100644 --- a/voting-booth-gui/src/main/resources/configuration/VotingBoothConfiguration.json +++ b/voting-booth-gui/src/main/resources/configuration/VotingBoothConfiguration.json @@ -41,6 +41,10 @@ "answer": "/images/MichaelJackson.png", "description": "Michael Jakson image." }, + { + "answer": "/images/AntonioBanderass.png", + "description": "Antonio Banderass image." + }, { "answer": "/images/AntonioBanderass.png", "description": "Antonio Banderass image." diff --git a/voting-booth-gui/src/main/resources/configuration/configuration.bin b/voting-booth-gui/src/main/resources/configuration/configuration.bin index 13e84e1..3c13169 100644 Binary files a/voting-booth-gui/src/main/resources/configuration/configuration.bin and b/voting-booth-gui/src/main/resources/configuration/configuration.bin differ diff --git a/voting-booth-gui/src/main/resources/view/select_candidate_by_picture.fxml b/voting-booth-gui/src/main/resources/view/select_candidate_by_picture.fxml index cbfb246..28467ee 100644 --- a/voting-booth-gui/src/main/resources/view/select_candidate_by_picture.fxml +++ b/voting-booth-gui/src/main/resources/view/select_candidate_by_picture.fxml @@ -120,27 +120,27 @@ - + - - - + + + - - - + + + - +
- + - + - + - + @@ -160,7 +160,7 @@ - +