X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFontChooser.java;h=4fa9180756c5e5fbe5103c9fe21124097bab7cdd;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=11495912fc83ddaf646f75e9889ab1fced6129a3;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git
diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java
index 1149591..4fa9180 100755
--- a/src/jalview/gui/FontChooser.java
+++ b/src/jalview/gui/FontChooser.java
@@ -1,29 +1,37 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
+ * Copyright (C) 2015 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.*;
-import java.awt.event.*;
-import javax.swing.*;
+import jalview.bin.Cache;
+import jalview.jbgui.GFontChooser;
+import jalview.util.MessageManager;
-import jalview.bin.*;
-import jalview.jbgui.*;
+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!
@@ -37,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.
*
@@ -68,6 +88,8 @@ public class FontChooser extends GFontChooser
public FontChooser(AlignmentPanel ap)
{
oldFont = ap.av.getFont();
+ oldProteinScale = ap.av.isScaleProteinAsCdna();
+
this.ap = ap;
init();
}
@@ -79,14 +101,29 @@ 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, "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, 200,
+ false);
}
frame.setLayer(JLayeredPane.PALETTE_LAYER);
@@ -101,7 +138,7 @@ public class FontChooser extends GFontChooser
for (int i = 1; i < 51; i++)
{
- fontSize.addItem(i + "");
+ fontSize.addItem(i);
}
fontStyle.addItem("plain");
@@ -109,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);
@@ -123,7 +160,7 @@ public class FontChooser extends GFontChooser
public void smoothFont_actionPerformed(ActionEvent e)
{
ap.av.antiAlias = smoothFont.isSelected();
- ap.annotationPanel.image = null;
+ ap.getAnnotationPanel().image = null;
ap.paintAlignment(true);
}
@@ -161,15 +198,21 @@ public class FontChooser extends GFontChooser
{
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
@@ -180,14 +223,6 @@ public class FontChooser extends GFontChooser
}
}
- private Font lastSelected = null;
-
- private int lastSelStyle = 0;
-
- private int lastSelSize = 0;
-
- private boolean lastSelMono = false;
-
/**
* DOCUMENT ME!
*/
@@ -197,31 +232,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,
- "Font doesn't have letters defined\nso cannot be used\nwith alignment data.",
- "Invalid Font", JOptionPane.WARNING_MESSAGE);
+ final String messageKey = iBounds.getHeight() < 1 ? "label.font_doesnt_have_letters_defined"
+ : "label.font_too_small";
+ JOptionPane.showInternalMessageDialog(this,
+ MessageManager.getString(messageKey),
+ 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)
@@ -230,12 +282,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;
}
@@ -288,10 +344,10 @@ 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!
*/
public void defaultButton_actionPerformed(ActionEvent e)
{
@@ -300,5 +356,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
}
}