Merge branch 'features/JAL-2435splitScreenFont' into develop
authorJim Procter <jprocter@issues.jalview.org>
Fri, 12 May 2017 14:48:16 +0000 (15:48 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Fri, 12 May 2017 14:48:16 +0000 (15:48 +0100)
1  2 
help/help.jhm
help/helpTOC.xml
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/appletgui/AlignViewport.java
src/jalview/appletgui/AlignmentPanel.java
src/jalview/appletgui/SeqPanel.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/SeqPanel.java
src/jalview/viewmodel/AlignmentViewport.java

diff --cc help/help.jhm
Simple merge
@@@ -24,8 -24,7 +24,9 @@@
        <tocitem text="Jalview Documentation" target="home" expand="true">
                        <tocitem text="What's new" target="new" expand="true">
                                <tocitem text="Latest Release Notes" target="release"/>
 +                              <tocitem text="Groovy Features Counter example" target="groovy.featurescounter"/>
 +                              <tocitem text="Omit hidden regions in Overview" target="overview"/>
+                               <tocitem text="Split Frame View" target="splitframe.mirrorfonts" />
                </tocitem>
                
                <tocitem text="Editing Alignments" target="edit" />
Simple merge
Simple merge
@@@ -40,8 -39,10 +40,9 @@@ import jalview.structure.SelectionSourc
  import jalview.structure.StructureSelectionManager;
  import jalview.structure.VamsasSource;
  import jalview.viewmodel.AlignmentViewport;
 -import jalview.viewmodel.ViewportRanges;
  
  import java.awt.Font;
+ import java.awt.FontMetrics;
  
  public class AlignViewport extends AlignmentViewport implements
          SelectionSource
Simple merge
Simple merge
Simple merge