updated other dialogs

Author: JavaSaBr

resources/ui/css/custom_ids.css

@@ -634,6 +634,7 @@
     -fx-pref-width: -fx-min-width;
     -fx-max-width: -fx-min-width;
     -fx-alignment: center-right;
+    -fx-padding: 0 2 0 0;
 }
 
 #CreateSkyDialogComboBox {
@@ -646,7 +647,7 @@
 }
 
 #CreateSkyDialogSpinner {
-    -fx-min-height: 24;
+    -fx-min-height: 22;
     -fx-pref-height: -fx-min-height;
     -fx-max-height: -fx-min-height;
     -fx-min-width: 70;

src/com/ss/editor/ui/component/asset/tree/context/menu/action/NewFileByCreatorAction.java

@@ -8,21 +8,21 @@
 import javafx.scene.control.MenuItem;
 
 /**
- * Реализация действия по созданию файла.
+ * The action for creating a new file.
  *
- * @author Ronn
+ * @author JavaSaBr
  */
 public class NewFileByCreatorAction extends MenuItem {
 
     private static final FXEventManager FX_EVENT_MANAGER = FXEventManager.getInstance();
 
     /**
-     * Элемент действия.
+     * The node element.
      */
     private final ResourceElement element;
 
     /**
-     * Описание создателя файлов.
+     * The creator description.
      */
     private final FileCreatorDescription description;
 
@@ -34,7 +34,7 @@ public NewFileByCreatorAction(final ResourceElement element, final FileCreatorDe
     }
 
     /**
-     * Процесс создания файла.
+     * Handle creating.
      */
     private void processCreate() {
 

src/com/ss/editor/ui/component/creator/impl/AbstractFileCreator.java

@@ -22,6 +22,8 @@
 import com.ss.editor.ui.event.FXEventManager;
 import com.ss.editor.ui.scene.EditorFXScene;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.awt.Point;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -124,7 +126,7 @@ private Path getInitFile() {
     }
 
     @Override
-    protected void createActions(final VBox root) {
+    protected void createActions(@NotNull final VBox root) {
         super.createActions(root);
 
         final HBox container = new HBox();
@@ -142,6 +144,9 @@ protected void createActions(final VBox root) {
         FXUtils.addToPane(cancelButton, container);
         FXUtils.addToPane(container, root);
 
+        FXUtils.addClassTo(okButton, CSSClasses.SPECIAL_FONT_16);
+        FXUtils.addClassTo(cancelButton, CSSClasses.SPECIAL_FONT_16);
+
         HBox.setMargin(okButton, OK_BUTTON_OFFSET);
         HBox.setMargin(cancelButton, CANCEL_BUTTON_OFFSET);
     }
@@ -198,7 +203,7 @@ protected void notifyFileCreated(final Path createdFile, boolean needSelect) {
     }
 
     @Override
-    protected void createContent(final VBox root) {
+    protected void createContent(@NotNull final VBox root) {
         super.createContent(root);
 
         final HBox container = new HBox();
@@ -262,8 +267,8 @@ protected void createSettings(final VBox root) {
         FXUtils.addToPane(fileNameField, fileNameContainer);
         FXUtils.addToPane(fileNameContainer, root);
 
-        FXUtils.addClassTo(fileNameLabel, CSSClasses.MAIN_FONT_13);
-        FXUtils.addClassTo(fileNameField, CSSClasses.MAIN_FONT_13);
+        FXUtils.addClassTo(fileNameLabel, CSSClasses.SPECIAL_FONT_13);
+        FXUtils.addClassTo(fileNameField, CSSClasses.SPECIAL_FONT_13);
 
         VBox.setMargin(fileNameContainer, FILE_NAME_CONTAINER_OFFSET);
     }

src/com/ss/editor/ui/component/creator/impl/EmptyFileCreator.java

@@ -4,16 +4,18 @@
 import com.ss.editor.ui.component.creator.FileCreatorDescription;
 import com.ss.editor.util.EditorUtil;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
 import rlib.util.StringUtils;
 
 /**
- * Реализация создателя новых пустых файлов.
+ * The creator for creating an empty file.
  *
- * @author Ronn
+ * @author JavaSaBr
  */
 public class EmptyFileCreator extends AbstractFileCreator {
 
@@ -27,6 +29,7 @@ public class EmptyFileCreator extends AbstractFileCreator {
     public EmptyFileCreator() {
     }
 
+    @NotNull
     @Override
     protected String getTitleText() {
         return Messages.EMPTY_FILE_CREATOR_TITLE;

src/com/ss/editor/ui/component/creator/impl/EmptyModelCreator.java

@@ -6,15 +6,17 @@
 import com.ss.editor.Messages;
 import com.ss.editor.ui.component.creator.FileCreatorDescription;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
 /**
- * Реализация создателя новых пустых моделей.
+ * The creator for creating an empty model.
  *
- * @author Ronn
+ * @author JavaSaBr
  */
 public class EmptyModelCreator extends AbstractFileCreator {
 
@@ -28,6 +30,7 @@ public class EmptyModelCreator extends AbstractFileCreator {
     public EmptyModelCreator() {
     }
 
+    @NotNull
     @Override
     protected String getTitleText() {
         return Messages.EMPTY_MODEL_CREATOR_TITLE;

src/com/ss/editor/ui/component/creator/impl/FolderCreator.java

@@ -4,6 +4,8 @@
 import com.ss.editor.ui.component.creator.FileCreatorDescription;
 import com.ss.editor.util.EditorUtil;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -27,6 +29,7 @@ public class FolderCreator extends AbstractFileCreator {
     public FolderCreator() {
     }
 
+    @NotNull
     @Override
     protected String getTitleText() {
         return Messages.FOLDER_CREATOR_TITLE;

src/com/ss/editor/ui/component/creator/impl/MaterialFileCreator.java

@@ -13,6 +13,8 @@
 import com.ss.editor.ui.util.AutoCompleteComboBoxListener;
 import com.ss.editor.util.EditorUtil;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.file.Files;
@@ -32,9 +34,9 @@
 import rlib.util.array.Array;
 
 /**
- * Реализация создателя новых материалов.
+ * The creator for creating a new material.
  *
- * @author Ronn
+ * @author JavaSaBr
  */
 public class MaterialFileCreator extends AbstractFileCreator {
 
@@ -47,18 +49,19 @@ public class MaterialFileCreator extends AbstractFileCreator {
     }
 
     /**
-     * Список доступных типов материалов.
+     * The list of available definitions.
      */
     private Array<String> definitions;
 
     /**
-     * Список с выбором типов материалов.
+     * The combo box.
      */
     private ComboBox<String> materialTypeComboBox;
 
     public MaterialFileCreator() {
     }
 
+    @NotNull
     @Override
     protected String getTitleText() {
         return Messages.MATERIAL_FILE_CREATOR_TITLE;
@@ -70,7 +73,7 @@ protected String getFileExtension() {
     }
 
     /**
-     * @return список с выбором типов материалов.
+     * @return the combo box.
      */
     public ComboBox<String> getMaterialTypeComboBox() {
         return materialTypeComboBox;
@@ -116,6 +119,8 @@ protected void createSettings(final VBox root) {
         FXUtils.addToPane(materialTypeContainer, root);
 
         FXUtils.addClassTo(materialTypeComboBox, CSSClasses.TRANSPARENT_COMBO_BOX);
+        FXUtils.addClassTo(materialTypeLabel, CSSClasses.SPECIAL_FONT_13);
+        FXUtils.addClassTo(materialTypeComboBox, CSSClasses.SPECIAL_FONT_13);
 
         VBox.setMargin(materialTypeContainer, FILE_NAME_CONTAINER_OFFSET);
     }

src/com/ss/editor/ui/component/creator/impl/PostFilterViewFileCreator.java

@@ -1,17 +1,19 @@
 package com.ss.editor.ui.component.creator.impl;
 
+import static com.ss.editor.Messages.POST_FILTER_VIEW_FILE_CREATOR_FILE_DESCRIPTION;
+import static com.ss.editor.Messages.POST_FILTER_VIEW_FILE_CREATOR_TITLE;
+
 import com.ss.editor.FileExtensions;
 import com.ss.editor.ui.component.creator.FileCreatorDescription;
 import com.ss.editor.util.EditorUtil;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import static com.ss.editor.Messages.POST_FILTER_VIEW_FILE_CREATOR_FILE_DESCRIPTION;
-import static com.ss.editor.Messages.POST_FILTER_VIEW_FILE_CREATOR_TITLE;
-
 /**
  * Реализация создателя новых файлов для PostFilterView.
  *
@@ -29,6 +31,7 @@ public class PostFilterViewFileCreator extends AbstractFileCreator {
     public PostFilterViewFileCreator() {
     }
 
+    @NotNull
     @Override
     protected String getTitleText() {
         return POST_FILTER_VIEW_FILE_CREATOR_TITLE;

src/com/ss/editor/ui/control/model/tree/dialog/AbstractNodeDialog.java

@@ -1,42 +1,55 @@
 package com.ss.editor.ui.control.model.tree.dialog;
 
 import com.ss.editor.Messages;
+import com.ss.editor.ui.css.CSSClasses;
 import com.ss.editor.ui.css.CSSIds;
 import com.ss.editor.ui.dialog.EditorDialog;
 
+import org.jetbrains.annotations.NotNull;
+
 import javafx.geometry.Insets;
 import javafx.scene.control.Button;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import rlib.ui.util.FXUtils;
 
 /**
- * Базовая реализация диалога для операций над узлами.
+ * The base implementation of the dialog for working with node elements.
  *
- * @author Ronn
+ * @author JavaSaBr
  */
 public abstract class AbstractNodeDialog extends EditorDialog {
 
     protected static final Insets OK_BUTTON_OFFSET = new Insets(0, 4, 0, 0);
     protected static final Insets CANCEL_BUTTON_OFFSET = new Insets(0, 15, 0, 0);
 
     /**
-     * Кнопка ок.
+     * The ok button.
      */
     private Button okButton;
 
     public AbstractNodeDialog() {
     }
 
+    @Override
+    protected void processKey(@NotNull final KeyEvent event) {
+        super.processKey(event);
+        if (event.getCode() == KeyCode.ENTER && !okButton.isDisable()) {
+            processOk();
+        }
+    }
+
     /**
-     * @return кнопка ок.
+     * @return the ok button.
      */
     protected Button getOkButton() {
         return okButton;
     }
 
     @Override
-    protected void createActions(final VBox root) {
+    protected void createActions(@NotNull final VBox root) {
         super.createActions(root);
 
         final HBox container = new HBox();
@@ -54,6 +67,9 @@ protected void createActions(final VBox root) {
         FXUtils.addToPane(cancelButton, container);
         FXUtils.addToPane(container, root);
 
+        FXUtils.addClassTo(okButton, CSSClasses.SPECIAL_FONT_16);
+        FXUtils.addClassTo(cancelButton, CSSClasses.SPECIAL_FONT_16);
+
         HBox.setMargin(okButton, OK_BUTTON_OFFSET);
         HBox.setMargin(cancelButton, CANCEL_BUTTON_OFFSET);
     }

src/com/ss/editor/ui/control/model/tree/dialog/sky/ChooseTextureControl.java

@@ -126,7 +126,7 @@ protected void createComponents() {
         FXUtils.addToPane(addButton, this);
         FXUtils.addToPane(removeButton, this);
 
-        FXUtils.addClassTo(textureLabel, CSSClasses.MAIN_FONT_13);
+        FXUtils.addClassTo(textureLabel, CSSClasses.SPECIAL_FONT_13);
         FXUtils.addClassTo(addButton, CSSClasses.TOOLBAR_BUTTON);
         FXUtils.addClassTo(removeButton, CSSClasses.TOOLBAR_BUTTON);