Update for windows version release

README.md

@@ -2,24 +2,24 @@
 
 ## 主要功能：
 
-1. 草稿字幕簡體轉繁體 或 台灣正體
+1. 草稿字幕簡體轉繁體
 2. 字幕匯出成 SRT 檔 及 TXT 文字檔
-3. 刪除影片字幕
+3. 載入既有的 SRT 檔
+4. 字幕編輯修改
+5. 刪除影片字幕
 
-## [Mac 版下載](https://github.com/jackychu0830/jy-srt-tools/tree/mac)
+## 安裝說明
+## 安裝說明
+1. 安裝 Java 11 執行環境 (下載: https://www.microsoft.com/openjdk)
+2. 下載剪映字幕工具箱式 [2.0.210 版](https://github.com/jackychu0830/jy-srt-tools/releases/download/2.0.210-Win/jy-srt-tools-2.0.210-Win.jar)
+3. 滑鼠雙擊 jy-srt-tools-2.0.210-Win.jar 執行程式
 
-## [Windows 版下載](https://github.com/jackychu0830/jy-srt-tools/tree/win)
+## 使用說明
 
 ## 執行畫面
 
-### Mac
-
-![Mac 版畫面](https://github.com/jackychu0830/jy-srt-tools/raw/mac/screenshot-1.png)
-
-### Windows
-
-![Windows 版畫面](https://github.com/jackychu0830/jy-srt-tools/raw/win/screenshot-1.png)
-
-## 使用說明
-
-https://youtu.be/ysV39jfLmfE
+![Mac 版畫面](https://github.com/jackychu0830/jy-srt-tools/raw/win/screenshot-1.png)
+![字幕編輯](https://github.com/jackychu0830/jy-srt-tools/raw/win/screenshot-2.png)
+![字幕尋找](https://github.com/jackychu0830/jy-srt-tools/raw/win/screenshot-3.png)
+![字幕替換](https://github.com/jackychu0830/jy-srt-tools/raw/win/screenshot-4.png)
+![載入字幕](https://github.com/jackychu0830/jy-srt-tools/raw/win/screenshot-5.png)

pom.xml

@@ -4,7 +4,7 @@
     <groupId>app.jackychu</groupId>
     <artifactId>jy-srt-tools</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.200</version>
+    <version>2.0.210</version>
 
     <name>jy-srt-tools</name>
     <description>The SRT tools for JianyingPro video editor</description>

src/main/java/app/jackychu/jysrttools/DraftTemplates.java

@@ -4,10 +4,13 @@
 
 import javax.swing.*;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URISyntaxException;
+import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.util.Locale;
 import java.util.Objects;
 
 public class DraftTemplates {
@@ -17,13 +20,30 @@ public class DraftTemplates {
     public static String getTemplate(String templateName) {
         String temp = null;
         try {
-            temp = Files.readString(Paths.get(Objects.requireNonNull(DraftTemplates.class.getClassLoader().getResource("draft_templates/" + templateName + ".json").toURI())),
-                    StandardCharsets.UTF_8);
+            String os = System.getProperty("os.name");
+            if (os.toLowerCase(Locale.ROOT).contains("windows")) {
+                InputStream in = DraftTemplates.class.getClassLoader().getResourceAsStream("draft_templates/" + templateName + ".json");
+                byte[] data = in.readAllBytes();
+                temp = new String(data);
+            } else {
+                temp = Files.readString(Paths.get(Objects.requireNonNull(DraftTemplates.class.getClassLoader().getResource("draft_templates/" + templateName + ".json").toURI())),
+                        StandardCharsets.UTF_8);
+            }
         } catch (IOException | URISyntaxException | RuntimeException e) {
             JOptionPane.showMessageDialog(null,
                     new ErrorMessagePanel(e), "讀取字幕模版失敗", JOptionPane.ERROR_MESSAGE);
         }
 
         return temp;
     }
+
+    public static String getDefaultFontPath() {
+        String os = System.getProperty("os.name");
+        if (os.toLowerCase(Locale.ROOT).contains("windows")) {
+            return WIN_DEFAULT_FONT_PATH;
+        } else {
+            return MAC_DEFAULT_FONT_PATH;
+        }
+
+    }
 }

src/main/java/app/jackychu/jysrttools/JyDraft.java

@@ -268,7 +268,7 @@ public void replaceDraftSubtitles(List<Subtitle> newSubtitles) throws JySrtTools
             String textTemp = DraftTemplates.getTemplate("draft_text");
             values = new HashMap<>();
             values.put("content", sub.getText());
-            values.put("font_path", DraftTemplates.MAC_DEFAULT_FONT_PATH);
+            values.put("font_path", DraftTemplates.getDefaultFontPath());
             String textId = UUID.randomUUID().toString().toUpperCase();
             values.put("id", textId);
             String textStr = StringSubstitutor.replace(textTemp, values, "${", "}");

src/main/java/app/jackychu/jysrttools/JyUtils.java

@@ -48,7 +48,10 @@ public static String getJyVersion() {
         try {
             String[] cmd;
             if (os.toLowerCase(Locale.ROOT).contains("windows")) {
-                cmd = new String[]{"cmd.exe", "dir"};
+                InputStream input = JyUtils.class.getClassLoader().getResourceAsStream("config.properties");
+                Properties prop = new Properties();
+                prop.load(input);
+                return prop.getProperty("jy_version");
             } else {
                 cmd = new String[]{"/usr/bin/bash", "mdls -name kMDItemVersion /Applications/VideoFusion-macOS.app | awk -F'\"' '{print $2}'"};
             }

src/main/java/app/jackychu/jysrttools/ui/DraftTextsPanel.java

@@ -76,7 +76,7 @@ public void setSubtitles(JyDraft draft) throws JySrtToolsException {
 
     private void setTableColumnSize() {
 //        subtitleTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
-        subtitleTable.getColumnModel().getColumn(0).setMaxWidth(40);
+        subtitleTable.getColumnModel().getColumn(0).setMaxWidth(50);
         subtitleTable.getColumnModel().getColumn(0).setResizable(false);
         subtitleTable.getColumnModel().getColumn(1).setMaxWidth(115);
         subtitleTable.getColumnModel().getColumn(1).setMinWidth(115);

src/main/resources/config.properties

@@ -1,2 +1,2 @@
-version=2.0.200
-jy_version=2.0.0
+version=2.0.210
+jy_version=2.1.0