ffmpegオプション入力パネルの初期化

diff --git a/frontend/src/yukihane/inqubus/gui/ConfigDialog.java b/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
index bbb837d..0989aab 100644 (file)
--- a/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
+++ b/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
@@ -1190,17 +1190,7 @@ public class ConfigDialog extends JDialog {
         /*
          * ffmpeg - ffmpegパラメータ
          */
-        final String fof = p.getFfmpegOptionFile();
-        pnlFfmpegParam.mdlFfmpegOption.reload(StringUtils.isNotEmpty(fof) ? new File(fof) : null);
-        pnlFfmpegParam.fldFfmpegOptionExtension.setText(p.getFfmpegExtension());
-        pnlFfmpegParam.fldFfmpegOptionMain.setText(p.getFfmpegMainOption());
-        pnlFfmpegParam.fldFfmpegOptionIn.setText(p.getFfmpegInOption());
-        pnlFfmpegParam.fldFfmpegOptionOut.setText(p.getFfmpegOutOption());
-        pnlFfmpegParam.fldFfmpegOptionAv.setText(p.getFfmpegAvOption());
-        pnlFfmpegParam.cbFfmpegOptionResize.setSelected(p.getFfmpegResizeEnable());
-        pnlFfmpegParam.fldFfmpegOptionResizeWidth.setText(p.getFfmpegResizeWidth());
-        pnlFfmpegParam.fldFfmpegOptionResizeHeight.setText(p.getFfmpegResizeHeight());
-        pnlFfmpegParam.cbFfmpegOptionKeepAspect.setSelected(p.getFfmpegKeepAspect());
+        pnlFfmpegParam.init(p);
 
         /*
          * NG 設定

diff --git a/frontend/src/yukihane/inqubus/gui/FfmpegParamPanel.java b/frontend/src/yukihane/inqubus/gui/FfmpegParamPanel.java
index a59f3d9..f97e295 100644 (file)
--- a/frontend/src/yukihane/inqubus/gui/FfmpegParamPanel.java
+++ b/frontend/src/yukihane/inqubus/gui/FfmpegParamPanel.java
@@ -1,5 +1,6 @@
 package yukihane.inqubus.gui;
 
+import java.io.File;
 import javax.swing.BorderFactory;
 import javax.swing.GroupLayout;
 import javax.swing.GroupLayout.Alignment;
@@ -9,8 +10,10 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.LayoutStyle.ComponentPlacement;
+import org.apache.commons.lang.StringUtils;
 import saccubus.FFmpegSelectedItem;
 import saccubus.OptionComboBoxModel;
+import yukihane.inqubus.Config;
 
 /**
  *
@@ -32,6 +35,20 @@ class FfmpegParamPanel extends JPanel {
     final JTextField fldFfmpegOptionResizeHeight = new JTextField();
     final JCheckBox cbFfmpegOptionKeepAspect = new JCheckBox("アスペクト比を維持");
 
+    void init(Config p) {
+        final String fof = p.getFfmpegOptionFile();
+        mdlFfmpegOption.reload(StringUtils.isNotEmpty(fof) ? new File(fof) : null);
+        fldFfmpegOptionExtension.setText(p.getFfmpegExtension());
+        fldFfmpegOptionMain.setText(p.getFfmpegMainOption());
+        fldFfmpegOptionIn.setText(p.getFfmpegInOption());
+        fldFfmpegOptionOut.setText(p.getFfmpegOutOption());
+        fldFfmpegOptionAv.setText(p.getFfmpegAvOption());
+        cbFfmpegOptionResize.setSelected(p.getFfmpegResizeEnable());
+        fldFfmpegOptionResizeWidth.setText(p.getFfmpegResizeWidth());
+        fldFfmpegOptionResizeHeight.setText(p.getFfmpegResizeHeight());
+        cbFfmpegOptionKeepAspect.setSelected(p.getFfmpegKeepAspect());
+    }
+
     FfmpegParamPanel() {
         final JLabel lblFfmpegOptionExtension = new JLabel("出力動画の拡張子");
         final JLabel lblFfmpegOptionMain = new JLabel("メインオプション");

diff --git a/frontend/src/yukihane/inqubus/gui/MainFrame.java b/frontend/src/yukihane/inqubus/gui/MainFrame.java
index 312ca4f..4b0464c 100644 (file)
--- a/frontend/src/yukihane/inqubus/gui/MainFrame.java
+++ b/frontend/src/yukihane/inqubus/gui/MainFrame.java
@@ -55,6 +55,7 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import saccubus.FfmpegOption;
 import saccubus.MainFrame_AboutBox;
+import saccubus.OptionComboBoxModel;
 import saccubus.util.WayBackTimeParser;
 import saccubus.worker.impl.convert.ConvertProgress;
 import saccubus.worker.impl.download.DownloadProgress;
@@ -117,7 +118,6 @@ public class MainFrame extends JFrame {
         final JPanel pnlButton = new JPanel();
         final JTabbedPane tbpInput = new JTabbedPane();
         final JPanel pnlInputMain = new JPanel();
-        final FfmpegParamPanel pnlInputFfmpeg = new FfmpegParamPanel();
         final JLabel lblId = new JLabel();
         fldId.setToolTipText(ID_FIELD_TOOLTIP);
         final JLabel lblVideo = new JLabel();
@@ -262,6 +262,7 @@ public class MainFrame extends JFrame {
                 .addComponent(cbBackLog)
                 .addPreferredGap(ComponentPlacement.RELATED)
                 .addComponent(fldBackLog, GroupLayout.PREFERRED_SIZE, 150, GroupLayout.PREFERRED_SIZE)
+                .addContainerGap()
             )
             .addGroup(glInputMain.createSequentialGroup()
                 .addContainerGap()
@@ -468,15 +469,6 @@ public class MainFrame extends JFrame {
             }
         }
     }
-    /** This method is called from within the constructor to
-     * initialize the form.
-     * WARNING: Do NOT modify this code. The content of this method is
-     * always regenerated by the Form Editor.
-     */
-    @SuppressWarnings("unchecked")
-    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
-    private void initComponents() {
-    }// </editor-fold>//GEN-END:initComponents
 
     private File searchFileMatchId(final File dir, final String id) {
         // TODO 候補は複数返すようにして、その後の対処は呼び出しもとで行ってもらった方が良いかも
@@ -577,7 +569,7 @@ public class MainFrame extends JFrame {
     private final JButton btnStart = new JButton("開始");
     private final JButton btnStop = new JButton("停止");
     private final JButton btnDeselect = new JButton("選択解除");
-    //入力領域 - 標準
+    // 入力領域 - メイン
     private final JTextField fldId = new JTextField();
     private final JCheckBox cbBackLogReduce = new JCheckBox("コメ数減少");
     private final JCheckBox cbBackLog = new JCheckBox("過去ログ");
@@ -590,12 +582,19 @@ public class MainFrame extends JFrame {
     private final JButton btnComment;
     private final JCheckBox cbOutputEnable;
     private final JTextField fldOutput;
+    // 入力領域 - ffmpeg
+    private final FfmpegParamPanel pnlInputFfmpeg = new FfmpegParamPanel();
     // 適用
     private final JTextField fldInputMessage = new JTextField();
     private final JButton btnApply = new JButton("適用");
     // End of variables declaration//GEN-END:variables
 
     private void initInputPanel() {
+        initMainTab();
+        initFfmpegTab();
+    }
+
+    private void initMainTab() {
         final Config p = Config.INSTANCE;
 
         fldId.setText("");
@@ -620,7 +619,10 @@ public class MainFrame extends JFrame {
         cbOutputEnable.setSelected(convert);
         fldOutput.setEnabled(convert);
         fldOutput.setText(p.getOutputFileNamePattern());
+    }
 
+    private void initFfmpegTab() {
+        pnlInputFfmpeg.init(Config.INSTANCE);
     }
 
     private JMenuBar initMenuBar() {