X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFontChooser.java;h=36e4c52eaf8e33b43dda7f700680b512d66393c4;hb=cca50cb3aee94f3ed1a5e504d45b8d8b665f8c5b;hp=310361a8671986324623d83d792afb6498699553;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git

diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java
index 310361a..36e4c52 100755
--- a/src/jalview/gui/FontChooser.java
+++ b/src/jalview/gui/FontChooser.java
@@ -1,19 +1,22 @@
 /*
- * 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 2.8.2)
+ * Copyright (C) 2014 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;
 
@@ -23,6 +26,7 @@ import javax.swing.*;
 
 import jalview.bin.*;
 import jalview.jbgui.*;
+import jalview.util.MessageManager;
 
 /**
  * DOCUMENT ME!
@@ -80,12 +84,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 +129,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);
   }
 
@@ -179,14 +186,50 @@ 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);
@@ -197,12 +240,9 @@ public class FontChooser extends GFontChooser
       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;
   }
 
   /**