X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGPreferences.java;h=1ca0802af1c1a2a8ef715df1ff8bd106cdcff761;hb=acf9118bba86938c8406e7041b4e5a507f4f37a3;hp=a58569a57258fec0a266d1bb4eeba308091137d6;hpb=75d0279984e769ace9e422376b4104a4522cf0c3;p=jalview.git diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java index a58569a..1ca0802 100755 --- a/src/jalview/jbgui/GPreferences.java +++ b/src/jalview/jbgui/GPreferences.java @@ -180,9 +180,18 @@ public class GPreferences extends JPanel protected JComboBox nucColour = new JComboBox<>(); - protected JButton gapColour = new JButton(); + /* + * Overview tab components + */ + protected JPanel gapColour = new JPanel(); + + protected JPanel hiddenColour = new JPanel(); + + protected JCheckBox useLegacyGap; + + protected JCheckBox showHiddenAtStart; - protected JButton hiddenColour = new JButton(); + protected JLabel gapLabel; /* * Connections tab components @@ -298,6 +307,9 @@ public class GPreferences extends JPanel tabbedPane.add(initColoursTab(), MessageManager.getString("label.colours")); + tabbedPane.add(initOverviewTab(), + MessageManager.getString("label.overview")); + tabbedPane.add(initStructureTab(), MessageManager.getString("label.structure")); @@ -892,10 +904,9 @@ public class GPreferences extends JPanel private JPanel initColoursTab() { JPanel coloursTab = new JPanel(); - JPanel alignmentPanel = new JPanel(); - alignmentPanel.setBorder(new TitledBorder( + coloursTab.setBorder(new TitledBorder( MessageManager.getString("action.open_new_alignment"))); - alignmentPanel.setLayout(new FlowLayout()); + coloursTab.setLayout(new FlowLayout()); JLabel mincolourLabel = new JLabel(); mincolourLabel.setFont(LABEL_FONT); mincolourLabel.setHorizontalAlignment(SwingConstants.RIGHT); @@ -934,7 +945,7 @@ public class GPreferences extends JPanel protColourLabel.setHorizontalAlignment(SwingConstants.LEFT); protColourLabel.setText( MessageManager.getString("label.prot_alignment_colour") + " "); - JvSwingUtils.addtoLayout(alignmentPanel, + JvSwingUtils.addtoLayout(coloursTab, MessageManager .getString("label.default_colour_scheme_for_alignment"), protColourLabel, protColour); @@ -946,7 +957,7 @@ public class GPreferences extends JPanel nucColourLabel.setHorizontalAlignment(SwingConstants.LEFT); nucColourLabel.setText( MessageManager.getString("label.nuc_alignment_colour") + " "); - JvSwingUtils.addtoLayout(alignmentPanel, + JvSwingUtils.addtoLayout(coloursTab, MessageManager .getString("label.default_colour_scheme_for_alignment"), nucColourLabel, nucColour); @@ -963,15 +974,25 @@ public class GPreferences extends JPanel MessageManager.getString( "label.default_maximum_colour_annotation_shading"), maxcolourLabel, maxColour); - alignmentPanel.add(annotationShding); // , FlowLayout.LEFT); + coloursTab.add(annotationShding); // , FlowLayout.LEFT); + return coloursTab; + } + /** + * Initialises the Overview tabbed panel. + * + * @return + */ + private JPanel initOverviewTab() + { JPanel overviewPanel = new JPanel(); overviewPanel.setBorder(new TitledBorder( MessageManager.getString("label.overview_settings"))); - overviewPanel.setLayout(new FlowLayout()); gapColour.setFont(LABEL_FONT); - gapColour.setBorder(BorderFactory.createEtchedBorder()); + // fixing the border colours stops apparent colour bleed from the panel + gapColour.setBorder( + BorderFactory.createEtchedBorder(Color.white, Color.lightGray)); gapColour.setPreferredSize(new Dimension(40, 20)); gapColour.addMouseListener(new MouseAdapter() { @@ -983,7 +1004,9 @@ public class GPreferences extends JPanel }); hiddenColour.setFont(LABEL_FONT); - hiddenColour.setBorder(BorderFactory.createEtchedBorder()); + // fixing the border colours stops apparent colour bleed from the panel + hiddenColour.setBorder( + BorderFactory.createEtchedBorder(Color.white, Color.lightGray)); hiddenColour.setPreferredSize(new Dimension(40, 20)); hiddenColour.addMouseListener(new MouseAdapter() { @@ -994,22 +1017,35 @@ public class GPreferences extends JPanel } }); - JCheckBox gapSetting = new JCheckBox( + useLegacyGap = new JCheckBox( MessageManager.getString("label.ov_legacy_gap")); - gapSetting.setFont(LABEL_FONT); - gapSetting.setHorizontalAlignment(SwingConstants.LEFT); - JLabel gapLabel = new JLabel( + useLegacyGap.setFont(LABEL_FONT); + useLegacyGap.setHorizontalAlignment(SwingConstants.LEFT); + useLegacyGap.setVerticalTextPosition(SwingConstants.TOP); + gapLabel = new JLabel( MessageManager.getString("label.gap_colour")); gapLabel.setFont(LABEL_FONT); gapLabel.setHorizontalAlignment(SwingConstants.LEFT); - JCheckBox hiddenSetting = new JCheckBox( + gapLabel.setVerticalTextPosition(SwingConstants.TOP); + showHiddenAtStart = new JCheckBox( MessageManager.getString("label.ov_show_hide_default")); - hiddenSetting.setFont(LABEL_FONT); - hiddenSetting.setHorizontalAlignment(SwingConstants.LEFT); + showHiddenAtStart.setFont(LABEL_FONT); + showHiddenAtStart.setHorizontalAlignment(SwingConstants.LEFT); + showHiddenAtStart.setVerticalTextPosition(SwingConstants.TOP); JLabel hiddenLabel = new JLabel( MessageManager.getString("label.hidden_colour")); hiddenLabel.setFont(LABEL_FONT); hiddenLabel.setHorizontalAlignment(SwingConstants.LEFT); + hiddenLabel.setVerticalTextPosition(SwingConstants.TOP); + + useLegacyGap.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + useLegacyGaps_actionPerformed(e); + } + }); overviewPanel.setLayout(new GridBagLayout()); GridBagConstraints c1 = new GridBagConstraints(); @@ -1018,20 +1054,22 @@ public class GPreferences extends JPanel c1.gridx = 0; c1.gridy = 0; c1.weightx = 1; + c1.ipady = 20; c1.anchor = GridBagConstraints.FIRST_LINE_START; - overviewPanel.add(gapSetting, c1); + overviewPanel.add(useLegacyGap, c1); GridBagConstraints c2 = new GridBagConstraints(); c2.fill = GridBagConstraints.HORIZONTAL; c2.gridx = 1; c2.gridy = 0; - c2.insets = new Insets(0, 5, 0, 5); + c2.insets = new Insets(0, 15, 0, 10); overviewPanel.add(gapLabel, c2); GridBagConstraints c3 = new GridBagConstraints(); c3.fill = GridBagConstraints.HORIZONTAL; c3.gridx = 2; c3.gridy = 0; + c3.insets = new Insets(0, 0, 0, 15); overviewPanel.add(gapColour, c3); GridBagConstraints c4 = new GridBagConstraints(); @@ -1039,32 +1077,50 @@ public class GPreferences extends JPanel c4.gridx = 0; c4.gridy = 1; c4.weightx = 1; - overviewPanel.add(hiddenSetting, c4); + overviewPanel.add(showHiddenAtStart, c4); GridBagConstraints c5 = new GridBagConstraints(); c5.fill = GridBagConstraints.HORIZONTAL; c5.gridx = 1; c5.gridy = 1; - c5.insets = new Insets(0, 5, 0, 5); + c5.insets = new Insets(0, 15, 0, 10); overviewPanel.add(hiddenLabel, c5); GridBagConstraints c6 = new GridBagConstraints(); c6.fill = GridBagConstraints.HORIZONTAL; c6.gridx = 2; c6.gridy = 1; + c6.insets = new Insets(0, 0, 0, 15); overviewPanel.add(hiddenColour, c6); + JButton resetButton = new JButton( + MessageManager.getString("label.reset_to_defaults")); + + resetButton.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + resetOvDefaults_actionPerformed(e); + } + }); + + GridBagConstraints c7 = new GridBagConstraints(); + c7.fill = GridBagConstraints.NONE; + c7.gridx = 0; + c7.gridy = 2; + c7.insets = new Insets(10, 0, 0, 0); + c7.anchor = GridBagConstraints.WEST; + overviewPanel.add(resetButton, c7); + // Add padding so the panel doesn't look ridiculous JPanel spacePanel = new JPanel(); overviewPanel.add(spacePanel, - new GridBagConstraints(0, 2, 1, 1, 1.0, 1.0, + new GridBagConstraints(0, 3, 1, 1, 1.0, 1.0, GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(0, 0, 0, 5), 0, 0)); - coloursTab.setLayout(new GridLayout(2, 1)); - coloursTab.add(alignmentPanel); - coloursTab.add(overviewPanel); - return coloursTab; + return overviewPanel; } /** @@ -1599,11 +1655,11 @@ public class GPreferences extends JPanel { } - protected void gapColour_actionPerformed(JButton btn) + protected void gapColour_actionPerformed(JPanel panel) { } - protected void hiddenColour_actionPerformed(JButton btn) + protected void hiddenColour_actionPerformed(JPanel panel) { } @@ -1613,6 +1669,14 @@ public class GPreferences extends JPanel } + protected void useLegacyGaps_actionPerformed(ActionEvent e) + { + } + + protected void resetOvDefaults_actionPerformed(ActionEvent e) + { + } + /** * DOCUMENT ME! *