フィールド宣言準変更

diff --git a/frontend/src/yukihane/inqubus/gui/ConfigDialog.java b/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
index d065f9e..4870da1 100644 (file)
--- a/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
+++ b/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
@@ -273,7 +273,7 @@ public class ConfigDialog extends JDialog {
 
         lblVideoDir.setText("保存フォルダ");
 
-        lblVideoFileNamepattern.setText("ファイル名パターン");
+        lblVideoFileNamepattern.setText("ファイル名規則");
 
         btnVideoDir.setText("...");
 
@@ -319,7 +319,7 @@ public class ConfigDialog extends JDialog {
 
         lblCommentDir.setText("保存フォルダ");
 
-        lblCommentFileNamePattern.setText("ファイル名パターン");
+        lblCommentFileNamePattern.setText("ファイル名規則");
 
         btnCommentDir.setText("...");
 
@@ -365,7 +365,7 @@ public class ConfigDialog extends JDialog {
 
         lblOutputDir.setText("保存フォルダ");
 
-        lblOutputFileNamePattern.setText("ファイル名パターン");
+        lblOutputFileNamePattern.setText("ファイル名規則");
 
         btnOutputDir.setText("...");
 
@@ -1014,17 +1014,14 @@ public class ConfigDialog extends JDialog {
             .addComponent(pnlButton)
         );
         layout.setVerticalGroup(
-//            layout.createParallelGroup(GroupLayout.Alignment.LEADING)
-//            .addGroup(layout.createSequentialGroup()
-//                .addComponent(jTabbedPane1, GroupLayout.DEFAULT_SIZE, 451, GroupLayout.PREFERRED_SIZE)
-//                .addContainerGap(23, Short.MAX_VALUE))
             layout.createSequentialGroup()
                 .addComponent(tabbedPane,GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE)
                 .addComponent(pnlButton)
         );
 
         pack();
-        setResizable(false);        loadConfig();
+        setResizable(false);
+        loadConfig();
     }
 
     /**
@@ -1064,72 +1061,95 @@ public class ConfigDialog extends JDialog {
         });
     }
     // Variables declaration - do not modify//GEN-BEGIN:variables
-    private final JButton btnVideoDir;
-    private final JButton btnNgWordDel;
-    private final JButton btnNgIdAdd;
-    private final JButton btnNgIdDel;
-    private final JButton btnSearchCommentAdd;
-    private final JButton btnSearchCommentDel;
-    private final JButton btnCommentDir;
-    private final JButton btnOutputDir;
-    private final JButton btnFfmpegPath;
-    private final JButton btnFfmpegDllPath;
-    private final JButton btnFontPath;
-    private final JButton btnSearchVideoAdd;
-    private final JButton btnSearchVideoDel;
-    private final JButton btnNgWordAdd;
+
+    // ネットワーク
+    // ネットワーク - アカウント
+    private final JTextField fldMail;
+    private final JTextField fldPassword;
+    // ネットワーク - プロキシ
     private final JCheckBox cbProxyUse;
-    private final JCheckBox cbCommentDisplaySizeDefault;
-    private final JCheckBox cbOutputDisplayProgress;
-    private final JCheckBox cbFontSizeArrangeDisable;
-    private final JCheckBox cbCommentOpaque;
+    private final JTextField fldProxyHost;
+    private final JTextField fldProxyPort;
+    // ファイル
+    // ファイル - 動画
+    private final JTextField fldVideoDir;
+    private final JButton btnVideoDir;
+    private final JTextField fldVideoFileNamePattern;
     private final JCheckBox cbVideoLocal;
+    // ファイル - コメント
+    private final JTextField fldCommentDir;
+    private final JButton btnCommentDir;
+    private final JTextField fldCommentFileNamePattern;
     private final JCheckBox cbCommentLocal;
+    // ファイル - 変換動画
+    private final JTextField fldOutputDir;
+    private final JTextField fldOutputFileNamePattern;
+    private final JButton btnOutputDir;
     private final JCheckBox cbOutputEnable;
-    private final JCheckBox cbCommentSizeAuto;
-    private final JCheckBox cbCommentMinSizeAuto;
     private final JCheckBox cbOutputCommentOverlay;
-    private final JCheckBox cbFfmpegOptionResize;
-    private final JCheckBox cbFfmpegOptionKeepAspect;
-    private final JComboBox cmbFfmpegOptionFile;
-    private final JList<String> lstSearchVideo;
-    private final DefaultListModel<String> mdlSearchVideo = new DefaultListModel<>();
-    private final JList<String> lstSearchComment;
-    private final DefaultListModel<String> mdlSearchComment = new DefaultListModel<>();
-    private final JList<String> lstNgWord;
-    private final DefaultListModel<String> mdlNgWord = new DefaultListModel<>();
-    private final JList<String> lstNgId;
-    private final DefaultListModel<String> mdlNgId = new DefaultListModel<>();
-    private final JRadioButton rbFfmpegOptionFile;
-    private final JRadioButton rbFfmpegOptionDirectInput;
-    private final JTextField fldMail;
-    private final JTextField fldOutputFileNamePattern;
+    private final JCheckBox cbOutputDisplayProgress;
+    // コメント
+    // コメント
+    private final JCheckBox cbCommentSizeAuto;
     private final JTextField fldCommentSizeManual;
+    private final JCheckBox cbCommentMinSizeAuto;
     private final JTextField fldCommentMinSizeManual;
+    private final JCheckBox cbCommentDisplaySizeDefault;
+    private final JTextField fldCommentDisplaySizeManual;
+    // コメント - 高度な設定
+    private final JTextField fldFontPath;
+    private final JButton btnFontPath;
+    private final JTextField fldFontIndex;
+    private final JTextField fldFontShadow;
+    private final JCheckBox cbFontSizeArrangeDisable;
+    private final JCheckBox cbCommentOpaque;
+    // ffmpeg
+    // ffmpeg - ファイルパス
     private final JTextField fldFfmpegPath;
+    private final JButton btnFfmpegPath;
     private final JTextField fldFfmpegDllPath;
-    private final JTextField fldFfmpegOptionResizeWidth;
-    private final JTextField fldFfmpegOptionResizeHeight;
+    private final JButton btnFfmpegDllPath;
+    // ffmpeg - ffmpegパラメータ
+    private final JRadioButton rbFfmpegOptionFile;
+    private final JRadioButton rbFfmpegOptionDirectInput;
+    private final JComboBox cmbFfmpegOptionFile;
     private final JTextField fldFfmpegOptionExtension;
     private final JTextField fldFfmpegOptionMain;
     private final JTextField fldFfmpegOptionIn;
-    private final JTextField fldPassword;
     private final JTextField fldFfmpegOptionOut;
     private final JTextField fldFfmpegOptionAv;
-    private final JTextField fldCommentDisplaySizeManual;
-    private final JTextField fldFontPath;
-    private final JTextField fldFontIndex;
-    private final JTextField fldFontShadow;
+    private final JCheckBox cbFfmpegOptionResize;
+    private final JTextField fldFfmpegOptionResizeWidth;
+    private final JTextField fldFfmpegOptionResizeHeight;
+    private final JCheckBox cbFfmpegOptionKeepAspect;
+    // NG設定
+    // NG設定 - NGワード
+    private final JList<String> lstNgWord;
+    private final DefaultListModel<String> mdlNgWord = new DefaultListModel<>();
     private final JTextField fldNgWord;
+    private final JButton btnNgWordAdd;
+    private final JButton btnNgWordDel;
+    // NG設定 - NGID
+    private final JList<String> lstNgId;
+    private final DefaultListModel<String> mdlNgId = new DefaultListModel<>();
     private final JTextField fldNgId;
+    private final JButton btnNgIdAdd;
+    private final JButton btnNgIdDel;
+    // 検索
+    // 検索 - 動画検索対象フォルダ
+    private final JList<String> lstSearchVideo;
+    private final DefaultListModel<String> mdlSearchVideo = new DefaultListModel<>();
+    private final JButton btnSearchVideoAdd;
+    private final JButton btnSearchVideoDel;
+    // 検索 - コメント検索対象フォルダ
+    private final JList<String> lstSearchComment;
+    private final DefaultListModel<String> mdlSearchComment = new DefaultListModel<>();
+    private final JButton btnSearchCommentAdd;
+    private final JButton btnSearchCommentDel;
+    // 検索 - キャッシュ更新(秒)
     private final JTextField fldSearchCache;
-    private final JTextField fldProxyHost;
-    private final JTextField fldProxyPort;
-    private final JTextField fldVideoDir;
-    private final JTextField fldVideoFileNamePattern;
-    private final JTextField fldCommentDir;
-    private final JTextField fldCommentFileNamePattern;
-    private final JTextField fldOutputDir;
+
+
     // End of variables declaration//GEN-END:variables
 
     private void loadConfig() {