X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fappletgui%2FFontChooser.java;h=48f11b5d6537ed8f31d1b1ab8cbb95c431fe6ec7;hb=6e514532a128c47d099985375d6126111ef548cb;hp=7a27df89754ca2375e4c73b44391e22d524bd400;hpb=a45774ee31d9f35d4eff46d54d7deab719afb092;p=jalview.git
diff --git a/src/jalview/appletgui/FontChooser.java b/src/jalview/appletgui/FontChooser.java
old mode 100755
new mode 100644
index 7a27df8..48f11b5
--- a/src/jalview/appletgui/FontChooser.java
+++ b/src/jalview/appletgui/FontChooser.java
@@ -1,24 +1,43 @@
/*
- * 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 .
+ * 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.appletgui;
-import java.awt.*;
-import java.awt.event.*;
+import jalview.api.ViewStyleI;
+import jalview.util.MessageManager;
+
+import java.awt.BorderLayout;
+import java.awt.Button;
+import java.awt.Choice;
+import java.awt.Color;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Frame;
+import java.awt.Label;
+import java.awt.Panel;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
public class FontChooser extends Panel implements ActionListener,
ItemListener
@@ -29,6 +48,8 @@ public class FontChooser extends Panel implements ActionListener,
Font oldFont;
+ int oldCharWidth = 0;
+
boolean init = true;
Frame frame;
@@ -60,6 +81,7 @@ public class FontChooser extends Panel implements ActionListener,
this.ap = ap;
oldFont = ap.av.getFont();
+ oldCharWidth = ap.av.getViewStyle().getCharWidth();
init();
}
@@ -87,7 +109,8 @@ public class FontChooser extends Panel implements ActionListener,
Frame frame = new Frame();
this.frame = frame;
frame.add(this);
- jalview.bin.JalviewLite.addFrame(frame, "Change Font", 440, 115);
+ jalview.bin.JalviewLite.addFrame(frame,
+ MessageManager.getString("action.change_font"), 440, 115);
init = false;
}
@@ -138,6 +161,12 @@ public class FontChooser extends Panel implements ActionListener,
if (ap != null)
{
ap.av.setFont(oldFont);
+ ViewStyleI style = ap.av.getViewStyle();
+ if (style.getCharWidth() != oldCharWidth)
+ {
+ style.setCharWidth(oldCharWidth);
+ ap.av.setViewStyle(style);
+ }
ap.paintAlignment(true);
}
else if (tp != null)
@@ -153,20 +182,60 @@ public class FontChooser extends Panel implements ActionListener,
frame.setVisible(false);
}
+ private Font lastSelected = null;
+
+ private int lastSelStyle = 0;
+
+ private int lastSelSize = 0;
+
+ /**
+ * DOCUMENT ME!
+ */
void changeFont()
{
+ if (lastSelected == null)
+ {
+ // initialise with original font
+ lastSelected = oldFont;
+ lastSelSize = oldFont.getSize();
+ lastSelStyle = oldFont.getStyle();
+ }
+
Font newFont = new Font(fontName.getSelectedItem().toString(),
fontStyle.getSelectedIndex(), Integer.parseInt(fontSize
.getSelectedItem().toString()));
- if (ap != null)
+ FontMetrics fm = getGraphics().getFontMetrics(newFont);
+ double mw = fm.getStringBounds("M", getGraphics()).getWidth(), iw = fm
+ .getStringBounds("I", getGraphics()).getWidth();
+ if (mw < 1 || iw < 1)
{
- ap.av.setFont(newFont);
- ap.fontChanged();
+ // TODO: JAL-1100
+ fontName.select(lastSelected.getName());
+ fontStyle.select(lastSelStyle);
+ fontSize.select("" + lastSelSize);
+ JVDialog d = new JVDialog(this.frame,
+ MessageManager.getString("label.invalid_font"), true, 350,
+ 200);
+ Panel mp = new Panel();
+ d.cancel.setVisible(false);
+ mp.setLayout(new FlowLayout());
+ mp.add(new Label(
+ "Font doesn't have letters defined\nso cannot be used\nwith alignment data."));
+ d.setMainPanel(mp);
+ d.setVisible(true);
+ return;
}
- else if (tp != null)
+ if (tp != null)
{
tp.setTreeFont(newFont);
}
+ else if (ap != null)
+ {
+ ap.av.setFont(newFont);
+ ap.fontChanged();
+ }
+ // remember last selected
+ lastSelected = newFont;
}
protected void fontName_actionPerformed()
@@ -234,7 +303,7 @@ public class FontChooser extends Panel implements ActionListener,
{
label1.setFont(new java.awt.Font("Verdana", 0, 11));
label1.setAlignment(Label.RIGHT);
- label1.setText("Font: ");
+ label1.setText(MessageManager.getString("label.font"));
this.setLayout(borderLayout4);
fontSize.setFont(new java.awt.Font("Verdana", 0, 11));
fontSize.addItemListener(this);
@@ -242,17 +311,17 @@ public class FontChooser extends Panel implements ActionListener,
fontStyle.addItemListener(this);
label2.setAlignment(Label.RIGHT);
label2.setFont(new java.awt.Font("Verdana", 0, 11));
- label2.setText("Size: ");
+ label2.setText(MessageManager.getString("label.size"));
label3.setAlignment(Label.RIGHT);
label3.setFont(new java.awt.Font("Verdana", 0, 11));
- label3.setText("Style: ");
+ label3.setText(MessageManager.getString("label.style"));
fontName.setFont(new java.awt.Font("Verdana", 0, 11));
fontName.addItemListener(this);
ok.setFont(new java.awt.Font("Verdana", 0, 11));
- ok.setLabel("OK");
+ ok.setLabel(MessageManager.getString("action.ok"));
ok.addActionListener(this);
cancel.setFont(new java.awt.Font("Verdana", 0, 11));
- cancel.setLabel("Cancel");
+ cancel.setLabel(MessageManager.getString("action.cancel"));
cancel.addActionListener(this);
this.setBackground(Color.white);
panel1.setLayout(borderLayout1);