Commit: 2 - HTMLinExcel (svn)

HTML チャンクがセルに入力された Excel を HTML 変換（またはその逆）します。

Commit MetaInfo

• Revisión: 2 (tree)
• Tiempo: 2014-01-20 01:29:01
• Autor: yu-tang

Log Message

wsf のコマンドラインオプションに Excel アプリケーションの Caption 指定用引数を追加

Cambiar Resumen

• modified: src/jp/sourceforge/users/yutang/omegat/plugin/htmlinexcel/ExcelModel.java
• modified: src/jp/sourceforge/users/yutang/omegat/plugin/htmlinexcel/Bundle.properties
• modified: src/jp/sourceforge/users/yutang/omegat/plugin/htmlinexcel/ImExController.java
• modified: src/jp/sourceforge/users/yutang/omegat/plugin/htmlinexcel/HTMLinExcel.wsf
• modified: src/jp/sourceforge/users/yutang/omegat/plugin/htmlinexcel/L10n.java
• modified: src/jp/sourceforge/users/yutang/omegat/plugin/htmlinexcel/Bundle_ja.properties
• normal:

Diferencia incremental

--- src/jp/sourceforge/users/yutang/omegat/plugin/htmlinexcel/ExcelModel.java	(revision 1)
+++ src/jp/sourceforge/users/yutang/omegat/plugin/htmlinexcel/ExcelModel.java	(revision 2)
@@ -125,6 +125,7 @@
                             String s = command.getAndClearStdout();
                             if (!s.isEmpty()) {
                                 Log.log(s);
+                                //@@TODO put statusbar
                             }
                         }
                     });
@@ -134,6 +135,7 @@
                             String s = command.getAndClearStderr();
                             if (!s.isEmpty()) {
                                 Log.log(s);
+                                //@@TODO put statusbar
                             }
                         }
                     });
@@ -314,12 +316,14 @@
             boolean deleteHtmlAfterImport = true;
             String worksheetName = "";
             boolean windowVisible = true;
-            List<String> commands = new ArrayList<String>(5);
+            String altAppCaption = L10n.getExcelAltApplicationCaption();
+            List<String> commands = new ArrayList<String>(6);
             commands.add("cscript.exe");
             commands.add("//nologo");
             commands.add(script);
             commands.add("/sourceFolder:\"" + sourceFolder + "\"");
             commands.add("/windowVisible" + (windowVisible ? "+" : "-"));
+            commands.add("/altAppCaption:\"" + altAppCaption + "\"");
 
             return startProcessAndWait(commands);
         }
@@ -335,12 +339,14 @@
             boolean deleteHtmlAfterImport = true;
             String worksheetName = "";
             boolean windowVisible = true;
-            List<String> commands = new ArrayList<String>(5);
+            String altAppCaption = L10n.getExcelAltApplicationCaption();
+            List<String> commands = new ArrayList<String>(6);
             commands.add("cscript.exe");
             commands.add("//nologo");
             commands.add(script);
             commands.add("/targetFolder:\"" + targetFolder + "\"");
             commands.add("/windowVisible" + (windowVisible ? "+" : "-"));
+            commands.add("/altAppCaption:\"" + altAppCaption + "\"");
 
             return startProcessAndWait(commands);
         }

--- src/jp/sourceforge/users/yutang/omegat/plugin/htmlinexcel/ImExController.java	(revision 1)
+++ src/jp/sourceforge/users/yutang/omegat/plugin/htmlinexcel/ImExController.java	(revision 2)
@@ -69,8 +69,11 @@
 
         try {
             //@@@TODO 後で設定画面を作成。とりあえず有効・無効の切替だけ実装
-
-            Setting.setEnabled(menuItem.isSelected());
+            boolean enabled = menuItem.isSelected();
+            Setting.setEnabled(enabled);
+            if (enabled) {
+                ExcelModel.exportHTML();
+            }
         } catch (IOException ex) {
             Log.log(ex);
         }

--- src/jp/sourceforge/users/yutang/omegat/plugin/htmlinexcel/L10n.java	(revision 1)
+++ src/jp/sourceforge/users/yutang/omegat/plugin/htmlinexcel/L10n.java	(revision 2)
@@ -44,8 +44,8 @@
 
     // Excel
 
-    public static String getExcelWindowTitle() {
-        return bundle.getString("HEC_EXCEL_WINDOW_TITLE");
+    public static String getExcelAltApplicationCaption() {
+        return bundle.getString("HEC_EXCEL_ALT_APPLICATION_CAPTION");
     }
 
     // Error