(no commit message)
[jalview.git] / forester / java / src / org / forester / archaeopteryx / ArchaeopteryxE.java
index e5bb03f..68671ef 100644 (file)
@@ -96,6 +96,7 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
     private JMenuItem                   _phyloxml_ref_item;
     private JMenuItem                   _aptx_ref_item;
     private JMenuItem                   _remove_branch_color_item;
+    private JMenuItem                   _remove_visual_styles_item;
     private JCheckBoxMenuItem           _show_domain_labels;
     private JCheckBoxMenuItem           _show_annotation_ref_source;
     private JCheckBoxMenuItem           _color_labels_same_as_parent_branch;
@@ -114,14 +115,15 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
     private JCheckBoxMenuItem           _search_case_senstive_cbmi;
     private JCheckBoxMenuItem           _search_whole_words_only_cbmi;
     private JCheckBoxMenuItem           _inverse_search_result_cbmi;
+    private JCheckBoxMenuItem           _search_with_regex_cbmi;
     private JCheckBoxMenuItem           _show_overview_cbmi;
     private JMenuItem                   _choose_minimal_confidence_mi;
-    private JCheckBoxMenuItem           _show_branch_length_values_cbmi;
     private JMenuItem                   _collapse_species_specific_subtrees;
     private JMenuItem                   _overview_placment_mi;
     private ButtonGroup                 _radio_group_1;
     private JCheckBoxMenuItem           _show_default_node_shapes_internal_cbmi;
     private JCheckBoxMenuItem           _show_default_node_shapes_external_cbmi;
+    private JCheckBoxMenuItem           _show_default_node_shapes_for_marked_cbmi;
     private JMenuItem                   _cycle_node_shape_mi;
     private JMenuItem                   _cycle_node_fill_mi;
     private JMenuItem                   _choose_node_size_mi;
@@ -131,6 +133,8 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
     private JMenuItem                   _gsdi_item;
     private JMenuItem                   _gsdir_item;
     private Phylogeny                   _species_tree;
+    private JCheckBoxMenuItem           _right_line_up_domains_cbmi;
+    private JCheckBoxMenuItem           _line_up_renderable_data_cbmi;
 
     @Override
     public void actionPerformed( final ActionEvent e ) {
@@ -164,6 +168,9 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
         else if ( o == _remove_branch_color_item ) {
             removeBranchColors();
         }
+        else if ( o == _remove_visual_styles_item ) {
+            removeVisualStyles();
+        }
         else if ( o == _switch_colors_mi ) {
             switchColors();
         }
@@ -245,6 +252,9 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
             getMainPanel().getControlPanel().search1();
         }
         else if ( o == _search_whole_words_only_cbmi ) {
+            if ( ( _search_with_regex_cbmi != null ) && _search_whole_words_only_cbmi.isSelected() ) {
+                _search_with_regex_cbmi.setSelected( false );
+            }
             updateOptions( getOptions() );
             getMainPanel().getControlPanel().search0();
             getMainPanel().getControlPanel().search1();
@@ -254,10 +264,18 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
             getMainPanel().getControlPanel().search0();
             getMainPanel().getControlPanel().search1();
         }
-        else if ( o == _show_scale_cbmi ) {
+        else if ( o == _search_with_regex_cbmi ) {
+            if ( ( _search_whole_words_only_cbmi != null ) && _search_with_regex_cbmi.isSelected() ) {
+                _search_whole_words_only_cbmi.setSelected( false );
+            }
+            if ( ( _search_case_senstive_cbmi != null ) && _search_with_regex_cbmi.isSelected() ) {
+                _search_case_senstive_cbmi.setSelected( true );
+            }
             updateOptions( getOptions() );
+            getMainPanel().getControlPanel().search0();
+            getMainPanel().getControlPanel().search1();
         }
-        else if ( o == _show_branch_length_values_cbmi ) {
+        else if ( o == _show_scale_cbmi ) {
             updateOptions( getOptions() );
         }
         else if ( o == _show_confidence_stddev_cbmi ) {
@@ -303,7 +321,12 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
             MainFrame.about();
         }
         else if ( o == _help_item ) {
-            help();
+            try {
+                AptxUtil.openWebsite( Constants.APTX_DOC_SITE, true, this );
+            }
+            catch ( final IOException e1 ) {
+                ForesterUtil.printErrorMessage( Constants.PRG_NAME, e1.toString() );
+            }
         }
         else if ( o == _website_item ) {
             try {
@@ -340,6 +363,18 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
         else if ( o == _color_by_taxonomic_group_cbmi ) {
             updateOptions( getOptions() );
         }
+        else if ( o == _line_up_renderable_data_cbmi ) {
+            if ( !_line_up_renderable_data_cbmi.isSelected() ) {
+                _right_line_up_domains_cbmi.setSelected( false );
+            }
+            updateOptions( getOptions() );
+        }
+        else if ( o == _right_line_up_domains_cbmi ) {
+            if ( _right_line_up_domains_cbmi.isSelected() ) {
+                _line_up_renderable_data_cbmi.setSelected( true );
+            }
+            updateOptions( getOptions() );
+        }
         repaint();
     }
 
@@ -357,7 +392,7 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
      * has been selected by the user by clicking the "Return ..."
      * menu item. This method is expected to be called from Javascript or
      * something like it.
-     * 
+     *
      * @return current external node data as String
      */
     public String getCurrentExternalNodesDataBuffer() {
@@ -374,7 +409,7 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
 
     /**
      * This method returns the current phylogeny as a string in the chosen format
-     * 
+     *
      * @param format must be NH, NHX, NEXUS or PHYLOXML
      * @return the phylogeny string
      * @author Herve Menager
@@ -401,10 +436,10 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
     }
 
     /**
-     * This method returns a view of the current phylogeny in a chosen 
+     * This method returns a view of the current phylogeny in a chosen
      * graphics format, base64-encoded in a string so that in can be used
      * from javascript.
-     * 
+     *
      * @param format must be GraphicsExportType (gif, jpg, pdf, png, tif, bmp)
      * @return the phylogeny string
      * @author Herve Menager
@@ -547,81 +582,91 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
             }
         }
         //
-        setVisible( false );
-        setMainPanel( new MainPanelApplets( getConfiguration(), this ) );
-        _jmenubar = new JMenuBar();
-        if ( !getConfiguration().isHideControlPanelAndMenubar() ) {
-            if ( !getConfiguration().isUseNativeUI() ) {
-                _jmenubar.setBackground( getConfiguration().getGuiMenuBackgroundColor() );
+        try {
+            setVisible( false );
+            setMainPanel( new MainPanelApplets( getConfiguration(), this ) );
+            _jmenubar = new JMenuBar();
+            if ( !getConfiguration().isHideControlPanelAndMenubar() ) {
+                if ( !getConfiguration().isUseNativeUI() ) {
+                    _jmenubar.setBackground( getConfiguration().getGuiMenuBackgroundColor() );
+                }
+                if ( getSpeciesTree() != null ) {
+                    buildAnalysisMenu();
+                }
+                buildToolsMenu();
+                buildViewMenu();
+                buildFontSizeMenu();
+                buildOptionsMenu();
+                buildTypeMenu();
+                buildHelpMenu();
+                setJMenuBar( _jmenubar );
             }
-            if ( getSpeciesTree() != null ) {
-                buildAnalysisMenu();
+            final Container contentpane = getContentPane();
+            contentpane.setLayout( new BorderLayout() );
+            contentpane.add( getMainPanel(), BorderLayout.CENTER );
+            addComponentListener( new ComponentAdapter() {
+
+                @Override
+                public void componentResized( final ComponentEvent e ) {
+                    if ( getMainPanel().getCurrentTreePanel() != null ) {
+                        getMainPanel().getCurrentTreePanel().calcParametersForPainting( getMainPanel()
+                                                                                        .getCurrentTreePanel()
+                                                                                        .getWidth(),
+                                                                                        getMainPanel()
+                                                                                        .getCurrentTreePanel()
+                                                                                        .getHeight() );
+                    }
+                }
+            } );
+            if ( getConfiguration().isUseTabbedDisplay() ) {
+                try {
+                    AptxUtil.printAppletMessage( NAME, "using tabbed display" );
+                    AptxUtil.addPhylogeniesToTabs( phys,
+                                                   new File( phys_url.getFile() ).getName(),
+                                                   phys_url.toString(),
+                                                   getConfiguration(),
+                                                   getMainPanel() );
+                }
+                catch ( final Exception e ) {
+                    ForesterUtil.printErrorMessage( NAME, e.toString() );
+                    e.printStackTrace();
+                }
             }
-            buildToolsMenu();
-            buildViewMenu();
-            buildFontSizeMenu();
-            buildOptionsMenu();
-            buildTypeMenu();
-            buildHelpMenu();
-            setJMenuBar( _jmenubar );
-        }
-        final Container contentpane = getContentPane();
-        contentpane.setLayout( new BorderLayout() );
-        contentpane.add( getMainPanel(), BorderLayout.CENTER );
-        addComponentListener( new ComponentAdapter() {
-
-            @Override
-            public void componentResized( final ComponentEvent e ) {
-                if ( getMainPanel().getCurrentTreePanel() != null ) {
-                    getMainPanel().getCurrentTreePanel().calcParametersForPainting( getMainPanel()
-                                                                                            .getCurrentTreePanel()
-                                                                                            .getWidth(),
-                                                                                    getMainPanel()
-                                                                                            .getCurrentTreePanel()
-                                                                                            .getHeight(),
-                                                                                    getOptions()
-                                                                                            .isAllowFontSizeChange() );
+            else {
+                AptxUtil.printAppletMessage( NAME, "not using tabbed display" );
+                if ( getSpeciesTree() != null ) {
+                    AptxUtil.printAppletMessage( NAME,
+                                                 "Warning: gsdi (gene duplication inference) only available tabbed display" );
                 }
+                AptxUtil.addPhylogenyToPanel( phys, getConfiguration(), getMainPanel() );
             }
-        } );
-        if ( getConfiguration().isUseTabbedDisplay() ) {
-            AptxUtil.printAppletMessage( NAME, "using tabbed display" );
-            AptxUtil.addPhylogeniesToTabs( phys,
-                                           new File( phys_url.getFile() ).getName(),
-                                           phys_url.toString(),
-                                           getConfiguration(),
-                                           getMainPanel() );
-        }
-        else {
-            AptxUtil.printAppletMessage( NAME, "not using tabbed display" );
-            if ( getSpeciesTree() != null ) {
-                AptxUtil.printAppletMessage( NAME,
-                                             "Warning: gsdi (gene duplication inference) only available tabbed display" );
+            validate();
+            setName( NAME );
+            getMainPanel().getControlPanel().showWholeAll();
+            getMainPanel().getControlPanel().showWhole();
+            /* GUILHEM_BEG */
+            getCurrentTreePanel().getControlPanel().getSequenceRelationTypeBox().removeAllItems();
+            for( final SequenceRelation.SEQUENCE_RELATION_TYPE type : getMainPanel().getCurrentPhylogeny()
+                    .getRelevantSequenceRelationTypes() ) {
+                getCurrentTreePanel().getControlPanel().getSequenceRelationTypeBox().addItem( type );
             }
-            AptxUtil.addPhylogenyToPanel( phys, getConfiguration(), getMainPanel() );
-        }
-        validate();
-        setName( NAME );
-        getMainPanel().getControlPanel().showWholeAll();
-        getMainPanel().getControlPanel().showWhole();
-        /* GUILHEM_BEG */
-        getCurrentTreePanel().getControlPanel().getSequenceRelationTypeBox().removeAllItems();
-        for( final SequenceRelation.SEQUENCE_RELATION_TYPE type : getMainPanel().getCurrentPhylogeny()
-                .getRelevantSequenceRelationTypes() ) {
-            getCurrentTreePanel().getControlPanel().getSequenceRelationTypeBox().addItem( type );
-        }
-        final String default_relation = getParameter( Constants.APPLET_PARAM_NAME_FOR_DEFAULT_SEQUENCE_RELATION_TYPE );
-        if ( default_relation != null ) {
-            getCurrentTreePanel().getControlPanel().getSequenceRelationTypeBox().setSelectedItem( default_relation );
-        }
-        final String default_sequence = getParameter( Constants.APPLET_PARAM_NAME_FOR_DEFAULT_QUERY_SEQUENCE );
-        if ( default_sequence != null ) {
-            getCurrentTreePanel().getControlPanel().getSequenceRelationBox().setSelectedItem( default_sequence );
-        }
-        /* GUILHEM_END */
-        System.gc();
-        AptxUtil.printAppletMessage( NAME, "successfully initialized" );
-        setVisible( true );
+            final String default_relation = getParameter( Constants.APPLET_PARAM_NAME_FOR_DEFAULT_SEQUENCE_RELATION_TYPE );
+            if ( default_relation != null ) {
+                getCurrentTreePanel().getControlPanel().getSequenceRelationTypeBox().setSelectedItem( default_relation );
+            }
+            final String default_sequence = getParameter( Constants.APPLET_PARAM_NAME_FOR_DEFAULT_QUERY_SEQUENCE );
+            if ( default_sequence != null ) {
+                getCurrentTreePanel().getControlPanel().getSequenceRelationBox().setSelectedItem( default_sequence );
+            }
+            /* GUILHEM_END */
+            System.gc();
+            AptxUtil.printAppletMessage( NAME, "successfully initialized" );
+            setVisible( true );
+        }
+        catch ( final Exception e ) {
+            ForesterUtil.printErrorMessage( NAME, e.toString() );
+            e.printStackTrace();
+        }
     }
 
     public void showTextFrame( final String s, final String title ) {
@@ -670,7 +715,8 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
 
     void buildHelpMenu() {
         _help_jmenu = MainFrame.createMenu( "Help", getConfiguration() );
-        _help_jmenu.add( _help_item = new JMenuItem( "Help" ) );
+        _help_jmenu.add( _help_item = new JMenuItem( "Documentation" ) );
+        _help_jmenu.addSeparator();
         _help_jmenu.add( _website_item = new JMenuItem( "Archaeopteryx Home" ) );
         _aptx_ref_item = new JMenuItem( "Archaeopteryx Reference" );
         _help_jmenu.add( _phyloxml_website_item = new JMenuItem( "phyloXML Home" ) );
@@ -700,16 +746,16 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
                         .setTextMinSupportMenuItem( _choose_minimal_confidence_mi, getOptions(), getCurrentTreePanel() );
                 MainFrame.setTextForFontChooserMenuItem( _choose_font_mi, MainFrame
                         .createCurrentFontDesc( getMainPanel().getTreeFontSet() ) );
-                MainFrame.updateOptionsMenuDependingOnPhylogenyType( getMainPanel(),
-                                                                     _show_scale_cbmi,
-                                                                     _show_branch_length_values_cbmi,
-                                                                     _non_lined_up_cladograms_rbmi,
-                                                                     _uniform_cladograms_rbmi,
-                                                                     _ext_node_dependent_cladogram_rbmi,
-                                                                     _label_direction_cbmi );
                 MainFrame.setCycleNodeFillMenuItem( _cycle_node_fill_mi, getOptions() );
                 MainFrame.setCycleNodeShapeMenuItem( _cycle_node_shape_mi, getOptions() );
                 MainFrame.setTextNodeSizeMenuItem( _choose_node_size_mi, getOptions() );
+                try {
+                    getMainPanel().getControlPanel().setVisibilityOfDomainStrucureCB();
+                    getMainPanel().getControlPanel().setVisibilityOfX();
+                }
+                catch ( final Exception ignore ) {
+                    // do nothing, not important.
+                }
             }
         } );
         _options_jmenu.add( MainFrame.customizeMenuItemAsLabel( new JMenuItem( MainFrame.DISPLAY_SUBHEADER ),
@@ -723,16 +769,17 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
         _radio_group_1.add( _ext_node_dependent_cladogram_rbmi );
         _radio_group_1.add( _uniform_cladograms_rbmi );
         _radio_group_1.add( _non_lined_up_cladograms_rbmi );
-        /////
         _options_jmenu.add( _show_overview_cbmi = new JCheckBoxMenuItem( MainFrame.SHOW_OVERVIEW_LABEL ) );
         _options_jmenu.add( _show_scale_cbmi = new JCheckBoxMenuItem( MainFrame.DISPLAY_SCALE_LABEL ) );
         _options_jmenu
-                .add( _show_branch_length_values_cbmi = new JCheckBoxMenuItem( MainFrame.DISPLAY_BRANCH_LENGTH_VALUES_LABEL ) );
-        _options_jmenu
                 .add( _show_default_node_shapes_internal_cbmi = new JCheckBoxMenuItem( MainFrame.DISPLAY_NODE_BOXES_LABEL_INT ) );
         _options_jmenu
                 .add( _show_default_node_shapes_external_cbmi = new JCheckBoxMenuItem( MainFrame.DISPLAY_NODE_BOXES_LABEL_EXT ) );
+        _options_jmenu
+                .add( _show_default_node_shapes_for_marked_cbmi = new JCheckBoxMenuItem( MainFrame.DISPLAY_NODE_BOXES_LABEL_MARKED ) );
+        _options_jmenu.add( _line_up_renderable_data_cbmi = new JCheckBoxMenuItem( MainFrame.LINE_UP_RENDERABLE_DATA ) );
         if ( getConfiguration().doDisplayOption( Configuration.show_domain_architectures ) ) {
+            _options_jmenu.add( _right_line_up_domains_cbmi = new JCheckBoxMenuItem( MainFrame.RIGHT_LINE_UP_DOMAINS ) );
             _options_jmenu.add( _show_domain_labels = new JCheckBoxMenuItem( MainFrame.SHOW_DOMAIN_LABELS_LABEL ) );
         }
         _options_jmenu.add( _show_annotation_ref_source = new JCheckBoxMenuItem( MainFrame.SHOW_ANN_REF_SOURCE_LABEL ) );
@@ -754,13 +801,14 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
         _options_jmenu.add( _overview_placment_mi = new JMenuItem( "" ) );
         _options_jmenu.add( _switch_colors_mi = new JMenuItem( "" ) );
         _options_jmenu.add( _choose_font_mi = new JMenuItem( "" ) );
-        /////
         _options_jmenu.addSeparator();
         _options_jmenu.add( MainFrame.customizeMenuItemAsLabel( new JMenuItem( MainFrame.SEARCH_SUBHEADER ),
                                                                 getConfiguration() ) );
         _options_jmenu
                 .add( _search_case_senstive_cbmi = new JCheckBoxMenuItem( MainFrame.SEARCH_CASE_SENSITIVE_LABEL ) );
         _options_jmenu.add( _search_whole_words_only_cbmi = new JCheckBoxMenuItem( MainFrame.SEARCH_TERMS_ONLY_LABEL ) );
+        _options_jmenu.add( _search_with_regex_cbmi = new JCheckBoxMenuItem( MainFrame.SEARCH_REGEX_LABEL ) );
+        _search_with_regex_cbmi.setToolTipText( MainFrame.SEARCH_WITH_REGEX_TIP );
         _options_jmenu
                 .add( _inverse_search_result_cbmi = new JCheckBoxMenuItem( MainFrame.INVERSE_SEARCH_RESULT_LABEL ) );
         customizeJMenuItem( _choose_font_mi );
@@ -779,6 +827,8 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
                 .isShowDefaultNodeShapesExternal() );
         customizeCheckBoxMenuItem( _show_default_node_shapes_internal_cbmi, getOptions()
                 .isShowDefaultNodeShapesInternal() );
+        customizeCheckBoxMenuItem( _show_default_node_shapes_for_marked_cbmi, getOptions()
+                .isShowDefaultNodeShapesForMarkedNodes() );
         customizeJMenuItem( _cycle_node_shape_mi );
         customizeJMenuItem( _cycle_node_fill_mi );
         customizeJMenuItem( _choose_node_size_mi );
@@ -791,11 +841,13 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
                                       getOptions().getCladogramType() == CLADOGRAM_TYPE.TOTAL_NODE_SUM_DEP );
         customizeRadioButtonMenuItem( _ext_node_dependent_cladogram_rbmi,
                                       getOptions().getCladogramType() == CLADOGRAM_TYPE.EXT_NODE_SUM_DEP );
-        customizeCheckBoxMenuItem( _show_branch_length_values_cbmi, getOptions().isShowBranchLengthValues() );
         customizeCheckBoxMenuItem( _show_overview_cbmi, getOptions().isShowOverview() );
+        customizeCheckBoxMenuItem( _search_with_regex_cbmi, getOptions().isSearchWithRegex() );
         customizeCheckBoxMenuItem( _search_whole_words_only_cbmi, getOptions().isMatchWholeTermsOnly() );
         customizeCheckBoxMenuItem( _inverse_search_result_cbmi, getOptions().isInverseSearchResult() );
         customizeCheckBoxMenuItem( _show_confidence_stddev_cbmi, getOptions().isShowConfidenceStddev() );
+        customizeCheckBoxMenuItem( _line_up_renderable_data_cbmi, getOptions().isLineUpRendarableNodeData() );
+        customizeCheckBoxMenuItem( _right_line_up_domains_cbmi, getOptions().isRightLineUpDomains() );
         _jmenubar.add( _options_jmenu );
     }
 
@@ -805,8 +857,13 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
         customizeJMenuItem( _confcolor_item );
         _tools_menu.add( _taxcolor_item = new JMenuItem( "Taxonomy Colorize Branches" ) );
         customizeJMenuItem( _taxcolor_item );
-        _tools_menu.add( _remove_branch_color_item = new JMenuItem( "Delete Branch Colors" ) );
-        _remove_branch_color_item.setToolTipText( "To delete branch color values from the current phylogeny." );
+        _tools_menu.addSeparator();
+        _tools_menu.add( _remove_visual_styles_item = new JMenuItem( "Delete All Visual Styles From Nodes" ) );
+        _remove_visual_styles_item
+                .setToolTipText( "To remove all node visual styles (fonts, colors) from the current phylogeny." );
+        customizeJMenuItem( _remove_visual_styles_item );
+        _tools_menu.add( _remove_branch_color_item = new JMenuItem( "Delete All Colors From Branches" ) );
+        _remove_branch_color_item.setToolTipText( "To remove all branch color values from the current phylogeny." );
         customizeJMenuItem( _remove_branch_color_item );
         _tools_menu.addSeparator();
         _tools_menu.add( _midpoint_root_item = new JMenuItem( "Midpoint-Root" ) );
@@ -898,7 +955,8 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
     }
 
     void displayBasicInformation() {
-        if ( ( getMainPanel().getCurrentPhylogeny() != null ) && !getMainPanel().getCurrentPhylogeny().isEmpty() ) {
+        if ( ( getMainPanel() != null ) && ( getMainPanel().getCurrentPhylogeny() != null )
+                && !getMainPanel().getCurrentPhylogeny().isEmpty() ) {
             String title = "Basic Information";
             if ( !ForesterUtil.isEmpty( getMainPanel().getCurrentPhylogeny().getName() ) ) {
                 title = title + " for \"" + _mainpanel.getCurrentPhylogeny().getName() + "\"";
@@ -1065,50 +1123,6 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
         return _options;
     }
 
-    void help() {
-        final StringBuilder sb = new StringBuilder();
-        sb.append( "Display options\n" );
-        sb.append( "-------------------\n" );
-        sb.append( "Use the checkboxes to select types of information to display on the tree.\n\n" );
-        sb.append( "Clickable tree nodes\n" );
-        sb.append( "--------------------\n" );
-        sb.append( "Tree nodes can be clicked, the action is determined by the 'click on node to' menu\n" );
-        sb.append( "or by right clicking:\n" );
-        sb.append( "o  Display Node Data -- display information for a node\n" );
-        sb.append( "o  Collapse/Uncollapse -- collapse and uncollapse subtree from clicked node\n" );
-        sb.append( "o  Root/Reroot -- change tree root to clicked node\n" );
-        sb.append( "o  Sub/Super Tree -- toggle between subtree from clicked node and whole tree\n" );
-        sb.append( "o  Swap Descendants -- switch descendant on either side of clicked node\n" );
-        sb.append( "o  Colorize Subtree -- color a subtree\n" );
-        sb.append( "o  Open Sequence Web -- launch a web browser to display sequence information\n" );
-        sb.append( "o  Open Taxonomy Web -- launch a web browser to display taxonomy information\n" );
-        sb.append( "-  there may be additional choices depending on this particular setup\n\n" );
-        sb.append( "Right clicking on a node always displays the information of a node.\n\n" );
-        sb.append( "Zooming\n" );
-        sb.append( "---------\n" );
-        sb.append( "The mouse wheel and the plus and minus keys control zooming.\n" );
-        sb.append( "Mouse wheel+Ctrl changes the text size.\n" );
-        sb.append( "Mouse wheel+Shift controls zooming in vertical direction only.\n" );
-        sb.append( "Use the buttons on the control panel to zoom the tree in and out, horizontally or vertically.\n" );
-        sb.append( "The entire tree can be fitted into the window by clicking the \"F\" button, or by pressing F, Delete, or Home.\n" );
-        sb.append( "The up, down, left, and right keys can be used to move the visible part (if zoomed in).\n" );
-        sb.append( "Up, down, left, and right+Shift can be used to control zooming horizontally and vertically.\n" );
-        sb.append( "Plus and minus keys+Ctrl change the text size; F+Ctrl, Delete+Ctrl, or Home+Ctrl resets it.\n\n" );
-        sb.append( "Quick tree manipulation:\n" );
-        sb.append( "------------------------\n" );
-        sb.append( "Order Subtrees -- order the tree by branch length\n" );
-        sb.append( "Uncollapse All -- uncollapse any and all collapsed branches\n\n" );
-        sb.append( "phyloXML\n" );
-        sb.append( "-------------------\n" );
-        sb.append( "Reference: " + Constants.PHYLOXML_REFERENCE + "\n" );
-        sb.append( "Website: " + Constants.PHYLOXML_WEB_SITE + "\n" );
-        sb.append( "Version: " + ForesterConstants.PHYLO_XML_VERSION + "\n" );
-        sb.append( "\n" );
-        sb.append( "For more information: http://www.phylosoft.org/archaeopteryx/\n" );
-        sb.append( "Email: " + Constants.AUTHOR_EMAIL + "\n\n" );
-        TextFrame.instantiate( sb.toString(), "Help", _textframes );
-    }
-
     void initializeTypeMenu( final Options options ) {
         setTypeMenuToAllUnselected();
         try {
@@ -1318,6 +1332,8 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
                 && _show_default_node_shapes_internal_cbmi.isSelected() );
         options.setShowDefaultNodeShapesExternal( ( _show_default_node_shapes_external_cbmi != null )
                 && _show_default_node_shapes_external_cbmi.isSelected() );
+        options.setShowDefaultNodeShapesForMarkedNodes( ( _show_default_node_shapes_for_marked_cbmi != null )
+                && _show_default_node_shapes_for_marked_cbmi.isSelected() );
         if ( ( _non_lined_up_cladograms_rbmi != null ) && ( _non_lined_up_cladograms_rbmi.isSelected() ) ) {
             options.setCladogramType( CLADOGRAM_TYPE.NON_LINED_UP );
         }
@@ -1343,11 +1359,9 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
         options.setShowOverview( ( _show_overview_cbmi != null ) && _show_overview_cbmi.isSelected() );
         options.setShowConfidenceStddev( ( _show_confidence_stddev_cbmi != null )
                 && _show_confidence_stddev_cbmi.isSelected() );
-        if ( ( _show_branch_length_values_cbmi != null ) && _show_branch_length_values_cbmi.isEnabled() ) {
-            options.setShowBranchLengthValues( _show_branch_length_values_cbmi.isSelected() );
-        }
         options.setMatchWholeTermsOnly( ( _search_whole_words_only_cbmi != null )
                 && _search_whole_words_only_cbmi.isSelected() );
+        options.setSearchWithRegex( ( _search_with_regex_cbmi != null ) && _search_with_regex_cbmi.isSelected() );
         options.setInverseSearchResult( ( _inverse_search_result_cbmi != null )
                 && _inverse_search_result_cbmi.isSelected() );
         if ( ( _rectangular_type_cbmi != null ) && _rectangular_type_cbmi.isSelected() ) {
@@ -1377,6 +1391,12 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
         if ( ( _color_by_taxonomic_group_cbmi != null ) && _color_by_taxonomic_group_cbmi.isEnabled() ) {
             options.setColorByTaxonomicGroup( _color_by_taxonomic_group_cbmi.isSelected() );
         }
+        if ( ( _right_line_up_domains_cbmi != null ) && _right_line_up_domains_cbmi.isEnabled() ) {
+            options.setRightLineUpDomains( _right_line_up_domains_cbmi.isSelected() );
+        }
+        if ( ( _line_up_renderable_data_cbmi != null ) && _line_up_renderable_data_cbmi.isEnabled() ) {
+            options.setLineUpRendarableNodeData( _line_up_renderable_data_cbmi.isSelected() );
+        }
     }
 
     void updateTypeCheckboxes( final Options options, final Object o ) {
@@ -1402,8 +1422,8 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
             if ( !ForesterUtil.isEmpty( getMainPanel().getCurrentPhylogeny().getName() ) ) {
                 title = "\"" + getMainPanel().getCurrentPhylogeny().getName() + "\" in " + title;
             }
-            showTextFrame( getMainPanel().getCurrentPhylogeny()
-                                   .toNewHampshire( false, getOptions().getNhConversionSupportValueStyle() ),
+            showTextFrame( getMainPanel().getCurrentPhylogeny().toNewHampshire( getOptions()
+                                   .getNhConversionSupportValueStyle() ),
                            title );
         }
     }
@@ -1468,7 +1488,7 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
         }
     }
 
-    private MainPanel getMainPanel() {
+    MainPanel getMainPanel() {
         return _mainpanel;
     }
 
@@ -1486,6 +1506,12 @@ public class ArchaeopteryxE extends JApplet implements ActionListener {
         }
     }
 
+    private void removeVisualStyles() {
+        if ( getMainPanel().getCurrentPhylogeny() != null ) {
+            AptxUtil.removeVisualStyles( getMainPanel().getCurrentPhylogeny() );
+        }
+    }
+
     private void setMainPanel( final MainPanelApplets main_panel ) {
         _mainpanel = main_panel;
     }