Simple tool with GUI that can handle following tasks: file and text encryption/decryption, hash sum calculation and file checksum verifier, text encoding. Supports AES128, AES256, DES, 3DES, MD2, MD5, SHA1, SHA224, SHA256, SHA384, SHA512.
+
Simple tool with JavaFX GUI that can handle following tasks: file and text encryption/decryption, hash sum calculation and file checksum verifier, text encoding. Supports AES128, AES256, DES, 3DES, MD2, MD5, SHA1, SHA224, SHA256, SHA384, SHA512.
## Description
-SimpleJavaCrypter is a program written in java which combines a number of useful functions: encryption/decryption of text and files with various algorithms, file and text hashsum calculation and file checksum verifier. There are several encryption algorithms available right now: AES-128, AES-256, DES, 3DES and SimpleCipher. The last one is a simple experimental encryption algorithm that can handle encryption and decryption of the text. Only English language is currently supported. Encryption is performed by an elementary algorithm which randomly changes chars in the given text. Text decryption is done by reverse algorithm. This encryption algorithm is currently under development and would need further work. List of all currently supported algorithms you can see below.
+SimpleJavaCrypter is a program written in java which combines a number of useful functions: encryption/decryption of text and files with various algorithms, file and text hashsum calculation and file checksum verifier. There are several encryption algorithms available right now: AES128, AES256, DES, 3DES and SimpleCipher. The last one is a simple experimental encryption algorithm that can handle encryption and decryption of the text. Only English language is currently supported. Encryption is performed by an elementary algorithm which randomly changes chars in the given text. Text decryption is done by reverse algorithm. This encryption algorithm is currently under development and would need further work. List of all currently supported algorithms you can see below.
## Features
@@ -17,9 +17,9 @@ SimpleJavaCrypter is a program written in java which combines a number of useful
* Generate random keys and secret combinations.
* Get current key.
* Encrypt/decrypt text and files with your own key.
-* Simple, nice and adjustable GUI.
-* Text hash-sum calculation.
-* File hash-sum calculation.
+* Simple, nice and adjustable JavaFX GUI.
+* Text hash calculation.
+* File hash calculation.
* File checksum verifier.
* GUI drag and drop is supported.
* Dark theme.
@@ -44,8 +44,6 @@ SimpleJavaCrypter is a program written in java which combines a number of useful
## Screenshots
-Basic graphical user interface.
-
Application home page
From 722f9ac710f43684ce29ce819c6825b1f25e1a08 Mon Sep 17 00:00:00 2001
From: MasterFlomaster1 <8usernameunknown8@gmail.com>
Date: Sat, 31 Aug 2019 17:40:15 +0300
Subject: [PATCH 02/95] GUI update
---
src/GUI/AboutPage.fxml | 88 +++++++++++++--------------
src/GUI/FileHashPage.fxml | 64 ++++++++++----------
src/GUI/HashSumCheckerPage.fxml | 104 +++++++++++++++++---------------
src/GUI/SideMenu.css | 2 +-
src/GUI/TextEncryptionPage.fxml | 38 ++++++------
5 files changed, 147 insertions(+), 149 deletions(-)
diff --git a/src/GUI/AboutPage.fxml b/src/GUI/AboutPage.fxml
index 6816fb4..f769de3 100644
--- a/src/GUI/AboutPage.fxml
+++ b/src/GUI/AboutPage.fxml
@@ -5,6 +5,7 @@
+
@@ -18,63 +19,56 @@
+
-
-
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/src/GUI/FileHashPage.fxml b/src/GUI/FileHashPage.fxml
index 5b7360f..47a7888 100644
--- a/src/GUI/FileHashPage.fxml
+++ b/src/GUI/FileHashPage.fxml
@@ -21,43 +21,43 @@
-
-
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/GUI/HashSumCheckerPage.fxml b/src/GUI/HashSumCheckerPage.fxml
index 3a04f6a..f644828 100644
--- a/src/GUI/HashSumCheckerPage.fxml
+++ b/src/GUI/HashSumCheckerPage.fxml
@@ -12,56 +12,62 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/GUI/SideMenu.css b/src/GUI/SideMenu.css
index e27f812..05c1f07 100644
--- a/src/GUI/SideMenu.css
+++ b/src/GUI/SideMenu.css
@@ -1,3 +1,3 @@
#menu {
- -fx-background-color: #1a1a1a;
+ -fx-background-color: #1a1a1a;
}
\ No newline at end of file
diff --git a/src/GUI/TextEncryptionPage.fxml b/src/GUI/TextEncryptionPage.fxml
index b42665f..da6363a 100644
--- a/src/GUI/TextEncryptionPage.fxml
+++ b/src/GUI/TextEncryptionPage.fxml
@@ -20,29 +20,27 @@
-
-
-
-
-
-
-
-
-
+
From 54798698fd0c7636f49700f4a5c8f61794a2145a Mon Sep 17 00:00:00 2001
From: MasterFlomaster1 <30301197+MasterFlomaster1@users.noreply.github.com>
Date: Sun, 1 Sep 2019 23:57:56 +0300
Subject: [PATCH 03/95] Update README.md
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index 7e5f146..2984a7e 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,8 @@ SimpleJavaCrypter is a program written in java which combines a number of useful
* AES256
* DES
* 3DES
+* RSA
+* Caesar
* SimpleCipher (*under development*)
## Supported hashing algorithms
From 0918f3a6b776e38c07a56ecad8f7975afba22f81 Mon Sep 17 00:00:00 2001
From: MasterFlomaster1 <8usernameunknown8@gmail.com>
Date: Mon, 2 Sep 2019 23:21:22 +0300
Subject: [PATCH 04/95] GUI update
---
src/Cipher/Caesar.java | 7 +++
src/Cipher/RSA.java | 4 ++
src/GUI/FileEncryptionPage.fxml | 88 ++++++++++++++++++++-------------
src/GUI/FileHashPage.fxml | 34 ++++++-------
4 files changed, 79 insertions(+), 54 deletions(-)
create mode 100644 src/Cipher/Caesar.java
create mode 100644 src/Cipher/RSA.java
diff --git a/src/Cipher/Caesar.java b/src/Cipher/Caesar.java
new file mode 100644
index 0000000..f2c45f2
--- /dev/null
+++ b/src/Cipher/Caesar.java
@@ -0,0 +1,7 @@
+package Cipher;
+
+public class Caesar {
+
+
+
+}
diff --git a/src/Cipher/RSA.java b/src/Cipher/RSA.java
new file mode 100644
index 0000000..694a61d
--- /dev/null
+++ b/src/Cipher/RSA.java
@@ -0,0 +1,4 @@
+package Cipher;
+
+public class RSA {
+}
diff --git a/src/GUI/FileEncryptionPage.fxml b/src/GUI/FileEncryptionPage.fxml
index 4e85de8..920036f 100644
--- a/src/GUI/FileEncryptionPage.fxml
+++ b/src/GUI/FileEncryptionPage.fxml
@@ -3,50 +3,70 @@
+
+
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/GUI/FileHashPage.fxml b/src/GUI/FileHashPage.fxml
index 47a7888..86dcda0 100644
--- a/src/GUI/FileHashPage.fxml
+++ b/src/GUI/FileHashPage.fxml
@@ -15,7 +15,7 @@
-
+
@@ -23,40 +23,34 @@
-
+
-
-
-
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
From 82782fd5c519e3c9629d55f43649a92c4d4df3d6 Mon Sep 17 00:00:00 2001
From: MasterFlomaster1 <8usernameunknown8@gmail.com>
Date: Mon, 2 Sep 2019 23:46:06 +0300
Subject: [PATCH 05/95] GUI update
---
src/GUI/TextHashPage.fxml | 38 +++++++++++++++++++++++++++++++-------
1 file changed, 31 insertions(+), 7 deletions(-)
diff --git a/src/GUI/TextHashPage.fxml b/src/GUI/TextHashPage.fxml
index 786a255..c3a889f 100644
--- a/src/GUI/TextHashPage.fxml
+++ b/src/GUI/TextHashPage.fxml
@@ -4,6 +4,7 @@
+
@@ -18,12 +19,35 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From e162449e2f59b441ae113195390856d3ae6c2dd8 Mon Sep 17 00:00:00 2001
From: MasterFlomaster1 <8usernameunknown8@gmail.com>
Date: Mon, 2 Sep 2019 23:55:58 +0300
Subject: [PATCH 06/95] GUI update
---
src/GUI/TextEncryptionPage.fxml | 44 ++++++++++++++++++++++-----------
1 file changed, 30 insertions(+), 14 deletions(-)
diff --git a/src/GUI/TextEncryptionPage.fxml b/src/GUI/TextEncryptionPage.fxml
index da6363a..b5eeafe 100644
--- a/src/GUI/TextEncryptionPage.fxml
+++ b/src/GUI/TextEncryptionPage.fxml
@@ -8,8 +8,8 @@
-
+
@@ -19,28 +19,44 @@
-
-
-
-
-
From fc36f77105a865424d263801e8d607b6afb90c9d Mon Sep 17 00:00:00 2001
From: MasterFlomaster1 <8usernameunknown8@gmail.com>
Date: Tue, 3 Sep 2019 00:00:15 +0300
Subject: [PATCH 07/95] GUI update
---
src/GUI/FileEncryptionPage.fxml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/GUI/FileEncryptionPage.fxml b/src/GUI/FileEncryptionPage.fxml
index 920036f..171816d 100644
--- a/src/GUI/FileEncryptionPage.fxml
+++ b/src/GUI/FileEncryptionPage.fxml
@@ -60,7 +60,7 @@
-
+
From da9e5b977325420a4b3ff5576bdec389af71e7fb Mon Sep 17 00:00:00 2001
From: MasterFlomaster1 <8usernameunknown8@gmail.com>
Date: Tue, 3 Sep 2019 00:11:46 +0300
Subject: [PATCH 08/95] code cleanup
---
src/GUI/TextEncryptionPage.fxml | 40 +++++++++++++--------------
src/GUI/TextHashPage.fxml | 48 ++++++++++++++++-----------------
2 files changed, 42 insertions(+), 46 deletions(-)
diff --git a/src/GUI/TextEncryptionPage.fxml b/src/GUI/TextEncryptionPage.fxml
index b5eeafe..3a108bb 100644
--- a/src/GUI/TextEncryptionPage.fxml
+++ b/src/GUI/TextEncryptionPage.fxml
@@ -21,15 +21,14 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/GUI/TextHashPage.fxml b/src/GUI/TextHashPage.fxml
index c3a889f..449ade0 100644
--- a/src/GUI/TextHashPage.fxml
+++ b/src/GUI/TextHashPage.fxml
@@ -20,34 +20,32 @@
-
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
From a749d38025bcd69a16752514f16e7e336aa6288d Mon Sep 17 00:00:00 2001
From: MasterFlomaster1 <8usernameunknown8@gmail.com>
Date: Mon, 9 Sep 2019 18:27:19 +0300
Subject: [PATCH 09/95] HomePage update
---
src/GUI/HomePage.fxml | 54 ++++++++++++++++++++++++++++---------------
1 file changed, 36 insertions(+), 18 deletions(-)
diff --git a/src/GUI/HomePage.fxml b/src/GUI/HomePage.fxml
index 9529d78..df15b77 100644
--- a/src/GUI/HomePage.fxml
+++ b/src/GUI/HomePage.fxml
@@ -3,32 +3,50 @@
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 44f98a1bdf8a23063bac680ac6fbca9cf203e37a Mon Sep 17 00:00:00 2001
From: MasterFlomaster1 <8usernameunknown8@gmail.com>
Date: Mon, 9 Sep 2019 18:28:06 +0300
Subject: [PATCH 10/95] code cleanup
---
src/GUI/HomePage.fxml | 60 +++++++++++++++++++++----------------------
1 file changed, 29 insertions(+), 31 deletions(-)
diff --git a/src/GUI/HomePage.fxml b/src/GUI/HomePage.fxml
index df15b77..a024410 100644
--- a/src/GUI/HomePage.fxml
+++ b/src/GUI/HomePage.fxml
@@ -13,37 +13,35 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From ce7f89cd525ec49cfdda34bea13e8e90cc63f719 Mon Sep 17 00:00:00 2001
From: MasterFlomaster1 <8usernameunknown8@gmail.com>
Date: Mon, 9 Sep 2019 19:59:47 +0300
Subject: [PATCH 11/95] GUI update
Updated AboutPage, FileEncryptionPage, FileHashPage, HashSumCheckPage, TextHashPage
Fixed fonts
Code cleanup
---
src/GUI/AboutPage.fxml | 18 ++++---
src/GUI/FileEncryptionPage.fxml | 70 ++++++++++++++++-----------
src/GUI/FileHashPage.fxml | 65 +++++++++++++++----------
src/GUI/HashSumCheckerPage.fxml | 84 ++++++++++++++++-----------------
src/GUI/TextHashPage.fxml | 19 ++++----
5 files changed, 138 insertions(+), 118 deletions(-)
diff --git a/src/GUI/AboutPage.fxml b/src/GUI/AboutPage.fxml
index f769de3..0ff7308 100644
--- a/src/GUI/AboutPage.fxml
+++ b/src/GUI/AboutPage.fxml
@@ -21,22 +21,20 @@
-
+
-
+
-
+
-
+
@@ -47,23 +45,23 @@
-
+
-
+
-
+
-
+
diff --git a/src/GUI/FileEncryptionPage.fxml b/src/GUI/FileEncryptionPage.fxml
index 171816d..9f49eef 100644
--- a/src/GUI/FileEncryptionPage.fxml
+++ b/src/GUI/FileEncryptionPage.fxml
@@ -22,48 +22,62 @@
-
-
-
-
-
-
+
-
-
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
+
+
diff --git a/src/GUI/FileHashPage.fxml b/src/GUI/FileHashPage.fxml
index 86dcda0..9e3748e 100644
--- a/src/GUI/FileHashPage.fxml
+++ b/src/GUI/FileHashPage.fxml
@@ -21,37 +21,50 @@
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/src/GUI/HashSumCheckerPage.fxml b/src/GUI/HashSumCheckerPage.fxml
index f644828..65115a0 100644
--- a/src/GUI/HashSumCheckerPage.fxml
+++ b/src/GUI/HashSumCheckerPage.fxml
@@ -12,62 +12,58 @@
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/src/GUI/TextHashPage.fxml b/src/GUI/TextHashPage.fxml
index 449ade0..760e05d 100644
--- a/src/GUI/TextHashPage.fxml
+++ b/src/GUI/TextHashPage.fxml
@@ -23,29 +23,28 @@
-
+
-
-
+
-
+
-
+
From 16677191b1a89849ab78a7ce44f19c88f173dc3a Mon Sep 17 00:00:00 2001
From: MasterFlomaster1 <8usernameunknown8@gmail.com>
Date: Mon, 9 Sep 2019 20:13:39 +0300
Subject: [PATCH 12/95] Fixed side menu bug
---
src/GUI/GUI.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/GUI/GUI.java b/src/GUI/GUI.java
index a0032ff..a579aaf 100644
--- a/src/GUI/GUI.java
+++ b/src/GUI/GUI.java
@@ -40,10 +40,10 @@ public void start(Stage primaryStage) {
menu = FXMLLoader.load(getClass().getResource("SideMenu.fxml"));
// menu.prefHeightProperty().bind(scene.heightProperty());
- menu.setTranslateX(-200);
+ menu.setTranslateX(-201);
menuTranslation = new TranslateTransition(Duration.millis(250), menu);
- menuTranslation.setFromX(-200);
- menuTranslation.setToX(0);
+ menuTranslation.setFromX(-201);
+ menuTranslation.setToX(-1);
menu.setOnMouseExited(evt -> {
menuTranslation.setRate(-1);
From 2e88a64083a8e6b0810e26bf2f32ad971e043f33 Mon Sep 17 00:00:00 2001
From: MasterFlomaster1 <8usernameunknown8@gmail.com>
Date: Mon, 9 Sep 2019 21:51:16 +0300
Subject: [PATCH 13/95] GUI general update + code simplification
---
src/Cipher/Aes128.java | 2 +-
src/Cipher/Aes256.java | 2 +-
src/Cipher/CurrentCipher.java | 2 +-
src/Cipher/Des.java | 2 +-
src/Cipher/Des3.java | 2 +-
.../AboutPageController.java | 7 +--
.../FileEncryptionPageController.java | 7 +--
.../FileHashPageController.java | 6 +--
.../HashSumCheckerPageController.java | 6 +--
.../{ => Controllers}/HomePageController.java | 7 +--
.../{ => Controllers}/MenuBarController.java | 5 +-
.../SettingsPageController.java | 6 +--
.../{ => Controllers}/ShowKeyController.java | 2 +-
.../{ => Controllers}/SideMenuController.java | 5 +-
.../TextEncryptionPageController.java | 6 +--
.../TextHashPageController.java | 6 +--
.../{ => Controllers}/UserKeyController.java | 2 +-
src/GUI/GenerateKey.java | 11 ----
src/GUI/{ => Main}/AlertDialog.java | 2 +-
src/GUI/{ => Main}/GUI.java | 52 ++++++++++++-------
src/GUI/{ => Main}/Pages.java | 8 +--
src/GUI/{ => Main}/ShowKey.java | 8 +--
src/GUI/{ => Main}/UserKey.java | 8 +--
src/GUI/{ => css}/General.css | 0
src/GUI/{ => css}/ShowKey.css | 0
src/GUI/{ => css}/SideMenu.css | 0
src/GUI/{ => css}/TextArea.css | 0
src/GUI/{ => css}/UserKey.css | 0
src/GUI/{ => fxml}/AboutPage.fxml | 2 +-
src/GUI/{ => fxml}/FileEncryptionPage.fxml | 2 +-
src/GUI/{ => fxml}/FileHashPage.fxml | 4 +-
src/GUI/{ => fxml}/HashSumCheckerPage.fxml | 4 +-
src/GUI/{ => fxml}/HomePage.fxml | 2 +-
src/GUI/{ => fxml}/MenuBar.fxml | 2 +-
src/GUI/{ => fxml}/SettingsPage.fxml | 4 +-
src/GUI/{ => fxml}/ShowKey.fxml | 2 +-
src/GUI/{ => fxml}/SideMenu.fxml | 6 +--
src/GUI/{ => fxml}/TextEncryptionPage.fxml | 6 +--
src/GUI/{ => fxml}/TextHashPage.fxml | 6 +--
src/GUI/{ => fxml}/UserKey.fxml | 4 +-
src/Hash/MD2.java | 2 +-
src/Hash/MD5.java | 2 +-
src/Hash/SHA1.java | 2 +-
src/Hash/SHA224.java | 2 +-
src/Hash/SHA256.java | 2 +-
src/Hash/SHA384.java | 2 +-
src/Hash/SHA512.java | 2 +-
47 files changed, 116 insertions(+), 106 deletions(-)
rename src/GUI/{ => Controllers}/AboutPageController.java (91%)
rename src/GUI/{ => Controllers}/FileEncryptionPageController.java (97%)
rename src/GUI/{ => Controllers}/FileHashPageController.java (96%)
rename src/GUI/{ => Controllers}/HashSumCheckerPageController.java (96%)
rename src/GUI/{ => Controllers}/HomePageController.java (86%)
rename src/GUI/{ => Controllers}/MenuBarController.java (97%)
rename src/GUI/{ => Controllers}/SettingsPageController.java (84%)
rename src/GUI/{ => Controllers}/ShowKeyController.java (94%)
rename src/GUI/{ => Controllers}/SideMenuController.java (93%)
rename src/GUI/{ => Controllers}/TextEncryptionPageController.java (92%)
rename src/GUI/{ => Controllers}/TextHashPageController.java (91%)
rename src/GUI/{ => Controllers}/UserKeyController.java (96%)
delete mode 100644 src/GUI/GenerateKey.java
rename src/GUI/{ => Main}/AlertDialog.java (98%)
rename src/GUI/{ => Main}/GUI.java (65%)
rename src/GUI/{ => Main}/Pages.java (78%)
rename src/GUI/{ => Main}/ShowKey.java (88%)
rename src/GUI/{ => Main}/UserKey.java (86%)
rename src/GUI/{ => css}/General.css (100%)
rename src/GUI/{ => css}/ShowKey.css (100%)
rename src/GUI/{ => css}/SideMenu.css (100%)
rename src/GUI/{ => css}/TextArea.css (100%)
rename src/GUI/{ => css}/UserKey.css (100%)
rename src/GUI/{ => fxml}/AboutPage.fxml (95%)
rename src/GUI/{ => fxml}/FileEncryptionPage.fxml (96%)
rename src/GUI/{ => fxml}/FileHashPage.fxml (94%)
rename src/GUI/{ => fxml}/HashSumCheckerPage.fxml (95%)
rename src/GUI/{ => fxml}/HomePage.fxml (94%)
rename src/GUI/{ => fxml}/MenuBar.fxml (98%)
rename src/GUI/{ => fxml}/SettingsPage.fxml (87%)
rename src/GUI/{ => fxml}/ShowKey.fxml (84%)
rename src/GUI/{ => fxml}/SideMenu.fxml (94%)
rename src/GUI/{ => fxml}/TextEncryptionPage.fxml (89%)
rename src/GUI/{ => fxml}/TextHashPage.fxml (89%)
rename src/GUI/{ => fxml}/UserKey.fxml (90%)
diff --git a/src/Cipher/Aes128.java b/src/Cipher/Aes128.java
index 8713a5e..5760bd9 100644
--- a/src/Cipher/Aes128.java
+++ b/src/Cipher/Aes128.java
@@ -1,6 +1,6 @@
package Cipher;
-import GUI.AlertDialog;
+import GUI.Main.AlertDialog;
import Utils.RepairString;
import javax.crypto.*;
diff --git a/src/Cipher/Aes256.java b/src/Cipher/Aes256.java
index 6b2bc2b..c24d710 100644
--- a/src/Cipher/Aes256.java
+++ b/src/Cipher/Aes256.java
@@ -1,6 +1,6 @@
package Cipher;
-import GUI.AlertDialog;
+import GUI.Main.AlertDialog;
import Utils.RepairString;
import javax.crypto.*;
diff --git a/src/Cipher/CurrentCipher.java b/src/Cipher/CurrentCipher.java
index 225b924..0027cc0 100644
--- a/src/Cipher/CurrentCipher.java
+++ b/src/Cipher/CurrentCipher.java
@@ -1,6 +1,6 @@
package Cipher;
-import GUI.AlertDialog;
+import GUI.Main.AlertDialog;
import java.io.File;
diff --git a/src/Cipher/Des.java b/src/Cipher/Des.java
index 91922b4..991d9df 100644
--- a/src/Cipher/Des.java
+++ b/src/Cipher/Des.java
@@ -1,6 +1,6 @@
package Cipher;
-import GUI.AlertDialog;
+import GUI.Main.AlertDialog;
import Utils.RepairString;
import javax.crypto.*;
diff --git a/src/Cipher/Des3.java b/src/Cipher/Des3.java
index 6fca078..c3e26d2 100644
--- a/src/Cipher/Des3.java
+++ b/src/Cipher/Des3.java
@@ -1,6 +1,6 @@
package Cipher;
-import GUI.AlertDialog;
+import GUI.Main.AlertDialog;
import Utils.RepairString;
import javax.crypto.*;
diff --git a/src/GUI/AboutPageController.java b/src/GUI/Controllers/AboutPageController.java
similarity index 91%
rename from src/GUI/AboutPageController.java
rename to src/GUI/Controllers/AboutPageController.java
index cd46cf2..9510f88 100644
--- a/src/GUI/AboutPageController.java
+++ b/src/GUI/Controllers/AboutPageController.java
@@ -1,5 +1,7 @@
-package GUI;
+package GUI.Controllers;
+import GUI.Main.GUI;
+import GUI.Main.AlertDialog;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
@@ -32,8 +34,7 @@ public void profileLinkAction() {
public void menuButtonPressed() {
menuImage.setImage(new javafx.scene.image.Image("/menu2.png"));
- GUI.menuTranslation.setRate(1);
- GUI.menuTranslation.play();
+ GUI.menuButtonPressed();
}
public void menuButtonRelease() {
diff --git a/src/GUI/FileEncryptionPageController.java b/src/GUI/Controllers/FileEncryptionPageController.java
similarity index 97%
rename from src/GUI/FileEncryptionPageController.java
rename to src/GUI/Controllers/FileEncryptionPageController.java
index 0d81f45..ce3dcb8 100644
--- a/src/GUI/FileEncryptionPageController.java
+++ b/src/GUI/Controllers/FileEncryptionPageController.java
@@ -1,5 +1,7 @@
-package GUI;
+package GUI.Controllers;
+import GUI.Main.GUI;
+import GUI.Main.AlertDialog;
import Utils.PathCutter;
import Cipher.CurrentCipher;
@@ -120,8 +122,7 @@ private void enableDragDropText() {
public void menuButtonPressed() {
menuImage.setImage(new Image("/menu2.png"));
- GUI.menuTranslation.setRate(1);
- GUI.menuTranslation.play();
+ GUI.menuButtonPressed();
}
public void menuButtonRelease() {
diff --git a/src/GUI/FileHashPageController.java b/src/GUI/Controllers/FileHashPageController.java
similarity index 96%
rename from src/GUI/FileHashPageController.java
rename to src/GUI/Controllers/FileHashPageController.java
index b18e0d0..61746c0 100644
--- a/src/GUI/FileHashPageController.java
+++ b/src/GUI/Controllers/FileHashPageController.java
@@ -1,5 +1,6 @@
-package GUI;
+package GUI.Controllers;
+import GUI.Main.GUI;
import Hash.CurrentHash;
import Utils.PathCutter;
import javafx.fxml.FXML;
@@ -78,8 +79,7 @@ private void enableDragDropText() {
public void menuButtonPressed() {
menuImage.setImage(new javafx.scene.image.Image("/menu2.png"));
- GUI.menuTranslation.setRate(1);
- GUI.menuTranslation.play();
+ GUI.menuButtonPressed();
}
public void menuButtonRelease() {
diff --git a/src/GUI/HashSumCheckerPageController.java b/src/GUI/Controllers/HashSumCheckerPageController.java
similarity index 96%
rename from src/GUI/HashSumCheckerPageController.java
rename to src/GUI/Controllers/HashSumCheckerPageController.java
index 3dad71d..9374d8d 100644
--- a/src/GUI/HashSumCheckerPageController.java
+++ b/src/GUI/Controllers/HashSumCheckerPageController.java
@@ -1,5 +1,6 @@
-package GUI;
+package GUI.Controllers;
+import GUI.Main.GUI;
import Hash.CurrentHash;
import Utils.PathCutter;
import javafx.fxml.FXML;
@@ -82,8 +83,7 @@ private void enableDragDropText() {
public void menuButtonPressed() {
menuImage.setImage(new Image("/menu2.png"));
- GUI.menuTranslation.setRate(1);
- GUI.menuTranslation.play();
+ GUI.menuButtonPressed();
}
public void menuButtonRelease() {
diff --git a/src/GUI/HomePageController.java b/src/GUI/Controllers/HomePageController.java
similarity index 86%
rename from src/GUI/HomePageController.java
rename to src/GUI/Controllers/HomePageController.java
index 142d683..846e010 100644
--- a/src/GUI/HomePageController.java
+++ b/src/GUI/Controllers/HomePageController.java
@@ -1,5 +1,7 @@
-package GUI;
+package GUI.Controllers;
+import GUI.Main.GUI;
+import GUI.Main.Pages;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
@@ -17,8 +19,7 @@ public void fileEncryptionPageAction() {
public void menuButtonPressed() {
menuImage.setImage(new Image("/menu2.png"));
- GUI.menuTranslation.setRate(1);
- GUI.menuTranslation.play();
+ GUI.menuButtonPressed();
}
public void menuButtonRelease() {
diff --git a/src/GUI/MenuBarController.java b/src/GUI/Controllers/MenuBarController.java
similarity index 97%
rename from src/GUI/MenuBarController.java
rename to src/GUI/Controllers/MenuBarController.java
index bb6795f..da6d12b 100644
--- a/src/GUI/MenuBarController.java
+++ b/src/GUI/Controllers/MenuBarController.java
@@ -1,6 +1,7 @@
-package GUI;
+package GUI.Controllers;
import Cipher.CurrentCipher;
+import GUI.Main.*;
import Hash.CurrentHash;
import javafx.fxml.FXML;
import javafx.scene.control.RadioMenuItem;
@@ -49,7 +50,7 @@ public void initialize() {
}
public void genKeyAction() {
- GenerateKey.generateKey();
+ CurrentCipher.generateKey();
}
public void showKeyAction() {
diff --git a/src/GUI/SettingsPageController.java b/src/GUI/Controllers/SettingsPageController.java
similarity index 84%
rename from src/GUI/SettingsPageController.java
rename to src/GUI/Controllers/SettingsPageController.java
index d84b6ea..a8b3ed5 100644
--- a/src/GUI/SettingsPageController.java
+++ b/src/GUI/Controllers/SettingsPageController.java
@@ -1,5 +1,6 @@
-package GUI;
+package GUI.Controllers;
+import GUI.Main.GUI;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
@@ -9,8 +10,7 @@ public class SettingsPageController {
public void menuButtonPressed() {
menuImage.setImage(new javafx.scene.image.Image("/menu2.png"));
- GUI.menuTranslation.setRate(1);
- GUI.menuTranslation.play();
+
}
public void menuButtonRelease() {
diff --git a/src/GUI/ShowKeyController.java b/src/GUI/Controllers/ShowKeyController.java
similarity index 94%
rename from src/GUI/ShowKeyController.java
rename to src/GUI/Controllers/ShowKeyController.java
index 8058268..d8185a6 100644
--- a/src/GUI/ShowKeyController.java
+++ b/src/GUI/Controllers/ShowKeyController.java
@@ -1,4 +1,4 @@
-package GUI;
+package GUI.Controllers;
import Cipher.CurrentCipher;
import javafx.fxml.FXML;
diff --git a/src/GUI/SideMenuController.java b/src/GUI/Controllers/SideMenuController.java
similarity index 93%
rename from src/GUI/SideMenuController.java
rename to src/GUI/Controllers/SideMenuController.java
index c24d4e8..6c04673 100644
--- a/src/GUI/SideMenuController.java
+++ b/src/GUI/Controllers/SideMenuController.java
@@ -1,4 +1,7 @@
-package GUI;
+package GUI.Controllers;
+
+import GUI.Main.GUI;
+import GUI.Main.Pages;
public class SideMenuController {
diff --git a/src/GUI/TextEncryptionPageController.java b/src/GUI/Controllers/TextEncryptionPageController.java
similarity index 92%
rename from src/GUI/TextEncryptionPageController.java
rename to src/GUI/Controllers/TextEncryptionPageController.java
index 4bc80c4..39c4670 100644
--- a/src/GUI/TextEncryptionPageController.java
+++ b/src/GUI/Controllers/TextEncryptionPageController.java
@@ -1,6 +1,7 @@
-package GUI;
+package GUI.Controllers;
import Cipher.CurrentCipher;
+import GUI.Main.GUI;
import javafx.fxml.FXML;
import javafx.scene.control.TextArea;
import javafx.scene.image.Image;
@@ -32,8 +33,7 @@ public void initialize() {
public void menuButtonPressed() {
menuImage.setImage(new javafx.scene.image.Image("/menu2.png"));
- GUI.menuTranslation.setRate(1);
- GUI.menuTranslation.play();
+ GUI.menuButtonPressed();
}
public void menuButtonRelease() {
diff --git a/src/GUI/TextHashPageController.java b/src/GUI/Controllers/TextHashPageController.java
similarity index 91%
rename from src/GUI/TextHashPageController.java
rename to src/GUI/Controllers/TextHashPageController.java
index 6de3c68..183571f 100644
--- a/src/GUI/TextHashPageController.java
+++ b/src/GUI/Controllers/TextHashPageController.java
@@ -1,5 +1,6 @@
-package GUI;
+package GUI.Controllers;
+import GUI.Main.GUI;
import Hash.CurrentHash;
import javafx.fxml.FXML;
import javafx.scene.control.TextArea;
@@ -28,8 +29,7 @@ public void hashButtonAction() {
public void menuButtonPressed() {
menuImage.setImage(new javafx.scene.image.Image("/menu2.png"));
- GUI.menuTranslation.setRate(1);
- GUI.menuTranslation.play();
+ GUI.menuButtonPressed();
}
public void menuButtonRelease() {
diff --git a/src/GUI/UserKeyController.java b/src/GUI/Controllers/UserKeyController.java
similarity index 96%
rename from src/GUI/UserKeyController.java
rename to src/GUI/Controllers/UserKeyController.java
index a9fea6b..8c8fb5f 100644
--- a/src/GUI/UserKeyController.java
+++ b/src/GUI/Controllers/UserKeyController.java
@@ -1,4 +1,4 @@
-package GUI;
+package GUI.Controllers;
import Cipher.CurrentCipher;
import javafx.fxml.FXML;
diff --git a/src/GUI/GenerateKey.java b/src/GUI/GenerateKey.java
deleted file mode 100644
index ac2aa0c..0000000
--- a/src/GUI/GenerateKey.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package GUI;
-
-import Cipher.CurrentCipher;
-
-class GenerateKey {
-
- static void generateKey() {
- CurrentCipher.generateKey();
- }
-
-}
diff --git a/src/GUI/AlertDialog.java b/src/GUI/Main/AlertDialog.java
similarity index 98%
rename from src/GUI/AlertDialog.java
rename to src/GUI/Main/AlertDialog.java
index 980fbda..bcd96d3 100644
--- a/src/GUI/AlertDialog.java
+++ b/src/GUI/Main/AlertDialog.java
@@ -1,4 +1,4 @@
-package GUI;
+package GUI.Main;
import javafx.scene.control.Alert;
import javafx.scene.control.ButtonType;
diff --git a/src/GUI/GUI.java b/src/GUI/Main/GUI.java
similarity index 65%
rename from src/GUI/GUI.java
rename to src/GUI/Main/GUI.java
index a579aaf..1a64ea5 100644
--- a/src/GUI/GUI.java
+++ b/src/GUI/Main/GUI.java
@@ -1,4 +1,4 @@
-package GUI;
+package GUI.Main;
import javafx.animation.TranslateTransition;
import javafx.application.Application;
@@ -20,7 +20,7 @@ public class GUI extends Application {
private static BorderPane borderPane = new BorderPane();
private static Pane pane;
private static VBox menu;
- static TranslateTransition menuTranslation;
+ private static TranslateTransition menuTranslation;
@Override
public void start(Stage primaryStage) {
@@ -30,20 +30,19 @@ public void start(Stage primaryStage) {
initializePages();
Scene scene = new Scene(new Pane(), 590, 390);
- Parent menuBar = FXMLLoader.load(getClass().getResource("MenuBar.fxml"));
+ Parent menuBar = FXMLLoader.load(getClass().getResource("/GUI/fxml/MenuBar.fxml"));
borderPane.setTop(menuBar);
pane = new Pane(Pages.HOME_PAGE.getParent());
- pane.getStylesheets().add(getClass().getResource("General.css").toExternalForm());
+ pane.getStylesheets().add(getClass().getResource("/GUI/css/General.css").toExternalForm());
borderPane.setCenter(pane);
- menu = FXMLLoader.load(getClass().getResource("SideMenu.fxml"));
-// menu.prefHeightProperty().bind(scene.heightProperty());
+ menu = FXMLLoader.load(getClass().getResource("/GUI/fxml/SideMenu.fxml"));
- menu.setTranslateX(-201);
+ menu.setTranslateX(-200);
menuTranslation = new TranslateTransition(Duration.millis(250), menu);
- menuTranslation.setFromX(-201);
- menuTranslation.setToX(-1);
+ menuTranslation.setFromX(-200);
+ menuTranslation.setToX(0);
menu.setOnMouseExited(evt -> {
menuTranslation.setRate(-1);
@@ -62,26 +61,41 @@ public void start(Stage primaryStage) {
private void initializePages() {
try {
- Pages.ABOUT_PAGE.setParent(FXMLLoader.load(getClass().getResource("AboutPage.fxml")));
- Pages.FILE_ENCRYPTION_PAGE.setParent(FXMLLoader.load(getClass().getResource("FileEncryptionPage.fxml")));
- Pages.FILE_HASH_PAGE.setParent(FXMLLoader.load(getClass().getResource("FileHashPage.fxml")));
- Pages.HASH_SUM_CHECKER_PAGE.setParent(FXMLLoader.load(getClass().getResource("HashSumCheckerPage.fxml")));
- Pages.HOME_PAGE.setParent(FXMLLoader.load(getClass().getResource("HomePage.fxml")));
- Pages.SETTINGS_PAGE.setParent(FXMLLoader.load(getClass().getResource("SettingsPage.fxml")));
- Pages.TEXT_ENCRYPTION_PAGE.setParent(FXMLLoader.load(getClass().getResource("TextEncryptionPage.fxml")));
- Pages.TEXT_HASH_PAGE.setParent(FXMLLoader.load(getClass().getResource("TextHashPage.fxml")));
+ Pages.ABOUT_PAGE.setParent(FXMLLoader.load(getClass().getResource("/GUI/fxml/AboutPage.fxml")));
+ Pages.FILE_ENCRYPTION_PAGE.setParent(FXMLLoader.load(getClass().getResource("/GUI/fxml/FileEncryptionPage.fxml")));
+ Pages.FILE_HASH_PAGE.setParent(FXMLLoader.load(getClass().getResource("/GUI/fxml/FileHashPage.fxml")));
+ Pages.HASH_SUM_CHECKER_PAGE.setParent(FXMLLoader.load(getClass().getResource("/GUI/fxml/HashSumCheckerPage.fxml")));
+ Pages.HOME_PAGE.setParent(FXMLLoader.load(getClass().getResource("/GUI/fxml/HomePage.fxml")));
+ Pages.SETTINGS_PAGE.setParent(FXMLLoader.load(getClass().getResource("/GUI/fxml/SettingsPage.fxml")));
+ Pages.TEXT_ENCRYPTION_PAGE.setParent(FXMLLoader.load(getClass().getResource("/GUI/fxml/TextEncryptionPage.fxml")));
+ Pages.TEXT_HASH_PAGE.setParent(FXMLLoader.load(getClass().getResource("/GUI/fxml/TextHashPage.fxml")));
} catch (IOException e) {
e.printStackTrace();
}
}
- static void updatePageContent(Node nextNode) {
+ public static void updatePageContent(Node nextNode) {
pane.getChildren().set(0, nextNode);
}
- static void hideMenu() {
+ public static void hideMenu() {
menuTranslation.setRate(-1);
menuTranslation.play();
+ sideMenuDisable();
+ }
+
+ public static void menuButtonPressed() {
+ sideMenuAble();
+ menuTranslation.setRate(1);
+ menuTranslation.play();
+ }
+
+ public static void sideMenuDisable() {
+// menuTranslation..
+ }
+
+ public static void sideMenuAble() {
+ menu.setDisable(false);
}
public static void main(String[] args) {
diff --git a/src/GUI/Pages.java b/src/GUI/Main/Pages.java
similarity index 78%
rename from src/GUI/Pages.java
rename to src/GUI/Main/Pages.java
index 287b900..c8f8ffe 100644
--- a/src/GUI/Pages.java
+++ b/src/GUI/Main/Pages.java
@@ -1,8 +1,8 @@
-package GUI;
+package GUI.Main;
import javafx.scene.Parent;
-enum Pages {
+public enum Pages {
ABOUT_PAGE (null),
FILE_ENCRYPTION_PAGE (null),
@@ -19,11 +19,11 @@ enum Pages {
this.parent = parent;
}
- Parent getParent() {
+ public Parent getParent() {
return parent;
}
- void setParent(Parent parent) {
+ public void setParent(Parent parent) {
this.parent = parent;
}
diff --git a/src/GUI/ShowKey.java b/src/GUI/Main/ShowKey.java
similarity index 88%
rename from src/GUI/ShowKey.java
rename to src/GUI/Main/ShowKey.java
index 83f5d57..15ce388 100644
--- a/src/GUI/ShowKey.java
+++ b/src/GUI/Main/ShowKey.java
@@ -1,4 +1,4 @@
-package GUI;
+package GUI.Main;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
@@ -9,12 +9,12 @@
import java.io.IOException;
-class ShowKey {
+public class ShowKey {
- void showKey() {
+ public void showKey() {
try {
Stage showKey = new Stage();
- Parent content = FXMLLoader.load(getClass().getResource("ShowKey.fxml"));
+ Parent content = FXMLLoader.load(getClass().getResource("/GUI/fxml/ShowKey.fxml"));
Scene scene = new Scene(content);
content.setId("showKey");
showKey.setTitle("key");
diff --git a/src/GUI/UserKey.java b/src/GUI/Main/UserKey.java
similarity index 86%
rename from src/GUI/UserKey.java
rename to src/GUI/Main/UserKey.java
index e8c3443..be96eba 100644
--- a/src/GUI/UserKey.java
+++ b/src/GUI/Main/UserKey.java
@@ -1,4 +1,4 @@
-package GUI;
+package GUI.Main;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
@@ -9,11 +9,11 @@
import java.io.IOException;
-class UserKey {
+public class UserKey {
- static void getKeyFromUser() {
+ public static void getKeyFromUser() {
try {
- Parent content = FXMLLoader.load(UserKey.class.getResource("UserKey.fxml"));
+ Parent content = FXMLLoader.load(UserKey.class.getResource("/GUI/fxml/UserKey.fxml"));
Scene scene = new Scene(content);
content.setId("userKey");
Stage userKey = new Stage();
diff --git a/src/GUI/General.css b/src/GUI/css/General.css
similarity index 100%
rename from src/GUI/General.css
rename to src/GUI/css/General.css
diff --git a/src/GUI/ShowKey.css b/src/GUI/css/ShowKey.css
similarity index 100%
rename from src/GUI/ShowKey.css
rename to src/GUI/css/ShowKey.css
diff --git a/src/GUI/SideMenu.css b/src/GUI/css/SideMenu.css
similarity index 100%
rename from src/GUI/SideMenu.css
rename to src/GUI/css/SideMenu.css
diff --git a/src/GUI/TextArea.css b/src/GUI/css/TextArea.css
similarity index 100%
rename from src/GUI/TextArea.css
rename to src/GUI/css/TextArea.css
diff --git a/src/GUI/UserKey.css b/src/GUI/css/UserKey.css
similarity index 100%
rename from src/GUI/UserKey.css
rename to src/GUI/css/UserKey.css
diff --git a/src/GUI/AboutPage.fxml b/src/GUI/fxml/AboutPage.fxml
similarity index 95%
rename from src/GUI/AboutPage.fxml
rename to src/GUI/fxml/AboutPage.fxml
index 0ff7308..0a15502 100644
--- a/src/GUI/AboutPage.fxml
+++ b/src/GUI/fxml/AboutPage.fxml
@@ -10,7 +10,7 @@
-
+
diff --git a/src/GUI/FileEncryptionPage.fxml b/src/GUI/fxml/FileEncryptionPage.fxml
similarity index 96%
rename from src/GUI/FileEncryptionPage.fxml
rename to src/GUI/fxml/FileEncryptionPage.fxml
index 9f49eef..3f8058e 100644
--- a/src/GUI/FileEncryptionPage.fxml
+++ b/src/GUI/fxml/FileEncryptionPage.fxml
@@ -11,7 +11,7 @@
-
+
diff --git a/src/GUI/FileHashPage.fxml b/src/GUI/fxml/FileHashPage.fxml
similarity index 94%
rename from src/GUI/FileHashPage.fxml
rename to src/GUI/fxml/FileHashPage.fxml
index 9e3748e..8d2a964 100644
--- a/src/GUI/FileHashPage.fxml
+++ b/src/GUI/fxml/FileHashPage.fxml
@@ -11,7 +11,7 @@
-
+
@@ -60,7 +60,7 @@