git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into features/ssFromPDBEntry
[jalview.git]
/
src
/
jalview
/
gui
/
AppJmol.java
diff --git
a/src/jalview/gui/AppJmol.java
b/src/jalview/gui/AppJmol.java
index
bcdc2de
..
998db4b
100644
(file)
--- a/
src/jalview/gui/AppJmol.java
+++ b/
src/jalview/gui/AppJmol.java
@@
-177,7
+177,7
@@
public class AppJmol extends GStructureViewer implements Runnable,
_alignwith = new Vector<AlignmentPanel>();
}
_alignwith = new Vector<AlignmentPanel>();
}
- seqColourBy = new ViewSelectionMenu("Colour by ..", this, _colourwith,
+ seqColourBy = new ViewSelectionMenu(MessageManager.getString("label.colour_by"), this, _colourwith,
new ItemListener()
{
new ItemListener()
{
@@
-197,7
+197,7
@@
public class AppJmol extends GStructureViewer implements Runnable,
});
viewMenu.add(seqColourBy);
final ItemListener handler;
});
viewMenu.add(seqColourBy);
final ItemListener handler;
- JMenu alpanels = new ViewSelectionMenu("Superpose with ..", this,
+ JMenu alpanels = new ViewSelectionMenu(MessageManager.getString("label.superpose_with"), this,
_alignwith, handler = new ItemListener()
{
_alignwith, handler = new ItemListener()
{
@@
-731,7
+731,7
@@
public class AppJmol extends GStructureViewer implements Runnable,
long hdl = pdbid.hashCode() - System.currentTimeMillis();
if (progressBar != null)
{
long hdl = pdbid.hashCode() - System.currentTimeMillis();
if (progressBar != null)
{
- progressBar.setProgressBar("Fetching PDB " + pdbid, hdl);
+ progressBar.setProgressBar(MessageManager.formatMessage("status.fetching_pdb", new String[]{pdbid}), hdl);
}
try
{
}
try
{
@@
-747,7
+747,7
@@
public class AppJmol extends GStructureViewer implements Runnable,
}
if (progressBar != null)
{
}
if (progressBar != null)
{
- progressBar.setProgressBar("Finished.", hdl);
+ progressBar.setProgressBar(MessageManager.getString("label.state_completed"), hdl);
}
if (pdbseq != null)
{
}
if (pdbseq != null)
{
@@
-891,7
+891,7
@@
public class AppJmol extends GStructureViewer implements Runnable,
jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
chooser.setFileView(new JalviewFileView());
jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
chooser.setFileView(new JalviewFileView());
- chooser.setDialogTitle("Save PDB File");
+ chooser.setDialogTitle(MessageManager.getString("label.save_pdb_file"));
chooser.setToolTipText(MessageManager.getString("action.save"));
int value = chooser.showSaveDialog(this);
chooser.setToolTipText(MessageManager.getString("action.save"));
int value = chooser.showSaveDialog(this);
@@
-1096,7
+1096,7
@@
public class AppJmol extends GStructureViewer implements Runnable,
public void backGround_actionPerformed(ActionEvent actionEvent)
{
java.awt.Color col = JColorChooser.showDialog(this,
public void backGround_actionPerformed(ActionEvent actionEvent)
{
java.awt.Color col = JColorChooser.showDialog(this,
- "Select Background Colour", null);
+ MessageManager.getString("label.select_backgroud_colour"), null);
if (col != null)
{
jmb.setBackgroundColour(col);
if (col != null)
{
jmb.setBackgroundColour(col);