X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJvSwingUtils.java;h=b6f85b3d11173c3394b28c20d717900aebdf9fcd;hb=93d63f3c608771bb48b5ac18f761194a1ea28554;hp=5d7cdd6c4e71eecf378b6263677868bc1cebd3fb;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git
diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java
index 5d7cdd6..b6f85b3 100644
--- a/src/jalview/gui/JvSwingUtils.java
+++ b/src/jalview/gui/JvSwingUtils.java
@@ -1,36 +1,44 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, 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.BorderLayout;
import java.awt.Color;
import java.awt.Font;
+import java.awt.GridLayout;
import java.awt.Rectangle;
import java.awt.event.ActionListener;
+import javax.swing.AbstractButton;
import javax.swing.JButton;
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 jalview.util.MessageManager;
+
/**
* useful functions for building Swing GUIs
*
@@ -44,20 +52,42 @@ public final class JvSwingUtils
*
*
* | field
+ * @param enclose TODO
+ * @param ttext
*
- * @param ttext
* @return
*/
- public static String wrapTooltip(String ttext)
+ public static String wrapTooltip(boolean enclose, String ttext)
{
- if (ttext.length() < 60)
+ ttext = ttext.trim();
+ boolean maxLenghtExceeded = false;
+
+ if (ttext.contains("
"))
{
- return ttext;
+ String[] htmllines = ttext.split("
");
+ for (String line : htmllines)
+ {
+ maxLenghtExceeded = line.length() > 60;
+ if (maxLenghtExceeded)
+ {
+ break;
+ }
+ }
}
else
{
- return "";
+ maxLenghtExceeded = ttext.length() > 60;
+ }
+
+ if (!maxLenghtExceeded)
+ {
+ return enclose ? "" + ttext + "" : ttext;
+ }
+ else
+ {
+ return (enclose ? ""
+ : "")
+ + ttext + ((enclose ? " |
" : ""));
}
}
@@ -100,7 +130,7 @@ public final class JvSwingUtils
menu.add(submenuinstance);
}
return submenuinstance;
-
+
}
/**
@@ -109,18 +139,22 @@ public final class JvSwingUtils
* @param tooltip
* @param label
* @param valBox
- * @return the GUI element created that was added to the layout so it's attributes can be changed.
+ * @return the GUI element created that was added to the layout so it's
+ * attributes can be changed.
*/
- public static JPanel addtoLayout(JPanel panel, String tooltip, JComponent label, JComponent valBox)
+ public static JPanel addtoLayout(JPanel panel, String tooltip,
+ JComponent label, JComponent valBox)
{
- JPanel laypanel = new JPanel(),labPanel=new JPanel(), valPanel=new JPanel();
+ JPanel laypanel = new JPanel(new GridLayout(1, 2));
+ JPanel labPanel = new JPanel(new BorderLayout());
+ 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.setBounds(new Rectangle(172, 7, 270, 23));
+ // labPanel.setLayout(new GridLayout(1,1));
+ // valPanel.setLayout(new GridLayout(1,1));
+ labPanel.add(label, BorderLayout.WEST);
valPanel.add(valBox);
laypanel.add(labPanel);
laypanel.add(valPanel);
@@ -135,60 +169,139 @@ public final class JvSwingUtils
public static void mgAddtoLayout(JPanel cpanel, String tooltip,
JLabel jLabel, JComponent name)
{
- mgAddtoLayout(cpanel, tooltip, jLabel, name,null);
+ 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) {
+ if (params == null)
+ {
cpanel.add(name);
- } else {cpanel.add(name, params);
+ }
+ else
+ {
+ cpanel.add(name, params);
}
name.setToolTipText(tooltip);
jLabel.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