From c3c79fff6ad9b8b9974d833baa6e9c770d82bebc Mon Sep 17 00:00:00 2001
From: yukihane <yukihane.feather@gmail.com>
Date: Tue, 6 Sep 2011 14:51:10 +0900
Subject: [PATCH] =?utf8?q?=E6=95=B0=E5=80=A4=E5=85=A5=E5=8A=9B=E6=AC=84?=
 =?utf8?q?=E3=81=AE=E3=83=95=E3=82=A3=E3=83=BC=E3=83=AB=E3=83=89=E3=82=AF?=
 =?utf8?q?=E3=83=A9=E3=82=B9=E3=82=92=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../src/yukihane/inqubus/gui/ConfigDialog.java     | 30 ++++++----------------
 .../src/yukihane/inqubus/gui/FfmpegParamPanel.java |  4 +--
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/frontend/src/yukihane/inqubus/gui/ConfigDialog.java b/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
index 5a765bb..6bd385b 100644
--- a/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
+++ b/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
@@ -66,8 +66,6 @@ public class ConfigDialog extends JDialog {
         cbProxyUse = new JCheckBox();
         final JLabel lblProxyHost = new JLabel();
         final JLabel lblProxyPort = new JLabel();
-        fldProxyHost = new JTextField();
-        fldProxyPort = new JTextField();
         final JPanel pnlFile = new JPanel();
         final JPanel pnlFileOutput = new JPanel();
         final JLabel lblOutputDir = new JLabel();
@@ -80,17 +78,11 @@ public class ConfigDialog extends JDialog {
         final JPanel pnlComment = new JPanel();
         final JPanel pnlCommentStandard = new JPanel();
         final JLabel lblCommentSize = new JLabel();
-        cbCommentSizeAuto = new JCheckBox();
         final JLabel lblCommentSizeManual = new JLabel();
-        fldCommentSizeManual = new JTextField();
         final JLabel lblCommentMinSize = new JLabel();
-        cbCommentMinSizeAuto = new JCheckBox();
-        fldCommentMinSizeManual = new JTextField();
         final JLabel lblCommentMinSizeManual = new JLabel();
         final JLabel lblCommentDisplayMax = new JLabel();
-        cbCommentDisplaySizeDefault = new JCheckBox();
         final JLabel lblCommentDisplayMaxManual = new JLabel();
-        fldCommentDisplaySizeManual = new JTextField();
         final JPanel pnlCommentAdvanced = new JPanel();
         final JLabel lblFontPath = new JLabel();
         cbFontSizeArrangeDisable = new JCheckBox();
@@ -341,20 +333,14 @@ public class ConfigDialog extends JDialog {
 
         lblCommentSize.setText("再生時間に応じたコメントの取得数");
 
-        cbCommentSizeAuto.setText("自動調整");
-
         lblCommentSizeManual.setText("手動取得");
 
         lblCommentMinSize.setText("1分当たりのコメント取得数");
 
-        cbCommentMinSizeAuto.setText("自動調整");
-
         lblCommentMinSizeManual.setText("手動取得");
 
         lblCommentDisplayMax.setText("1画面に表示する最大コメント数");
 
-        cbCommentDisplaySizeDefault.setText("標準(30)");
-
         lblCommentDisplayMaxManual.setText("手動設定");
 
         GroupLayout gl_pnlCommentStandard = new GroupLayout(pnlCommentStandard);
@@ -777,8 +763,8 @@ public class ConfigDialog extends JDialog {
     private final JTextField fldPassword;
     // ネットワーク - プロキシ
     private final JCheckBox cbProxyUse;
-    private final JTextField fldProxyHost;
-    private final JTextField fldProxyPort;
+    private final JTextField fldProxyHost = new JTextField();
+    private final NumberFormattedTextField fldProxyPort = new NumberFormattedTextField();
     // ファイル
     // ファイル - 動画
     private final DownloadLocationPanel pnlFileVideo = new DownloadLocationPanel();
@@ -796,12 +782,12 @@ public class ConfigDialog extends JDialog {
     private final JTextField fldReplaceTo = new JTextField();
     // コメント
     // コメント
-    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 JCheckBox cbCommentSizeAuto = new JCheckBox("自動調整");
+    private final NumberFormattedTextField fldCommentSizeManual = new NumberFormattedTextField();
+    private final JCheckBox cbCommentMinSizeAuto = new JCheckBox("自動調整");
+    private final NumberFormattedTextField fldCommentMinSizeManual = new NumberFormattedTextField();
+    private final JCheckBox cbCommentDisplaySizeDefault = new JCheckBox("標準(30)");
+    private final NumberFormattedTextField fldCommentDisplaySizeManual = new NumberFormattedTextField();
     // コメント - 高度な設定
     private final JTextField fldFontPath;
     private final JTextField fldFontIndex;
diff --git a/frontend/src/yukihane/inqubus/gui/FfmpegParamPanel.java b/frontend/src/yukihane/inqubus/gui/FfmpegParamPanel.java
index 39e30db..fa14f29 100644
--- a/frontend/src/yukihane/inqubus/gui/FfmpegParamPanel.java
+++ b/frontend/src/yukihane/inqubus/gui/FfmpegParamPanel.java
@@ -31,8 +31,8 @@ class FfmpegParamPanel extends JPanel {
     final JTextField fldFfmpegOptionOut = new JTextField();
     final JTextField fldFfmpegOptionAv = new JTextField();
     final JCheckBox cbFfmpegOptionResize = new JCheckBox("次のサイズに収まるよう縮小(-s)");
-    final JTextField fldFfmpegOptionResizeWidth = new JTextField();
-    final JTextField fldFfmpegOptionResizeHeight = new JTextField();
+    final NumberFormattedTextField fldFfmpegOptionResizeWidth = new NumberFormattedTextField();
+    final NumberFormattedTextField fldFfmpegOptionResizeHeight = new NumberFormattedTextField();
     final JCheckBox cbFfmpegOptionKeepAspect = new JCheckBox("アスペクト比を維持");
 
     void init(Config p) {
-- 
2.11.0