inprogress

[jalview.git] / forester / java / src / org / forester / archaeopteryx / ControlPanel.java

diff --git a/forester/java/src/org/forester/archaeopteryx/ControlPanel.java b/forester/java/src/org/forester/archaeopteryx/ControlPanel.java
index 9549aef..a2f0c68 100644 (file)
--- a/forester/java/src/org/forester/archaeopteryx/ControlPanel.java
+++ b/forester/java/src/org/forester/archaeopteryx/ControlPanel.java
@@ -95,6 +95,7 @@ final class ControlPanel extends JPanel implements ActionListener {
     private boolean              _color_branches;
     private JCheckBox            _color_branches_cb;
     private int                  _color_subtree_cb_item;
+    private int                  _change_node_font_item;
     // The settings from the conf file
     private final Configuration  _configuration;
     private int                  _copy_subtree_item;
@@ -116,12 +117,19 @@ final class ControlPanel extends JPanel implements ActionListener {
     private int                  _open_pdb_item;
     private int                  _open_seq_web_item;
     private int                  _open_tax_web_item;
+    private int                  _color_node_font_item;
     private JButton              _order;
     private boolean              _order_of_appearance;
     private int                  _paste_subtree_item;
     private int                  _reroot_cb_item;
     private JButton              _return_to_super_tree;
-   
+    // Search 
+    private JLabel               _search_found_label_0;
+    private JLabel               _search_found_label_1;
+    private JButton              _search_reset_button_0;
+    private JButton              _search_reset_button_1;
+    private JTextField           _search_tf_0;
+    private JTextField           _search_tf_1;
     private int                  _select_nodes_item;
     private Sequence             _selected_query_seq;
     private JCheckBox            _seq_relation_confidence_switch;
@@ -129,14 +137,6 @@ final class ControlPanel extends JPanel implements ActionListener {
     private JCheckBox            _show_annotation;
     private JCheckBox            _show_binary_character_counts;
     private JCheckBox            _show_binary_characters;
-    // Search 
-    private JLabel               _search_found_label_0;
-    private JButton              _search_reset_button_0;
-    private JTextField           _search_tf_0;
-    private JLabel               _search_found_label_1;
-    private JButton              _search_reset_button_1;
-    private JTextField           _search_tf_1;
-    
     // Indices for the click-to options in the combo box
     private int                  _show_data_item;
     private JCheckBox            _show_domain_architectures;
@@ -761,7 +761,7 @@ final class ControlPanel extends JPanel implements ActionListener {
     JLabel getSearchFoundCountsLabel0() {
         return _search_found_label_0;
     }
-    
+
     JLabel getSearchFoundCountsLabel1() {
         return _search_found_label_1;
     }
@@ -769,7 +769,7 @@ final class ControlPanel extends JPanel implements ActionListener {
     JButton getSearchResetButton0() {
         return _search_reset_button_0;
     }
-    
+
     JButton getSearchResetButton1() {
         return _search_reset_button_1;
     }
@@ -777,7 +777,7 @@ final class ControlPanel extends JPanel implements ActionListener {
     JTextField getSearchTextField0() {
         return _search_tf_0;
     }
-    
+
     JTextField getSearchTextField1() {
         return _search_tf_1;
     }
@@ -908,8 +908,6 @@ final class ControlPanel extends JPanel implements ActionListener {
         if ( query != null ) {
             query = query.trim();
         }
-       
-        
         if ( !ForesterUtil.isEmpty( query ) ) {
             search0( main_panel, tree, query );
         }
@@ -920,7 +918,7 @@ final class ControlPanel extends JPanel implements ActionListener {
             searchReset0();
         }
     }
-    
+
     void search1() {
         final MainPanel main_panel = getMainPanel();
         final Phylogeny tree = main_panel.getCurrentPhylogeny();
@@ -931,7 +929,6 @@ final class ControlPanel extends JPanel implements ActionListener {
         if ( query != null ) {
             query = query.trim();
         }
-       
         if ( !ForesterUtil.isEmpty( query ) ) {
             search1( main_panel, tree, query );
         }
@@ -942,15 +939,13 @@ final class ControlPanel extends JPanel implements ActionListener {
             searchReset1();
         }
     }
-    
-    
 
     void searchReset0() {
         if ( getMainPanel().getCurrentTreePanel() != null ) {
             getMainPanel().getCurrentTreePanel().setFoundNodes0( null );
         }
     }
-    
+
     void searchReset1() {
         if ( getMainPanel().getCurrentTreePanel() != null ) {
             getMainPanel().getCurrentTreePanel().setFoundNodes1( null );
@@ -1173,6 +1168,12 @@ final class ControlPanel extends JPanel implements ActionListener {
         else if ( action == _open_pdb_item ) {
             setActionWhenNodeClicked( NodeClickAction.OPEN_PDB_WEB );
         }
+        else if ( action == _color_node_font_item ) {
+            setActionWhenNodeClicked( NodeClickAction.COLOR_NODE_FONT );
+        }
+        else if ( action == _change_node_font_item ) {
+            setActionWhenNodeClicked( NodeClickAction.CHANGE_NODE_FONT );
+        }
         else {
             throw new RuntimeException( "unknown action: " + action );
         }
@@ -1213,7 +1214,7 @@ final class ControlPanel extends JPanel implements ActionListener {
     void setSearchFoundCountsOnLabel0( final int counts ) {
         getSearchFoundCountsLabel0().setText( "Found: " + counts );
     }
-    
+
     void setSearchFoundCountsOnLabel1( final int counts ) {
         getSearchFoundCountsLabel1().setText( "Found: " + counts );
     }
@@ -1409,8 +1410,7 @@ final class ControlPanel extends JPanel implements ActionListener {
         s_panel_2.add( _search_found_label_1 );
         addJButton( _search_reset_button_1, s_panel_2 );
     }
-    
-    
+
     void showAnnotations() {
         if ( _show_annotation != null ) {
             _show_annotation.setSelected( true );
@@ -1780,7 +1780,7 @@ final class ControlPanel extends JPanel implements ActionListener {
             searchReset0();
         }
     }
-    
+
     private void search1( final MainPanel main_panel, final Phylogeny tree, final String query_str ) {
         getSearchFoundCountsLabel1().setVisible( true );
         getSearchResetButton1().setEnabled( true );
@@ -1902,6 +1902,24 @@ final class ControlPanel extends JPanel implements ActionListener {
             }
             cb_index++;
         }
+        if ( _configuration.doDisplayClickToOption( Configuration.color_node_font ) ) {
+            _color_node_font_item = cb_index;
+            addClickToOption( Configuration.color_node_font,
+                              _configuration.getClickToTitle( Configuration.color_node_font ) );
+            if ( default_option == Configuration.color_node_font ) {
+                selected_index = cb_index;
+            }
+            cb_index++;
+        }
+        if ( _configuration.doDisplayClickToOption( Configuration.change_node_font ) ) {
+            _change_node_font_item = cb_index;
+            addClickToOption( Configuration.change_node_font,
+                              _configuration.getClickToTitle( Configuration.change_node_font ) );
+            if ( default_option == Configuration.change_node_font ) {
+                selected_index = cb_index;
+            }
+            cb_index++;
+        }
         if ( _configuration.doDisplayClickToOption( Configuration.open_seq_web ) ) {
             _open_seq_web_item = cb_index;
             addClickToOption( Configuration.open_seq_web, _configuration.getClickToTitle( Configuration.open_seq_web ) );
@@ -2239,6 +2257,8 @@ final class ControlPanel extends JPanel implements ActionListener {
         SHOW_DATA,
         SORT_DESCENDENTS,
         SUBTREE,
-        SWAP;
+        SWAP,
+        CHANGE_NODE_FONT,
+        COLOR_NODE_FONT;
     }
 }