X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFontChooser.java;h=80ac189eaf1f0c4263b427e11223feea1b8ea5bf;hb=a57976ba40e1abe6d7c1940386e1a25419ef9c9d;hp=afd2d625cddc22154aef5ea68c4b7c6f7174c8bc;hpb=2de8acfae59aced665e4c37ad0f7dcc2ed68818e;p=jalview.git diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java index afd2d62..80ac189 100755 --- a/src/jalview/gui/FontChooser.java +++ b/src/jalview/gui/FontChooser.java @@ -1,29 +1,35 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1) - * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * - * This program 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 2 - * of the License, or (at your option) any later version. + * This file is part of Jalview. * - * This program 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. + * 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. + * + * 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 this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.gui; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; +import jalview.bin.Cache; +import jalview.jbgui.GFontChooser; +import jalview.util.MessageManager; + +import java.awt.Font; +import java.awt.FontMetrics; +import java.awt.geom.Rectangle2D; -import jalview.bin.*; -import jalview.jbgui.*; +import javax.swing.JInternalFrame; +import javax.swing.JLayeredPane; /** * DOCUMENT ME! @@ -37,38 +43,69 @@ public class FontChooser extends GFontChooser TreePanel tp; + /* + * The font on opening the dialog (to be restored on Cancel) + */ Font oldFont; + /* + * The font on opening the dialog (to be restored on Cancel) + * on the other half of a split frame (if applicable) + */ + Font oldComplementFont; + + /* + * the state of 'scale protein as cDNA' on opening the dialog + */ + boolean oldProteinScale; + + /* + * the state of 'same font for protein and cDNA' on opening the dialog + */ + boolean oldMirrorFont; + boolean init = true; JInternalFrame frame; + /* + * The last font settings selected in the dialog + */ + private Font lastSelected = null; + + private boolean lastSelMono = false; + + private boolean oldSmoothFont; + + private boolean oldComplementSmooth; + /** - * Creates a new FontChooser object. + * Creates a new FontChooser for a tree panel * - * @param ap - * DOCUMENT ME! + * @param treePanel */ - public FontChooser(TreePanel tp) + public FontChooser(TreePanel treePanel) { - this.tp = tp; - ap = tp.treeCanvas.ap; - oldFont = tp.getTreeFont(); + this.tp = treePanel; + ap = treePanel.treeCanvas.ap; + oldFont = treePanel.getTreeFont(); defaultButton.setVisible(false); smoothFont.setEnabled(false); init(); } /** - * Creates a new FontChooser object. + * Creates a new FontChooser for an alignment panel * - * @param ap - * DOCUMENT ME! + * @param alignPanel */ - public FontChooser(AlignmentPanel ap) + public FontChooser(AlignmentPanel alignPanel) { - oldFont = ap.av.getFont(); - this.ap = ap; + oldFont = alignPanel.av.getFont(); + oldProteinScale = alignPanel.av.isScaleProteinAsCdna(); + oldMirrorFont = alignPanel.av.isProteinFontAsCdna(); + oldSmoothFont = alignPanel.av.antiAlias; + this.ap = alignPanel; init(); } @@ -79,14 +116,35 @@ 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. Also enable + * checkbox for copy font changes to other half of split frame. + */ + boolean inSplitFrame = ap.av.getCodingComplement() != null; + if (inSplitFrame) + { + oldComplementFont = ((AlignViewport) ap.av.getCodingComplement()) + .getFont(); + oldComplementSmooth = ((AlignViewport) ap.av + .getCodingComplement()).antiAlias; + scaleAsCdna.setVisible(true); + scaleAsCdna.setSelected(ap.av.isScaleProteinAsCdna()); + fontAsCdna.setVisible(true); + fontAsCdna.setSelected(ap.av.isProteinFontAsCdna()); + } + if (tp != null) { - Desktop.addInternalFrame(frame, "Change Font (Tree Panel)", 340, 170, - false); + Desktop.addInternalFrame(frame, + MessageManager.getString("action.change_font_tree_panel"), + 400, 200, false); } else { - Desktop.addInternalFrame(frame, "Change Font", 340, 170, false); + Desktop.addInternalFrame(frame, + MessageManager.getString("action.change_font"), 380, 220, + false); } frame.setLayer(JLayeredPane.PALETTE_LAYER); @@ -101,7 +159,7 @@ public class FontChooser extends GFontChooser for (int i = 1; i < 51; i++) { - fontSize.addItem(i + ""); + fontSize.addItem(i); } fontStyle.addItem("plain"); @@ -109,31 +167,42 @@ 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); - monospaced.setSelected(fm.getStringBounds("M", getGraphics()) - .getWidth() == fm.getStringBounds("|", getGraphics()) - .getWidth()); + monospaced.setSelected( + fm.getStringBounds("M", getGraphics()).getWidth() == fm + .getStringBounds("|", getGraphics()).getWidth()); init = false; } - public void smoothFont_actionPerformed(ActionEvent e) + @Override + protected void smoothFont_actionPerformed() { ap.av.antiAlias = smoothFont.isSelected(); - ap.annotationPanel.image = null; - ap.paintAlignment(true); + ap.getAnnotationPanel().image = null; + ap.paintAlignment(true, false); + if (ap.av.getCodingComplement() != null && ap.av.isProteinFontAsCdna()) + { + ((AlignViewport) ap.av + .getCodingComplement()).antiAlias = ap.av.antiAlias; + SplitFrame sv = (SplitFrame) ap.alignFrame.getSplitViewContainer(); + sv.adjustLayout(); + sv.repaint(); + } + } /** * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ - protected void ok_actionPerformed(ActionEvent e) + @Override + protected void ok_actionPerformed() { try { @@ -155,22 +224,36 @@ public class FontChooser extends GFontChooser * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ - protected void cancel_actionPerformed(ActionEvent e) + @Override + protected void cancel_actionPerformed() { if (ap != null) { - ap.av.setFont(oldFont); - ap.paintAlignment(true); + ap.av.setFont(oldFont, true); + ap.av.setScaleProteinAsCdna(oldProteinScale); + ap.av.setProteinFontAsCdna(oldMirrorFont); + ap.av.antiAlias = oldSmoothFont; + ap.paintAlignment(true, false); + + if (scaleAsCdna.isVisible() && scaleAsCdna.isEnabled()) + { + ap.av.getCodingComplement().setScaleProteinAsCdna(oldProteinScale); + ap.av.getCodingComplement().setProteinFontAsCdna(oldMirrorFont); + ((AlignViewport) ap.av + .getCodingComplement()).antiAlias = oldComplementSmooth; + ap.av.getCodingComplement().setFont(oldComplementFont, true); + SplitFrame splitFrame = (SplitFrame) ap.alignFrame + .getSplitViewContainer(); + splitFrame.adjustLayout(); + splitFrame.repaint(); + } } else if (tp != null) { tp.setTreeFont(oldFont); } - fontName.setSelectedItem(oldFont.getName()); - fontSize.setSelectedItem(oldFont.getSize() + ""); - fontStyle.setSelectedIndex(oldFont.getStyle()); try { @@ -185,34 +268,97 @@ public class FontChooser extends GFontChooser */ void changeFont() { + if (lastSelected == null) + { + // initialise with original font + lastSelected = oldFont; + FontMetrics fm = getGraphics().getFontMetrics(oldFont); + 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(); + final Rectangle2D iBounds = fm.getStringBounds("I", getGraphics()); + double iw = iBounds.getWidth(); + if (mw < 1 || iw < 1) + { + 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) { tp.setTreeFont(newFont); } else if (ap != null) { - ap.av.setFont(newFont); + ap.av.setFont(newFont, true); ap.fontChanged(); - } - FontMetrics fm = getGraphics().getFontMetrics(newFont); + /* + * adjust other half of split frame if present, whether or not same font or + * scale to cDNA is selected, because a font change may affect character + * width, and this is kept the same in both panels + */ + if (fontAsCdna.isVisible()) + { + if (fontAsCdna.isSelected()) + { + ap.av.getCodingComplement().setFont(newFont, true); + } + + SplitFrame splitFrame = (SplitFrame) ap.alignFrame + .getSplitViewContainer(); + splitFrame.adjustLayout(); + splitFrame.repaint(); + } + } - monospaced.setSelected(fm.getStringBounds("M", getGraphics()) - .getWidth() == fm.getStringBounds("|", getGraphics()) - .getWidth()); + monospaced.setSelected(mw == iw); + /* + * Remember latest valid selection, so it can be restored if followed by an + * invalid one + */ + lastSelected = newFont; } /** - * DOCUMENT ME! - * - * @param e - * DOCUMENT ME! + * Updates on change of selected font name */ - protected void fontName_actionPerformed(ActionEvent e) + @Override + protected void fontName_actionPerformed() { if (init) { @@ -223,12 +369,10 @@ public class FontChooser extends GFontChooser } /** - * DOCUMENT ME! - * - * @param e - * DOCUMENT ME! + * Updates on change of selected font size */ - protected void fontSize_actionPerformed(ActionEvent e) + @Override + protected void fontSize_actionPerformed() { if (init) { @@ -239,12 +383,10 @@ public class FontChooser extends GFontChooser } /** - * DOCUMENT ME! - * - * @param e - * DOCUMENT ME! + * Updates on change of selected font style */ - protected void fontStyle_actionPerformed(ActionEvent e) + @Override + protected void fontStyle_actionPerformed() { if (init) { @@ -255,17 +397,57 @@ public class FontChooser extends GFontChooser } /** - * DOCUMENT ME! - * - * @param e - * 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) */ - public void defaultButton_actionPerformed(ActionEvent e) + @Override + public void defaultButton_actionPerformed() { Cache.setProperty("FONT_NAME", fontName.getSelectedItem().toString()); Cache.setProperty("FONT_STYLE", fontStyle.getSelectedIndex() + ""); Cache.setProperty("FONT_SIZE", fontSize.getSelectedItem().toString()); - Cache.setProperty("ANTI_ALIAS", Boolean.toString(smoothFont - .isSelected())); + 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() + { + ap.av.setScaleProteinAsCdna(scaleAsCdna.isSelected()); + ap.av.getCodingComplement() + .setScaleProteinAsCdna(scaleAsCdna.isSelected()); + final SplitFrame splitFrame = (SplitFrame) ap.alignFrame + .getSplitViewContainer(); + splitFrame.adjustLayout(); + splitFrame.repaint(); + } + + /** + * Turn on/off mirroring of font across split frame. If turning on, also + * copies the current font across the split frame. If turning off, restores + * the other half of the split frame to its initial font. + */ + @Override + protected void mirrorFonts_actionPerformed() + { + boolean selected = fontAsCdna.isSelected(); + ap.av.setProteinFontAsCdna(selected); + ap.av.getCodingComplement().setProteinFontAsCdna(selected); + + /* + * reset other half of split frame if turning option off + */ + if (!selected) + { + ap.av.getCodingComplement().setFont(oldComplementFont, true); + } + + changeFont(); } }