• R/O
  • HTTP
  • SSH
  • HTTPS

importpicture: Commit


Commit MetaInfo

Revision5086a3e9ae1d32a04c6638ee38cddbe82b3ebe4f (tree)
Time2019-10-17 05:56:49
Authorhaya4 <hayashi.yuu@gmai...>
Commiterhaya4

Log Message

fixed: ダイアログからモーダルの「コマンド実行パネル」を呼び出すことに成功

Change Summary

Incremental Difference

--- a/src/osm/jp/gpx/Restamp.java
+++ b/src/osm/jp/gpx/Restamp.java
@@ -13,7 +13,7 @@ import java.util.logging.Logger;
1313 import org.apache.commons.imaging.ImageReadException;
1414
1515 /**
16- * 動画から一定間隔で切り出したIMAGEのファイル更新日時を書き換える
16+ * 動画から一定間隔で切り出したIMAGEファイルの更新日時を書き換える
1717 *
1818 * @author yuu
1919 */
--- a/src/osm/jp/gpx/matchtime/gui/AdjustTime.java
+++ b/src/osm/jp/gpx/matchtime/gui/AdjustTime.java
@@ -544,7 +544,7 @@ public class AdjustTime extends JFrame
544544 }
545545
546546 void miRestamp_Action(java.awt.event.ActionEvent event) throws IOException {
547- (new RestampDialog(this, true)).setVisible(true);
547+ (new RestampDialog(this, false)).setVisible(true);
548548 }
549549
550550 void miExit_Action(java.awt.event.ActionEvent event) {
--- a/src/osm/jp/gpx/matchtime/gui/restamp/CardPerformFile.java
+++ b/src/osm/jp/gpx/matchtime/gui/restamp/CardPerformFile.java
@@ -1,7 +1,6 @@
11 package osm.jp.gpx.matchtime.gui.restamp;
22
33 import java.awt.BorderLayout;
4-import java.awt.Dialog;
54 import java.io.File;
65 import java.util.ArrayList;
76 import javax.swing.BoxLayout;
@@ -12,9 +11,7 @@ import javax.swing.JTabbedPane;
1211 import osm.jp.gpx.matchtime.gui.AdjustTime;
1312 import static osm.jp.gpx.matchtime.gui.AdjustTime.i18n;
1413 import osm.jp.gpx.matchtime.gui.Card;
15-import osm.jp.gpx.matchtime.gui.DoDialog;
1614 import osm.jp.gpx.matchtime.gui.PanelAction;
17-import osm.jp.gpx.matchtime.gui.ParameterPanelImageFile;
1815 import osm.jp.gpx.matchtime.gui.ParameterPanelTime;
1916
2017 /**
@@ -77,8 +74,6 @@ public class CardPerformFile extends Card implements PanelAction {
7774 */
7875 @SuppressWarnings("UseSpecificCatch")
7976 void doButton_Action(java.awt.event.ActionEvent event) {
80- doButton.setEnabled(false);
81-
8277 ArrayList<String> arry = new ArrayList<>();
8378 File file = arg1_basetime.getImageFile().getImageFile();
8479 File dir = file.getParentFile();
@@ -90,8 +85,6 @@ public class CardPerformFile extends Card implements PanelAction {
9085 arry.add(arg2_basetime.argField.getText());
9186 String[] argv = arry.toArray(new String[arry.size()]);
9287 (new DoRestamp(argv)).setVisible(true);
93-
94- doButton.setEnabled(true);
9588 }
9689
9790 /**
--- a/src/osm/jp/gpx/matchtime/gui/restamp/DoRestamp.java
+++ b/src/osm/jp/gpx/matchtime/gui/restamp/DoRestamp.java
@@ -30,7 +30,7 @@ public class DoRestamp extends JDialog {
3030
3131 @SuppressWarnings("OverridableMethodCallInConstructor")
3232 public DoRestamp(String[] args) {
33- super(); // モーダルダイアログを基盤にする
33+ super(); // 親フォームなしのモーダルダイアログを基盤にする
3434 this.args = args;
3535
3636 // INIT_CONTROLS
--- a/src/osm/jp/gpx/matchtime/gui/restamp/RestampDialog.java
+++ b/src/osm/jp/gpx/matchtime/gui/restamp/RestampDialog.java
@@ -14,7 +14,7 @@ import osm.jp.gpx.matchtime.gui.ParameterPanelTime;
1414 import osm.jp.gpx.matchtime.gui.SimpleDocumentListener;
1515
1616 @SuppressWarnings("serial")
17-public class RestampDialog extends Dialog implements Observer
17+public class RestampDialog extends JDialog implements Observer
1818 {
1919 //{{DECLARE_CONTROLS
2020 java.awt.Button closeButton;
Show on old repository browser