From 552fb3b94f38dc9e5af59d3d85e609608659ba8d Mon Sep 17 00:00:00 2001
From: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Date: Tue, 6 Apr 2010 14:55:29 +0300
Subject: [PATCH] Allow picking images to import using file picker

---
 Changelog.utf8                          |  1 +
 org/jpc/pluginsaux/ImportDiskImage.java | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/Changelog.utf8 b/Changelog.utf8
index 1dffb94..2bd3441 100644
--- a/Changelog.utf8
+++ b/Changelog.utf8
@@ -34,6 +34,7 @@ Change since JPC-RR Release 9.1:
 - Add wait for PC to stop function to Lua.
 - Update brief instructions.
 - Give import disk window proper layout.
+- Allow using file chooser in image import.
 
 Changes from JPC-RR Release 9 to JPC-RR Release 9.1:
 ====================================================
diff --git a/org/jpc/pluginsaux/ImportDiskImage.java b/org/jpc/pluginsaux/ImportDiskImage.java
index 9f0cb97..0f9d141 100644
--- a/org/jpc/pluginsaux/ImportDiskImage.java
+++ b/org/jpc/pluginsaux/ImportDiskImage.java
@@ -104,9 +104,12 @@ public class ImportDiskImage implements ActionListener, KeyListener
         add(imageName = new JTextField("", 50), 1, 0);
         imageName.addKeyListener(this);
 
-        add(new JLabel("Image file/directory"), 0, 1);
+        JButton select;
+        add(select = new JButton("Image file/directory"), 0, 1);
         add(imageFile = new JTextField("", 50), 1, 1);
         imageFile.addKeyListener(this);
+        select.addActionListener(this);
+        select.setActionCommand("SELECT");
 
         add(new JLabel("Image Type"), 0, 2);
         add(imageType = new JComboBox(), 1, 2);
@@ -189,6 +192,19 @@ public class ImportDiskImage implements ActionListener, KeyListener
         window.setVisible(true);
     }
 
+    private void selectImage()
+    {
+        JFileChooser fc = new JFileChooser();
+        fc.setApproveButtonText("Select");
+        fc.setDialogTitle("Select image file or directory to import");
+        fc.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
+        int returnVal = fc.showOpenDialog(window);
+        if(returnVal == JFileChooser.APPROVE_OPTION) {
+            imageFile.setText(fc.getSelectedFile().getAbsolutePath());
+            keyTyped(null);
+        }
+    }
+
     private void setNoValidChoice(JComboBox box)
     {
         box.removeAllItems();
@@ -528,6 +544,8 @@ public class ImportDiskImage implements ActionListener, KeyListener
             }
         } else if("CANCEL".equals(command)) {
             window.dispose();
+        } else if("SELECT".equals(command)) {
+            selectImage();
         } else {
             keyTyped(null);
         }
-- 
2.11.4.GIT