← Back to branch summary

~andreas.hoelzl/jhelioviewer/jhv-formatting

« back to all changes in this revision

Viewing changes to jhv/src/org/helioviewer/jhv/gui/ImageViewerGui.java

  • Committer: Markus
  • Date: 2010-03-20 16:42:47 UTC
  • mfrom: (14.2.140 jhv-opengl)
  • Revision ID: markus@home-20100320164247-wg4r8a4xi9peydv3
Merged with Markus' branch, including several smaller fixes and improvements: Amoung others, a popup to explain how to link movies and an improved toolbar

Show diffs side-by-side

added added

removed removed

Lines of Context:
jhv/src/org/helioviewer/jhv/gui/ImageViewerGui.java
33
33
import org.helioviewer.jhv.gui.components.OverviewImagePanel;
34
34
import org.helioviewer.jhv.gui.components.StatusPanel;
35
35
import org.helioviewer.jhv.gui.components.TopToolBar;
36
 
import org.helioviewer.jhv.gui.components.collapsibleObservation;
 
36
import org.helioviewer.jhv.gui.components.CollapsibleObservation;
37
37
import org.helioviewer.jhv.gui.components.statusplugins.FramerateStatusPanel;
38
38
import org.helioviewer.jhv.gui.components.statusplugins.MetaDataStatusPanel;
39
39
import org.helioviewer.jhv.gui.components.statusplugins.JPIPStatusPanel;
146
146
 
147
147
        // OBSERVATION
148
148
        observationPanel = new ObservationPanel();
149
 
        collapsibleObservation newPane = new collapsibleObservation(
 
149
        CollapsibleObservation newPane = new CollapsibleObservation(
150
150
                observationPanel);
151
151
        // newPane.setBorder(normalBorder);
152
152