X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplitFrame.java;h=574cf045acc42e3432739bd24c72b2be0acbb62e;hb=e00aedcdf1c30781339cd93e6e812c71f16b86d3;hp=dca77bf8d26227d1372992d071a3926f243a6ed9;hpb=1b378087ec2d5be9b290cd63c45bfdb9e75269fb;p=jalview.git diff --git a/src/jalview/gui/SplitFrame.java b/src/jalview/gui/SplitFrame.java index dca77bf..574cf04 100644 --- a/src/jalview/gui/SplitFrame.java +++ b/src/jalview/gui/SplitFrame.java @@ -32,12 +32,11 @@ import jalview.util.MessageManager; import jalview.util.Platform; import jalview.viewmodel.AlignmentViewport; +import java.awt.BorderLayout; import java.awt.Component; import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; @@ -48,6 +47,7 @@ import java.util.Map.Entry; import javax.swing.AbstractAction; import javax.swing.InputMap; +import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JDesktopPane; import javax.swing.JInternalFrame; @@ -56,6 +56,8 @@ import javax.swing.JMenuItem; import javax.swing.JPanel; import javax.swing.JTabbedPane; import javax.swing.KeyStroke; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; import javax.swing.event.InternalFrameAdapter; import javax.swing.event.InternalFrameEvent; @@ -178,26 +180,21 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI */ public void adjustLayout() { + final AlignViewport topViewport = ((AlignFrame) getTopFrame()).viewport; + final AlignViewport bottomViewport = ((AlignFrame) getBottomFrame()).viewport; + /* * Ensure sequence ids are the same width so sequences line up */ - int w1 = ((AlignFrame) getTopFrame()).getViewport().getIdWidth(); - int w2 = ((AlignFrame) getBottomFrame()).getViewport().getIdWidth(); + int w1 = topViewport.getIdWidth(); + int w2 = bottomViewport.getIdWidth(); int w3 = Math.max(w1, w2); - if (w1 != w3) - { - ((AlignFrame) getTopFrame()).getViewport().setIdWidth(w3); - } - if (w2 != w3) - { - ((AlignFrame) getBottomFrame()).getViewport().setIdWidth(w3); - } + topViewport.setIdWidth(w3); + bottomViewport.setIdWidth(w3); /* * Scale protein to either 1 or 3 times character width of dna */ - final AlignViewport topViewport = ((AlignFrame) getTopFrame()).viewport; - final AlignViewport bottomViewport = ((AlignFrame) getBottomFrame()).viewport; final AlignmentI topAlignment = topViewport.getAlignment(); final AlignmentI bottomAlignment = bottomViewport.getAlignment(); AlignmentViewport cdna = topAlignment.isNucleotide() ? topViewport @@ -861,14 +858,87 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI FeatureSettingsControllerGuiI featureSettings) { boolean showInternalFrame = false; - if (featureSettingsUI == null) + if (featureSettingsUI == null || featureSettingsPanels == null) { showInternalFrame = true; featureSettingsPanels = new JTabbedPane(); - featureSettingsUI = new JInternalFrame( - "Feature Settings for CDS and Protein Views"); + featureSettingsPanels.addChangeListener(new ChangeListener() + { + + @Override + public void stateChanged(ChangeEvent e) + { + if (e.getSource() != featureSettingsPanels + || featureSettingsUI == null + || featureSettingsUI.isClosed() + || !featureSettingsUI.isVisible()) + { + // not our tabbed pane + return; + } + int tab = featureSettingsPanels.getSelectedIndex(); + if (tab < 0 || featureSettingsPanels + .getSelectedComponent() instanceof FeatureSettingsControllerGuiI) + { + // no tab selected or already showing a feature settings GUI + return; + } + getAlignFrames().get(tab).showFeatureSettingsUI(); + } + }); + featureSettingsUI = new JInternalFrame(MessageManager.getString( + "label.sequence_feature_settings_for_CDS_and_Protein")); featureSettingsPanels.setOpaque(true); - featureSettingsUI.setContentPane(featureSettingsPanels); + + JPanel dialog = new JPanel(); + dialog.setOpaque(true); + dialog.setLayout(new BorderLayout()); + dialog.add(featureSettingsPanels, BorderLayout.CENTER); + JPanel buttons = new JPanel(); + JButton ok = new JButton(MessageManager.getString("action.ok")); + ok.addActionListener(new ActionListener() + { + + @Override + public void actionPerformed(ActionEvent e) + { + try + { + featureSettingsUI.setClosed(true); + } catch (PropertyVetoException pv) + { + pv.printStackTrace(); + } + } + }); + JButton cancel = new JButton( + MessageManager.getString("action.cancel")); + cancel.addActionListener(new ActionListener() + { + + @Override + public void actionPerformed(ActionEvent e) + { + try + { + for (Component fspanel : featureSettingsPanels.getComponents()) + { + if (fspanel instanceof FeatureSettingsControllerGuiI) + { + ((FeatureSettingsControllerGuiI) fspanel).revert(); + } + } + featureSettingsUI.setClosed(true); + } catch (Exception pv) + { + pv.printStackTrace(); + } + } + }); + buttons.add(ok); + buttons.add(cancel); + dialog.add(buttons, BorderLayout.SOUTH); + featureSettingsUI.setContentPane(dialog); createDummyTabs(); } if (featureSettingsPanels @@ -885,32 +955,40 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI if (pos == 0) { featureSettingsPanels.removeTabAt(0); - featureSettingsPanels.insertTab("CDS", null, - (Component) featureSettings, "Feature Settings for DNA CDS", + featureSettingsPanels.insertTab(tabName[0], null, + (Component) featureSettings, + MessageManager.formatMessage( + "label.sequence_feature_settings_for", tabName[0]), 0); } if (pos == 1) { featureSettingsPanels.removeTabAt(1); - featureSettingsPanels.insertTab("Protein", null, - (Component) featureSettings, "Feature Settings for Protein", + featureSettingsPanels.insertTab(tabName[1], null, + (Component) featureSettings, + MessageManager.formatMessage( + "label.sequence_feature_settings_for", tabName[1]), 1); } featureSettingsPanels.setSelectedComponent((Component) featureSettings); + + // TODO: JAL-3535 - construct a feature settings title including names of + // currently selected CDS and Protein names + if (showInternalFrame) { if (Platform.isAMac()) { Desktop.addInternalFrame(featureSettingsUI, MessageManager.getString( - "Feature Settings for CDS and Protein Views"), + "label.sequence_feature_settings_for_CDS_and_Protein"), 600, 480); } else { Desktop.addInternalFrame(featureSettingsUI, MessageManager.getString( - "Feature Settings for CDS and Protein Views"), + "label.sequence_feature_settings_for_CDS_and_Protein"), 600, 450); } featureSettingsUI @@ -939,39 +1017,19 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI } } featureSettingsPanels = null; + featureSettingsUI = null; }; }); featureSettingsUI.setLayer(JLayeredPane.PALETTE_LAYER); } } - /* - * for materialising feature settings for a tab when clicked on - */ - private FocusListener fl1 = new FocusListener() - { - - @Override - public void focusLost(FocusEvent e) - { - // TODO Auto-generated method stub - - } - - @Override - public void focusGained(FocusEvent e) - { - int tab = featureSettingsPanels.getSelectedIndex(); - getAlignFrames().get(tab).showFeatureSettingsUI(); - } - }; - /** * tab names for feature settings */ private String[] tabName = new String[] { MessageManager.getString("label.CDS"), - MessageManager.getString("label.Protein") }; + MessageManager.getString("label.protein") }; /** * create placeholder tabs which materialise the feature settings for a given @@ -982,7 +1040,6 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI for (int tabIndex = 0; tabIndex < 2; tabIndex++) { JPanel dummyTab = new JPanel(); - dummyTab.addFocusListener(fl1); featureSettingsPanels.addTab(tabName[tabIndex], dummyTab); } } @@ -993,26 +1050,25 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI for (int tabIndex = 0; tabIndex < 2; tabIndex++) { if (featureSettingsPanels.getTabCount() > tabIndex) - { + { dummyTab = featureSettingsPanels.getTabComponentAt(tabIndex); if (dummyTab instanceof FeatureSettingsControllerGuiI && !dummyTab.isVisible()) - { + { featureSettingsPanels.removeTabAt(tabIndex); // close the feature Settings tab ((FeatureSettingsControllerGuiI) dummyTab) .featureSettings_isClosed(); // create a dummy tab in its place - dummyTab = new JPanel(); - dummyTab.addFocusListener(fl1); + dummyTab = new JPanel(); featureSettingsPanels.insertTab(tabName[tabIndex], null, dummyTab, MessageManager.formatMessage( "label.sequence_feature_settings_for", tabName[tabIndex]), tabIndex); + } } } - } } @Override