Merge branch 'hotfix/JAL-1521' into Release_2_8_2_Branch

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

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index 6ebdc07..e44915d 100755 (executable)
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -90,9 +90,10 @@ public class Preferences extends GPreferences
               .indexOf("SRS|http://srs.ebi.ac.uk/srsbin/cgi-bin/wgetz?-newId+(([uniprot-all:$SEQUENCE_ID$]))+-view+SwissEntry");
       if (srsPos > -1)
       {
-        sequenceURLLinks.setElementAt(
-                "EMBL-EBI Search|http://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$SEQUENCE_ID$",
-                srsPos);
+        sequenceURLLinks
+                .setElementAt(
+                        "EMBL-EBI Search|http://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$SEQUENCE_ID$",
+                        srsPos);
       }
     }
 
@@ -131,7 +132,8 @@ public class Preferences extends GPreferences
       height = 460;
     }
 
-    Desktop.addInternalFrame(frame, MessageManager.getString("label.preferences"), width, height);
+    Desktop.addInternalFrame(frame,
+            MessageManager.getString("label.preferences"), width, height);
     frame.setMinimumSize(new Dimension(width, height));
 
     seqLimit.setSelected(Cache.getDefault("SHOW_JVSUFFIX", true));
@@ -211,11 +213,10 @@ public class Preferences extends GPreferences
     sortby.addItem("Pairwise Identity");
     sortby.setSelectedItem(Cache.getDefault("SORT_ALIGNMENT", "No sort"));
 
-    epsRendering.addItem("Prompt each time");
-    epsRendering.addItem("Lineart");
-    epsRendering.addItem("Text");
-    epsRendering.setSelectedItem(Cache.getDefault("EPS_RENDERING",
-            "Prompt each time"));
+    epsRendering.addItem(MessageManager.getString("label.prompt_each_time"));
+    epsRendering.addItem(MessageManager.getString("label.lineart"));
+    epsRendering.addItem(MessageManager.getString("action.text"));
+    epsRendering.setSelectedIndex(0);
     autoIdWidth.setSelected(Cache.getDefault("FIGURE_AUTOIDWIDTH", false));
     userIdWidth.setEnabled(autoIdWidth.isSelected());
     userIdWidthlabel.setEnabled(autoIdWidth.isSelected());
@@ -508,7 +509,7 @@ public class Preferences extends GPreferences
             { "Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "Jalview" },
             jalview.bin.Cache.getProperty("DEFAULT_FILE_FORMAT"));
     chooser.setFileView(new JalviewFileView());
-    chooser.setDialogTitle("Select startup file");
+    chooser.setDialogTitle(MessageManager.getString("label.select_startup_file"));
 
     int value = chooser.showOpenDialog(this);
 
@@ -566,8 +567,8 @@ public class Preferences extends GPreferences
     while (!valid)
     {
       if (JOptionPane.showInternalConfirmDialog(Desktop.desktop, link,
-              MessageManager.getString("label.new_sequence_url_link"), JOptionPane.OK_CANCEL_OPTION, -1,
-              null) == JOptionPane.OK_OPTION)
+              MessageManager.getString("label.new_sequence_url_link"),
+              JOptionPane.OK_CANCEL_OPTION, -1, null) == JOptionPane.OK_OPTION)
       {
         if (link.checkValid())
         {
@@ -592,7 +593,8 @@ public class Preferences extends GPreferences
     if (index == -1)
     {
       JOptionPane.showInternalMessageDialog(Desktop.desktop,
-              MessageManager.getString("label.no_link_selected"), MessageManager.getString("label.no_link_selected"),
+              MessageManager.getString("label.no_link_selected"),
+              MessageManager.getString("label.no_link_selected"),
               JOptionPane.WARNING_MESSAGE);
       return;
     }
@@ -605,8 +607,8 @@ public class Preferences extends GPreferences
     {
 
       if (JOptionPane.showInternalConfirmDialog(Desktop.desktop, link,
-              MessageManager.getString("label.new_sequence_url_link"), JOptionPane.OK_CANCEL_OPTION, -1,
-              null) == JOptionPane.OK_OPTION)
+              MessageManager.getString("label.new_sequence_url_link"),
+              JOptionPane.OK_CANCEL_OPTION, -1, null) == JOptionPane.OK_OPTION)
       {
         if (link.checkValid())
         {
@@ -630,7 +632,8 @@ public class Preferences extends GPreferences
     if (index == -1)
     {
       JOptionPane.showInternalMessageDialog(Desktop.desktop,
-              MessageManager.getString("label.no_link_selected"), MessageManager.getString("label.no_link_selected"),
+              MessageManager.getString("label.no_link_selected"),
+              MessageManager.getString("label.no_link_selected"),
               JOptionPane.WARNING_MESSAGE);
       return;
     }
@@ -648,7 +651,7 @@ public class Preferences extends GPreferences
   public void defaultBrowser_mouseClicked(MouseEvent e)
   {
     JFileChooser chooser = new JFileChooser(".");
-    chooser.setDialogTitle("Select default web browser");
+    chooser.setDialogTitle(MessageManager.getString("label.select_default_browser"));
 
     int value = chooser.showOpenDialog(this);
 
@@ -684,7 +687,7 @@ public class Preferences extends GPreferences
   public void minColour_actionPerformed()
   {
     Color col = JColorChooser.showDialog(this,
-            "Select Colour for Minimum Value", minColour.getBackground());
+            MessageManager.getString("label.select_colour_minimum_value"), minColour.getBackground());
     if (col != null)
     {
       minColour.setBackground(col);
@@ -695,7 +698,7 @@ public class Preferences extends GPreferences
   public void maxColour_actionPerformed()
   {
     Color col = JColorChooser.showDialog(this,
-            "Select Colour for Maximum Value", maxColour.getBackground());
+            MessageManager.getString("label.select_colour_maximum_value"), maxColour.getBackground());
     if (col != null)
     {
       maxColour.setBackground(col);
@@ -723,8 +726,8 @@ public class Preferences extends GPreferences
       JOptionPane
               .showInternalMessageDialog(
                       Desktop.desktop,
-                      "The user defined width for the\nannotation and sequence ID columns\nin exported figures must be\nat least 12 pixels wide.",
-                      "Invalid ID Column width",
+                      MessageManager.getString("warn.user_defined_width_requirements"),
+                      MessageManager.getString("label.invalid_id_column_width"),
                       JOptionPane.WARNING_MESSAGE);
       userIdWidth.setText("");
     }