ファイル選択ボタンを削除

diff --git a/frontend/src/yukihane/inqubus/gui/MainFrame.java b/frontend/src/yukihane/inqubus/gui/MainFrame.java
index 4643fea..f221e0a 100644 (file)
--- a/frontend/src/yukihane/inqubus/gui/MainFrame.java
+++ b/frontend/src/yukihane/inqubus/gui/MainFrame.java
@@ -125,7 +125,6 @@ public class MainFrame extends JFrame {
         cbVideoLocal.setToolTipText(FILE_LOCALBUTTON_TOOLTIP);
         fldVideo = new JTextField();
         fldVideo.setToolTipText(FILE_INPUTFIELD_TOOLTIP);
         cbVideoLocal.setToolTipText(FILE_LOCALBUTTON_TOOLTIP);
         fldVideo = new JTextField();
         fldVideo.setToolTipText(FILE_INPUTFIELD_TOOLTIP);

-        btnVideo = new JButton();

         final JLabel lblComment = new JLabel();
 
         fldBackLog.setToolTipText("YYYY/MM/DD hh:mm:ss形式、あるいは1970/01/01からの経過秒を入力します。");
         final JLabel lblComment = new JLabel();
 
         fldBackLog.setToolTipText("YYYY/MM/DD hh:mm:ss形式、あるいは1970/01/01からの経過秒を入力します。");


@@ -161,7 +160,6 @@ public class MainFrame extends JFrame {
         });
         fldComment = new JTextField();
         fldComment.setToolTipText(FILE_INPUTFIELD_TOOLTIP);
         });
         fldComment = new JTextField();
         fldComment.setToolTipText(FILE_INPUTFIELD_TOOLTIP);

-        btnComment = new JButton();

         final JLabel lblOutput = new JLabel();
         cbOutputEnable = new JCheckBox();
         fldOutput = new JTextField();
         final JLabel lblOutput = new JLabel();
         cbOutputEnable = new JCheckBox();
         fldOutput = new JTextField();


@@ -222,8 +220,6 @@ public class MainFrame extends JFrame {
             }
         });
 
             }
         });
 

-        btnVideo.setText("...");
-

         lblComment.setText("コメント");
 
         cbCommentLocal.setText("local");
         lblComment.setText("コメント");
 
         cbCommentLocal.setText("local");


@@ -234,8 +230,6 @@ public class MainFrame extends JFrame {
             }
         });
 
             }
         });
 

-        btnComment.setText("...");
-

         lblOutput.setText("出力");
 
         cbOutputEnable.setText("変換");
         lblOutput.setText("出力");
 
         cbOutputEnable.setText("変換");


@@ -267,34 +261,26 @@ public class MainFrame extends JFrame {
             .addGroup(glInputMain.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(glInputMain.createParallelGroup(Alignment.LEADING)
             .addGroup(glInputMain.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(glInputMain.createParallelGroup(Alignment.LEADING)

-                    .addGroup(glInputMain.createSequentialGroup()
-                        .addGroup(glInputMain.createParallelGroup(Alignment.LEADING)
-                            .addComponent(lblVideo)
-                            .addComponent(lblComment)
-                            .addComponent(lblOutput))
-                        .addPreferredGap(ComponentPlacement.RELATED)
-                        .addGroup(glInputMain.createParallelGroup(Alignment.LEADING)
-                            .addGroup(glInputMain.createSequentialGroup()
-                                .addComponent(cbVideoLocal)
-                                .addPreferredGap(ComponentPlacement.RELATED)
-                                .addComponent(fldVideo, GroupLayout.DEFAULT_SIZE, 317, Short.MAX_VALUE)
-                                .addPreferredGap(ComponentPlacement.RELATED)
-                                .addComponent(btnVideo))
-                            .addGroup(Alignment.TRAILING, glInputMain.createSequentialGroup()
-                                .addGroup(glInputMain.createParallelGroup(Alignment.TRAILING)
-                                    .addGroup(Alignment.LEADING, glInputMain.createSequentialGroup()
-                                        .addComponent(cbOutputEnable)
-                                        .addPreferredGap(ComponentPlacement.RELATED)
-                                        .addComponent(fldOutput, GroupLayout.DEFAULT_SIZE, 317, Short.MAX_VALUE))
-                                    .addGroup(glInputMain.createSequentialGroup()
-                                        .addComponent(cbCommentLocal)
-                                        .addPreferredGap(ComponentPlacement.RELATED)
-                                        .addComponent(fldComment, GroupLayout.DEFAULT_SIZE, 317, Short.MAX_VALUE)))
-                                .addPreferredGap(ComponentPlacement.RELATED)
-                                .addComponent(btnComment))))
-                    )
-                .addContainerGap())
+                    .addComponent(lblVideo)
+                    .addComponent(lblComment)
+                    .addComponent(lblOutput)
+                )
+                .addPreferredGap(ComponentPlacement.RELATED)
+                .addGroup(glInputMain.createParallelGroup(Alignment.LEADING)
+                    .addComponent(cbVideoLocal)
+                    .addComponent(cbCommentLocal)
+                    .addComponent(cbOutputEnable)
+                )
+                .addPreferredGap(ComponentPlacement.RELATED)
+                .addGroup(glInputMain.createParallelGroup(Alignment.LEADING)
+                    .addComponent(fldVideo, GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE)
+                    .addComponent(fldComment, GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE)
+                    .addComponent(fldOutput, GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE)
+                )
+                .addContainerGap()
+            )

         );
         );

+

         glInputMain.setVerticalGroup(
             glInputMain.createParallelGroup(Alignment.LEADING)
             .addGroup(glInputMain.createSequentialGroup()
         glInputMain.setVerticalGroup(
             glInputMain.createParallelGroup(Alignment.LEADING)
             .addGroup(glInputMain.createSequentialGroup()


@@ -310,19 +296,18 @@ public class MainFrame extends JFrame {
                 .addGroup(glInputMain.createParallelGroup(Alignment.BASELINE)
                     .addComponent(lblVideo)
                     .addComponent(fldVideo, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
                 .addGroup(glInputMain.createParallelGroup(Alignment.BASELINE)
                     .addComponent(lblVideo)
                     .addComponent(fldVideo, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)

-                    .addComponent(btnVideo)

                     .addComponent(cbVideoLocal))
                 .addPreferredGap(ComponentPlacement.RELATED)
                 .addGroup(glInputMain.createParallelGroup(Alignment.BASELINE)
                     .addComponent(lblComment)
                     .addComponent(fldComment, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
                     .addComponent(cbVideoLocal))
                 .addPreferredGap(ComponentPlacement.RELATED)
                 .addGroup(glInputMain.createParallelGroup(Alignment.BASELINE)
                     .addComponent(lblComment)
                     .addComponent(fldComment, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)

-                    .addComponent(btnComment)

                     .addComponent(cbCommentLocal))
                 .addPreferredGap(ComponentPlacement.RELATED)
                 .addGroup(glInputMain.createParallelGroup(Alignment.BASELINE)
                     .addComponent(lblOutput)
                     .addComponent(fldOutput, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
                     .addComponent(cbCommentLocal))
                 .addPreferredGap(ComponentPlacement.RELATED)
                 .addGroup(glInputMain.createParallelGroup(Alignment.BASELINE)
                     .addComponent(lblOutput)
                     .addComponent(fldOutput, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)

-                    .addComponent(cbOutputEnable))
+                    .addComponent(cbOutputEnable)
+                )

             )
         );
 
             )
         );
 


@@ -543,21 +528,17 @@ public class MainFrame extends JFrame {
 
         final ItemSelectable source = evt.getItemSelectable();
 
 
         final ItemSelectable source = evt.getItemSelectable();
 

-        JButton btn;

         JTextField field;
         File dir;
         if (source == cbVideoLocal) {
         JTextField field;
         File dir;
         if (source == cbVideoLocal) {

-            btn = btnVideo;

             field = fldVideo;
             dir = new File(p.getVideoDir());
         } else {
             field = fldVideo;
             dir = new File(p.getVideoDir());
         } else {

-            btn = btnComment;

             field = fldComment;
             dir = new File(p.getCommentDir());
         }
 
         final boolean useLocal = (evt.getStateChange() == ItemEvent.SELECTED);
             field = fldComment;
             dir = new File(p.getCommentDir());
         }
 
         final boolean useLocal = (evt.getStateChange() == ItemEvent.SELECTED);

-        btn.setEnabled(useLocal);

 
         String text;
         if (useLocal) {
 
         String text;
         if (useLocal) {


@@ -616,10 +597,8 @@ public class MainFrame extends JFrame {
     private final JTextField fldBackLog = new JTextField();
     private final JCheckBox cbVideoLocal;
     private final JTextField fldVideo;
     private final JTextField fldBackLog = new JTextField();
     private final JCheckBox cbVideoLocal;
     private final JTextField fldVideo;

-    private final JButton btnVideo;

     private final JCheckBox cbCommentLocal;
     private final JTextField fldComment;
     private final JCheckBox cbCommentLocal;
     private final JTextField fldComment;

-    private final JButton btnComment;

     private final JCheckBox cbOutputEnable;
     private final JTextField fldOutput;
     // 入力領域 - ffmpeg
     private final JCheckBox cbOutputEnable;
     private final JTextField fldOutput;
     // 入力領域 - ffmpeg


@@ -643,14 +622,12 @@ public class MainFrame extends JFrame {
 
         final boolean movieLocal = p.getVideoUseLocal();
         cbVideoLocal.setSelected(movieLocal);
 
         final boolean movieLocal = p.getVideoUseLocal();
         cbVideoLocal.setSelected(movieLocal);

-        btnVideo.setEnabled(movieLocal);

         if (!movieLocal) {
             fldVideo.setText(p.getVideoFileNamePattern());
         }
 
         final boolean commentLocal = p.getCommentUseLocal();
         cbCommentLocal.setSelected(commentLocal);
         if (!movieLocal) {
             fldVideo.setText(p.getVideoFileNamePattern());
         }
 
         final boolean commentLocal = p.getCommentUseLocal();
         cbCommentLocal.setSelected(commentLocal);

-        btnComment.setEnabled(commentLocal);

         if (!commentLocal) {
             fldComment.setText(p.getCommentFileNamePattern());
         }
         if (!commentLocal) {
             fldComment.setText(p.getCommentFileNamePattern());
         }