changed controls in create new notepad window

Author: lgajos

src/main/java/notepack/NotepadCreateController.java

@@ -1,9 +1,14 @@
 package notepack;
 
+import javafx.scene.input.Clipboard;
+import javafx.scene.input.ClipboardContent;
 import notepack.NotepadCreateCallback;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 import java.util.ResourceBundle;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -44,14 +49,12 @@ public class NotepadCreateController implements Initializable {
 
     @FXML
     private TextField notepadName;
-    private TextField directoryPath;
 
     private NotepadCreateCallback clbk;
     @FXML
     private Button btnCancel;
 
     private Notepad notepad;
-    private boolean notepadEdition = false;
     @FXML
     private ToggleButton btnUserColor6;
     @FXML
@@ -77,20 +80,17 @@ public class NotepadCreateController implements Initializable {
     private AnchorPane engineForm;
 
     private EngineController currentFormController;
+
     @FXML
-    private CheckBox gpgCheckbox;
-    @FXML
-    private TextField gpgPublicKeyPath;
-    @FXML
-    private Button gpgSelectPublicKey;
+    private CheckBox encryptionCheckbox;
     @FXML
-    private TextField gpgPrivateKeyPath;
+    private PasswordField encryptionPassword;
     @FXML
-    private Button gpgSelectPrivateKey;
+    private Button generatePassword;
     @FXML
-    private Label gpgPublicLabel;
+    private Button copyPasswordBtn;
     @FXML
-    private Label gpgPrivateLabel;
+    private Label passwordLabel;
 
     /**
      * Initializes the controller class.
@@ -119,21 +119,15 @@ public void initialize(URL url, ResourceBundle rb) {
             }
         });
 
-        gpgCheckbox.selectedProperty().addListener((o) -> {
-            if (gpgCheckbox.isSelected()) {
-                gpgPrivateLabel.setDisable(false);
-                gpgPublicLabel.setDisable(false);
-                gpgPrivateKeyPath.setDisable(false);
-                gpgPublicKeyPath.setDisable(false);
-                gpgSelectPrivateKey.setDisable(false);
-                gpgSelectPublicKey.setDisable(false);
+        encryptionCheckbox.selectedProperty().addListener((o) -> {
+            if (encryptionCheckbox.isSelected()) {
+                encryptionPassword.setDisable(false);
+                generatePassword.setDisable(false);
+                passwordLabel.setDisable(false);
             } else {
-                gpgPrivateLabel.setDisable(true);
-                gpgPublicLabel.setDisable(true);
-                gpgPrivateKeyPath.setDisable(true);
-                gpgPublicKeyPath.setDisable(true);
-                gpgSelectPrivateKey.setDisable(true);
-                gpgSelectPublicKey.setDisable(true);
+                encryptionPassword.setDisable(true);
+                generatePassword.setDisable(true);
+                passwordLabel.setDisable(true);
             }
         });
 
@@ -151,8 +145,7 @@ public void initialize(URL url, ResourceBundle rb) {
 
             try {
                 Parent root = fxmlLoader.load();
-//                new Theme(new PreferencesSettings()).setCurrent(root.getScene());
-                
+
                 currentFormController = (EngineController) fxmlLoader.getController();
 
                 engineForm.getChildren().add(root);
@@ -171,7 +164,7 @@ public void setNotepadCreateCallback(NotepadCreateCallback clbk) {
 
     public void setNotepadToEdit(Notepad notepad) {
         this.notepad = notepad;
-        notepadEdition = true;
+//        notepadEdition = true;
 
         notepadName.setText(notepad.getName());
 
@@ -188,17 +181,16 @@ public void setNotepadToEdit(Notepad notepad) {
         engineSelection.getSelectionModel().select(0);
         engineSelection.setDisable(true);
 
-        if (notepad.getParam("gpg-enabled").equals("1")) {
-            gpgPrivateKeyPath.setText(notepad.getParam("gpg-private-key"));
-            gpgPublicKeyPath.setText(notepad.getParam("gpg-public-key"));
-            gpgCheckbox.setSelected(true);
+        if (notepad.getParam("encryption-enabled").equals("1")) {
+            encryptionPassword.setText(notepad.getParam("encryption-password"));
+            encryptionCheckbox.setSelected(true);
+            copyPasswordBtn.setDisable(false);
         }
 
-        gpgCheckbox.setDisable(true);
-        gpgPrivateKeyPath.setDisable(true);
-        gpgPublicKeyPath.setDisable(true);
-        gpgSelectPrivateKey.setDisable(true);
-        gpgSelectPublicKey.setDisable(true);
+        encryptionCheckbox.setDisable(true);
+        encryptionPassword.setDisable(true);
+        generatePassword.setDisable(true);
+        passwordLabel.setDisable(true);
 
         currentFormController.setStorage(notepad.getStorage());
 
@@ -248,28 +240,21 @@ private void onAdd(ActionEvent event) {
             return;
         }
 
-        if (gpgCheckbox.isSelected()) {
-            notepad.setParam("gpg-enabled", "1");
+        if (encryptionCheckbox.isSelected()) {
+            notepad.setParam("encryption-enabled", "1");
 
-            File privateFile = new File(gpgPrivateKeyPath.getText());
-            File publicFile = new File(gpgPublicKeyPath.getText());
+            String pwd = encryptionPassword.getText();
 
-            if (!privateFile.exists()) {
-                Alert a = new Alert(Alert.AlertType.ERROR, "GPG private key not exists");
-                a.show();
-                return;
-            }
-            if (!publicFile.exists()) {
-                Alert a = new Alert(Alert.AlertType.ERROR, "GPG public key not exists");
+            if (pwd.length() < 5) {
+                Alert a = new Alert(Alert.AlertType.ERROR, "Password must have at least 5 characters");
                 a.show();
                 return;
             }
 
-            notepad.setParam("gpg-private-key", privateFile.getAbsolutePath());
-            notepad.setParam("gpg-public-key", publicFile.getAbsolutePath());
+            notepad.setParam("encryption-password", pwd);
 
         } else {
-            notepad.setParam("gpg-enabled", "0");
+            notepad.setParam("encryption-enabled", "0");
         }
 
         String color = (String) tg.getSelectedToggle().getUserData();
@@ -289,57 +274,81 @@ private void onCancel(ActionEvent event) {
         stage.close();
     }
 
-    private void webDavTestConnection(ActionEvent event) {
-
-        String url = webDavUrl.getText();
-        String username = webDavUsername.getText();
-        String password = webDavPassword.getText();
-
-        NoteStorageConfiguration nsc = new NoteStorageConfiguration();
-        nsc.set("url", url);
-        nsc.set("username", username);
-        nsc.set("password", password);
-
-        Webdav wd = new Webdav(nsc);
-        
-        try {
-            NoteStorageItem noteItem = wd.getItemsInStorage();
-            wd.refreshItemsInStorage();
-        } catch (MessageError ex) {
-            Alert a = new Alert(Alert.AlertType.ERROR, "WebDAV problem: " + ex.getMessage());
-            a.showAndWait();
-            return;
-        }
-
-        Alert a = new Alert(Alert.AlertType.INFORMATION, "WebDAV configuration looks good ");
-        a.showAndWait();
-
-    }
-
     @FXML
-    private void onSelectPublicKey(ActionEvent event) {
-        Stage stage = (Stage) gpgPublicKeyPath.getScene().getWindow();
+    public void generateRandomPassword(ActionEvent actionEvent) {
+        String input = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_=+,./<>?;':[]{}";
+        String pwd = "";
+        for (int i = 0; i < 20; i++) {
+            List<String> result = Arrays.asList(input.split(""));
+            Collections.shuffle(result);
+            pwd = pwd + result.get(0);
+        }
+        encryptionPassword.setText(pwd);
+        copyPasswordBtn.setDisable(false);
 
-        FileChooser chooser = new FileChooser();
-        chooser.setTitle("Select GPG public key");
+        Alert alert = new Alert(Alert.AlertType.INFORMATION);
+        alert.setTitle("Information Dialog");
+        alert.setHeaderText(null);
+        alert.setContentText("Copy and save generated password, this is possible only now!");
 
-        File selectedFile = chooser.showOpenDialog(stage);
-        if (selectedFile != null) {
-            gpgPublicKeyPath.setText(selectedFile.getAbsolutePath());
-        }
+        alert.showAndWait();
     }
 
     @FXML
-    private void onSelectPrivateKey(ActionEvent event) {
-        Stage stage = (Stage) gpgPrivateKeyPath.getScene().getWindow();
-
-        FileChooser chooser = new FileChooser();
-        chooser.setTitle("Select GPG private key");
-
-        File selectedFile = chooser.showOpenDialog(stage);
-        if (selectedFile != null) {
-            gpgPrivateKeyPath.setText(selectedFile.getAbsolutePath());
-        }
+    public void copyPassword(ActionEvent actionEvent) {
+        Clipboard clipboard = Clipboard.getSystemClipboard();
+        ClipboardContent content = new ClipboardContent();
+        content.putString(encryptionPassword.getText());
+        clipboard.setContent(content);
     }
 
+//    private void webDavTestConnection(ActionEvent event) {
+//
+//        String url = webDavUrl.getText();
+//        String username = webDavUsername.getText();
+//        String password = webDavPassword.getText();
+//
+//        NoteStorageConfiguration nsc = new NoteStorageConfiguration();
+//        nsc.set("url", url);
+//        nsc.set("username", username);
+//        nsc.set("password", password);
+//
+//        Webdav wd = new Webdav(nsc);
+//
+//        try {
+//            NoteStorageItem noteItem = wd.getItemsInStorage();
+//            wd.refreshItemsInStorage();
+//        } catch (MessageError ex) {
+//            Alert a = new Alert(Alert.AlertType.ERROR, "WebDAV problem: " + ex.getMessage());
+//            a.showAndWait();
+//            return;
+//        }
+//
+//        Alert a = new Alert(Alert.AlertType.INFORMATION, "WebDAV configuration looks good ");
+//        a.showAndWait();
+//
+//    }
+
+//    private void onSelectPublicKey(ActionEvent event) {
+//        Stage stage = (Stage) gpgPublicKeyPath.getScene().getWindow();
+//
+//        FileChooser chooser = new FileChooser();
+//        chooser.setTitle("Select GPG public key");
+//
+//        File selectedFile = chooser.showOpenDialog(stage);
+//        if (selectedFile != null) {
+//            gpgPublicKeyPath.setText(selectedFile.getAbsolutePath());
+//        }
+//    }
+//    private void onSelectPrivateKey(ActionEvent event) {
+//        Stage stage = (Stage) gpgPrivateKeyPath.getScene().getWindow();
+//
+//        FileChooser chooser = new FileChooser();
+//        chooser.setTitle("Select GPG private key");
+//
+//        File selectedFile = chooser.showOpenDialog(stage);
+//        if (selectedFile != null) {
+//            gpgPrivateKeyPath.setText(selectedFile.getAbsolutePath());
+//        }
+//    }
 }

src/main/resources/notepack/NotepadCreate.fxml

@@ -18,9 +18,9 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<VBox prefHeight="825.0" prefWidth="746.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="notepack.NotepadCreateController">
+<VBox prefHeight="699.0" prefWidth="746.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="notepack.NotepadCreateController">
     <stylesheets>
-        <!--<URL value="@color-definition.css" />-->
+        <URL value="@color-definition.css" />
         <URL value="@scrollbar.css" />  
         <URL value="@icons.css" />  
         <URL value="@default.css" />  
@@ -33,37 +33,31 @@
                <font>
                   <Font size="15.0" />
                </font></Label>
-                <TextField fx:id="notepadName" layoutX="280.0" layoutY="31.0" prefHeight="38.0" prefWidth="315.0" />
+                <TextField fx:id="notepadName" layoutX="215.0" layoutY="32.0" prefHeight="38.0" prefWidth="445.0" />
                 <Label layoutX="56.0" layoutY="84.0" text="Notepad color:" AnchorPane.leftAnchor="20.0">
                <font>
                   <Font size="15.0" />
                </font></Label>
-                <ToggleButton fx:id="btnUserColor6" layoutX="444.0" layoutY="79.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="25.0" style="-fx-background-color: user-color-6;" />
-                <ToggleButton fx:id="btnUserColor5" layoutX="410.0" layoutY="79.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="25.0" style="-fx-background-color: user-color-5;" />
-                <ToggleButton fx:id="btnUserColor4" layoutX="378.0" layoutY="79.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="25.0" style="-fx-background-color: user-color-4;" />
-                <ToggleButton fx:id="btnUserColor3" layoutX="344.0" layoutY="79.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="25.0" style="-fx-background-color: user-color-3;" />
-                <ToggleButton fx:id="btnUserColor2" layoutX="312.0" layoutY="79.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="25.0" style="-fx-background-color: user-color-2;" />
-                <ToggleButton fx:id="btnUserColor1" layoutX="280.0" layoutY="79.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="25.0" selected="true" style="-fx-background-color: user-color-1;" />
-            <Label layoutX="40.0" layoutY="126.0" text="Enable GPG encryption:">
+                <ToggleButton fx:id="btnUserColor6" layoutX="379.0" layoutY="80.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="25.0" style="-fx-background-color: user-color-6;" />
+                <ToggleButton fx:id="btnUserColor5" layoutX="345.0" layoutY="80.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="25.0" style="-fx-background-color: user-color-5;" />
+                <ToggleButton fx:id="btnUserColor4" layoutX="313.0" layoutY="80.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="25.0" style="-fx-background-color: user-color-4;" />
+                <ToggleButton fx:id="btnUserColor3" layoutX="279.0" layoutY="80.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="25.0" style="-fx-background-color: user-color-3;" />
+                <ToggleButton fx:id="btnUserColor2" layoutX="247.0" layoutY="80.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="25.0" style="-fx-background-color: user-color-2;" />
+                <ToggleButton fx:id="btnUserColor1" layoutX="215.0" layoutY="80.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="25.0" selected="true" style="-fx-background-color: user-color-1;" />
+            <Label layoutX="40.0" layoutY="126.0" text="Enable encryption:">
                <font>
                   <Font size="15.0" />
                </font>
             </Label>
-            <CheckBox fx:id="gpgCheckbox" layoutX="280.0" layoutY="127.0" mnemonicParsing="false" />
-            <Label fx:id="gpgPublicLabel" disable="true" layoutX="40.0" layoutY="175.0" text="Public key:">
+            <CheckBox fx:id="encryptionCheckbox" layoutX="215.0" layoutY="128.0" mnemonicParsing="false" />
+            <Label fx:id="passwordLabel" disable="true" layoutX="40.0" layoutY="175.0" text="Password:">
                <font>
                   <Font size="15.0" />
                </font>
             </Label>
-            <TextField fx:id="gpgPublicKeyPath" disable="true" layoutX="277.0" layoutY="166.0" prefHeight="38.0" prefWidth="253.0" />
-            <Button fx:id="gpgSelectPublicKey" cancelButton="true" disable="true" layoutX="530.0" layoutY="166.0" mnemonicParsing="false" onAction="#onSelectPublicKey" text="Select" />
-            <Label fx:id="gpgPrivateLabel" disable="true" layoutX="40.0" layoutY="228.0" text="Private key:">
-               <font>
-                  <Font size="15.0" />
-               </font>
-            </Label>
-            <TextField fx:id="gpgPrivateKeyPath" disable="true" layoutX="277.0" layoutY="218.0" prefHeight="38.0" prefWidth="253.0" />
-            <Button fx:id="gpgSelectPrivateKey" cancelButton="true" disable="true" layoutX="530.0" layoutY="218.0" mnemonicParsing="false" onAction="#onSelectPrivateKey" text="Select" />
+            <PasswordField fx:id="encryptionPassword" disable="true" layoutX="214.0" layoutY="167.0" prefHeight="37.0" prefWidth="223.0" />
+            <Button fx:id="generatePassword" disable="true" layoutX="446.0" layoutY="168.0" mnemonicParsing="false" onAction="#generateRandomPassword" text="Generate" />
+            <Button fx:id="copyPasswordBtn" disable="true" layoutX="539.0" layoutY="168.0" mnemonicParsing="false" onAction="#copyPassword" text="Copy password" />
          </children>
          <padding>
             <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
@@ -78,10 +72,10 @@
          </VBox.margin>
          <children>
             <ComboBox fx:id="engineSelection" layoutX="23.0" layoutY="22.0" prefHeight="26.0" prefWidth="665.0" promptText="Select storage engine" AnchorPane.leftAnchor="15.0" AnchorPane.rightAnchor="15.0" AnchorPane.topAnchor="15.0" />
-            <AnchorPane fx:id="engineForm" layoutX="15.0" layoutY="52.0" prefHeight="292.0" prefWidth="706.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
+            <AnchorPane fx:id="engineForm" layoutX="15.0" layoutY="52.0" prefHeight="269.0" prefWidth="706.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
          </children>
       </AnchorPane>
-        <AnchorPane maxHeight="-1.0" maxWidth="-1.0" prefHeight="100.0" VBox.vgrow="ALWAYS">
+        <AnchorPane maxHeight="-1.0" maxWidth="-1.0" prefHeight="86.0" prefWidth="706.0" VBox.vgrow="ALWAYS">
             <children>
                 <Button fx:id="btnSave" defaultButton="true" layoutX="333.0" layoutY="436.0" mnemonicParsing="false" onAction="#onAdd" text="Add" AnchorPane.bottomAnchor="10.0" AnchorPane.rightAnchor="0.0" />
                 <Button fx:id="btnCancel" cancelButton="true" layoutX="577.0" layoutY="10.0" mnemonicParsing="false" onAction="#onCancel" text="Cancel" AnchorPane.bottomAnchor="10.0" AnchorPane.rightAnchor="60.0" />