X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTextColourChooser.java;h=5bc6563f8da79a753bd57bc6a35fa8b22c184f83;hb=8dca84768d848bc368985a8f0938a6c7ac059952;hp=a1b3caf9f259ab4154f9361652f7fdd02aa53172;hpb=217274a8e9ea2ae20d5a6d21989b8b16840ca6f0;p=jalview.git diff --git a/src/jalview/gui/TextColourChooser.java b/src/jalview/gui/TextColourChooser.java index a1b3caf..5bc6563 100644 --- a/src/jalview/gui/TextColourChooser.java +++ b/src/jalview/gui/TextColourChooser.java @@ -20,10 +20,6 @@ */ package jalview.gui; -import jalview.datamodel.SequenceGroup; -import jalview.gui.JalviewColourChooser.ColourChooserListener; -import jalview.util.MessageManager; - import java.awt.BorderLayout; import java.awt.Color; import java.awt.Dimension; @@ -33,13 +29,16 @@ import java.util.HashMap; import java.util.Map; import javax.swing.BorderFactory; -import javax.swing.JColorChooser; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JSlider; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; +import jalview.datamodel.SequenceGroup; +import jalview.gui.JalviewColourChooser.ColourChooserListener; +import jalview.util.MessageManager; + public class TextColourChooser { AlignmentPanel ap; @@ -85,7 +84,7 @@ public class TextColourChooser col2.setToolTipText(MessageManager.getString("label.light_colour")); col2.setBackground(original2); final JPanel bigpanel = new JPanel(new BorderLayout()); - JPanel panel = new JPanel(); + JPanel panel = new JPanel(new BorderLayout()); bigpanel.add(panel, BorderLayout.CENTER); bigpanel.add( new JLabel("" @@ -93,16 +92,17 @@ public class TextColourChooser "label.select_dark_light_set_threshold") + ""), BorderLayout.NORTH); - panel.add(col1); - panel.add(slider); - panel.add(col2); + panel.add(col1, BorderLayout.WEST); + panel.add(slider, BorderLayout.CENTER); + panel.add(col2, BorderLayout.EAST); col1.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent e) { - String ttl = MessageManager.getString("label.select_colour_for_text"); + String ttl = MessageManager + .getString("label.select_colour_for_text"); ColourChooserListener listener = new ColourChooserListener() { @Override @@ -122,7 +122,8 @@ public class TextColourChooser @Override public void mousePressed(MouseEvent e) { - String ttl = MessageManager.getString("label.select_colour_for_text"); + String ttl = MessageManager + .getString("label.select_colour_for_text"); ColourChooserListener listener = new ColourChooserListener() { @Override @@ -146,16 +147,19 @@ public class TextColourChooser } }); - int reply = JvOptionPane.showInternalOptionDialog(alignPanel, bigpanel, - MessageManager.getString( - "label.adjunst_foreground_text_colour_threshold"), - JvOptionPane.OK_CANCEL_OPTION, JvOptionPane.QUESTION_MESSAGE, - null, null, null); - - if (reply == JvOptionPane.CANCEL_OPTION) + Object[] options = new Object[] { MessageManager.getString("action.ok"), + MessageManager.getString("action.cancel") }; + String title = MessageManager + .getString("label.adjust_foreground_text_colour_threshold"); + Runnable action = () -> // response for 1 = Cancel { restoreInitialSettings(); - } + }; + JvOptionPane.newOptionDialog(alignPanel.alignFrame) + .setResponseHandler(1, action).showInternalDialog(bigpanel, + title, JvOptionPane.YES_NO_CANCEL_OPTION, + JvOptionPane.PLAIN_MESSAGE, null, options, + MessageManager.getString("action.ok")); } /** @@ -186,6 +190,8 @@ public class TextColourChooser group.textColour2 = groupColour2.get(group); group.thresholdTextColour = groupThreshold.get(group); } + + ap.paintAlignment(false, false); } /**