Merge pull request #77 from tgvaughan/applauncher_patch

AppLauncher patch
CompEvol · Nov 19, 2023 · 2ba1aa3 · 2ba1aa3
2 parents fb2013b + 07039ef
commit 2ba1aa3
Showing 1 changed file with 10 additions and 32 deletions.
diff --git a/src/beastfx/app/tools/AppLauncher.java b/src/beastfx/app/tools/AppLauncher.java
@@ -3,11 +3,7 @@
 
 
 
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Point;
-import java.awt.Rectangle;
+import java.awt.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.File;
@@ -20,20 +16,7 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.swing.Box;
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.DefaultListModel;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JOptionPane;
-import javax.swing.JScrollPane;
-import javax.swing.ListSelectionModel;
-import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
+import javax.swing.*;
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.w3c.dom.Document;
@@ -103,9 +86,6 @@ public JDialog launchGUI() {
     }
 
     private Component createList() {
-        Box box = Box.createVerticalBox();
-        box.add(Box.createGlue());
-
         listApps = new JList<PackageApp>(model) {
  			private static final long serialVersionUID = 1L;
 
@@ -147,9 +127,13 @@ public Component getListCellRendererComponent(JList<?> list, Object value, int i
                                                           boolean cellHasFocus) {
                 JLabel label = (JLabel) super
                         .getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-                label.setIcon(((PackageApp) value).icon);
-                label.setHorizontalTextPosition(SwingConstants.CENTER);
-                label.setVerticalTextPosition(SwingConstants.BOTTOM);
+                PackageApp app = (PackageApp) value;
+                label.setText(app.description +  " (" + app.packageName + ")");
+                Image img = app.icon.getImage()
+                        .getScaledInstance(50,50, Image.SCALE_SMOOTH);
+                label.setIcon(new ImageIcon(img));
+                label.setHorizontalTextPosition(SwingConstants.RIGHT);
+                label.setVerticalTextPosition(SwingConstants.CENTER);
                 return label;
             }
         });
@@ -174,13 +158,7 @@ public void mouseClicked(MouseEvent e) {
         listScroller.setPreferredSize(new Dimension(660, 400));
         listScroller.setAlignmentX(Component.LEFT_ALIGNMENT);
 
-        JLabel label = new JLabel("List of available package applications");
-        label.setLabelFor(listApps);
-
-        box.add(label);
-        box.add(listScroller);
-
-        return box;
+        return listScroller;
     }
 
     private void resetAppList() {