変換中動画表示の有無とdll使用有無のコンフィグ設定

[coroid/inqubus.git] / frontend / src / yukihane / inqubus / gui / ConfigDialog.java

diff --git a/frontend/src/yukihane/inqubus/gui/ConfigDialog.java b/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
index 5dfe7fb..4d8da7c 100644 (file)
--- a/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
+++ b/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
@@ -492,7 +492,6 @@ public class ConfigDialog extends JDialog {
         btnFfmpegDllPath.addActionListener(
                 new FileChooseAction(ConfigDialog.this, JFileChooser.FILES_ONLY, fldFfmpegDllPath));
 
-
         GroupLayout gl_jPanel10 = new GroupLayout(pnlFfmpegBinPath);
         pnlFfmpegBinPath.setLayout(gl_jPanel10);
         gl_jPanel10.setHorizontalGroup(
@@ -529,17 +528,36 @@ public class ConfigDialog extends JDialog {
 
         pnlFfmpegParam.setBorder(BorderFactory.createTitledBorder("ffmpegパラメータ"));
 
+        // ffmpeg - その他
+        final JPanel pnlFffmpegEtc = new JPanel();
+        pnlFffmpegEtc.setBorder(BorderFactory.createTitledBorder("その他"));
+        final GroupLayout glFfmpegEtc = new GroupLayout(pnlFffmpegEtc);
+        glFfmpegEtc.setAutoCreateContainerGaps(true);
+        glFfmpegEtc.setAutoCreateGaps(true);
+        pnlFffmpegEtc.setLayout(glFfmpegEtc);
+
+        glFfmpegEtc.setHorizontalGroup(glFfmpegEtc.createParallelGroup()
+            .addComponent(cbDisplayConverting)
+            .addComponent(cbDllDisabled)
+        );
+        glFfmpegEtc.setVerticalGroup(glFfmpegEtc.createSequentialGroup()
+            .addComponent(cbDisplayConverting)
+            .addComponent(cbDllDisabled)
+        );
+
         final GroupLayout glFfmpeg = new GroupLayout(pnlFfmpeg);
         glFfmpeg.setAutoCreateContainerGaps(true);
         pnlFfmpeg.setLayout(glFfmpeg);
         glFfmpeg.setHorizontalGroup(glFfmpeg.createParallelGroup(GroupLayout.Alignment.LEADING)
             .addComponent(pnlFfmpegBinPath)
             .addComponent(pnlFfmpegParam)
+            .addComponent(pnlFffmpegEtc)
         );
         glFfmpeg.setVerticalGroup(glFfmpeg.createSequentialGroup()
             .addComponent(pnlFfmpegBinPath, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
             .addPreferredGap(ComponentPlacement.RELATED)
             .addComponent(pnlFfmpegParam)
+            .addComponent(pnlFffmpegEtc)
         );
 
         tabbedPane.addTab("ffmpeg", pnlFfmpeg);
@@ -806,6 +824,9 @@ public class ConfigDialog extends JDialog {
     private final JTextField fldFfmpegDllPath;
     // ffmpeg - ffmpegパラメータ
     private final FfmpegParamPanel pnlFfmpegParam = new FfmpegParamPanel();
+    // ffmpeg - その他
+    private final JCheckBox cbDisplayConverting = new JCheckBox("変換中動画表示");
+    private final JCheckBox cbDllDisabled = new JCheckBox("拡張DLL無効化(デバッグ用)");
     // NG設定
     // NG設定 - NGワード
     private final NgRegisterPanel pnlNgWord = new NgRegisterPanel();
@@ -902,6 +923,12 @@ public class ConfigDialog extends JDialog {
         pnlFfmpegParam.init(p);
 
         /*
+         * ffmpeg - その他
+         */
+        cbDisplayConverting.setSelected(p.getFfmpegDisplayConverting());
+        cbDllDisabled.setSelected(p.getFfmpegDllDisabled());
+
+        /*
          * NG 設定
          */
         final List<String> ngWords = p.getNgWords();
@@ -1012,6 +1039,12 @@ public class ConfigDialog extends JDialog {
         p.setFfmpegKeepAspect(pnlFfmpegParam.cbFfmpegOptionKeepAspect.isSelected());
 
         /*
+         * ffmpeg - その他
+         */
+        p.setFfmpegDisplayConverting(cbDisplayConverting.isSelected());
+        p.setFfmpegDllDisabled(cbDllDisabled.isSelected());
+
+        /*
          * NG 設定
          */
         p.setNgWords(pnlNgWord.getAllElements());