X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFontChooser.java;h=5e137810f4b6e2399188a9e548408248db5dddd0;hb=e0c4027fce496e56101696f10559eb3ea94c7e7e;hp=d12c69721987f3775d72acb50ad4ae7cefb91a1c;hpb=973ea5b735c3725ca2d1208c6dd32f2671069bbb;p=jalview.git
diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java
index d12c697..5e13781 100755
--- a/src/jalview/gui/FontChooser.java
+++ b/src/jalview/gui/FontChooser.java
@@ -1,28 +1,36 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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 java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.event.ActionEvent;
+
+import javax.swing.JInternalFrame;
+import javax.swing.JLayeredPane;
+import javax.swing.JOptionPane;
-import jalview.bin.*;
-import jalview.jbgui.*;
+import jalview.bin.Cache;
+import jalview.jbgui.GFontChooser;
+import jalview.util.MessageManager;
/**
* DOCUMENT ME!
@@ -38,6 +46,8 @@ public class FontChooser extends GFontChooser
Font oldFont;
+ boolean oldProteinScale;
+
boolean init = true;
JInternalFrame frame;
@@ -67,6 +77,8 @@ public class FontChooser extends GFontChooser
public FontChooser(AlignmentPanel ap)
{
oldFont = ap.av.getFont();
+ oldProteinScale = ap.av.isScaleProteinAsCdna();
+
this.ap = ap;
init();
}
@@ -78,14 +90,27 @@ 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
+ */
+ if (ap.av.getCodingComplement() != null)
+ {
+ 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);
@@ -100,7 +125,7 @@ public class FontChooser extends GFontChooser
for (int i = 1; i < 51; i++)
{
- fontSize.addItem(i + "");
+ fontSize.addItem(i);
}
fontStyle.addItem("plain");
@@ -108,7 +133,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);
@@ -122,7 +147,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);
}
@@ -160,15 +185,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
@@ -179,41 +210,48 @@ public class FontChooser extends GFontChooser
}
}
- private Font lastSelected=null;
- private int lastSelStyle=0;
- private int lastSelSize=0;
- private boolean lastSelMono=false;
+ private Font lastSelected = null;
+
+ private int lastSelStyle = 0;
+
+ private int lastSelSize = 0;
+
+ private boolean lastSelMono = false;
+
/**
* DOCUMENT ME!
*/
void changeFont()
{
- if (lastSelected==null)
+ if (lastSelected == null)
{
// initialise with original font
- lastSelected=oldFont;
- lastSelSize=oldFont.getSize();
- lastSelStyle=oldFont.getStyle();
+ 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(), iw = fm
+ .getStringBounds("I", getGraphics()).getWidth();
+ lastSelMono = mw == iw;
}
-
+
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();
- if (mw<1 || iw < 1) {
+ double mw = fm.getStringBounds("M", getGraphics()).getWidth(), iw = fm
+ .getStringBounds("I", getGraphics()).getWidth();
+ if (mw < 1 || iw < 1)
+ {
fontName.setSelectedItem(lastSelected.getName());
fontStyle.setSelectedIndex(lastSelStyle);
- fontSize.setSelectedItem(""+lastSelSize);
+ 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);
+ JOptionPane
+ .showInternalMessageDialog(
+ this,
+ MessageManager.getString("label.font_doesnt_have_letters_defined"),
+ MessageManager.getString("label.invalid_font"), JOptionPane.WARNING_MESSAGE);
return;
}
if (tp != null)
@@ -222,14 +260,13 @@ public class FontChooser extends GFontChooser
}
else if (ap != null)
{
- ap.av.setFont(newFont);
+ ap.av.setFont(newFont, true);
ap.fontChanged();
}
-
- monospaced.setSelected(mw==iw);
+ monospaced.setSelected(mw == iw);
// remember last selected
- lastSelected=newFont;
+ lastSelected = newFont;
}
/**
@@ -281,10 +318,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)
{
@@ -293,5 +330,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
}
}