Merge branch 'features/JAL-2447experimentalFlag' into develop
authorJim Procter <jprocter@issues.jalview.org>
Wed, 17 May 2017 13:31:54 +0000 (14:31 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 17 May 2017 13:31:54 +0000 (14:31 +0100)
1  2 
resources/lang/Messages.properties
src/jalview/gui/Desktop.java

@@@ -1301,10 -1300,5 +1301,12 @@@ warn.name_cannot_be_duplicate = User-de
  label.invalid_name = Invalid Name !
  label.output_seq_details = Output Sequence Details to list all database references
  label.urllinks = Links
 +label.togglehidden = Show hidden regions
 +label.quality_descr = Alignment Quality based on Blosum62 scores
 +label.conservation_descr = Conservation of total alignment less than {0}% gaps
 +label.consensus_descr = PID
 +label.complement_consensus_descr = PID for cDNA
 +label.strucconsensus_descr = PID for base pairs
 +label.occupancy_descr = Number of aligned positions 
+ label.show_experimental = Enable experimental features
 -label.show_experimental_tip = Enable any new and currently 'experimental' features (see Latest Release Notes for details)
++label.show_experimental_tip = Enable any new and currently 'experimental' features (see Latest Release Notes for details)
@@@ -129,10 -129,8 +129,12 @@@ public class Desktop extends jalview.jb
          DropTargetListener, ClipboardOwner, IProgressIndicator,
          jalview.api.StructureSelectionManagerProvider
  {
 +  private static int DEFAULT_MIN_WIDTH = 300;
 +
 +  private static int DEFAULT_MIN_HEIGHT = 250;
 +
+   private static final String EXPERIMENTAL_FEATURES = "EXPERIMENTAL_FEATURES";
    private JalviewChangeSupport changeSupport = new JalviewChangeSupport();
  
    /**