import java.awt.event.*;\r
import javax.swing.*;\r
import javax.swing.event.*;\r
+import jalview.bin.Cache;\r
\r
\r
public class FontChooser extends GFontChooser\r
boolean init = true;\r
JInternalFrame frame;\r
\r
- public FontChooser(AlignmentPanel ap, JInternalFrame f)\r
+ public FontChooser(AlignmentPanel ap)\r
{\r
+ frame = new JInternalFrame();\r
+ frame.setContentPane(this);\r
+ Desktop.addInternalFrame(frame, "Change Font", 480,100, false);\r
+ frame.setLayer(JLayeredPane.PALETTE_LAYER);\r
+\r
this.ap = ap;\r
- frame = f;\r
String fonts[] = java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();\r
for(int i=0; i<fonts.length; i++)\r
fontName.addItem(fonts[i]);\r
frame.setClosed(true);\r
}catch(Exception ex){}\r
\r
- jalview.bin.Cache.setProperty("FONT_NAME", fontName.getSelectedItem().toString());\r
- jalview.bin.Cache.setProperty("FONT_STYLE", fontStyle.getSelectedIndex()+"");\r
- jalview.bin.Cache.setProperty("FONT_SIZE", fontSize.getSelectedItem().toString());\r
+ if(ap.getOverviewPanel()!=null)\r
+ ap.getOverviewPanel().updateOverviewImage();\r
}\r
\r
protected void cancel_actionPerformed(ActionEvent e)\r
{\r
ap.av.setFont(oldFont);\r
- ap.RefreshPanels();\r
+ ap.repaint();\r
fontName.setSelectedItem(oldFont.getName());\r
fontSize.setSelectedItem(oldFont.getSize()+"");\r
fontStyle.setSelectedIndex(oldFont.getStyle());\r
+ try{\r
+ frame.setClosed(true);\r
+ }catch(Exception ex){}\r
}\r
\r
void changeFont()\r
Integer.parseInt(fontSize.getSelectedItem().toString())\r
);\r
ap.av.setFont(newFont);\r
- ap.annotationPanel.adjustPanelHeight();\r
- ap.repaint();\r
+ ap.fontChanged();\r
}\r
\r
protected void fontName_actionPerformed(ActionEvent e)\r
changeFont();\r
}\r
\r
+ public void defaultButton_actionPerformed(ActionEvent e)\r
+ {\r
+ Cache.setProperty("FONT_NAME", fontName.getSelectedItem().toString());\r
+ Cache.setProperty("FONT_STYLE", fontStyle.getSelectedIndex()+"");\r
+ Cache.setProperty("FONT_SIZE", fontSize.getSelectedItem().toString());\r
+ }\r
+\r
+\r
\r
}\r