v6.8

Mararsh · Feb 9, 2024 · 7e1dcd9 · 7e1dcd9
1 parent 2e0403a
commit 7e1dcd9
Show file tree

Hide file tree

Showing 312 changed files with 15,199 additions and 13,603 deletions.
diff --git a/README.md b/README.md
diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/BaseImageScope.java b/alpha/MyBox/src/main/java/mara/mybox/controller/BaseImageScope.java
@@ -309,6 +309,7 @@ public void changed(ObservableValue ov, Image oldValue, Image newValue) {
 
     @Override
     public boolean afterImageLoaded() {
+        boolean firstView = needFixSize;
         if (super.afterImageLoaded()) {
             if (UserConfig.getBoolean(baseName + "ClearDataWhenLoadImage", true)) {
 
@@ -327,7 +328,8 @@ public boolean afterImageLoaded() {
                 outlinesList.getSelectionModel().clearSelection();
             }
 
-            imageLoaded();
+            needFixSize = firstView;
+            pickScope();
             return true;
         } else {
             return false;
@@ -342,10 +344,6 @@ public void fitView() {
         }
     }
 
-    public void imageLoaded() {
-        pickScope();
-    }
-
     @FXML
     @Override
     public void createAction() {

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/BaseImageScope_Values.java b/alpha/MyBox/src/main/java/mara/mybox/controller/BaseImageScope_Values.java
@@ -89,10 +89,7 @@ protected void whenSucceeded() {
                 } else {
                     drawMaskShape();
                 }
-                if (needFixSize) {
-                    paneSize();
-                    needFixSize = false;
-                }
+                fitView();
                 showNotify.set(!showNotify.get());
             }
 

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/ControlSelectPixels.java b/alpha/MyBox/src/main/java/mara/mybox/controller/ControlSelectPixels.java
@@ -24,7 +24,6 @@ public void setParameters(BaseImageController parent) {
 
             toolbar.getChildren().removeAll(selectFileButton, fileMenuButton);
 
-            needFixSize = true;
         } catch (Exception e) {
             MyBoxLog.debug(e);
         }

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,7 +7,7 @@
  */
 public class AppValues {
 
-    public static final boolean Alpha = true;
+    public static final boolean Alpha = false;
     public static final String AppVersion = "6.8";
     public static final String AppVersionDate = "2024-2-9";
     public static final String AppDerbyUser = "mara";

diff --git a/alpha/MyBox/src/main/resources/MyBox-Overview-zh.pdf b/alpha/MyBox/src/main/resources/MyBox-Overview-zh.pdf
diff --git a/alpha/MyBox/src/main/resources/bundles/Messages_en.properties b/alpha/MyBox/src/main/resources/bundles/Messages_en.properties
diff --git a/alpha/MyBox/src/main/resources/bundles/Messages_zh_CN.properties b/alpha/MyBox/src/main/resources/bundles/Messages_zh_CN.properties
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
@@ -7,13 +7,14 @@ This is compute application to provide simple and easy functions. It's free and
 2024-2-9 v6.8                
 
 * Improve:                                     
-     - New shortcut CTRL/ALT+0: set/disable "Always on top". not work for popup window.                                                                                                           
-     - New shortcut CTRL/ALT+9: Snapshot window.                                                                                                           
+     - New shortcut CTRL/ALT+0: set/disable "Always on top". Not work for popup window.                                                                                                           
+     - New shortcut CTRL/ALT+9: Snapshot current window.                                                                                                           
      - Save and manage "Image Scope" in tree.                                                                                                           
      - Simplify interface of editing html.                               
 * Solved problems:                                   
      - Manage colors: "Copy colors" fails to work.                                                                                                           
      - Edit html: Contents are lost when switch from "texts" mode.        
+     - Button "play" does not work in interface of "View PPT".        
 
 Happy Chinese Loong Year!                                                                                                                
 
@@ -32,7 +33,7 @@ Without enough testings, MyBox has low reliability and bad stability. When use M
 ## Source Codes          
 | Download | Size | Developement Guide | Packing Steps |           
 | --- | --- | --- | --- | 
-| [MyBox-src.zip](https://sourceforge.net/projects/mara-mybox/files/latests/MyBox-src.zip)  |  75M- | [pdf](https://mara-mybox.sourceforge.io/guide/MyBox-DevGuide-en.pdf) | [html](https://mara-mybox.sourceforge.io/pack_steps_en.html) |
+| [MyBox-src.zip](https://sourceforge.net/projects/mara-mybox/files/latests/MyBox-src.zip)  |  80M- | [pdf](https://mara-mybox.sourceforge.io/guide/MyBox-DevGuide-en.pdf) | [html](https://mara-mybox.sourceforge.io/pack_steps_en.html) |
            
 ## Self-contain packages
 Self-contain packages include all files and need not java env nor installation.      
@@ -220,7 +221,7 @@ MyBox is based on following open sources:
 | XZ for Java                         | archive/compress                | <https://tukaani.org/xz/java.html>                                                                                                                                                                                                  |
 | ffmpeg                              | convert/create medias           | [http://ffmpeg.org](http://ffmpeg.org/)                                                                                                                                                                                             |
 | image4j                             | ico format                      | <https://github.com/imcdonagh/image4j>                                                                                                                                                                                              |
-| AutoCommitCell                      | Submit updates                  | <https://stackoverflow.com/questions/24694616>[（Ogmios](https://stackoverflow.com/questions/24694616)[）](https://stackoverflow.com/questions/24694616)                                                                              |
+| AutoCommitCell                      | Submit updates                  | <https://stackoverflow.com/questions/24694616>[(Ogmios](https://stackoverflow.com/questions/24694616)[)](https://stackoverflow.com/questions/24694616)                                                                              |
 | GaoDe                               | Map                             | <https://lbs.amap.com/api/javascript-api/summary>                                                                                                                                                                                   |
 | GaoDe                               | Coordinate                      | <https://lbs.amap.com/api/webservice/guide/api/georegeo>                                                                                                                                                                            |
 | WeiBo                               | Image materials                 | <https://weibo.com/3876734080/InmB1aPiL?type=comment#_rnd1582211299665>                                                                                                                                                             |

diff --git a/alpha/MyBox/src/main/resources/doc/zh/MyBox-Overview-zh.pdf b/alpha/MyBox/src/main/resources/doc/zh/MyBox-Overview-zh.pdf
diff --git a/alpha/MyBox/src/main/resources/doc/zh/README.md b/alpha/MyBox/src/main/resources/doc/zh/README.md
@@ -9,13 +9,13 @@
 
 * 改进：                                     
      - 新增快捷键CTRL/ALT+0：设置/解除“总是在上面”，对弹出窗口无效。                                                                                                           
-     - 新增快捷键CTRL/ALT+9：截图窗口。                                                                                                           
+     - 新增快捷键CTRL/ALT+9：截图当前窗口。                                                                                                           
      - 以树形保存和管理“图片的范围”。                                                                                                           
      - 简化编辑网页的界面。                                                                                                          
 * 解决问题：                                     
      - 管理颜色：复制颜色失效了。                                                                                                           
      - 编辑网页：从文本模式切换时内容丢失了。                                                                                                                                                                                                              
-     - 播放PPT失效了。                                                                                                                                                                                                              
+     - 在查看PPT界面中“播放”按钮失效了。                                                                                                                                                                                                              
 
 中国龙年快乐！ 
 
@@ -35,7 +35,7 @@ MyBox未经足够测试，可靠性低、稳定性差。使用MyBox，可能出
 ## 源码
 | 下载 | 大小 | 开发指南 | 打包步骤 |           
 | --- | --- | --- | --- | 
-| [MyBox-src.zip](https://sourceforge.net/projects/mara-mybox/files/latests/MyBox-src.zip)   |  75M-  | [pdf](https://mara-mybox.sourceforge.io/guide/MyBox-DevGuide-zh.pdf) | [html](https://mara-mybox.sourceforge.io/pack_steps_zh.html) |
+| [MyBox-src.zip](https://sourceforge.net/projects/mara-mybox/files/latests/MyBox-src.zip)   |  80M-  | [pdf](https://mara-mybox.sourceforge.io/guide/MyBox-DevGuide-zh.pdf) | [html](https://mara-mybox.sourceforge.io/pack_steps_zh.html) |
            
 ## 自包含程序包
 自包含的程序包无需java环境、无需安装、解包可用。