X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPopupMenu.java;h=206a969d106b2993521607c4f7883fdad9e01701;hb=beca055dbed389362bb692de3c15fa5487c1ebd3;hp=5213bad73baeddff6f51b729053c4eeb8caf7155;hpb=eb77addf49f8957e88b61f07ce36414c6619a221;p=jalview.git

diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index 5213bad..206a969 100755
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -32,6 +32,8 @@ import javax.swing.*;
 
 import java.util.Vector;
 import jalview.io.FormatAdapter;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.ChangeEvent;
 
 
 /**
@@ -81,6 +83,8 @@ public class PopupMenu extends JPopupMenu
   JMenuItem discoverPDB = new JMenuItem();
   JMenu outputMenu = new JMenu();
   JMenuItem sequenceFeature = new JMenuItem();
+  JMenuItem textColour = new JMenuItem();
+  JMenu jMenu1 = new JMenu();
 
   /**
      * Creates a new PopupMenu object.
@@ -510,23 +514,25 @@ public class PopupMenu extends JPopupMenu
         sequenceFeature_actionPerformed(e);
       }
     });
+    textColour.setText("Text Colour");
+    textColour.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        textColour_actionPerformed(e);
+      }
+    });
+    jMenu1.setText("Group");
     add(groupMenu);
 
     add(sequenceMenu);
     groupMenu.add(editMenu);
     groupMenu.add(outputMenu);
-    groupMenu.addSeparator();
     groupMenu.add(sequenceFeature);
-    groupMenu.addSeparator();
-    groupMenu.add(groupName);
-    groupMenu.add(unGroupMenuItem);
-    groupMenu.add(colourMenu);
-    groupMenu.add(showBoxes);
-    groupMenu.add(showText);
-    groupMenu.add(showColourText);
-    groupMenu.add(outline);
+    groupMenu.add(jMenu1);
     sequenceMenu.add(sequenceName);
     sequenceMenu.add(pdbMenu);
+    colourMenu.add(textColour);
     colourMenu.add(noColourmenuItem);
         colourMenu.add(clustalColour);
         colourMenu.add(BLOSUM62Colour);
@@ -573,6 +579,13 @@ public class PopupMenu extends JPopupMenu
     pdbMenu.add(pdbFromFile);
     pdbMenu.add(enterPDB);
     pdbMenu.add(discoverPDB);
+    jMenu1.add(groupName);
+    jMenu1.add(unGroupMenuItem);
+    jMenu1.add(colourMenu);
+    jMenu1.add(showBoxes);
+    jMenu1.add(showText);
+    jMenu1.add(showColourText);
+    jMenu1.add(outline);
     noColourmenuItem.setText("None");
         noColourmenuItem.addActionListener(new java.awt.event.ActionListener()
             {
@@ -952,31 +965,6 @@ public class PopupMenu extends JPopupMenu
         groupName.setText(reply);
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param e DOCUMENT ME!
-     */
-    protected void analyze_actionPerformed(ActionEvent e)
-    {
-        CutAndPasteTransfer cap = new CutAndPasteTransfer();
-        JInternalFrame frame = new JInternalFrame();
-        frame.setContentPane(cap);
-        Desktop.addInternalFrame(frame, "Analyze this - ", 400, 300);
-
-        SequenceGroup sg = getGroup();
-        StringBuffer sb = new StringBuffer();
-
-        for (int i = 0; i < sg.getSize(false); i++)
-        {
-            Sequence tmp = (Sequence) sg.getSequences(false).elementAt(i);
-            sb.append(tmp.getSequence(sg.getStartRes(), sg.getEndRes() + 1));
-            sb.append("\n");
-        }
-
-        sb.append("Something amazing will happen soon");
-        cap.setText(sb.toString());
-    }
 
     /**
      * DOCUMENT ME!
@@ -1040,13 +1028,15 @@ public class PopupMenu extends JPopupMenu
             }
 
             s = s.replace(' ', '_');
-            sequence.getDatasetSequence().setName(s);
             sequence.setName(s);
             ap.repaint();
         }
 
-        sequence.getDatasetSequence().setDescription(description.getText());
         sequence.setDescription(description.getText());
+
+        ap.av.firePropertyChange("alignment", null,
+                                  ap.av.getAlignment().getSequences());
+
     }
 
     /**
@@ -1253,6 +1243,7 @@ public class PopupMenu extends JPopupMenu
   public void outputText_actionPerformed(ActionEvent e)
   {
     CutAndPasteTransfer cap = new CutAndPasteTransfer();
+    cap.setForInput(null);
     Desktop.addInternalFrame(cap,
                              "Alignment output - " + e.getActionCommand(), 600,
                              500);
@@ -1366,4 +1357,89 @@ public class PopupMenu extends JPopupMenu
       ap.highlightSearchResults(null);
     }
   }
+
+  public void textColour_actionPerformed(ActionEvent e)
+  {
+    final SequenceGroup sg = getGroup();
+
+    int original1 = sg.textColour.getRGB();
+    int original2 = sg.textColour2.getRGB();
+    int thresh = sg.thresholdTextColour;
+    final JSlider slider = new JSlider(0, 750,sg.thresholdTextColour);
+    final JButton col1 = new JButton("DARK");
+    col1.setBackground(sg.textColour);
+    col1.setForeground(sg.textColour);
+    final JButton col2 = new JButton("LIGHT");
+    col2.setBackground(sg.textColour2);
+    col2.setForeground(sg.textColour2);
+    final JPanel bigpanel = new JPanel(new BorderLayout());
+    JPanel panel = new JPanel();
+    bigpanel.add(panel, BorderLayout.CENTER);
+    bigpanel.add(new JLabel(
+      "<html><i>Select a dark and light text colour, then set the threshold to"
+     +"<br>switch between colours, based on background colour</i></html>"),
+                 BorderLayout.NORTH);
+    panel.add(col1);
+    panel.add(slider);
+    panel.add(col2);
+
+    col1.addActionListener(new ActionListener()
+        {
+          public void actionPerformed(ActionEvent e)
+          {
+            Color col = JColorChooser.showDialog(bigpanel,
+                                                 "Select Colour for Text",
+                                                 sg.textColour);
+            if (col != null)
+            {
+              sg.textColour = col;
+              col1.setBackground(col);
+              col1.setForeground(col);
+            }
+            ap.repaint();
+          }
+        });
+
+    col2.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        Color col = JColorChooser.showDialog(bigpanel,
+                                             "Select Colour for Text",
+                                             sg.textColour);
+        if (col != null)
+        {
+          sg.textColour2 = col;
+          col2.setBackground(col);
+          col2.setForeground(col);
+        }
+        ap.repaint();
+      }
+    });
+
+
+    slider.addChangeListener(new ChangeListener()
+    {
+      public void stateChanged(ChangeEvent evt)
+      {
+        sg.thresholdTextColour = slider.getValue();
+        ap.repaint();
+      }
+    });
+
+    int reply = JOptionPane.showInternalOptionDialog(Desktop.desktop,
+                                                 bigpanel,
+                                                 "Adjust Foreground Text Colour Threshold",
+                                                 JOptionPane.OK_CANCEL_OPTION,
+                                                 JOptionPane.QUESTION_MESSAGE,
+                                                 null,
+                                                 null, null);
+
+    if(reply==JOptionPane.CANCEL_OPTION)
+    {
+      sg.textColour = new Color(original1);
+      sg.textColour2 = new Color(original2);
+      sg.thresholdTextColour = thresh;
+    }
+  }
 }