From: yukihane <yukihane.feather@gmail.com>
Date: Tue, 30 Aug 2011 10:59:35 +0000 (+0900)
Subject: ffmpegオプション設定のラジオボタン削除
X-Git-Tag: test20110903_ver2.a.0~79
X-Git-Url: http://git.sourceforge.jp/view?p=coroid%2Finqubus.git;a=commitdiff_plain;h=85120da957dadc3da1239bb604d1850d8510d58f

ffmpegオプション設定のラジオボタン削除
---

diff --git a/frontend/src/yukihane/inqubus/gui/ConfigDialog.java b/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
index 38fa445..39128ed 100644
--- a/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
+++ b/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
@@ -29,7 +29,6 @@ import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JPanel;
-import javax.swing.JRadioButton;
 import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
 import javax.swing.JTextField;
@@ -58,7 +57,6 @@ public class ConfigDialog extends JDialog {
     public ConfigDialog(JFrame owner){
         super(owner);
 
-        final ButtonGroup buttonGroup1 = new ButtonGroup();
         final JTabbedPane tabbedPane = new JTabbedPane();
         final JPanel pnlNetwork = new JPanel();
         final JPanel pnlAccount = new JPanel();
@@ -128,8 +126,6 @@ public class ConfigDialog extends JDialog {
         btnFfmpegPath = new JButton();
         btnFfmpegDllPath = new JButton();
         final JPanel pnlFfmpegParam = new JPanel();
-        rbFfmpegOptionFile = new JRadioButton();
-        rbFfmpegOptionDirectInput = new JRadioButton();
         final JPanel pnlFfmpegParamOption = new JPanel();
         final JLabel lblFfmpegOptionExtension = new JLabel();
         final JLabel lblFfmpegOptionMain = new JLabel();
@@ -685,12 +681,6 @@ public class ConfigDialog extends JDialog {
 
         pnlFfmpegParam.setBorder(BorderFactory.createTitledBorder("ffmpegパラメータ"));
 
-        buttonGroup1.add(rbFfmpegOptionFile);
-        rbFfmpegOptionFile.setText("オプションファイル");
-
-        buttonGroup1.add(rbFfmpegOptionDirectInput);
-        rbFfmpegOptionDirectInput.setText("直接入力");
-
         pnlFfmpegParamOption.setBorder(BorderFactory.createEtchedBorder());
 
         lblFfmpegOptionExtension.setText("出力動画の拡張子");
@@ -791,22 +781,14 @@ public class ConfigDialog extends JDialog {
                 .addContainerGap()
                 .addGroup(gl_pnlFfmpegParam.createParallelGroup(Alignment.LEADING)
                     .addComponent(pnlFfmpegParamOption, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addGroup(gl_pnlFfmpegParam.createSequentialGroup()
-                        .addComponent(rbFfmpegOptionFile)
-                        .addPreferredGap(ComponentPlacement.RELATED)
-                        .addComponent(cmbFfmpegOptionFile, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
-                    .addComponent(rbFfmpegOptionDirectInput))
+                    .addComponent(cmbFfmpegOptionFile, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
                 .addContainerGap())
         );
         gl_pnlFfmpegParam.setVerticalGroup(
             gl_pnlFfmpegParam.createParallelGroup(Alignment.LEADING)
             .addGroup(gl_pnlFfmpegParam.createSequentialGroup()
                 .addContainerGap()
-                .addGroup(gl_pnlFfmpegParam.createParallelGroup(Alignment.BASELINE)
-                    .addComponent(rbFfmpegOptionFile)
-                    .addComponent(cmbFfmpegOptionFile, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(ComponentPlacement.RELATED)
-                .addComponent(rbFfmpegOptionDirectInput)
+                .addComponent(cmbFfmpegOptionFile, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(ComponentPlacement.RELATED)
                 .addComponent(pnlFfmpegParamOption, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                 .addContainerGap())
@@ -1227,8 +1209,6 @@ public class ConfigDialog extends JDialog {
     private final JTextField fldFfmpegDllPath;
     private final JButton btnFfmpegDllPath;
     // ffmpeg - ffmpegパラメータ
-    private final JRadioButton rbFfmpegOptionFile;
-    private final JRadioButton rbFfmpegOptionDirectInput;
     private final JComboBox<FFmpegSelectedItem> cmbFfmpegOptionFile = new JComboBox<>(new OptionComboBoxModel());
     private final JTextField fldFfmpegOptionExtension;
     private final JTextField fldFfmpegOptionMain;
@@ -1347,8 +1327,6 @@ public class ConfigDialog extends JDialog {
         /*
          * ffmpeg - ffmpegパラメータ
          */
-        rbFfmpegOptionFile.setSelected(!p.getFfmpegParamInputDirect());
-        rbFfmpegOptionDirectInput.setSelected(p.getFfmpegParamInputDirect());
         // TODO cmbFfmpegOptionFile
         fldFfmpegOptionExtension.setText(p.getFfmpegExtension());
         fldFfmpegOptionMain.setText(p.getFfmpegMainOption());
@@ -1455,7 +1433,7 @@ public class ConfigDialog extends JDialog {
         /*
          * ffmpeg - ffmpegパラメータ
          */
-        p.setFfmpegParamInputDirect(rbFfmpegOptionDirectInput.isSelected());
+        // TODO p.setFfmpegParamInputDirect(rbFfmpegOptionDirectInput.isSelected());
         // TODO cmbFfmpegOptionFile
         p.setFfmpegExtension(fldFfmpegOptionExtension.getText());
         p.setFfmpegMainOption(fldFfmpegOptionMain.getText());