説明文を追加.EXIF設定画面の変更

diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java b/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java
index 8a160c6..df86815 100644 (file)
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java
+++ b/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java
@@ -31,7 +31,8 @@ public class AdjustTime extends JFrame
     ParameterPanelFolder arg1Panel_1;
     ParameterPanelImageFile arg1Panel_2;
     ParameterPanel arg1Panel_3;
-    ParameterPanelSelecter arg1Panel_4;                // EXIF 書き出しモード
+    JRadioButton exifON;               // EXIF 書き出しモード
+    ParameterPanelFolder arg1Panel_4;       // EXIF 書き出しフォルダ
     ParameterPanelFolder arg1Panel_5;       // GPXファイル・フォルダ
     
     JPanel buttonPanel;                // ボタンパネル   (下部)
@@ -97,9 +98,6 @@ public class AdjustTime extends JFrame
             else if (object == doButton) {
                doButton_Action(event);
             }
-            else if (object == arg1Panel_4.field) {
-               doButton_Action(event);
-            }
             else if (object == nextButton) {
                nextButton_Action(event);
             }
@@ -221,8 +219,17 @@ public class AdjustTime extends JFrame
         
         JPanel tmpPanel5 = new JPanel();
         tmpPanel5.setLayout(new BoxLayout(tmpPanel5, BoxLayout.Y_AXIS));
-        String[] combodata = {"更新しない", "更新する"};
-        arg1Panel_4 = new ParameterPanelSelecter("EXIF変更: ", combodata);
+
+        exifON = new JRadioButton("EXIFの変換をする");
+        JRadioButton exifOFF = new JRadioButton("EXIFの変換をしない", true);
+        ButtonGroup group = new ButtonGroup();
+        group.add(exifON);
+        group.add(exifOFF);
+        tmpPanel5.add(exifOFF);
+        tmpPanel5.add(exifON);
+        
+        File outputDir = new File(".");
+        arg1Panel_4 = new ParameterPanelFolder("書き出しフォルダ: ", outputDir.getAbsolutePath());
         tmpPanel5.add(arg1Panel_4);
         cards[cardNo].add(tmpPanel5, BorderLayout.CENTER);
         
@@ -263,7 +270,7 @@ public class AdjustTime extends JFrame
         arg1Panel_2.argField.addActionListener(lSymAction);
         arg1Panel_2.openButton.addActionListener(lSymAction);
         doButton.addActionListener(lSymAction);
-        arg1Panel_4.field.addActionListener(lSymAction);
+        //arg1Panel_4.field.addActionListener(lSymAction);
         nextButton.addActionListener(lSymAction);
         backButton.addActionListener(lSymAction);
         //}}
@@ -440,8 +447,7 @@ public class AdjustTime extends JFrame
         argv[0] = arg1Panel_1.getText();
         argv[1] = arg1Panel_2.getText();
         argv[2] = arg1Panel_3.getText();
-        String value = (String) arg1Panel_4.field.getSelectedItem();
-        argv[3] = (value.equals("更新する") ? "EXIF" : "none");
+        argv[3] = (exifON.isSelected() ? "EXIF" : "none");
 
         (new DoDialog(this, argv)).setVisible(true);