X-Git-Url: http://git.sourceforge.jp/view?p=coroid%2Finqubus.git;a=blobdiff_plain;f=frontend%2Fsrc%2Fyukihane%2Finqubus%2Fgui%2FFfmpegParamPanel.java;h=ae03dc6eec0e8a392eaacf3fc3d39d72622bbf80;hp=fda09b191014d43125ebe7409a733caf4ecbc8cf;hb=53d96cc8faad657196ed558f34acecbe60d8d5d8;hpb=07487b9841bee7c9fb0b076e07ca81b3960232a3

diff --git a/frontend/src/yukihane/inqubus/gui/FfmpegParamPanel.java b/frontend/src/yukihane/inqubus/gui/FfmpegParamPanel.java
index fda09b1..ae03dc6 100644
--- a/frontend/src/yukihane/inqubus/gui/FfmpegParamPanel.java
+++ b/frontend/src/yukihane/inqubus/gui/FfmpegParamPanel.java
@@ -1,9 +1,12 @@
 package yukihane.inqubus.gui;
 
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.io.File;
 import javax.swing.BorderFactory;
 import javax.swing.GroupLayout;
 import javax.swing.GroupLayout.Alignment;
+import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
 import javax.swing.JLabel;
@@ -13,7 +16,7 @@ import javax.swing.LayoutStyle.ComponentPlacement;
 import org.apache.commons.lang.StringUtils;
 import saccubus.FFmpegSelectedItem;
 import saccubus.OptionComboBoxModel;
-import yukihane.inqubus.Config;
+import yukihane.inqubus.config.Config;
 
 /**
  *
@@ -31,8 +34,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) {
@@ -125,6 +128,14 @@ class FfmpegParamPanel extends JPanel {
             .addComponent(cbFfmpegOptionKeepAspect)
         );
 
+        final JButton btnReload = new JButton("更新");
+        btnReload.addActionListener(new ActionListener() {
+
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                mdlFfmpegOption.reload();
+            }
+        });
 
 
         final GroupLayout glFfmpegParam = new GroupLayout(this);
@@ -134,15 +145,23 @@ class FfmpegParamPanel extends JPanel {
             .addGroup(glFfmpegParam.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(glFfmpegParam.createParallelGroup(Alignment.LEADING)
+                    .addGroup(glFfmpegParam.createSequentialGroup()
+                        .addComponent(cmbFfmpegOptionFile, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(ComponentPlacement.UNRELATED)
+                        .addComponent(btnReload)
+                    )
                     .addComponent(pnlFfmpegParamOption, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addComponent(cmbFfmpegOptionFile, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
+                )
                 .addContainerGap())
         );
         glFfmpegParam.setVerticalGroup(
             glFfmpegParam.createParallelGroup(Alignment.LEADING)
             .addGroup(glFfmpegParam.createSequentialGroup()
                 .addContainerGap()
-                .addComponent(cmbFfmpegOptionFile, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                .addGroup(glFfmpegParam.createParallelGroup(Alignment.BASELINE)
+                    .addComponent(cmbFfmpegOptionFile, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                    .addComponent(btnReload)
+                )
                 .addPreferredGap(ComponentPlacement.RELATED)
                 .addComponent(pnlFfmpegParamOption)
                 .addContainerGap())