X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJvSwingUtils.java;h=8a735ed6e937fab580fdaf9c60b7671f13384356;hb=0751c58086542f9e0466201b624f84d1efd547bb;hp=9573e1facc94d6dcf50065cb7bd8140efd286659;hpb=a45774ee31d9f35d4eff46d54d7deab719afb092;p=jalview.git
diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java
index 9573e1f..8a735ed 100644
--- a/src/jalview/gui/JvSwingUtils.java
+++ b/src/jalview/gui/JvSwingUtils.java
@@ -1,35 +1,49 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.gui;
import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
import java.awt.Font;
-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.JTextArea;
+import javax.swing.JScrollBar;
import javax.swing.SwingConstants;
+import javax.swing.border.Border;
+import javax.swing.border.TitledBorder;
+
+import jalview.util.MessageManager;
+import jalview.util.Platform;
/**
* useful functions for building Swing GUIs
@@ -39,26 +53,60 @@ import javax.swing.SwingConstants;
*/
public final class JvSwingUtils
{
+ static final String HTML_PREFIX = (Platform.isJS() ?
+ "
"
+ : "
"
+ );
+
/**
- * wrap a bare html safe string to around 60 characters per line using a
- *
- *
- *
field
+ * wrap a bare html safe string to around 60 characters per line using a CSS
+ * style class specifying word-wrap and break-word
*
+ * @param enclose
+ * if true, add <html> wrapper tags (currently false for only
+ * two references -- both in Jws2Discoverer --
* @param ttext
+ *
* @return
*/
- public static String wrapTooltip(String ttext)
+ public static String wrapTooltip(boolean enclose, String ttext)
{
- if (ttext.length() < 60)
+ Objects.requireNonNull(ttext,
+ "Tootip text to format must not be null!");
+ ttext = ttext.trim().replaceAll(" ", " ");
+
+ boolean maxLengthExceeded = false;
+ boolean isHTML = ttext.startsWith("");
+ if (isHTML)
{
- return ttext;
+ ttext = ttext.substring(6);
}
- else
+ if (ttext.endsWith(""))
{
- return "
" + ttext
- + "
";
+ isHTML = true;
+ ttext = ttext.substring(0, ttext.length() - 7);
}
+ boolean hasBR = ttext.contains(" ");
+ enclose |= isHTML || hasBR;
+ if (hasBR)
+ {
+ int pt = -1, ptlast = -4;
+ while ((pt = ttext.indexOf(" ", pt + 1)) >= 0) {
+ if (pt - ptlast - 4 > 60) {
+ maxLengthExceeded = true;
+ break;
+ }
+ }
+ }
+ else
+ {
+ maxLengthExceeded = ttext.length() > 60;
+ }
+
+ String ret = (!enclose ? ttext : maxLengthExceeded ? HTML_PREFIX + ttext + "" :
+ "" + ttext + "");
+ //System.out.println("JvSwUtil " + enclose + " " + maxLengthExceeded + " " + ret);
+ return ret;
}
public static JButton makeButton(String label, String tooltip,
@@ -88,8 +136,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);
}
@@ -100,95 +148,212 @@ public final class JvSwingUtils
menu.add(submenuinstance);
}
return submenuinstance;
-
+
}
/**
+ * 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)
+ public static void addtoLayout(Container container, String tooltip,
+ JComponent label, JComponent comp, String constraints)
{
- JPanel laypanel = new JPanel(),labPanel=new JPanel(), valPanel=new JPanel();
- // laypanel.setSize(panel.getPreferredSize());
- // laypanel.setLayout(null);
- labPanel.setBounds(new Rectangle(7, 7, 158, 23));
- valPanel.setBounds(new Rectangle(172, 7, 270,23));
- //labPanel.setLayout(new GridLayout(1,1));
- //valPanel.setLayout(new GridLayout(1,1));
- labPanel.add(label);
- 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)
- {
- 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);
}
/**
- * standard font for labels and check boxes in dialog boxes
+ * standard font for labels and check boxes in dialog boxes
+ *
* @return
*/
public static Font getLabelFont()
{
- return getLabelFont(false,false);
+ return getLabelFont(false, false);
}
+
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);
}
/**
* standard font for editable text areas
+ *
* @return
*/
public static Font getTextAreaFont()
{
- return getLabelFont(false,false);
+ return getLabelFont(false, false);
}
/**
- * clean up a swing menu.
- * Removes any empty submenus without selection listeners.
+ * clean up a swing menu. Removes any empty submenus without selection
+ * listeners.
+ *
* @param webService
*/
public static void cleanMenu(JMenu webService)
{
- for (int i=0;i buildComboWithTooltips(
+ List