X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJvSwingUtils.java;fp=src%2Fjalview%2Fgui%2FJvSwingUtils.java;h=90f11c31dc6b5e9b54b6748cf423ee64155e0bec;hb=b57a02c25e335d033c97f8a6bacd6b54f62bd2b6;hp=5d7cdd6c4e71eecf378b6263677868bc1cebd3fb;hpb=1cc81e06ac2faa5ee4b8879e9fa019956e34259f;p=jalview.git diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java index 5d7cdd6..90f11c3 100644 --- a/src/jalview/gui/JvSwingUtils.java +++ b/src/jalview/gui/JvSwingUtils.java @@ -100,7 +100,7 @@ public final class JvSwingUtils menu.add(submenuinstance); } return submenuinstance; - + } /** @@ -109,17 +109,19 @@ 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(), 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)); + 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); @@ -135,57 +137,69 @@ 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