X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFontChooser.java;h=8220aea35ecd327d5991f41d78d3e1729ada828f;hb=8feb5f87bd94e5d49c9dbc5fd7ec7e866ef80e9d;hp=72b7bd6854f1f3182005a6b9f78347aefd57836a;hpb=f69e96788c2ae3a08f56c4461d8d197a3b3a06a2;p=jalview.git diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java index 72b7bd6..8220aea 100755 --- a/src/jalview/gui/FontChooser.java +++ b/src/jalview/gui/FontChooser.java @@ -20,18 +20,19 @@ */ package jalview.gui; +import jalview.bin.Cache; +import jalview.jbgui.GFontChooser; +import jalview.util.MessageManager; + import java.awt.Font; import java.awt.FontMetrics; import java.awt.event.ActionEvent; +import java.awt.geom.Rectangle2D; import javax.swing.JInternalFrame; import javax.swing.JLayeredPane; import javax.swing.JOptionPane; -import jalview.bin.Cache; -import jalview.jbgui.GFontChooser; -import jalview.util.MessageManager; - /** * DOCUMENT ME! * @@ -44,6 +45,9 @@ public class FontChooser extends GFontChooser TreePanel tp; + /* + * The font on opening the dialog (to be restored on Cancel) + */ Font oldFont; boolean oldProteinScale; @@ -52,6 +56,13 @@ public class FontChooser extends GFontChooser JInternalFrame frame; + /* + * The last font settings selected in the dialog + */ + private Font lastSelected = null; + + private boolean lastSelMono = false; + /** * Creates a new FontChooser object. * @@ -91,12 +102,13 @@ public class FontChooser extends GFontChooser smoothFont.setSelected(ap.av.antiAlias); /* - * Enable 'scale protein as cDNA' in protein half of a SplitFrame view. The - * selection is stored in the ViewStyle of the Viewport + * Enable 'scale protein as cDNA' in a SplitFrame view. The selection is + * stored in the ViewStyle of both dna and protein Viewport */ - if (ap.av.getCodingComplement() != null - && !ap.av.getAlignment().isNucleotide()) + scaleAsCdna.setEnabled(false); + if (ap.av.getCodingComplement() != null) { + scaleAsCdna.setEnabled(true); scaleAsCdna.setVisible(true); scaleAsCdna.setSelected(ap.av.isScaleProteinAsCdna()); } @@ -145,6 +157,7 @@ public class FontChooser extends GFontChooser init = false; } + @Override public void smoothFont_actionPerformed(ActionEvent e) { ap.av.antiAlias = smoothFont.isSelected(); @@ -158,6 +171,7 @@ public class FontChooser extends GFontChooser * @param e * DOCUMENT ME! */ + @Override protected void ok_actionPerformed(ActionEvent e) { try @@ -182,6 +196,7 @@ public class FontChooser extends GFontChooser * @param e * DOCUMENT ME! */ + @Override protected void cancel_actionPerformed(ActionEvent e) { if (ap != null) @@ -189,6 +204,11 @@ public class FontChooser extends GFontChooser ap.av.setFont(oldFont, true); ap.av.setScaleProteinAsCdna(oldProteinScale); ap.paintAlignment(true); + if (scaleAsCdna.isEnabled()) + { + ap.av.setScaleProteinAsCdna(oldProteinScale); + ap.av.getCodingComplement().setScaleProteinAsCdna(oldProteinScale); + } } else if (tp != null) { @@ -206,14 +226,6 @@ public class FontChooser extends GFontChooser } } - private Font lastSelected = null; - - private int lastSelStyle = 0; - - private int lastSelSize = 0; - - private boolean lastSelMono = false; - /** * DOCUMENT ME! */ @@ -223,31 +235,48 @@ public class FontChooser extends GFontChooser { // initialise with original font lastSelected = oldFont; - lastSelSize = oldFont.getSize(); - lastSelStyle = oldFont.getStyle(); FontMetrics fm = getGraphics().getFontMetrics(oldFont); - double mw = fm.getStringBounds("M", getGraphics()).getWidth(), iw = fm - .getStringBounds("I", getGraphics()).getWidth(); - lastSelMono = mw == iw; + double mw = fm.getStringBounds("M", getGraphics()).getWidth(); + double iw = fm.getStringBounds("I", getGraphics()).getWidth(); + lastSelMono = (mw == iw); // == on double - flaky? } Font newFont = new Font(fontName.getSelectedItem().toString(), fontStyle.getSelectedIndex(), (Integer) fontSize.getSelectedItem()); FontMetrics fm = getGraphics().getFontMetrics(newFont); - double mw = fm.getStringBounds("M", getGraphics()).getWidth(), iw = fm - .getStringBounds("I", getGraphics()).getWidth(); + double mw = fm.getStringBounds("M", getGraphics()).getWidth(); + final Rectangle2D iBounds = fm.getStringBounds("I", getGraphics()); + double iw = iBounds.getWidth(); if (mw < 1 || iw < 1) { - fontName.setSelectedItem(lastSelected.getName()); - fontStyle.setSelectedIndex(lastSelStyle); - fontSize.setSelectedItem(lastSelSize); - monospaced.setSelected(lastSelMono); - JOptionPane - .showInternalMessageDialog( - this, - MessageManager.getString("label.font_doesnt_have_letters_defined"), - MessageManager.getString("label.invalid_font"), JOptionPane.WARNING_MESSAGE); + String message = iBounds.getHeight() < 1 ? MessageManager + .getString("label.font_doesnt_have_letters_defined") + : MessageManager.getString("label.font_too_small"); + JvOptionPane.showInternalMessageDialog(this, message, + MessageManager.getString("label.invalid_font"), + JvOptionPane.WARNING_MESSAGE); + /* + * Restore the changed value - note this will reinvoke this method via the + * ActionListener, but now validation should pass + */ + if (lastSelected.getSize() != (Integer) fontSize.getSelectedItem()) // autoboxing + { + fontSize.setSelectedItem(lastSelected.getSize()); + } + if (!lastSelected.getName().equals( + fontName.getSelectedItem().toString())) + { + fontName.setSelectedItem(lastSelected.getName()); + } + if (lastSelected.getStyle() != fontStyle.getSelectedIndex()) + { + fontStyle.setSelectedIndex(lastSelected.getStyle()); + } + if (lastSelMono != monospaced.isSelected()) + { + monospaced.setSelected(lastSelMono); + } return; } if (tp != null) @@ -261,7 +290,11 @@ public class FontChooser extends GFontChooser } monospaced.setSelected(mw == iw); - // remember last selected + + /* + * Remember latest valid selection, so it can be restored if followed by an + * invalid one + */ lastSelected = newFont; } @@ -271,6 +304,7 @@ public class FontChooser extends GFontChooser * @param e * DOCUMENT ME! */ + @Override protected void fontName_actionPerformed(ActionEvent e) { if (init) @@ -287,6 +321,7 @@ public class FontChooser extends GFontChooser * @param e * DOCUMENT ME! */ + @Override protected void fontSize_actionPerformed(ActionEvent e) { if (init) @@ -303,6 +338,7 @@ public class FontChooser extends GFontChooser * @param e * DOCUMENT ME! */ + @Override protected void fontStyle_actionPerformed(ActionEvent e) { if (init) @@ -314,11 +350,12 @@ public class FontChooser extends GFontChooser } /** - * DOCUMENT ME! + * Make selected settings the defaults by storing them (via Cache class) in + * the .jalview_properties file (the file is only written when Jalview exits) * * @param e - * DOCUMENT ME! */ + @Override public void defaultButton_actionPerformed(ActionEvent e) { Cache.setProperty("FONT_NAME", fontName.getSelectedItem().toString()); @@ -326,6 +363,8 @@ public class FontChooser extends GFontChooser Cache.setProperty("FONT_SIZE", fontSize.getSelectedItem().toString()); Cache.setProperty("ANTI_ALIAS", Boolean.toString(smoothFont.isSelected())); + Cache.setProperty(Preferences.SCALE_PROTEIN_TO_CDNA, + Boolean.toString(scaleAsCdna.isSelected())); } /** @@ -336,7 +375,13 @@ public class FontChooser extends GFontChooser protected void scaleAsCdna_actionPerformed(ActionEvent e) { ap.av.setScaleProteinAsCdna(scaleAsCdna.isSelected()); - ((SplitFrame) ap.alignFrame.getSplitViewContainer()).adjustLayout(); - ap.paintAlignment(true); + ap.av.getCodingComplement().setScaleProteinAsCdna( + scaleAsCdna.isSelected()); + final SplitFrame splitFrame = (SplitFrame) ap.alignFrame + .getSplitViewContainer(); + splitFrame.adjustLayout(); + splitFrame.repaint(); + // ap.paintAlignment(true); + // TODO would like to repaint } }