git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9ee61e0
)
JAL-3048 adapt Cancel and refresh for JalviewJS
author
gmungoc
<g.m.carstairs@dundee.ac.uk>
Tue, 10 Jul 2018 10:58:14 +0000
(11:58 +0100)
committer
gmungoc
<g.m.carstairs@dundee.ac.uk>
Tue, 10 Jul 2018 10:58:14 +0000
(11:58 +0100)
src/jalview/gui/TextColourChooser.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/TextColourChooser.java
b/src/jalview/gui/TextColourChooser.java
index
faf19ad
..
86a51ab
100644
(file)
--- a/
src/jalview/gui/TextColourChooser.java
+++ b/
src/jalview/gui/TextColourChooser.java
@@
-23,6
+23,7
@@
package jalview.gui;
import jalview.datamodel.SequenceGroup;
import jalview.gui.JalviewColourChooser.ColourChooserListener;
import jalview.util.MessageManager;
import jalview.datamodel.SequenceGroup;
import jalview.gui.JalviewColourChooser.ColourChooserListener;
import jalview.util.MessageManager;
+import jalview.util.dialogrunner.RunResponse;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.BorderLayout;
import java.awt.Color;
@@
-145,16
+146,23
@@
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.adjunst_foreground_text_colour_threshold");
+ RunResponse action = new RunResponse(JvOptionPane.NO_OPTION) // Cancel
{
{
- restoreInitialSettings();
- }
+ @Override
+ public void run()
+ {
+ restoreInitialSettings();
+ }
+ };
+ JvOptionPane.newOptionDialog(alignPanel).response(action)
+ .showInternalDialog(bigpanel, title,
+ JvOptionPane.YES_NO_CANCEL_OPTION,
+ JvOptionPane.PLAIN_MESSAGE, null, options,
+ MessageManager.getString("action.ok"));
}
/**
}
/**
@@
-185,6
+193,8
@@
public class TextColourChooser
group.textColour2 = groupColour2.get(group);
group.thresholdTextColour = groupThreshold.get(group);
}
group.textColour2 = groupColour2.get(group);
group.thresholdTextColour = groupThreshold.get(group);
}
+
+ ap.paintAlignment(false, false);
}
/**
}
/**