From bda1b6a4412a73727de4613cfe3a6829b0fe0804 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Tue, 8 Oct 2013 11:53:33 +0100 Subject: [PATCH] JAL-1384 documentation and consistent ordering for new items in select menu --- help/html/menus/alignmentMenu.html | 16 ++++++++++------ help/html/menus/alwselect.html | 13 +++++++++---- src/jalview/appletgui/AlignFrame.java | 2 +- src/jalview/jbgui/GAlignFrame.java | 6 +++--- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/help/html/menus/alignmentMenu.html b/help/html/menus/alignmentMenu.html index 9ec5adc..d53b3eb 100755 --- a/help/html/menus/alignmentMenu.html +++ b/help/html/menus/alignmentMenu.html @@ -235,17 +235,21 @@ Any columns currently not selected will replace the current column selection. -
  • Undefine Groups (Control U)
    The - alignment will be reset with no defined groups.
    WARNING: - This cannot be undone.     -
    • -
  • Make Groups
     The currently +
  • Create Group (Control G)
     + Create a group containing the currently selected sequences.
    • +
  • Remove Group (Shift Control G)
     + Ungroup the currently selected sequence group. (Create/Remove group new in Jalview 2.8.1)
    • +
  • Make Groups for selection
     The currently selected groups of the alignment will be subdivided according to the contents of the currently selected region.
    Use this to subdivide an alignment based on the different combinations of residues observed at specific positions. (new in jalview 2.5)
    • - +
  • Undefine Groups (Control U)
    The + alignment will be reset with no defined groups.
    WARNING: + This cannot be undone.     +
    • +
  • View
    • New View (Control T)
      diff --git a/help/html/menus/alwselect.html b/help/html/menus/alwselect.html index c4b3002..bd17fa7 100644 --- a/help/html/menus/alwselect.html +++ b/help/html/menus/alwselect.html @@ -38,11 +38,16 @@
    • Invert Column Selection (Control Alt I)
      Any columns currently not selected will replace the current column selection.
      • -
    • Undefine Groups (Control U)
      -       The alignment will be reset with no defined groups.
      - WARNING: This cannot be undone.
      • -
    • Make Groups
       +
    • Create Group (Control G)
       + Create a group containing the currently selected sequences.
      • +
    • Remove Group (Shift Control G)
       + Ungroup the currently selected sequence group. (Create/Remove group new in Jalview 2.8.1)
      • +
    • Make Groups for selection
       The currently selected groups of the alignment will be subdivided according to the contents of the currently selected region.
      Use this to subdivide an alignment based on the different combinations of residues observed at specific positions. (new in jalview 2.5)
      • +
    • Undefine Groups (Control U)
      +       The alignment will be reset with no defined groups.
      + WARNING: This cannot be undone.
      • +
    diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java index 3325525..bf04268 100644 --- a/src/jalview/appletgui/AlignFrame.java +++ b/src/jalview/appletgui/AlignFrame.java @@ -3083,7 +3083,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, nucleotideColour.addActionListener(this); deleteGroups.setLabel("Undefine Groups"); deleteGroups.addActionListener(this); - grpsFromSelection.setLabel("Make Groups for selection"); + grpsFromSelection.setLabel("Make Groups For Selection"); grpsFromSelection.addActionListener(this); createGroup.setLabel("Create Group"); unGroup.setLabel("Remove Group"); diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java index 1eb406e..9b9af7e 100755 --- a/src/jalview/jbgui/GAlignFrame.java +++ b/src/jalview/jbgui/GAlignFrame.java @@ -620,7 +620,7 @@ public class GAlignFrame extends JInternalFrame invertSequenceMenuItem_actionPerformed(e); } }); - grpsFromSelection.setText("Make Groups for selection"); + grpsFromSelection.setText("Make Groups For Selection"); grpsFromSelection.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1213,7 +1213,7 @@ public class GAlignFrame extends JInternalFrame createGroup_actionPerformed(e); } }); - unGroup.setText("Ungroup"); + unGroup.setText("Remove Group"); unGroup.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_G,Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask() | java.awt.event.KeyEvent.SHIFT_MASK, false)); @@ -1973,8 +1973,8 @@ public class GAlignFrame extends JInternalFrame selectMenu.add(invertColSel); selectMenu.add(createGroup); selectMenu.add(unGroup); - selectMenu.add(deleteGroups); selectMenu.add(grpsFromSelection); + selectMenu.add(deleteGroups); // TODO - determine if the listenToViewSelections button is needed : see bug // JAL-574 // selectMenu.addSeparator(); -- 1.7.10.2