git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3446 Dynamic menu - Moves calc sortby tree item creation to opening
[jalview.git]
/
src
/
jalview
/
gui
/
FontChooser.java
diff --git
a/src/jalview/gui/FontChooser.java
b/src/jalview/gui/FontChooser.java
index
20a6289
..
2d9682b
100755
(executable)
--- a/
src/jalview/gui/FontChooser.java
+++ b/
src/jalview/gui/FontChooser.java
@@
-87,7
+87,7
@@
public class FontChooser extends GFontChooser
public FontChooser(TreePanel treePanel)
{
this.tp = treePanel;
public FontChooser(TreePanel treePanel)
{
this.tp = treePanel;
- ap = treePanel.treeCanvas.ap;
+ ap = treePanel.getTreeCanvas().getAssociatedPanel();
oldFont = treePanel.getTreeFont();
defaultButton.setVisible(false);
smoothFont.setEnabled(false);
oldFont = treePanel.getTreeFont();
defaultButton.setVisible(false);
smoothFont.setEnabled(false);
@@
-126,24
+126,25
@@
public class FontChooser extends GFontChooser
{
oldComplementFont = ((AlignViewport) ap.av.getCodingComplement())
.getFont();
{
oldComplementFont = ((AlignViewport) ap.av.getCodingComplement())
.getFont();
- oldComplementSmooth = ((AlignViewport) ap.av.getCodingComplement()).antiAlias;
+ oldComplementSmooth = ((AlignViewport) ap.av
+ .getCodingComplement()).antiAlias;
scaleAsCdna.setVisible(true);
scaleAsCdna.setSelected(ap.av.isScaleProteinAsCdna());
fontAsCdna.setVisible(true);
fontAsCdna.setSelected(ap.av.isProteinFontAsCdna());
}
scaleAsCdna.setVisible(true);
scaleAsCdna.setSelected(ap.av.isScaleProteinAsCdna());
fontAsCdna.setVisible(true);
fontAsCdna.setSelected(ap.av.isProteinFontAsCdna());
}
- if (tp != null)
+ if (isTreeFont())
{
Desktop.addInternalFrame(frame,
{
Desktop.addInternalFrame(frame,
- MessageManager.getString("action.change_font_tree_panel"),
- 400, 200, false);
+ MessageManager.getString("action.change_font_tree_panel"), Desktop.FRAME_MAKE_VISIBLE,
+ 400, 200, Desktop.FRAME_NOT_RESIZABLE, Desktop.FRAME_SET_MIN_SIZE_300);
}
else
{
Desktop.addInternalFrame(frame,
}
else
{
Desktop.addInternalFrame(frame,
- MessageManager.getString("action.change_font"), 380, 220,
- false);
+ MessageManager.getString("action.change_font"), Desktop.FRAME_MAKE_VISIBLE, 380, 220,
+ Desktop.FRAME_NOT_RESIZABLE, Desktop.FRAME_SET_MIN_SIZE_300);
}
frame.setLayer(JLayeredPane.PALETTE_LAYER);
}
frame.setLayer(JLayeredPane.PALETTE_LAYER);
@@
-170,9
+171,9
@@
public class FontChooser extends GFontChooser
fontStyle.setSelectedIndex(oldFont.getStyle());
FontMetrics fm = getGraphics().getFontMetrics(oldFont);
fontStyle.setSelectedIndex(oldFont.getStyle());
FontMetrics fm = getGraphics().getFontMetrics(oldFont);
- monospaced.setSelected(fm.getStringBounds("M", getGraphics())
- .getWidth() == fm.getStringBounds("|", getGraphics())
- .getWidth());
+ monospaced.setSelected(
+ fm.getStringBounds("M", getGraphics()).getWidth() == fm
+ .getStringBounds("|", getGraphics()).getWidth());
init = false;
}
init = false;
}
@@
-182,10
+183,11
@@
public class FontChooser extends GFontChooser
{
ap.av.antiAlias = smoothFont.isSelected();
ap.getAnnotationPanel().image = null;
{
ap.av.antiAlias = smoothFont.isSelected();
ap.getAnnotationPanel().image = null;
- ap.paintAlignment(true);
+ ap.paintAlignment(true, false);
if (ap.av.getCodingComplement() != null && ap.av.isProteinFontAsCdna())
{
if (ap.av.getCodingComplement() != null && ap.av.isProteinFontAsCdna())
{
- ((AlignViewport) ap.av.getCodingComplement()).antiAlias = ap.av.antiAlias;
+ ((AlignViewport) ap.av
+ .getCodingComplement()).antiAlias = ap.av.antiAlias;
SplitFrame sv = (SplitFrame) ap.alignFrame.getSplitViewContainer();
sv.adjustLayout();
sv.repaint();
SplitFrame sv = (SplitFrame) ap.alignFrame.getSplitViewContainer();
sv.adjustLayout();
sv.repaint();
@@
-227,19
+229,24
@@
public class FontChooser extends GFontChooser
@Override
protected void cancel_actionPerformed()
{
@Override
protected void cancel_actionPerformed()
{
- if (ap != null)
+ if (isTreeFont())
+ {
+ tp.setTreeFont(oldFont);
+ }
+ else if (ap != null)
{
ap.av.setFont(oldFont, true);
ap.av.setScaleProteinAsCdna(oldProteinScale);
ap.av.setProteinFontAsCdna(oldMirrorFont);
ap.av.antiAlias = oldSmoothFont;
{
ap.av.setFont(oldFont, true);
ap.av.setScaleProteinAsCdna(oldProteinScale);
ap.av.setProteinFontAsCdna(oldMirrorFont);
ap.av.antiAlias = oldSmoothFont;
- ap.paintAlignment(true);
+ ap.fontChanged();
if (scaleAsCdna.isVisible() && scaleAsCdna.isEnabled())
{
ap.av.getCodingComplement().setScaleProteinAsCdna(oldProteinScale);
ap.av.getCodingComplement().setProteinFontAsCdna(oldMirrorFont);
if (scaleAsCdna.isVisible() && scaleAsCdna.isEnabled())
{
ap.av.getCodingComplement().setScaleProteinAsCdna(oldProteinScale);
ap.av.getCodingComplement().setProteinFontAsCdna(oldMirrorFont);
- ((AlignViewport) ap.av.getCodingComplement()).antiAlias = oldComplementSmooth;
+ ((AlignViewport) ap.av
+ .getCodingComplement()).antiAlias = oldComplementSmooth;
ap.av.getCodingComplement().setFont(oldComplementFont, true);
SplitFrame splitFrame = (SplitFrame) ap.alignFrame
.getSplitViewContainer();
ap.av.getCodingComplement().setFont(oldComplementFont, true);
SplitFrame splitFrame = (SplitFrame) ap.alignFrame
.getSplitViewContainer();
@@
-247,10
+254,6
@@
public class FontChooser extends GFontChooser
splitFrame.repaint();
}
}
splitFrame.repaint();
}
}
- else if (tp != null)
- {
- tp.setTreeFont(oldFont);
- }
try
{
try
{
@@
-260,6
+263,11
@@
public class FontChooser extends GFontChooser
}
}
}
}
+ private boolean isTreeFont()
+ {
+ return tp != null;
+ }
+
/**
* DOCUMENT ME!
*/
/**
* DOCUMENT ME!
*/
@@
-284,8
+292,9
@@
public class FontChooser extends GFontChooser
double iw = iBounds.getWidth();
if (mw < 1 || iw < 1)
{
double iw = iBounds.getWidth();
if (mw < 1 || iw < 1)
{
- String message = iBounds.getHeight() < 1 ? MessageManager
- .getString("label.font_doesnt_have_letters_defined")
+ String message = iBounds.getHeight() < 1
+ ? MessageManager
+ .getString("label.font_doesnt_have_letters_defined")
: MessageManager.getString("label.font_too_small");
JvOptionPane.showInternalMessageDialog(this, message,
MessageManager.getString("label.invalid_font"),
: MessageManager.getString("label.font_too_small");
JvOptionPane.showInternalMessageDialog(this, message,
MessageManager.getString("label.invalid_font"),
@@
-298,8
+307,8
@@
public class FontChooser extends GFontChooser
{
fontSize.setSelectedItem(lastSelected.getSize());
}
{
fontSize.setSelectedItem(lastSelected.getSize());
}
- if (!lastSelected.getName().equals(
- fontName.getSelectedItem().toString()))
+ if (!lastSelected.getName()
+ .equals(fontName.getSelectedItem().toString()))
{
fontName.setSelectedItem(lastSelected.getName());
}
{
fontName.setSelectedItem(lastSelected.getName());
}
@@
-313,7
+322,7
@@
public class FontChooser extends GFontChooser
}
return;
}
}
return;
}
- if (tp != null)
+ if (isTreeFont())
{
tp.setTreeFont(newFont);
}
{
tp.setTreeFont(newFont);
}
@@
-416,8
+425,8
@@
public class FontChooser extends GFontChooser
protected void scaleAsCdna_actionPerformed()
{
ap.av.setScaleProteinAsCdna(scaleAsCdna.isSelected());
protected void scaleAsCdna_actionPerformed()
{
ap.av.setScaleProteinAsCdna(scaleAsCdna.isSelected());
- ap.av.getCodingComplement().setScaleProteinAsCdna(
- scaleAsCdna.isSelected());
+ ap.av.getCodingComplement()
+ .setScaleProteinAsCdna(scaleAsCdna.isSelected());
final SplitFrame splitFrame = (SplitFrame) ap.alignFrame
.getSplitViewContainer();
splitFrame.adjustLayout();
final SplitFrame splitFrame = (SplitFrame) ap.alignFrame
.getSplitViewContainer();
splitFrame.adjustLayout();