JAL-2360 ColourSchemes holds configured schemes, AlignFrame colour menu

[jalview.git] / src / jalview / gui / PopupMenu.java

diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index ebcb062..696f03d 100644 (file)
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -1300,7 +1300,8 @@ public class PopupMenu extends JPopupMenu
       }
     });
 
-    clustalColour.setText(MessageManager.getString("label.clustalx"));
+    clustalColour.setText(MessageManager
+            .getString("label.colourScheme_clustal"));
     clustalColour.setName(JalviewColourScheme.Clustal.toString());
     clustalColour.addActionListener(new ActionListener()
     {
@@ -1310,7 +1311,8 @@ public class PopupMenu extends JPopupMenu
         clustalColour_actionPerformed();
       }
     });
-    zappoColour.setText(MessageManager.getString("label.zappo"));
+    zappoColour.setText(MessageManager
+            .getString("label.colourScheme_zappo"));
     zappoColour.setName(JalviewColourScheme.Zappo.toString());
     zappoColour.addActionListener(new ActionListener()
     {
@@ -1320,7 +1322,8 @@ public class PopupMenu extends JPopupMenu
         zappoColour_actionPerformed();
       }
     });
-    taylorColour.setText(MessageManager.getString("label.taylor"));
+    taylorColour.setText(MessageManager
+            .getString("label.colourScheme_taylor"));
     taylorColour.setName(JalviewColourScheme.Taylor.toString());
     taylorColour.addActionListener(new ActionListener()
     {
@@ -1331,7 +1334,7 @@ public class PopupMenu extends JPopupMenu
       }
     });
     hydrophobicityColour.setText(MessageManager
-            .getString("label.hydrophobicity"));
+            .getString("label.colourScheme_hydrophobic"));
     hydrophobicityColour
             .setName(JalviewColourScheme.Hydrophobic.toString());
     hydrophobicityColour.addActionListener(new ActionListener()
@@ -1342,7 +1345,8 @@ public class PopupMenu extends JPopupMenu
         hydrophobicityColour_actionPerformed();
       }
     });
-    helixColour.setText(MessageManager.getString("label.helix_propensity"));
+    helixColour.setText(MessageManager
+            .getString("label.colourScheme_helix_propensity"));
     helixColour.setName(JalviewColourScheme.Helix.toString());
     helixColour.addActionListener(new ActionListener()
     {
@@ -1353,7 +1357,7 @@ public class PopupMenu extends JPopupMenu
       }
     });
     strandColour.setText(MessageManager
-            .getString("label.strand_propensity"));
+            .getString("label.colourScheme_strand_propensity"));
     strandColour.setName(JalviewColourScheme.Strand.toString());
     strandColour.addActionListener(new ActionListener()
     {
@@ -1363,7 +1367,8 @@ public class PopupMenu extends JPopupMenu
         strandColour_actionPerformed();
       }
     });
-    turnColour.setText(MessageManager.getString("label.turn_propensity"));
+    turnColour.setText(MessageManager
+            .getString("label.colourScheme_turn_propensity"));
     turnColour.setName(JalviewColourScheme.Turn.toString());
     turnColour.addActionListener(new ActionListener()
     {
@@ -1373,7 +1378,8 @@ public class PopupMenu extends JPopupMenu
         turnColour_actionPerformed();
       }
     });
-    buriedColour.setText(MessageManager.getString("label.buried_index"));
+    buriedColour.setText(MessageManager
+            .getString("label.colourScheme_buried_index"));
     buriedColour.setName(JalviewColourScheme.Buried.toString());
     buriedColour.addActionListener(new ActionListener()
     {
@@ -1395,7 +1401,6 @@ public class PopupMenu extends JPopupMenu
     });
     userDefinedColour.setText(MessageManager
             .getString("action.user_defined"));
-    userDefinedColour.setName(JalviewColourScheme.UserDefined.toString());
     userDefinedColour.addActionListener(new ActionListener()
     {
       @Override
@@ -1405,7 +1410,8 @@ public class PopupMenu extends JPopupMenu
       }
     });
     PIDColour
-            .setText(MessageManager.getString("label.percentage_identity"));
+.setText(MessageManager
+            .getString("label.colourScheme_%_identity"));
     PIDColour.setName(JalviewColourScheme.PID.toString());
     PIDColour.addActionListener(new ActionListener()
     {
@@ -1416,7 +1422,8 @@ public class PopupMenu extends JPopupMenu
       }
     });
     BLOSUM62Colour
-            .setText(MessageManager.getString("label.blosum62_score"));
+.setText(MessageManager
+            .getString("label.colourScheme_blosum62"));
     BLOSUM62Colour.setName(JalviewColourScheme.Blosum62.toString());
     BLOSUM62Colour.addActionListener(new ActionListener()
     {
@@ -1426,7 +1433,8 @@ public class PopupMenu extends JPopupMenu
         BLOSUM62Colour_actionPerformed();
       }
     });
-    nucleotideColour.setText(MessageManager.getString("label.nucleotide"));
+    nucleotideColour.setText(MessageManager
+            .getString("label.colourScheme_nucleotide"));
     nucleotideColour.setName(JalviewColourScheme.Nucleotide.toString());
     nucleotideColour.addActionListener(new ActionListener()
     {
@@ -1437,7 +1445,7 @@ public class PopupMenu extends JPopupMenu
       }
     });
     purinePyrimidineColour.setText(MessageManager
-            .getString("label.purine_pyrimidine"));
+            .getString("label.colourScheme_purine/pyrimidine"));
     purinePyrimidineColour.setName(JalviewColourScheme.PurinePyrimidine
             .toString());
     purinePyrimidineColour.addActionListener(new ActionListener()
@@ -1449,7 +1457,8 @@ public class PopupMenu extends JPopupMenu
       }
     });
 
-    tcoffeeColour.setText(MessageManager.getString("label.tcoffee_scores"));
+    tcoffeeColour.setText(MessageManager
+            .getString("label.colourScheme_t-coffee_scores"));
     tcoffeeColour.setName(JalviewColourScheme.TCoffee.toString());
     tcoffeeColour.addActionListener(new ActionListener()
     {