X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FJvSwingUtils.java;h=7850ff330d6511a1235d08d7b87c4e372ea9b306;hb=d64df47a7e363e2415d2de43353accf523393e56;hp=65be457b655df42e62af87a5b3272b5835ca010b;hpb=91ef57a97eda85f9bb7b6f68bba52e06f19c29b8;p=jalview.git
diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java
index 65be457..7850ff3 100644
--- a/src/jalview/gui/JvSwingUtils.java
+++ b/src/jalview/gui/JvSwingUtils.java
@@ -22,23 +22,27 @@ package jalview.gui;
import jalview.util.MessageManager;
-import java.awt.BorderLayout;
import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
import java.awt.Font;
-import java.awt.GridLayout;
-import java.awt.Rectangle;
import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.List;
import java.util.Objects;
import javax.swing.AbstractButton;
+import javax.swing.BorderFactory;
import javax.swing.JButton;
+import javax.swing.JComboBox;
import javax.swing.JComponent;
-import javax.swing.JLabel;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
-import javax.swing.JPanel;
import javax.swing.JScrollBar;
import javax.swing.SwingConstants;
+import javax.swing.border.Border;
+import javax.swing.border.TitledBorder;
/**
* useful functions for building Swing GUIs
@@ -60,15 +64,11 @@ public final class JvSwingUtils
*/
public static String wrapTooltip(boolean enclose, String ttext)
{
- Objects.requireNonNull(ttext, "Tootip text to format must not be null!");
+ Objects.requireNonNull(ttext,
+ "Tootip text to format must not be null!");
ttext = ttext.trim();
boolean maxLengthExceeded = false;
- /*
- * Split into lines if already separated by
tags.
- *
- * TODO what about ,
,
?
- */
if (ttext.contains("
"))
{
String[] htmllines = ttext.split("
");
@@ -91,9 +91,10 @@ public final class JvSwingUtils
return enclose ? "" + ttext + "" : ttext;
}
- return enclose ? "
" - + ttext + "
" - : ttext; + return (enclose ? "" : "") + + "" + + ttext + "
" + ((enclose ? "" : "")); + } public static JButton makeButton(String label, String tooltip, @@ -123,8 +124,8 @@ public final class JvSwingUtils for (int i = 0, iSize = menu.getMenuComponentCount(); i < iSize; i++) { if (menu.getMenuComponent(i) instanceof JMenu - && ((JMenu) menu.getMenuComponent(i)).getText().equals( - submenu)) + && ((JMenu) menu.getMenuComponent(i)).getText() + .equals(submenu)) { submenuinstance = (JMenu) menu.getMenuComponent(i); } @@ -139,54 +140,23 @@ public final class JvSwingUtils } /** + * A convenience method that that adds a component with label to a container, + * sets a tooltip on both component and label, and optionally specifies layout + * constraints for the added component (but not the label) * - * @param panel + * @param container * @param tooltip * @param label - * @param valBox - * @return the GUI element created that was added to the layout so it's - * attributes can be changed. + * @param comp + * @param constraints */ - public static JPanel addtoLayout(JPanel panel, String tooltip, - JComponent label, JComponent valBox) - { - JPanel laypanel = new JPanel(new GridLayout(1, 2)); - JPanel labPanel = new JPanel(new BorderLayout()); - JPanel valPanel = new JPanel(); - labPanel.setBounds(new Rectangle(7, 7, 158, 23)); - valPanel.setBounds(new Rectangle(172, 7, 270, 23)); - labPanel.add(label, BorderLayout.WEST); - valPanel.add(valBox); - laypanel.add(labPanel); - laypanel.add(valPanel); - valPanel.setToolTipText(tooltip); - labPanel.setToolTipText(tooltip); - valBox.setToolTipText(tooltip); - panel.add(laypanel); - panel.validate(); - return laypanel; - } - - public static void mgAddtoLayout(JPanel cpanel, String tooltip, - JLabel jLabel, JComponent name) + public static void addtoLayout(Container container, String tooltip, + JComponent label, JComponent comp, String constraints) { - mgAddtoLayout(cpanel, tooltip, jLabel, name, null); - } - - public static void mgAddtoLayout(JPanel cpanel, String tooltip, - JLabel jLabel, JComponent name, String params) - { - cpanel.add(jLabel); - if (params == null) - { - cpanel.add(name); - } - else - { - cpanel.add(name, params); - } - name.setToolTipText(tooltip); - jLabel.setToolTipText(tooltip); + container.add(label); + container.add(comp, constraints); + comp.setToolTipText(tooltip); // this doesn't seem to show? + label.setToolTipText(tooltip); } /** @@ -202,8 +172,10 @@ public final class JvSwingUtils public static Font getLabelFont(boolean bold, boolean italic) { - return new java.awt.Font("Verdana", (!bold && !italic) ? Font.PLAIN - : (bold ? Font.BOLD : 0) + (italic ? Font.ITALIC : 0), 11); + return new java.awt.Font("Verdana", + (!bold && !italic) ? Font.PLAIN + : (bold ? Font.BOLD : 0) + (italic ? Font.ITALIC : 0), + 11); } /** @@ -279,8 +251,8 @@ public final class JvSwingUtils * of possible positions. */ float fraction = proportion - * (scrollbar.getMaximum() - scrollbar.getMinimum() - scrollbar - .getModel().getExtent()) + * (scrollbar.getMaximum() - scrollbar.getMinimum() + - scrollbar.getModel().getExtent()) + (scrollbar.getModel().getExtent() / 2f); return Math.min(Math.round(fraction), scrollbar.getMaximum()); } @@ -305,4 +277,71 @@ public final class JvSwingUtils comp.setFont(JvSwingUtils.getLabelFont()); } + /** + * A helper method to build a drop-down choice of values, with tooltips for + * the entries + * + * @param entries + * @param tooltips + */ + public static JComboBox