X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSliderPanel.java;h=6665588a9365376e379259085292f3d192b492d7;hb=071a00a0f8ce9892254630595696c1c9d7c39ec7;hp=e6ec82235ff9653e9ac58bb67c75b89a517a268c;hpb=f4766a7bbcfae845fc95923b01fa14ff83d589ff;p=jalview.git

diff --git a/src/jalview/gui/SliderPanel.java b/src/jalview/gui/SliderPanel.java
index e6ec822..6665588 100755
--- a/src/jalview/gui/SliderPanel.java
+++ b/src/jalview/gui/SliderPanel.java
@@ -20,12 +20,6 @@
  */
 package jalview.gui;
 
-import jalview.analysis.Conservation;
-import jalview.datamodel.SequenceGroup;
-import jalview.jbgui.GSliderPanel;
-import jalview.renderer.ResidueShaderI;
-import jalview.util.MessageManager;
-
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.beans.PropertyVetoException;
@@ -38,6 +32,12 @@ import javax.swing.event.ChangeListener;
 import javax.swing.event.InternalFrameAdapter;
 import javax.swing.event.InternalFrameEvent;
 
+import jalview.analysis.Conservation;
+import jalview.datamodel.SequenceGroup;
+import jalview.jbgui.GSliderPanel;
+import jalview.renderer.ResidueShaderI;
+import jalview.util.MessageManager;
+
 /**
  * DOCUMENT ME!
  * 
@@ -117,7 +117,7 @@ public class SliderPanel extends GSliderPanel
       @Override
       public void stateChanged(ChangeEvent evt)
       {
-        valueField.setText(slider.getValue() + "");
+        valueField.setText(String.valueOf(slider.getValue()));
         valueChanged(slider.getValue());
       }
     });
@@ -127,12 +127,12 @@ public class SliderPanel extends GSliderPanel
       @Override
       public void mouseReleased(MouseEvent evt)
       {
-        ap.paintAlignment(true);
+        ap.paintAlignment(true, true);
       }
     });
 
     slider.setValue(value);
-    valueField.setText(value + "");
+    valueField.setText(String.valueOf(value));
   }
 
   /**
@@ -156,6 +156,7 @@ public class SliderPanel extends GSliderPanel
     {
       sliderPanel = new SliderPanel(ap, rs.getConservationInc(), true, rs);
       conservationSlider = new JInternalFrame();
+      conservationSlider.setFrameIcon(WindowIcons.logoIcon);
       conservationSlider.setContentPane(sliderPanel);
       conservationSlider.setLayer(JLayeredPane.PALETTE_LAYER);
     }
@@ -177,6 +178,8 @@ public class SliderPanel extends GSliderPanel
     if (groups != null && !groups.isEmpty())
     {
       sliderPanel.setAllGroupsCheckEnabled(true);
+      sliderPanel.allGroupsCheck
+              .setSelected(ap.av.getColourAppliesToAllGroups());
     }
     else
     {
@@ -230,7 +233,8 @@ public class SliderPanel extends GSliderPanel
     if (!conservationSlider.isVisible())
     {
       Desktop.addInternalFrame(conservationSlider,
-              conservationSlider.getTitle(), 420, 90, false);
+              conservationSlider.getTitle(), true, FRAME_WIDTH,
+              FRAME_HEIGHT, false, true);
       conservationSlider.addInternalFrameListener(new InternalFrameAdapter()
       {
         @Override
@@ -266,6 +270,7 @@ public class SliderPanel extends GSliderPanel
     {
       sliderPanel = new SliderPanel(ap, threshold, false, rs);
       PIDSlider = new JInternalFrame();
+      PIDSlider.setFrameIcon(WindowIcons.logoIcon);
       PIDSlider.setContentPane(sliderPanel);
       PIDSlider.setLayer(JLayeredPane.PALETTE_LAYER);
     }
@@ -305,8 +310,8 @@ public class SliderPanel extends GSliderPanel
 
     if (!PIDSlider.isVisible())
     {
-      Desktop.addInternalFrame(PIDSlider, PIDSlider.getTitle(), 420, 90,
-              false);
+      Desktop.addInternalFrame(PIDSlider, PIDSlider.getTitle(), true,
+              FRAME_WIDTH, FRAME_HEIGHT, false, true);
       PIDSlider.setLayer(JLayeredPane.PALETTE_LAYER);
       PIDSlider.addInternalFrameListener(new InternalFrameAdapter()
       {
@@ -396,7 +401,6 @@ public class SliderPanel extends GSliderPanel
   public void setAllGroupsCheckEnabled(boolean b)
   {
     allGroupsCheck.setEnabled(b);
-    allGroupsCheck.setSelected(ap.av.getColourAppliesToAllGroups());
   }
 
   /**