FinalCrypt - The No¹ One-Time Pad Encryption
| リビジョン | 057f7f5e84618dddb87d5ba019c8407c6ced20ce (tree) |
|---|---|
| 日時 | 2019-12-09 10:15:10 |
| 作者 | ron <ronuitzaandam@gmai...> |
| コミッター | ron |
Date: 2019-12-08 Version: 6.0.1
Fixed startup intro and welcome display order
Fixed bug crashing on enabled audio at startup
Fixed large Chinese user-guidance startup text
Fixed Support Window glyphs in Farsi Language
Fixed Apple bug that hangs GUI by File-Manager
Improved internationalization GUI realignments
src/rdj/GUIFX.fxml (diff)
src/rdj/GUIFX.java (diff)| @@ -22,28 +22,27 @@ | ||
| 22 | 22 | <tabs> |
| 23 | 23 | <Tab fx:id="encryptTab" closable="false" onSelectionChanged="#encryptTabSelectionChanged" text="Encrypt"> |
| 24 | 24 | <content> |
| 25 | - <GridPane> | |
| 25 | + <GridPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308"> | |
| 26 | 26 | <columnConstraints> |
| 27 | - <ColumnConstraints hgrow="SOMETIMES" minWidth="500.0" prefWidth="100.0" /> | |
| 28 | - <ColumnConstraints hgrow="SOMETIMES" minWidth="500.0" prefWidth="100.0" /> | |
| 27 | + <ColumnConstraints hgrow="ALWAYS" maxWidth="1.7976931348623157E308" minWidth="500.0" /> | |
| 28 | + <ColumnConstraints hgrow="ALWAYS" maxWidth="1.7976931348623157E308" minWidth="500.0" /> | |
| 29 | 29 | </columnConstraints> |
| 30 | 30 | <rowConstraints> |
| 31 | 31 | <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> |
| 32 | 32 | </rowConstraints> |
| 33 | 33 | <children> |
| 34 | - <AnchorPane minWidth="500.0" GridPane.vgrow="ALWAYS"> | |
| 34 | + <AnchorPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minWidth="500.0" GridPane.vgrow="ALWAYS"> | |
| 35 | 35 | <children> |
| 36 | - <VBox prefHeight="601.0" prefWidth="649.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> | |
| 36 | + <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="601.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> | |
| 37 | 37 | <children> |
| 38 | - <AnchorPane maxHeight="50.0" minHeight="50.0" minWidth="500.0" prefHeight="50.0" prefWidth="500.0" styleClass="background_top" VBox.vgrow="NEVER"> | |
| 38 | + <AnchorPane maxHeight="50.0" maxWidth="1.7976931348623157E308" minHeight="50.0" prefHeight="50.0" styleClass="background_top" VBox.vgrow="NEVER"> | |
| 39 | 39 | <children> |
| 40 | - <GridPane alignment="CENTER" layoutX="32.0" layoutY="50.0" prefHeight="50.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> | |
| 40 | + <GridPane alignment="CENTER" layoutX="32.0" layoutY="50.0" maxWidth="1.7976931348623157E308" prefHeight="50.0" prefWidth="799.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> | |
| 41 | 41 | <columnConstraints> |
| 42 | 42 | <ColumnConstraints halignment="RIGHT" maxWidth="1.7976931348623157E308" minWidth="0.0" prefWidth="0.0" /> |
| 43 | - <ColumnConstraints halignment="RIGHT" hgrow="NEVER" maxWidth="181.0" minWidth="11.0" prefWidth="100.0" /> | |
| 44 | - <ColumnConstraints halignment="RIGHT" hgrow="ALWAYS" maxWidth="438.0" minWidth="253.0" prefWidth="344.0" /> | |
| 45 | - <ColumnConstraints halignment="LEFT" hgrow="NEVER" maxWidth="181.0" minWidth="37.0" prefWidth="181.0" /> | |
| 46 | - <ColumnConstraints halignment="CENTER" hgrow="NEVER" maxWidth="1.7976931348623157E308" minWidth="10.0" prefWidth="92.0" /> | |
| 43 | + <ColumnConstraints halignment="LEFT" hgrow="NEVER" maxWidth="150.0" minWidth="150.0" prefWidth="150.0" /> | |
| 44 | + <ColumnConstraints halignment="CENTER" hgrow="ALWAYS" maxWidth="1.7976931348623157E308" prefWidth="457.0" /> | |
| 45 | + <ColumnConstraints halignment="CENTER" hgrow="NEVER" maxWidth="150.0" minWidth="150.0" prefWidth="150.0" /> | |
| 47 | 46 | </columnConstraints> |
| 48 | 47 | <rowConstraints> |
| 49 | 48 | <RowConstraints maxHeight="20.0" minHeight="20.0" prefHeight="20.0" vgrow="SOMETIMES" /> |
| @@ -66,7 +65,7 @@ | ||
| 66 | 65 | </children></AnchorPane> |
| 67 | 66 | <AnchorPane GridPane.columnIndex="2"> |
| 68 | 67 | <children> |
| 69 | - <Label fx:id="targetLabel1" alignment="CENTER_RIGHT" contentDisplay="CENTER" focusTraversable="false" prefHeight="25.0" prefWidth="296.0" style="-fx-font-size: 16;" styleClass="text_color_standard" text="Select items to encrypt or decrypt" textAlignment="CENTER" textFill="LIGHTGRAY" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> | |
| 68 | + <Label fx:id="targetLabel1" alignment="CENTER" contentDisplay="CENTER" focusTraversable="false" prefHeight="25.0" prefWidth="296.0" style="-fx-font-size: 16;" styleClass="text_color_standard" text="Select items to encrypt or decrypt" textAlignment="CENTER" textFill="LIGHTGRAY" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> | |
| 70 | 69 | <font> |
| 71 | 70 | <Font name="Open Sans" size="18.0" /> |
| 72 | 71 | </font> |
| @@ -75,7 +74,7 @@ | ||
| 75 | 74 | </AnchorPane> |
| 76 | 75 | <AnchorPane GridPane.columnIndex="2" GridPane.rowIndex="1"> |
| 77 | 76 | <children> |
| 78 | - <Label fx:id="targetLabel2" alignment="CENTER_RIGHT" contentDisplay="CENTER" focusTraversable="false" prefHeight="20.0" prefWidth="438.0" style="-fx-font-size: 11;" styleClass="text_color_standard" text="Hold down [Control] / [Shift] to select more items" textAlignment="CENTER" textFill="LIGHTGRAY" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> | |
| 77 | + <Label fx:id="targetLabel2" alignment="CENTER" contentDisplay="CENTER" focusTraversable="false" prefHeight="20.0" prefWidth="438.0" style="-fx-font-size: 11;" styleClass="text_color_standard" text="Hold down [Control] / [Shift] to select more items" textAlignment="CENTER" textFill="LIGHTGRAY" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> | |
| 79 | 78 | <font> |
| 80 | 79 | <Font name="Open Sans" size="12.0" /> |
| 81 | 80 | </font> |
| @@ -84,7 +83,7 @@ | ||
| 84 | 83 | </AnchorPane> |
| 85 | 84 | <AnchorPane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="3" GridPane.rowSpan="2"> |
| 86 | 85 | <children> |
| 87 | - <Label fx:id="targetInfoLabel" contentDisplay="CENTER" focusTraversable="false" onMouseClicked="#targetInfoLabelClicked" prefHeight="40.0" prefWidth="114.0" style="-fx-font-family: FreeSans; -fx-font-size: 18;" text="info" textAlignment="CENTER" textFill="LIGHTBLUE" translateX="10.0" underline="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> | |
| 86 | + <Label fx:id="targetInfoLabel" alignment="CENTER" contentDisplay="CENTER" focusTraversable="false" onMouseClicked="#targetInfoLabelClicked" prefHeight="40.0" prefWidth="114.0" style="-fx-font-family: FreeSans; -fx-font-size: 18;" text="info" textAlignment="CENTER" textFill="LIGHTBLUE" underline="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> | |
| 88 | 87 | <cursor> |
| 89 | 88 | <Cursor fx:constant="HAND" /> |
| 90 | 89 | </cursor> |
| @@ -92,9 +91,7 @@ | ||
| 92 | 91 | <Font name="Open Sans Italic" size="18.0" /> |
| 93 | 92 | </font> |
| 94 | 93 | </Label> |
| 95 | - </children> | |
| 96 | - </AnchorPane> | |
| 97 | - <AnchorPane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="4" GridPane.rowSpan="2" /> | |
| 94 | + </children></AnchorPane> | |
| 98 | 95 | </children> |
| 99 | 96 | </GridPane> |
| 100 | 97 | </children> |
| @@ -113,27 +110,26 @@ | ||
| 113 | 110 | </VBox> |
| 114 | 111 | </children> |
| 115 | 112 | </AnchorPane> |
| 116 | - <AnchorPane focusTraversable="true" minWidth="500.0" GridPane.columnIndex="1" GridPane.vgrow="ALWAYS"> | |
| 113 | + <AnchorPane focusTraversable="true" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minWidth="500.0" GridPane.columnIndex="1" GridPane.vgrow="ALWAYS"> | |
| 117 | 114 | <children> |
| 118 | - <VBox prefHeight="601.0" prefWidth="649.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> | |
| 115 | + <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="601.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> | |
| 119 | 116 | <children> |
| 120 | - <AnchorPane maxHeight="50.0" minHeight="50.0" minWidth="500.0" prefHeight="50.0" prefWidth="500.0" styleClass="background_top" VBox.vgrow="NEVER"> | |
| 117 | + <AnchorPane maxHeight="50.0" maxWidth="1.7976931348623157E308" minHeight="50.0" prefHeight="50.0" styleClass="background_top" VBox.vgrow="NEVER"> | |
| 121 | 118 | <children> |
| 122 | - <GridPane alignment="CENTER" layoutX="39.0" layoutY="50.0" prefHeight="50.0" prefWidth="649.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> | |
| 119 | + <GridPane alignment="CENTER" layoutX="39.0" layoutY="50.0" maxWidth="1.7976931348623157E308" prefHeight="50.0" prefWidth="769.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> | |
| 123 | 120 | <children> |
| 124 | - <AnchorPane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowSpan="2" /> | |
| 125 | - <AnchorPane prefHeight="25.0" prefWidth="321.0" GridPane.columnIndex="2"> | |
| 121 | + <AnchorPane prefHeight="25.0" prefWidth="321.0" GridPane.columnIndex="1"> | |
| 126 | 122 | <children> |
| 127 | - <Label fx:id="keyLabel1" alignment="CENTER_RIGHT" contentDisplay="CENTER" focusTraversable="false" prefHeight="25.0" prefWidth="296.0" style="-fx-font-size: 16;" styleClass="text_color_standard" text="Select One-Time Pad Key Dir" textAlignment="CENTER" textFill="LIGHTGRAY" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> | |
| 123 | + <Label fx:id="keyLabel1" alignment="CENTER" contentDisplay="CENTER" focusTraversable="false" prefHeight="25.0" prefWidth="296.0" style="-fx-font-size: 16;" styleClass="text_color_standard" text="Select One-Time Pad Key Dir" textAlignment="CENTER" textFill="LIGHTGRAY" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> | |
| 128 | 124 | <font> |
| 129 | 125 | <Font name="Open Sans" size="18.0" /> |
| 130 | 126 | </font> |
| 131 | 127 | </Label> |
| 132 | 128 | </children> |
| 133 | 129 | </AnchorPane> |
| 134 | - <AnchorPane onMouseEntered="#keyLabelAnchorOnMouseEntered" onMouseExited="#keyLabelAnchorOnMouseExited" GridPane.columnIndex="2" GridPane.rowIndex="1"> | |
| 130 | + <AnchorPane onMouseEntered="#keyLabelAnchorOnMouseEntered" onMouseExited="#keyLabelAnchorOnMouseExited" GridPane.columnIndex="1" GridPane.rowIndex="1"> | |
| 135 | 131 | <children> |
| 136 | - <Label fx:id="keyLabel" alignment="CENTER_RIGHT" contentDisplay="CENTER" focusTraversable="false" onMouseClicked="#keyLabelOnMouseClicked" prefHeight="20.0" prefWidth="296.0" style="-fx-font-size: 11;" text="Create a Manual One-Time Pad Key File" textAlignment="CENTER" textFill="#cfcfcf80" underline="true" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> | |
| 132 | + <Label fx:id="keyLabel" alignment="CENTER" contentDisplay="CENTER" focusTraversable="false" onMouseClicked="#keyLabelOnMouseClicked" prefHeight="20.0" prefWidth="296.0" style="-fx-font-size: 11;" text="Create a Manual One-Time Pad Key File" textAlignment="CENTER" textFill="#cfcfcf80" underline="true" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> | |
| 137 | 133 | <font> |
| 138 | 134 | <Font name="Open Sans" size="12.0" /> |
| 139 | 135 | </font> |
| @@ -143,18 +139,6 @@ | ||
| 143 | 139 | </Label> |
| 144 | 140 | </children> |
| 145 | 141 | </AnchorPane> |
| 146 | - <AnchorPane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="3" GridPane.rowSpan="2"> | |
| 147 | - <children> | |
| 148 | - <Label fx:id="keyInfoLabel" contentDisplay="CENTER" focusTraversable="false" onMouseClicked="#keyInfoLabelClicked" prefHeight="40.0" prefWidth="30.0" style="-fx-font-family: FreeSans; -fx-font-size: 18;" text="info" textAlignment="CENTER" textFill="LIGHTBLUE" translateX="10.0" underline="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> | |
| 149 | - <font> | |
| 150 | - <Font name="Open Sans Italic" size="18.0" /> | |
| 151 | - </font> | |
| 152 | - <cursor> | |
| 153 | - <Cursor fx:constant="HAND" /> | |
| 154 | - </cursor> | |
| 155 | - </Label> | |
| 156 | - </children> | |
| 157 | - </AnchorPane> | |
| 158 | 142 | <AnchorPane prefHeight="200.0" prefWidth="200.0" GridPane.rowSpan="2"> |
| 159 | 143 | <children> |
| 160 | 144 | <Button fx:id="keyFileDeleteButton2" alignment="CENTER" contentDisplay="CENTER" maxHeight="20.0" mnemonicParsing="false" onAction="#keyFileDeleteButton2OnAction" prefHeight="20.0" prefWidth="78.0" style="-fx-background-color: #AAAAAA;" text="Delete" textAlignment="CENTER" AnchorPane.bottomAnchor="10.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="10.0"> |
| @@ -171,13 +155,23 @@ | ||
| 171 | 155 | </Button> |
| 172 | 156 | </children> |
| 173 | 157 | </AnchorPane> |
| 158 | + <AnchorPane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="2" GridPane.rowSpan="2"> | |
| 159 | + <children> | |
| 160 | + <Label fx:id="keyInfoLabel" alignment="CENTER" contentDisplay="CENTER" focusTraversable="false" onMouseClicked="#keyInfoLabelClicked" prefHeight="40.0" prefWidth="30.0" style="-fx-font-family: FreeSans; -fx-font-size: 18;" text="info" textAlignment="CENTER" textFill="LIGHTBLUE" underline="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> | |
| 161 | + <font> | |
| 162 | + <Font name="Open Sans Italic" size="18.0" /> | |
| 163 | + </font> | |
| 164 | + <cursor> | |
| 165 | + <Cursor fx:constant="HAND" /> | |
| 166 | + </cursor> | |
| 167 | + </Label> | |
| 168 | + </children> | |
| 169 | + </AnchorPane> | |
| 174 | 170 | </children> |
| 175 | 171 | <columnConstraints> |
| 176 | - <ColumnConstraints halignment="RIGHT" maxWidth="1.7976931348623157E308" minWidth="0.0" prefWidth="100.0" /> | |
| 177 | - <ColumnConstraints halignment="RIGHT" hgrow="NEVER" maxWidth="183.0" minWidth="38.0" prefWidth="108.0" /> | |
| 178 | - <ColumnConstraints halignment="RIGHT" hgrow="ALWAYS" maxWidth="325.0" minWidth="206.0" prefWidth="250.0" /> | |
| 179 | - <ColumnConstraints halignment="LEFT" hgrow="NEVER" maxWidth="210.0" minWidth="34.0" prefWidth="181.0" /> | |
| 180 | - <ColumnConstraints maxWidth="1.7976931348623157E308" minWidth="0.0" prefWidth="100.0" /> | |
| 172 | + <ColumnConstraints halignment="LEFT" hgrow="NEVER" maxWidth="150.0" minWidth="150.0" prefWidth="150.0" /> | |
| 173 | + <ColumnConstraints halignment="RIGHT" hgrow="ALWAYS" maxWidth="1.7976931348623157E308" prefWidth="471.0" /> | |
| 174 | + <ColumnConstraints hgrow="NEVER" maxWidth="100.0" minWidth="100.0" prefWidth="100.0" /> | |
| 181 | 175 | </columnConstraints> |
| 182 | 176 | <rowConstraints> |
| 183 | 177 | <RowConstraints maxHeight="21.0" minHeight="20.0" prefHeight="21.0" vgrow="SOMETIMES" /> |
| @@ -750,7 +750,7 @@ public class GUIFX extends Application implements UI, Initializable | ||
| 750 | 750 | |
| 751 | 751 | if (checkFileChoosers) |
| 752 | 752 | { |
| 753 | - updateFileChoosers(false, firsttime, false, false, firsttime, true); | |
| 753 | + updateFileChoosers(false, firsttime, true, false, firsttime, true); | |
| 754 | 754 | } |
| 755 | 755 | } |
| 756 | 756 |
| @@ -1242,7 +1242,6 @@ public class GUIFX extends Application implements UI, Initializable | ||
| 1242 | 1242 | disableFileChoosers(false, true, true); |
| 1243 | 1243 | } |
| 1244 | 1244 | |
| 1245 | -// keyFileChooser.updateUI(); | |
| 1246 | 1245 | updateFileChoosers(false, false, true, false, false, true); |
| 1247 | 1246 | |
| 1248 | 1247 | FadeTransition sysmonFadeTransition = new FadeTransition(Duration.millis(2000), userGuidanceFadePane); // sysMonCanvas |
| @@ -4393,7 +4392,7 @@ public class GUIFX extends Application implements UI, Initializable | ||
| 4393 | 4392 | // switchLanguage(selectedLocale, true, true, false); |
| 4394 | 4393 | |
| 4395 | 4394 | // switchLanguage(Locale locale, String selectedLanguageCode, boolean writeLanguage, boolean redrawFileChoosers, boolean firsttime, boolean checkFileChoosers) |
| 4396 | - switchLanguage(selectedLocale, selectedLanguageCode, true, true, false, false); | |
| 4395 | + switchLanguage(selectedLocale, selectedLanguageCode, true, true, false, true); | |
| 4397 | 4396 | |
| 4398 | 4397 | selectLanguage.setVisible(false); |
| 4399 | 4398 | }); |
finalcrypt
Fork
ron-from-nl/FinalCrypt