X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplitFrame.java;h=6ebedb753e30389b096a710dd8bb0bed52221329;hb=4bae495df9a00ece3d4f7672639c3a669446d461;hp=7ade7975df52901105eebee39755136625501ab1;hpb=6b13a606027284408286d1cd2833470d1f9b9bfe;p=jalview.git diff --git a/src/jalview/gui/SplitFrame.java b/src/jalview/gui/SplitFrame.java index 7ade797..6ebedb7 100644 --- a/src/jalview/gui/SplitFrame.java +++ b/src/jalview/gui/SplitFrame.java @@ -259,8 +259,8 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI * calculate the maximum ratio that leaves at least the height * of two sequences (after rounding) visible in the bottom panel */ - int bottomSequencesHeight = bottomFrame.alignPanel.getSeqPanel().seqCanvas - .getHeight(); + int bottomSequencesHeight = bottomFrame.alignPanel + .getSeqPanel().seqCanvas.getHeight(); int bottomPanelMinHeight = bottomPanelHeight - Math.max(0, bottomSequencesHeight - 3 * bottomCharHeight); double maxRatio = (totalHeight - bottomPanelMinHeight) / totalHeight; @@ -427,7 +427,9 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI * Ctrl-W / Cmd-W - close view or window */ KeyStroke key_cmdW = KeyStroke.getKeyStroke(KeyEvent.VK_W, - jalview.util.ShortcutKeyMaskExWrapper.getMenuShortcutKeyMaskEx(), false); + jalview.util.ShortcutKeyMaskExWrapper + .getMenuShortcutKeyMaskEx(), + false); action = new AbstractAction() { @Override @@ -448,7 +450,9 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI * Ctrl-T / Cmd-T open new view */ KeyStroke key_cmdT = KeyStroke.getKeyStroke(KeyEvent.VK_T, - jalview.util.ShortcutKeyMaskExWrapper.getMenuShortcutKeyMaskEx(), false); + jalview.util.ShortcutKeyMaskExWrapper + .getMenuShortcutKeyMaskEx(), + false); AbstractAction action = new AbstractAction() { @Override @@ -804,7 +808,9 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI * Ctrl-F / Cmd-F open Finder dialog, 'focused' on the right alignment */ KeyStroke key_cmdF = KeyStroke.getKeyStroke(KeyEvent.VK_F, - jalview.util.ShortcutKeyMaskExWrapper.getMenuShortcutKeyMaskEx(), false); + jalview.util.ShortcutKeyMaskExWrapper + .getMenuShortcutKeyMaskEx(), + false); AbstractAction action = new AbstractAction() { @Override @@ -814,7 +820,11 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI if (c != null && c instanceof AlignFrame) { AlignFrame af = (AlignFrame) c; - new Finder(af.alignPanel); + boolean dna = af.getViewport().getAlignment().isNucleotide(); + String scope = MessageManager.getString("label.in") + " " + + (dna ? MessageManager.getString("label.nucleotide") + : MessageManager.getString("label.protein")); + new Finder(af.alignPanel, true, scope); } } }; @@ -847,7 +857,8 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI } /** - * holds the frame for feature settings, so Protein and DNA tabs can be managed + * holds the frame for feature settings, so Protein and DNA tabs can be + * managed */ JInternalFrame featureSettingsUI;