v6.7.5

Mararsh · Jul 23, 2023 · a0d05d1 · a0d05d1
1 parent 914ab7d
commit a0d05d1
Show file tree

Hide file tree

Showing 955 changed files with 42,575 additions and 23,123 deletions.
diff --git a/README.md b/README.md
diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/MainMenuController_Help.java b/alpha/MyBox/src/main/java/mara/mybox/controller/MainMenuController_Help.java
@@ -48,7 +48,7 @@ protected void StoriesOfImages(ActionEvent event) {
 
     @FXML
     protected void InterfaceTips(ActionEvent event) {
-        openHtml(HelpTools.interfaceTips());
+        openHtml(HelpTools.makeInterfaceTips(Languages.getLangName()));
     }
 
     @FXML

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/ShortcutsController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/ShortcutsController.java
@@ -124,7 +124,7 @@ public void initControls() {
             tableData.add(new ShortCut("CTRL", "a", message("SelectAll"), "ALT+a", "iconSelectAll.png"));
             tableData.add(new ShortCut("CTRL", "o", message("SelectNone"), "ALT+o", "iconSelectNone.png"));
             tableData.add(new ShortCut("CTRL", "u", message("Select"), "ALT+u", "iconSelect.png"));
-            tableData.add(new ShortCut("CTRL", "l", message("Clear"), "ALT+l(lowercase of 'L')", "iconClear.png"));
+            tableData.add(new ShortCut("CTRL", "l", message("Clear"), "ALT+l(" + message("LowercaseL") + ")", "iconClear.png"));
             tableData.add(new ShortCut("CTRL", "w", message("Cancel") + " / " + message("Withdraw") + " / " + message("ReplaceAll"), "ESCAPE", "iconCancel.png"));
             tableData.add(new ShortCut("CTRL", "p", message("Pop"), "ALT+p", "iconPop.png"));
             tableData.add(new ShortCut("CTRL", "q", message("Query"), "ALT+q", "iconQuery.png"));

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/TextReplaceBatchController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/TextReplaceBatchController.java
@@ -30,8 +30,6 @@ public void initValues() {
             super.initValues();
 
             optionsController = textReplaceOptionsController;
-            MyBoxLog.console(optionsController != null);
-            MyBoxLog.console(editType);
 
         } catch (Exception e) {
             MyBoxLog.debug(e);

diff --git a/alpha/MyBox/src/main/java/mara/mybox/fxml/HelpTools.java b/alpha/MyBox/src/main/java/mara/mybox/fxml/HelpTools.java
@@ -327,18 +327,6 @@ public static File makeFunctionsList(MenuBar menuBar) {
         }
     }
 
-    public static File interfaceTips() {
-        try {
-            String lang = Languages.getLangName();
-            File file = FxFileTools.getInternalFile("/doc/" + lang + "/mybox_interface_tips_" + lang + ".html",
-                    "doc", "mybox_interface_tips_" + lang + ".html");
-            return file;
-        } catch (Exception e) {
-            MyBoxLog.error(e);
-            return null;
-        }
-    }
-
     public static File makeInterfaceTips(String lang) {
         try {
             StringBuilder s = new StringBuilder();

diff --git a/alpha/MyBox/src/main/java/mara/mybox/fxml/style/StyleButton.java b/alpha/MyBox/src/main/java/mara/mybox/fxml/style/StyleButton.java
@@ -106,7 +106,7 @@ public static StyleData startsWith(String id) {
             switch (id) {
                 case "clearButton":
                 case "clearCodesButton":
-                    return new StyleData(id, message("Clear"), "CTRL+l(lowercase of 'L')", "iconClear.png");
+                    return new StyleData(id, message("Clear"), "CTRL+l(" + message("LowercaseL") + ")", "iconClear.png");
                 default:
                     return new StyleData(id, message("Clear"), "", "iconClear.png");
             }

diff --git a/alpha/MyBox/src/main/java/mara/mybox/value/AppValues.java b/alpha/MyBox/src/main/java/mara/mybox/value/AppValues.java
@@ -7,9 +7,9 @@
  */
 public class AppValues {
 
-    public static final boolean Alpha = true;
+    public static final boolean Alpha = false;
     public static final String AppVersion = "6.7.5";
-    public static final String AppVersionDate = "2023-7-16";
+    public static final String AppVersionDate = "2023-7-23";
     public static final String AppDerbyUser = "mara";
     public static final String AppDerbyPassword = "mybox";
     public static final int AppYear = 2023;

diff --git a/alpha/MyBox/src/main/resources/bundles/Messages_en.properties b/alpha/MyBox/src/main/resources/bundles/Messages_en.properties
@@ -5043,3 +5043,4 @@ RecoverFile=Recover file
 SimpleMerged=Simple merged
 AllMerged=All merged
 RulerColor=Ruler color
+LowercaseL=lowercase of 'L'
diff --git a/alpha/MyBox/src/main/resources/bundles/Messages_zh_CN.properties b/alpha/MyBox/src/main/resources/bundles/Messages_zh_CN.properties
@@ -5043,3 +5043,4 @@ RecoverFile=\u6062\u590d\u6587\u4ef6
 SimpleMerged=\u7b80\u5355\u5408\u5e76
 AllMerged=\u6240\u6709\u5408\u5e76
 RulerColor=\u6807\u5c3a\u989c\u8272
+LowercaseL=\u5c0f\u5199\u7684L
diff --git a/alpha/MyBox/src/main/resources/doc/en/MyBox-Overview-en.pdf b/alpha/MyBox/src/main/resources/doc/en/MyBox-Overview-en.pdf
diff --git a/alpha/MyBox/src/main/resources/doc/en/README.md b/alpha/MyBox/src/main/resources/doc/en/README.md
@@ -19,7 +19,7 @@ This is desktop application based on JavaFx to provide simple and easy functions
      - When edit XML file, XML codes can be inputted to add new node.                                                        
      - Function menu in tabs of web browser to close tabs more easily.                                                            
      - Shortcuts of button "Go" are F9 and CTRL+g. Shortcut of button "Clear" is CTRL+l(lowercase of 'L').                                                        
-* Removed: When edit image, event "double-click" is not handled any more.                                                                                            
+* Removed: Event "double-click" is not handled for image any more.                                                                                            
 * Solved problems:                                      
      - Image OCR fails in last 2 versions.                                                            
      - When scale image, the inputted width and height do not work.                                                        
@@ -82,14 +82,7 @@ The latest versions and all archived versions can be downloaded in following add
 | --- | --- | --- | 
 | github | [https://github.com/Mararsh/MyBox/releases](https://github.com/Mararsh/MyBox/releases)  | [English](https://mararsh.github.io/MyBox/readme_en.html)     [Chinese](https://mararsh.github.io/MyBox/readme_zh.html) |
 | sourceforge | [https://sourceforge.net/projects/mara-mybox/files/](https://sourceforge.net/projects/mara-mybox/files/)  | [English](https://mara-mybox.sourceforge.io/readme_en.html)    [Chinese](https://mara-mybox.sourceforge.io/readme_zh.html) |
-| cloud | [https://pan.baidu.com/s/1fWMRzym_jh075OCX0D8y8A#list/path=%2F](https://pan.baidu.com/s/1fWMRzym_jh075OCX0D8y8A#list/path=%2F)   |  |
-
-## Migration
-1. Each version has itself's configuration file. New version can copy parameters from existed versions.             
-2. Data handled in each version are under "Data Directory" referred by it. Multiple versions can refer to same data directory.
-3. MyBox is backward compatibility: Later version can work on data of previous versions.
-While forward compatibility is not supported: Wrong may happen when old version handles data of new version.
-
+| cloud | [https://pan.baidu.com/s/1fWMRzym_jh075OCX0D8y8A#list/path=%2F](https://pan.baidu.com/s/1fWMRzym_jh075OCX0D8y8A#list/path=%2F)   |  |      
 
 ## Configuration 
 Configuration file is under "User Home":        
@@ -103,6 +96,42 @@ Configuration file is under "User Home":
 Add parameter "config=\"FilePath\"" when run jar to change configuration file temporarily.        
 Function "Settings" can be used to change configuration values.        
 
+## Migration
+1. Each version has itself's configuration file. New version can copy parameters from existed versions.             
+2. Data handled in each version are under "Data Directory" referred by it. Multiple versions can refer to same data directory.
+3. MyBox is backward compatibility: Later version can work on data of previous versions.
+While forward compatibility is not supported: Wrong may happen when old version handles data of new version.          
+
+## Backup and Recover
+1. To backup, copy directories to other places.       
+2. To recover, override current directories with backup directories.
+3. Need not backup each directory under data path.       
+   Predefined directories under data path are listed below. Only directories of "referred by database" need backups:               
+
+|    directory    |         role         | internal referred | read/write automatically | referred by database | cleared automatically |
+|-----------------|----------------------|-------------------|--------------------------|----------------------|-----------------------|
+| AppTemp         | temporary files      | yes               | yes                      |                      | yes                   |
+| buttons         | customized buttons   | yes               | yes                      |                      |                       |
+| data            | internal data        | yes               | yes                      |                      |                       |
+| dataClipboard   | data clipboard       | yes               | yes                      | yes                  |                       |
+| doc             | internal documents   | yes               | yes                      |                      |                       |
+| downloads       | download files       |                   | yes                      |                      |                       |
+| fileBackups     | files' backups       | yes               | yes                      | yes                  |                       |
+| generated       | generated files      |                   | yes                      |                      |                       |
+| ICC             | ICC profiles         | yes               | yes                      |                      |                       |
+| icons           | icon files           | yes               | yes                      |                      |                       |
+| image           | image files          | yes               | yes                      |                      |                       |
+| imageClipboard  | image clipbooard     | yes               | yes                      | yes                  |                       |
+| imageHistories  | image edit histories | yes               | yes                      | yes                  |                       |
+| imageScopes     | image scopes         | yes               | yes                      | yes                  |                       |
+| js              | javascript           | yes               | yes                      |                      |                       |
+| logs            | database logs        |                   | yes                      |                      |                       |
+| map             | map files            | yes               | yes                      |                      |                       |
+| mybox_derby     | database             | yes               | yes                      | yes                  |                       |
+| mybox_languages | customized languages | yes               | yes                      |                      |                       |
+| security        | cert files           | yes               | yes                      |                      |                       |
+| sound           | sound files          | yes               | yes                      |                      |                       |     
+
 # Resource Addresses        
 | Contents | Link |        
 | --- | --- |