From 29625ee998523520e87bb88643247b3723e908bd Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Thu, 3 Nov 2022 13:14:43 +0000 Subject: [PATCH] JAL-3416 More JInternalFrame icons --- resources/images/windowIcons/splitIcon.png | Bin 0 -> 5792 bytes src/jalview/gui/AnnotationChooser.java | 11 +++++---- src/jalview/gui/AnnotationColourChooser.java | 18 +++++++------- src/jalview/gui/AnnotationColumnChooser.java | 16 ++++++------ src/jalview/gui/AnnotationExporter.java | 24 +++++++++--------- src/jalview/gui/AppVarna.java | 34 +++++++++++++------------- src/jalview/gui/CalculationChooser.java | 19 +++++++------- src/jalview/gui/SplitFrame.java | 1 + src/jalview/gui/StructureViewerBase.java | 1 + src/jalview/gui/WindowIcons.java | 4 +++ 10 files changed, 68 insertions(+), 60 deletions(-) create mode 100644 resources/images/windowIcons/splitIcon.png diff --git a/resources/images/windowIcons/splitIcon.png b/resources/images/windowIcons/splitIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..c6a0520acfbb0f5ca8e9a5dd7baccdbe00bb4832 GIT binary patch literal 5792 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 literal 0 HcmV?d00001 diff --git a/src/jalview/gui/AnnotationChooser.java b/src/jalview/gui/AnnotationChooser.java index 791421d..ad5e574 100644 --- a/src/jalview/gui/AnnotationChooser.java +++ b/src/jalview/gui/AnnotationChooser.java @@ -20,11 +20,6 @@ */ package jalview.gui; -import jalview.datamodel.AlignmentAnnotation; -import jalview.datamodel.AlignmentI; -import jalview.datamodel.SequenceGroup; -import jalview.util.MessageManager; - import java.awt.BorderLayout; import java.awt.Checkbox; import java.awt.CheckboxGroup; @@ -45,6 +40,11 @@ import javax.swing.JInternalFrame; import javax.swing.JLayeredPane; import javax.swing.JPanel; +import jalview.datamodel.AlignmentAnnotation; +import jalview.datamodel.AlignmentI; +import jalview.datamodel.SequenceGroup; +import jalview.util.MessageManager; + /** * A panel that allows the user to select which sequence-associated annotation * rows to show or hide. @@ -602,6 +602,7 @@ public class AnnotationChooser extends JPanel private void showFrame() { frame = new JInternalFrame(); + frame.setFrameIcon(WindowIcons.annotationIcon); frame.setContentPane(this); frame.setLayer(JLayeredPane.PALETTE_LAYER); Desktop.addInternalFrame(frame, diff --git a/src/jalview/gui/AnnotationColourChooser.java b/src/jalview/gui/AnnotationColourChooser.java index 4e9a26d..77dc1c5 100644 --- a/src/jalview/gui/AnnotationColourChooser.java +++ b/src/jalview/gui/AnnotationColourChooser.java @@ -20,15 +20,6 @@ */ package jalview.gui; -import jalview.bin.Cache; -import jalview.datamodel.AlignmentAnnotation; -import jalview.datamodel.GraphLine; -import jalview.datamodel.SequenceGroup; -import jalview.gui.JalviewColourChooser.ColourChooserListener; -import jalview.schemes.AnnotationColourGradient; -import jalview.schemes.ColourSchemeI; -import jalview.util.MessageManager; - import java.awt.BorderLayout; import java.awt.Color; import java.awt.Dimension; @@ -48,6 +39,14 @@ import javax.swing.JInternalFrame; import javax.swing.JLayeredPane; import javax.swing.JPanel; +import jalview.bin.Cache; +import jalview.datamodel.AlignmentAnnotation; +import jalview.datamodel.GraphLine; +import jalview.datamodel.SequenceGroup; +import jalview.gui.JalviewColourChooser.ColourChooserListener; +import jalview.schemes.AnnotationColourGradient; +import jalview.schemes.ColourSchemeI; +import jalview.util.MessageManager; import net.miginfocom.swing.MigLayout; @SuppressWarnings("serial") @@ -87,6 +86,7 @@ public class AnnotationColourChooser extends AnnotationRowFilter } } frame = new JInternalFrame(); + frame.setFrameIcon(WindowIcons.annotationIcon); frame.setContentPane(this); frame.setLayer(JLayeredPane.PALETTE_LAYER); Desktop.addInternalFrame(frame, diff --git a/src/jalview/gui/AnnotationColumnChooser.java b/src/jalview/gui/AnnotationColumnChooser.java index c0d4708..401df42 100644 --- a/src/jalview/gui/AnnotationColumnChooser.java +++ b/src/jalview/gui/AnnotationColumnChooser.java @@ -21,14 +21,6 @@ package jalview.gui; -import jalview.datamodel.AlignmentAnnotation; -import jalview.datamodel.HiddenColumns; -import jalview.io.cache.JvCacheableInputBox; -import jalview.schemes.AnnotationColourGradient; -import jalview.util.MessageManager; -import jalview.util.Platform; -import jalview.viewmodel.annotationfilter.AnnotationFilterParameter; - import java.awt.BorderLayout; import java.awt.CardLayout; import java.awt.Color; @@ -50,6 +42,13 @@ import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.border.TitledBorder; +import jalview.datamodel.AlignmentAnnotation; +import jalview.datamodel.HiddenColumns; +import jalview.io.cache.JvCacheableInputBox; +import jalview.schemes.AnnotationColourGradient; +import jalview.util.MessageManager; +import jalview.util.Platform; +import jalview.viewmodel.annotationfilter.AnnotationFilterParameter; import net.miginfocom.swing.MigLayout; @SuppressWarnings("serial") @@ -98,6 +97,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter { super(av, ap); frame = new JInternalFrame(); + frame.setFrameIcon(WindowIcons.annotationIcon); frame.setContentPane(this); frame.setLayer(JLayeredPane.PALETTE_LAYER); Desktop.addInternalFrame(frame, diff --git a/src/jalview/gui/AnnotationExporter.java b/src/jalview/gui/AnnotationExporter.java index 1efd100..c22761a 100644 --- a/src/jalview/gui/AnnotationExporter.java +++ b/src/jalview/gui/AnnotationExporter.java @@ -20,24 +20,13 @@ */ package jalview.gui; -import java.util.Locale; - -import jalview.api.FeatureRenderer; -import jalview.bin.Cache; -import jalview.datamodel.AlignmentAnnotation; -import jalview.datamodel.SequenceI; -import jalview.io.AnnotationFile; -import jalview.io.FeaturesFile; -import jalview.io.JalviewFileChooser; -import jalview.io.JalviewFileView; -import jalview.util.MessageManager; - import java.awt.Color; import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.FileWriter; import java.io.PrintWriter; +import java.util.Locale; import javax.swing.BoxLayout; import javax.swing.ButtonGroup; @@ -50,6 +39,16 @@ import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.SwingConstants; +import jalview.api.FeatureRenderer; +import jalview.bin.Cache; +import jalview.datamodel.AlignmentAnnotation; +import jalview.datamodel.SequenceI; +import jalview.io.AnnotationFile; +import jalview.io.FeaturesFile; +import jalview.io.JalviewFileChooser; +import jalview.io.JalviewFileView; +import jalview.util.MessageManager; + /** * * GUI dialog for exporting features or alignment annotations depending upon @@ -108,6 +107,7 @@ public class AnnotationExporter extends JPanel } frame = new JInternalFrame(); + frame.setFrameIcon(WindowIcons.annotationIcon); frame.setContentPane(this); frame.setLayer(JLayeredPane.PALETTE_LAYER); Dimension preferredSize = frame.getPreferredSize(); diff --git a/src/jalview/gui/AppVarna.java b/src/jalview/gui/AppVarna.java index 3a64716..6fac8fc 100644 --- a/src/jalview/gui/AppVarna.java +++ b/src/jalview/gui/AppVarna.java @@ -20,23 +20,6 @@ */ package jalview.gui; -import jalview.analysis.AlignSeq; -import jalview.datamodel.AlignmentAnnotation; -import jalview.datamodel.ColumnSelection; -import jalview.datamodel.HiddenColumns; -import jalview.datamodel.RnaViewerModel; -import jalview.datamodel.SequenceGroup; -import jalview.datamodel.SequenceI; -import jalview.ext.varna.RnaModel; -import jalview.structure.SecondaryStructureListener; -import jalview.structure.SelectionListener; -import jalview.structure.SelectionSource; -import jalview.structure.StructureSelectionManager; -import jalview.structure.VamsasSource; -import jalview.util.Comparison; -import jalview.util.MessageManager; -import jalview.util.ShiftList; - import java.awt.BorderLayout; import java.awt.Color; import java.util.Collection; @@ -60,6 +43,22 @@ import fr.orsay.lri.varna.models.FullBackup; import fr.orsay.lri.varna.models.annotations.HighlightRegionAnnotation; import fr.orsay.lri.varna.models.rna.ModeleBase; import fr.orsay.lri.varna.models.rna.RNA; +import jalview.analysis.AlignSeq; +import jalview.datamodel.AlignmentAnnotation; +import jalview.datamodel.ColumnSelection; +import jalview.datamodel.HiddenColumns; +import jalview.datamodel.RnaViewerModel; +import jalview.datamodel.SequenceGroup; +import jalview.datamodel.SequenceI; +import jalview.ext.varna.RnaModel; +import jalview.structure.SecondaryStructureListener; +import jalview.structure.SelectionListener; +import jalview.structure.SelectionSource; +import jalview.structure.StructureSelectionManager; +import jalview.structure.VamsasSource; +import jalview.util.Comparison; +import jalview.util.MessageManager; +import jalview.util.ShiftList; public class AppVarna extends JInternalFrame implements SelectionListener, SecondaryStructureListener, @@ -216,6 +215,7 @@ public class AppVarna extends JInternalFrame */ protected AppVarna(AlignmentPanel ap) { + this.setFrameIcon(null); this.ap = ap; this.viewId = System.currentTimeMillis() + "." + this.hashCode(); vab = new AppVarnaBinding(); diff --git a/src/jalview/gui/CalculationChooser.java b/src/jalview/gui/CalculationChooser.java index f7e5413..dda0a9f 100644 --- a/src/jalview/gui/CalculationChooser.java +++ b/src/jalview/gui/CalculationChooser.java @@ -20,15 +20,6 @@ */ package jalview.gui; -import jalview.analysis.TreeBuilder; -import jalview.analysis.scoremodels.ScoreModels; -import jalview.analysis.scoremodels.SimilarityParams; -import jalview.api.analysis.ScoreModelI; -import jalview.api.analysis.SimilarityParamsI; -import jalview.bin.Cache; -import jalview.datamodel.SequenceGroup; -import jalview.util.MessageManager; - import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; @@ -61,6 +52,15 @@ import javax.swing.JRadioButton; import javax.swing.event.InternalFrameAdapter; import javax.swing.event.InternalFrameEvent; +import jalview.analysis.TreeBuilder; +import jalview.analysis.scoremodels.ScoreModels; +import jalview.analysis.scoremodels.SimilarityParams; +import jalview.api.analysis.ScoreModelI; +import jalview.api.analysis.SimilarityParamsI; +import jalview.bin.Cache; +import jalview.datamodel.SequenceGroup; +import jalview.util.MessageManager; + /** * A dialog where a user can choose and action Tree or PCA calculation options */ @@ -130,6 +130,7 @@ public class CalculationChooser extends JPanel { setLayout(new BorderLayout()); frame = new JInternalFrame(); + frame.setFrameIcon(WindowIcons.treeIcon); frame.setContentPane(this); this.setBackground(Color.white); frame.addFocusListener(new FocusListener() diff --git a/src/jalview/gui/SplitFrame.java b/src/jalview/gui/SplitFrame.java index 6ebedb7..7398a3f 100644 --- a/src/jalview/gui/SplitFrame.java +++ b/src/jalview/gui/SplitFrame.java @@ -105,6 +105,7 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI */ protected void init() { + setFrameIcon(WindowIcons.splitIcon); getTopFrame().setSplitFrame(this); getBottomFrame().setSplitFrame(this); getTopFrame().setVisible(true); diff --git a/src/jalview/gui/StructureViewerBase.java b/src/jalview/gui/StructureViewerBase.java index ec5579c..f4970ae 100644 --- a/src/jalview/gui/StructureViewerBase.java +++ b/src/jalview/gui/StructureViewerBase.java @@ -135,6 +135,7 @@ public abstract class StructureViewerBase extends GStructureViewer public StructureViewerBase() { super(); + setFrameIcon(WindowIcons.structureIcon); } /** diff --git a/src/jalview/gui/WindowIcons.java b/src/jalview/gui/WindowIcons.java index 61599df..0e74785 100644 --- a/src/jalview/gui/WindowIcons.java +++ b/src/jalview/gui/WindowIcons.java @@ -40,4 +40,8 @@ public class WindowIcons protected static final ImageIcon structureIcon = new ImageIcon( WindowIcons.class .getResource("/images/windowIcons/structureIcon.png")); + + protected static final ImageIcon splitIcon = new ImageIcon( + WindowIcons.class + .getResource("/images/windowIcons/splitIcon.png")); } -- 1.7.10.2