meerkat
/
meerkat-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resulted the bug with the not expendable panel

android-scanner
VladimirEliTokarev 2016-11-12 17:37:42 +02:00
parent 6161898805
commit 08cc50c22a
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
voting-booth-gui/src/main/java/meerkat/voting/gui/configuration/Converter.java
View File

@ -13,7 +13,7 @@ import java.io.IOException;
* This class uses the configuration creator which converts json configuration into normal binary proto file * This class uses the configuration creator which converts json configuration into normal binary proto file
*/ */
public class Converter { 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 DEFAULT_CONFIGURATION_PATH = "VotingBoothConfiguration.json";
private final static String CONVERTER_DESCRIPTION = "Welcome to simple voting booth " + private final static String CONVERTER_DESCRIPTION = "Welcome to simple voting booth " +
"configuration converter (which converts json voting booth configuration into " + "configuration converter (which converts json voting booth configuration into " +

4
voting-booth-gui/src/main/resources/configuration/VotingBoothConfiguration.json
View File

@ -41,6 +41,10 @@
"answer": "/images/MichaelJackson.png", "answer": "/images/MichaelJackson.png",
"description": "Michael Jakson image." "description": "Michael Jakson image."
}, },
{
"answer": "/images/AntonioBanderass.png",
"description": "Antonio Banderass image."
},
{ {
"answer": "/images/AntonioBanderass.png", "answer": "/images/AntonioBanderass.png",
"description": "Antonio Banderass image." "description": "Antonio Banderass image."

BIN
voting-booth-gui/src/main/resources/configuration/configuration.bin
View File

Binary file not shown.

26
voting-booth-gui/src/main/resources/view/select_candidate_by_picture.fxml
View File

@ -120,27 +120,27 @@
</BorderPane> </BorderPane>
</children> </children>
</GridPane> </GridPane>
<GridPane prefHeight="250.0" prefWidth="600.0" GridPane.rowIndex="1"> <GridPane GridPane.rowIndex="1">
<columnConstraints> <columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="144.0" minWidth="10.0" prefWidth="25.0" /> <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="552.0" minWidth="10.0" prefWidth="548.0" /> <ColumnConstraints hgrow="SOMETIMES" minWidth="273.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="192.0" minWidth="10.0" prefWidth="25.0" /> <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
</columnConstraints> </columnConstraints>
<rowConstraints> <rowConstraints>
<RowConstraints maxHeight="57.0" minHeight="0.0" prefHeight="9.0" vgrow="SOMETIMES" /> <RowConstraints minHeight="0.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="213.0" minHeight="10.0" prefHeight="213.0" vgrow="SOMETIMES" /> <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="41.0" minHeight="5.0" prefHeight="5.0" vgrow="SOMETIMES" /> <RowConstraints minHeight="5.0" vgrow="SOMETIMES" />
</rowConstraints> </rowConstraints>
<children> <children>
<BorderPane prefHeight="250.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1"> <BorderPane GridPane.columnIndex="1" GridPane.rowIndex="1">
<center> <center>
<ScrollPane prefHeight="250.0" prefWidth="200.0" BorderPane.alignment="CENTER"> <ScrollPane BorderPane.alignment="CENTER">
<content> <content>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="199.0" prefWidth="1000.0"> <AnchorPane>
<children> <children>
<Pane prefHeight="199.0" prefWidth="1000.0"> <Pane>
<children> <children>
<GridPane fx:id="AnswersGridPane" layoutY="-2.0" prefHeight="199.0" prefWidth="1000.0"> <GridPane fx:id="AnswersGridPane" layoutY="-2.0">
</GridPane> </GridPane>
</children> </children>
</Pane> </Pane>
@ -160,7 +160,7 @@
</columnConstraints> </columnConstraints>
<rowConstraints> <rowConstraints>
<RowConstraints maxHeight="129.0" minHeight="0.0" prefHeight="31.0" vgrow="SOMETIMES" /> <RowConstraints maxHeight="129.0" minHeight="0.0" prefHeight="31.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="326.0" minHeight="10.0" prefHeight="315.0" vgrow="SOMETIMES" /> <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="75.0" minHeight="10.0" prefHeight="35.0" vgrow="SOMETIMES" /> <RowConstraints maxHeight="75.0" minHeight="10.0" prefHeight="35.0" vgrow="SOMETIMES" />
</rowConstraints> </rowConstraints>
</GridPane> </GridPane>