X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFontChooser.java;h=fc66965e48f5e5b23fa85f0dcd34bb047d519c2d;hb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;hp=d996aaf58e0f69e5d92e5f3f2cad3dd34d453bf6;hpb=a45774ee31d9f35d4eff46d54d7deab719afb092;p=jalview.git

diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java
index d996aaf..fc66965 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, 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 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 jalview.bin.*;
-import jalview.jbgui.*;
+import javax.swing.JInternalFrame;
+import javax.swing.JLayeredPane;
+import javax.swing.JOptionPane;
 
 /**
  * DOCUMENT ME!
@@ -80,12 +88,15 @@ public class FontChooser extends GFontChooser
 
     if (tp != null)
     {
-      Desktop.addInternalFrame(frame, "Change Font (Tree Panel)", 340, 170,
-              false);
+      Desktop.addInternalFrame(frame,
+              MessageManager.getString("action.change_font_tree_panel"),
+              340, 170, false);
     }
     else
     {
-      Desktop.addInternalFrame(frame, "Change Font", 340, 170, false);
+      Desktop.addInternalFrame(frame,
+              MessageManager.getString("action.change_font"), 340, 170,
+              false);
     }
 
     frame.setLayer(JLayeredPane.PALETTE_LAYER);
@@ -122,7 +133,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,7 +171,7 @@ public class FontChooser extends GFontChooser
   {
     if (ap != null)
     {
-      ap.av.setFont(oldFont);
+      ap.av.setFont(oldFont, true);
       ap.paintAlignment(true);
     }
     else if (tp != null)
@@ -179,30 +190,63 @@ public class FontChooser extends GFontChooser
     }
   }
 
+  private Font lastSelected = null;
+
+  private int lastSelStyle = 0;
+
+  private int lastSelSize = 0;
+
+  private boolean lastSelMono = false;
+
   /**
    * DOCUMENT ME!
    */
   void changeFont()
   {
+    if (lastSelected == null)
+    {
+      // 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;
+    }
+
     Font newFont = new Font(fontName.getSelectedItem().toString(),
             fontStyle.getSelectedIndex(), Integer.parseInt(fontSize
                     .getSelectedItem().toString()));
+    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,
+                      MessageManager.getString("label.font_doesnt_have_letters_defined"),
+                      MessageManager.getString("label.invalid_font"), JOptionPane.WARNING_MESSAGE);
+      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);
-
-    monospaced.setSelected(fm.getStringBounds("M", getGraphics())
-            .getWidth() == fm.getStringBounds("|", getGraphics())
-            .getWidth());
-
+    monospaced.setSelected(mw == iw);
+    // remember last selected
+    lastSelected = newFont;
   }
 
   /**