X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFontChooser.java;h=381fbe36f50b4532537f097b388a1cd0eba73170;hb=af4672ad3ed5b549ac78488e4e0aa9d2cde04ce9;hp=1504f41640c6d4e70be6471a588f3fc5cb0761bc;hpb=4cea7a0328724b90a6a7c16ae8c926e0cc12cedd;p=jalview.git

diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java
index 1504f41..381fbe3 100755
--- a/src/jalview/gui/FontChooser.java
+++ b/src/jalview/gui/FontChooser.java
@@ -1,28 +1,35 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, 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 <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * 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 jalview.bin.*;
-import jalview.jbgui.*;
+import javax.swing.JInternalFrame;
+import javax.swing.JLayeredPane;
+import javax.swing.JOptionPane;
+
+import jalview.bin.Cache;
+import jalview.jbgui.GFontChooser;
 import jalview.util.MessageManager;
 
 /**
@@ -39,6 +46,8 @@ public class FontChooser extends GFontChooser
 
   Font oldFont;
 
+  boolean oldProteinScale;
+
   boolean init = true;
 
   JInternalFrame frame;
@@ -68,6 +77,8 @@ public class FontChooser extends GFontChooser
   public FontChooser(AlignmentPanel ap)
   {
     oldFont = ap.av.getFont();
+    oldProteinScale = ap.av.isScaleProteinAsCdna();
+
     this.ap = ap;
     init();
   }
@@ -79,14 +90,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, MessageManager.getString("action.change_font_tree_panel"), 340, 170,
-              false);
+      Desktop.addInternalFrame(frame,
+              MessageManager.getString("action.change_font_tree_panel"),
+              400, 200, false);
     }
     else
     {
-      Desktop.addInternalFrame(frame, MessageManager.getString("action.change_font"), 340, 170, false);
+      Desktop.addInternalFrame(frame,
+              MessageManager.getString("action.change_font"), 380, 200,
+              false);
     }
 
     frame.setLayer(JLayeredPane.PALETTE_LAYER);
@@ -101,7 +127,7 @@ public class FontChooser extends GFontChooser
 
     for (int i = 1; i < 51; i++)
     {
-      fontSize.addItem(i + "");
+      fontSize.addItem(i);
     }
 
     fontStyle.addItem("plain");
@@ -109,7 +135,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 +149,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 +187,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
@@ -206,22 +238,26 @@ public class FontChooser extends GFontChooser
     }
 
     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)
     {
-      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);
+                      MessageManager.getString("label.font_doesnt_have_letters_defined"),
+                      MessageManager.getString("label.invalid_font"), JOptionPane.WARNING_MESSAGE);
+      /*
+       * Restore previous values - size first to avoid recursive calls to this
+       * point!
+       */
+      fontSize.setSelectedItem(lastSelSize);
+      fontName.setSelectedItem(lastSelected.getName());
+      fontStyle.setSelectedIndex(lastSelStyle);
+      monospaced.setSelected(lastSelMono);
       return;
     }
     if (tp != null)
@@ -230,7 +266,7 @@ public class FontChooser extends GFontChooser
     }
     else if (ap != null)
     {
-      ap.av.setFont(newFont);
+      ap.av.setFont(newFont, true);
       ap.fontChanged();
     }
 
@@ -288,10 +324,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 +336,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
   }
 }