X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosDeviceDialog.java;h=3df4c6ebeb15c27e4176dc16ff1560bf5fdbe7b6;hp=cb1eef8bc8f8204db8ab414a5dbd7563be1ddb80;hb=22800dc094797e1e0ad99124198809d0360f7556;hpb=baaaac499cfbc1286ae55374cfdc796d32983b92

diff --git a/ao-tools/altosui/AltosDeviceDialog.java b/ao-tools/altosui/AltosDeviceDialog.java
index cb1eef8b..3df4c6eb 100644
--- a/ao-tools/altosui/AltosDeviceDialog.java
+++ b/ao-tools/altosui/AltosDeviceDialog.java
@@ -20,26 +20,141 @@ package altosui;
 import java.lang.*;
 import java.util.*;
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.*;
+import libaltosJNI.libaltos;
+import libaltosJNI.altos_device;
+import libaltosJNI.SWIGTYPE_p_altos_file;
+import libaltosJNI.SWIGTYPE_p_altos_list;
 import altosui.AltosDevice;
-import altosui.AltosDeviceLinux;
-
-public class AltosDeviceDialog {
-
-	static AltosDevice show (JFrame frame, String product) {
-		AltosDevice[]	devices = null;
-		if (System.getProperty("os.name").startsWith("Linux"))
-			devices = AltosDeviceLinux.list(product);
-		if (devices != null & devices.length > 0) {
-			Object o = JOptionPane.showInputDialog(frame,
-							       "Select a device",
-							       "Device Selection",
-							       JOptionPane.PLAIN_MESSAGE,
-							       null,
-							       devices,
-							       devices[0]);
-			return (AltosDevice) o;
+
+public class AltosDeviceDialog extends JDialog implements ActionListener {
+
+	private static AltosDeviceDialog	dialog;
+	private static AltosDevice		value = null;
+	private JList				list;
+
+	public static AltosDevice show (Component frameComp, int product) {
+
+		Frame frame = JOptionPane.getFrameForComponent(frameComp);
+		AltosDevice[]	devices;
+		devices = AltosDevice.list(product);
+
+		if (devices != null && devices.length > 0) {
+			value = null;
+			dialog = new AltosDeviceDialog(frame, frameComp,
+						       devices,
+						       devices[0]);
+
+			dialog.setVisible(true);
+			return value;
 		} else {
+			JOptionPane.showMessageDialog(frame,
+						      "No AltOS devices available",
+						      "No AltOS devices",
+						      JOptionPane.ERROR_MESSAGE);
 			return null;
 		}
 	}
+
+	private AltosDeviceDialog (Frame frame, Component location,
+				   AltosDevice[] devices,
+				   AltosDevice initial) {
+		super(frame, "Device Selection", true);
+
+		value = null;
+
+		JButton cancelButton = new JButton("Cancel");
+		cancelButton.addActionListener(this);
+
+		final JButton selectButton = new JButton("Select");
+		selectButton.setActionCommand("select");
+		selectButton.addActionListener(this);
+		getRootPane().setDefaultButton(selectButton);
+
+		list = new JList(devices) {
+				//Subclass JList to workaround bug 4832765, which can cause the
+				//scroll pane to not let the user easily scroll up to the beginning
+				//of the list.  An alternative would be to set the unitIncrement
+				//of the JScrollBar to a fixed value. You wouldn't get the nice
+				//aligned scrolling, but it should work.
+				public int getScrollableUnitIncrement(Rectangle visibleRect,
+								      int orientation,
+								      int direction) {
+					int row;
+					if (orientation == SwingConstants.VERTICAL &&
+					    direction < 0 && (row = getFirstVisibleIndex()) != -1) {
+						Rectangle r = getCellBounds(row, row);
+						if ((r.y == visibleRect.y) && (row != 0))  {
+							Point loc = r.getLocation();
+							loc.y--;
+							int prevIndex = locationToIndex(loc);
+							Rectangle prevR = getCellBounds(prevIndex, prevIndex);
+
+							if (prevR == null || prevR.y >= r.y) {
+								return 0;
+							}
+							return prevR.height;
+						}
+					}
+					return super.getScrollableUnitIncrement(
+						visibleRect, orientation, direction);
+				}
+			};
+
+		list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+		list.setLayoutOrientation(JList.HORIZONTAL_WRAP);
+		list.setVisibleRowCount(-1);
+		list.addMouseListener(new MouseAdapter() {
+				 public void mouseClicked(MouseEvent e) {
+					 if (e.getClickCount() == 2) {
+						 selectButton.doClick(); //emulate button click
+					 }
+				 }
+			});
+		JScrollPane listScroller = new JScrollPane(list);
+		listScroller.setPreferredSize(new Dimension(400, 80));
+		listScroller.setAlignmentX(LEFT_ALIGNMENT);
+
+		//Create a container so that we can add a title around
+		//the scroll pane.  Can't add a title directly to the
+		//scroll pane because its background would be white.
+		//Lay out the label and scroll pane from top to bottom.
+		JPanel listPane = new JPanel();
+		listPane.setLayout(new BoxLayout(listPane, BoxLayout.PAGE_AXIS));
+
+		JLabel label = new JLabel("Select Device");
+		label.setLabelFor(list);
+		listPane.add(label);
+		listPane.add(Box.createRigidArea(new Dimension(0,5)));
+		listPane.add(listScroller);
+		listPane.setBorder(BorderFactory.createEmptyBorder(10,10,10,10));
+
+		//Lay out the buttons from left to right.
+		JPanel buttonPane = new JPanel();
+		buttonPane.setLayout(new BoxLayout(buttonPane, BoxLayout.LINE_AXIS));
+		buttonPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10));
+		buttonPane.add(Box.createHorizontalGlue());
+		buttonPane.add(cancelButton);
+		buttonPane.add(Box.createRigidArea(new Dimension(10, 0)));
+		buttonPane.add(selectButton);
+
+		//Put everything together, using the content pane's BorderLayout.
+		Container contentPane = getContentPane();
+		contentPane.add(listPane, BorderLayout.CENTER);
+		contentPane.add(buttonPane, BorderLayout.PAGE_END);
+
+		//Initialize values.
+		list.setSelectedValue(initial, true);
+		pack();
+		setLocationRelativeTo(location);
+	}
+
+	//Handle clicks on the Set and Cancel buttons.
+	public void actionPerformed(ActionEvent e) {
+		if ("select".equals(e.getActionCommand()))
+			AltosDeviceDialog.value = (AltosDevice)(list.getSelectedValue());
+		AltosDeviceDialog.dialog.setVisible(false);
+	}
+
 }