X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFontChooser.java;h=1f6c0680cad5c885f712e99d213be47a99846cd4;hb=37de9310bec3501cbc6381e0c3dcb282fcaad812;hp=248277e9efb03f04ad2faaa7c7afa573f1b7b52d;hpb=25aaaa87042b3f507ad4348120df7dd073182759;p=jalview.git diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java index 248277e..1f6c068 100755 --- a/src/jalview/gui/FontChooser.java +++ b/src/jalview/gui/FontChooser.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -20,14 +20,19 @@ */ package jalview.gui; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; - -import jalview.bin.*; -import jalview.jbgui.*; +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; + /** * DOCUMENT ME! * @@ -40,12 +45,24 @@ public class FontChooser extends GFontChooser TreePanel tp; + /* + * The font on opening the dialog (to be restored on Cancel) + */ Font oldFont; + boolean oldProteinScale; + boolean init = true; JInternalFrame frame; + /* + * The last font settings selected in the dialog + */ + private Font lastSelected = null; + + private boolean lastSelMono = false; + /** * Creates a new FontChooser object. * @@ -71,6 +88,8 @@ public class FontChooser extends GFontChooser public FontChooser(AlignmentPanel ap) { oldFont = ap.av.getFont(); + oldProteinScale = ap.av.isScaleProteinAsCdna(); + this.ap = ap; init(); } @@ -82,16 +101,28 @@ public class FontChooser extends GFontChooser smoothFont.setSelected(ap.av.antiAlias); + /* + * Enable 'scale protein as cDNA' in a SplitFrame view. The selection is + * stored in the ViewStyle of both dna and protein Viewport + */ + scaleAsCdna.setEnabled(false); + if (ap.av.getCodingComplement() != null) + { + scaleAsCdna.setEnabled(true); + scaleAsCdna.setVisible(true); + scaleAsCdna.setSelected(ap.av.isScaleProteinAsCdna()); + } + if (tp != null) { Desktop.addInternalFrame(frame, MessageManager.getString("action.change_font_tree_panel"), - 340, 170, false); + 400, 200, false); } else { Desktop.addInternalFrame(frame, - MessageManager.getString("action.change_font"), 340, 170, + MessageManager.getString("action.change_font"), 380, 200, false); } @@ -107,7 +138,7 @@ public class FontChooser extends GFontChooser for (int i = 1; i < 51; i++) { - fontSize.addItem(i + ""); + fontSize.addItem(i); } fontStyle.addItem("plain"); @@ -115,7 +146,7 @@ public class FontChooser extends GFontChooser fontStyle.addItem("italic"); fontName.setSelectedItem(oldFont.getName()); - fontSize.setSelectedItem(oldFont.getSize() + ""); + fontSize.setSelectedItem(oldFont.getSize()); fontStyle.setSelectedIndex(oldFont.getStyle()); FontMetrics fm = getGraphics().getFontMetrics(oldFont); @@ -126,6 +157,7 @@ public class FontChooser extends GFontChooser init = false; } + @Override public void smoothFont_actionPerformed(ActionEvent e) { ap.av.antiAlias = smoothFont.isSelected(); @@ -139,6 +171,7 @@ public class FontChooser extends GFontChooser * @param e * DOCUMENT ME! */ + @Override protected void ok_actionPerformed(ActionEvent e) { try @@ -163,19 +196,26 @@ public class FontChooser extends GFontChooser * @param e * DOCUMENT ME! */ + @Override protected void cancel_actionPerformed(ActionEvent e) { if (ap != null) { - ap.av.setFont(oldFont); + 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) { tp.setTreeFont(oldFont); } fontName.setSelectedItem(oldFont.getName()); - fontSize.setSelectedItem(oldFont.getSize() + ""); + fontSize.setSelectedItem(oldFont.getSize()); fontStyle.setSelectedIndex(oldFont.getStyle()); try @@ -186,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! */ @@ -203,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.parseInt(fontSize - .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"); + JOptionPane.showInternalMessageDialog(this, message, + MessageManager.getString("label.invalid_font"), + JOptionPane.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) @@ -236,12 +285,16 @@ public class FontChooser extends GFontChooser } else if (ap != null) { - ap.av.setFont(newFont); + ap.av.setFont(newFont, true); ap.fontChanged(); } monospaced.setSelected(mw == iw); - // remember last selected + + /* + * Remember latest valid selection, so it can be restored if followed by an + * invalid one + */ lastSelected = newFont; } @@ -251,6 +304,7 @@ public class FontChooser extends GFontChooser * @param e * DOCUMENT ME! */ + @Override protected void fontName_actionPerformed(ActionEvent e) { if (init) @@ -267,6 +321,7 @@ public class FontChooser extends GFontChooser * @param e * DOCUMENT ME! */ + @Override protected void fontSize_actionPerformed(ActionEvent e) { if (init) @@ -283,6 +338,7 @@ public class FontChooser extends GFontChooser * @param e * DOCUMENT ME! */ + @Override protected void fontStyle_actionPerformed(ActionEvent e) { if (init) @@ -294,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()); @@ -306,5 +363,25 @@ 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())); + } + + /** + * Turn on/off scaling of protein characters to 3 times the width of cDNA + * characters + */ + @Override + protected void scaleAsCdna_actionPerformed(ActionEvent e) + { + ap.av.setScaleProteinAsCdna(scaleAsCdna.isSelected()); + 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 } }