Index: trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java =================================================================== --- trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java (revision 54) +++ trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java (revision 55) @@ -56,8 +56,4 @@ public ScriptEventType currentEventType; /** - * A list of all the event type buttons. - */ - private ArrayList eventButtons = null; - /** * True if we are currently editing an incident. */ @@ -66,5 +62,5 @@ * Index of the previous incident. */ - int oldIncidentIndex; + private int oldIncidentIndex; /** @@ -121,101 +117,4 @@ public void keyPressed(KeyEvent e) { - JButton lastButton = null; - for (JButton eb : eventButtons) - { - eb.setFocusPainted(false); - if (eb.isSelected()) - { - lastButton = eb; - } - eb.setSelected(false); - } - - JButton newButton = null; - switch (e.getKeyChar()) - { - case 'u': - currentEventType = ScriptEventType.AUDIO_EVENT; - newButton = audioButton; - break; - case 'c': - currentEventType = ScriptEventType.CAD_EVENT; - newButton = cadButton; - break; - case 'v': - currentEventType = ScriptEventType.CCTV_EVENT; - newButton = cctvButton; - break; - case 'h': - currentEventType = ScriptEventType.CHP_RADIO_EVENT; - newButton = chpRadioButton; - break; - case 'p': - currentEventType = ScriptEventType.PARAMICS_EVENT; - newButton = paramicsButton; - break; - case 'o': - currentEventType = ScriptEventType.TOW_EVENT; - newButton = towButton; - break; - case 'n': - currentEventType = ScriptEventType.UNIT_EVENT; - newButton = unitButton; - break; - case 'w': - currentEventType = ScriptEventType.WITNESS_EVENT; - newButton = witnessButton; - break; - case 'm': - currentEventType = ScriptEventType.MAINTENANCE_RADIO_EVENT; - newButton = maintenanceRadioButton; - break; - case 't': - currentEventType = ScriptEventType.TMT_RADIO_EVENT; - newButton = tmtRadioButton; - break; - case 'e': - currentEventType = ScriptEventType.TELEPHONE_EVENT; - newButton = telephoneButton; - break; - case 'a': - currentEventType = ScriptEventType.ATMS_EVAL_EVENT; - newButton = atmsEvalButton; - break; - case 'l': - currentEventType = ScriptEventType.ACTIVITY_LOG_EVAL_EVENT; - newButton = activityLogEvalButton; - break; - case 'd': - currentEventType = ScriptEventType.CAD_EVAL_EVENT; - newButton = cadEvalButton; - break; - case 's': - currentEventType = ScriptEventType.CMS_EVAL_EVENT; - newButton = cmsEvalButton; - break; - case 'f': - currentEventType = ScriptEventType.FACILITATOR_EVAL_EVENT; - newButton = facilitatorEvalButton; - break; - case 'r': - currentEventType = ScriptEventType.RADIO_EVAL_EVENT; - newButton = radioEvalButton; - break; - default: - newButton = lastButton; - } - - if (e.getKeyCode() == KeyEvent.VK_ESCAPE) - { - currentEventType = null; - newButton = selectButton; - } - - if (newButton != null) - { - newButton.setSelected(true); - } - repaint(); } @@ -252,24 +151,6 @@ initComponents(); this.update(null, script); - selectButton.addKeyListener(new TimelineKeyListener()); - cadButton.addKeyListener(new TimelineKeyListener()); - cctvButton.addKeyListener(new TimelineKeyListener()); - chpRadioButton.addKeyListener(new TimelineKeyListener()); - paramicsButton.addKeyListener(new TimelineKeyListener()); - towButton.addKeyListener(new TimelineKeyListener()); - unitButton.addKeyListener(new TimelineKeyListener()); - witnessButton.addKeyListener(new TimelineKeyListener()); - maintenanceRadioButton.addKeyListener(new TimelineKeyListener()); - tmtRadioButton.addKeyListener(new TimelineKeyListener()); - telephoneButton.addKeyListener(new TimelineKeyListener()); - atmsEvalButton.addKeyListener(new TimelineKeyListener()); - activityLogEvalButton.addKeyListener(new TimelineKeyListener()); - cadEvalButton.addKeyListener(new TimelineKeyListener()); - cmsEvalButton.addKeyListener(new TimelineKeyListener()); - facilitatorEvalButton.addKeyListener(new TimelineKeyListener()); - radioEvalButton.addKeyListener(new TimelineKeyListener()); // Hack to refresh the zoom - //This is stupid tbh /* zoomSlider.setValue(zoomSlider.getValue() - 1); @@ -280,25 +161,4 @@ timelinesScrollPane.getHorizontalScrollBar().addAdjustmentListener(listener); timelinesScrollPane.getVerticalScrollBar().addAdjustmentListener(listener); - - // Button list - eventButtons = new ArrayList(); - eventButtons.add(maintenanceRadioButton); - eventButtons.add(tmtRadioButton); - eventButtons.add(telephoneButton); - eventButtons.add(paramicsButton); - eventButtons.add(towButton); - eventButtons.add(witnessButton); - eventButtons.add(unitButton); - eventButtons.add(audioButton); - eventButtons.add(cadButton); - eventButtons.add(cctvButton); - eventButtons.add(chpRadioButton); - eventButtons.add(selectButton); - eventButtons.add(cmsEvalButton); - eventButtons.add(atmsEvalButton); - eventButtons.add(cadEvalButton); - eventButtons.add(activityLogEvalButton); - eventButtons.add(facilitatorEvalButton); - eventButtons.add(radioEvalButton); } @@ -470,24 +330,4 @@ incidentNumberPanel10 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); zoomSlider = new javax.swing.JSlider(); - selectButton = new javax.swing.JButton(); - incidentEventsPanel = new javax.swing.JPanel(); - maintenanceRadioButton = new javax.swing.JButton(); - tmtRadioButton = new javax.swing.JButton(); - telephoneButton = new javax.swing.JButton(); - unitButton = new javax.swing.JButton(); - witnessButton = new javax.swing.JButton(); - paramicsButton = new javax.swing.JButton(); - towButton = new javax.swing.JButton(); - audioButton = new javax.swing.JButton(); - cctvButton = new javax.swing.JButton(); - cadButton = new javax.swing.JButton(); - chpRadioButton = new javax.swing.JButton(); - evaluationEventsPanel = new javax.swing.JPanel(); - atmsEvalButton = new javax.swing.JButton(); - cmsEvalButton = new javax.swing.JButton(); - cadEvalButton = new javax.swing.JButton(); - facilitatorEvalButton = new javax.swing.JButton(); - activityLogEvalButton = new javax.swing.JButton(); - radioEvalButton = new javax.swing.JButton(); zoomInIcon = new javax.swing.JLabel(); zoomOutIcon = new javax.swing.JLabel(); @@ -1289,5 +1129,4 @@ zoomSlider.setMaximum(22); zoomSlider.setMinimum(4); - zoomSlider.setOrientation(javax.swing.JSlider.VERTICAL); zoomSlider.setValue(4); zoomSlider.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); @@ -1300,352 +1139,4 @@ } }); - - selectButton.setToolTipText("Select"); - selectButton.setFocusPainted(false); - selectButton.setIconTextGap(0); - selectButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); - selectButton.setPreferredSize(new java.awt.Dimension(30, 25)); - selectButton.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - selectButtonActionPerformed(evt); - } - }); - - incidentEventsPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Incident Events")); - - maintenanceRadioButton.setText("Maintenance Radio"); - maintenanceRadioButton.setToolTipText(""); - maintenanceRadioButton.setFocusPainted(false); - maintenanceRadioButton.setIconTextGap(0); - maintenanceRadioButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); - maintenanceRadioButton.setPreferredSize(new java.awt.Dimension(30, 25)); - maintenanceRadioButton.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - maintenanceRadioButtonActionPerformed(evt); - } - }); - - tmtRadioButton.setText("TMT Radio"); - tmtRadioButton.setToolTipText(""); - tmtRadioButton.setFocusPainted(false); - tmtRadioButton.setIconTextGap(0); - tmtRadioButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); - tmtRadioButton.setPreferredSize(new java.awt.Dimension(30, 25)); - tmtRadioButton.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - tmtRadioButtonActionPerformed(evt); - } - }); - - telephoneButton.setText("Telephone"); - telephoneButton.setToolTipText(""); - telephoneButton.setFocusPainted(false); - telephoneButton.setIconTextGap(0); - telephoneButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); - telephoneButton.setPreferredSize(new java.awt.Dimension(30, 25)); - telephoneButton.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - telephoneButtonActionPerformed(evt); - } - }); - - unitButton.setText("Unit"); - unitButton.setToolTipText(""); - unitButton.setFocusPainted(false); - unitButton.setIconTextGap(0); - unitButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); - unitButton.setPreferredSize(new java.awt.Dimension(30, 25)); - unitButton.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - unitButtonActionPerformed(evt); - } - }); - - witnessButton.setText("Witness"); - witnessButton.setToolTipText(""); - witnessButton.setFocusPainted(false); - witnessButton.setIconTextGap(0); - witnessButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); - witnessButton.setPreferredSize(new java.awt.Dimension(30, 25)); - witnessButton.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - witnessButtonActionPerformed(evt); - } - }); - - paramicsButton.setText("Paramics"); - paramicsButton.setToolTipText(""); - paramicsButton.setFocusPainted(false); - paramicsButton.setIconTextGap(0); - paramicsButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); - paramicsButton.setPreferredSize(new java.awt.Dimension(30, 25)); - paramicsButton.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - paramicsButtonActionPerformed(evt); - } - }); - - towButton.setText("Tow"); - towButton.setToolTipText(""); - towButton.setFocusPainted(false); - towButton.setIconTextGap(0); - towButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); - towButton.setPreferredSize(new java.awt.Dimension(30, 25)); - towButton.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - towButtonActionPerformed(evt); - } - }); - - audioButton.setText("Audio"); - audioButton.setToolTipText(""); - audioButton.setFocusPainted(false); - audioButton.setIconTextGap(0); - audioButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); - audioButton.setPreferredSize(new java.awt.Dimension(30, 25)); - audioButton.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - audioButtonActionPerformed(evt); - } - }); - - cctvButton.setText("CCTV"); - cctvButton.setToolTipText(""); - cctvButton.setFocusPainted(false); - cctvButton.setIconTextGap(0); - cctvButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); - cctvButton.setPreferredSize(new java.awt.Dimension(30, 25)); - cctvButton.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - cctvButtonActionPerformed(evt); - } - }); - - cadButton.setText("CAD"); - cadButton.setToolTipText(""); - cadButton.setFocusPainted(false); - cadButton.setIconTextGap(0); - cadButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); - cadButton.setPreferredSize(new java.awt.Dimension(30, 25)); - cadButton.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - cadButtonActionPerformed(evt); - } - }); - - chpRadioButton.setText("CHP Radio"); - chpRadioButton.setToolTipText(""); - chpRadioButton.setFocusPainted(false); - chpRadioButton.setIconTextGap(0); - chpRadioButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); - chpRadioButton.setPreferredSize(new java.awt.Dimension(30, 25)); - chpRadioButton.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - chpRadioButtonActionPerformed(evt); - } - }); - - javax.swing.GroupLayout incidentEventsPanelLayout = new javax.swing.GroupLayout(incidentEventsPanel); - incidentEventsPanel.setLayout(incidentEventsPanelLayout); - incidentEventsPanelLayout.setHorizontalGroup( - incidentEventsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(incidentEventsPanelLayout.createSequentialGroup() - .addContainerGap() - .addGroup(incidentEventsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(incidentEventsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, incidentEventsPanelLayout.createSequentialGroup() - .addComponent(maintenanceRadioButton, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(tmtRadioButton, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(telephoneButton, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(paramicsButton, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(incidentEventsPanelLayout.createSequentialGroup() - .addComponent(towButton, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(unitButton, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(witnessButton, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(audioButton, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addGroup(incidentEventsPanelLayout.createSequentialGroup() - .addComponent(cadButton, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(cctvButton, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(chpRadioButton, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - ); - incidentEventsPanelLayout.setVerticalGroup( - incidentEventsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(incidentEventsPanelLayout.createSequentialGroup() - .addGroup(incidentEventsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(incidentEventsPanelLayout.createSequentialGroup() - .addGroup(incidentEventsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(maintenanceRadioButton, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(tmtRadioButton, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(telephoneButton, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(incidentEventsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(towButton, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(unitButton, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(witnessButton, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(audioButton, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addComponent(paramicsButton, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(incidentEventsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addGroup(incidentEventsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(cctvButton, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(chpRadioButton, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addComponent(cadButton, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE))) - ); - - evaluationEventsPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Evaluation Events")); - - atmsEvalButton.setText("ATMS Evaluation"); - atmsEvalButton.setToolTipText(""); - atmsEvalButton.setFocusPainted(false); - atmsEvalButton.setIconTextGap(0); - atmsEvalButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); - atmsEvalButton.setPreferredSize(new java.awt.Dimension(30, 25)); - atmsEvalButton.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - atmsEvalButtonActionPerformed(evt); - } - }); - - cmsEvalButton.setText("CMS Evaluation"); - cmsEvalButton.setToolTipText(""); - cmsEvalButton.setFocusPainted(false); - cmsEvalButton.setIconTextGap(0); - cmsEvalButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); - cmsEvalButton.setPreferredSize(new java.awt.Dimension(30, 25)); - cmsEvalButton.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - cmsEvalButtonActionPerformed(evt); - } - }); - - cadEvalButton.setText("CAD Evaluation"); - cadEvalButton.setToolTipText(""); - cadEvalButton.setFocusPainted(false); - cadEvalButton.setIconTextGap(0); - cadEvalButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); - cadEvalButton.setPreferredSize(new java.awt.Dimension(30, 25)); - cadEvalButton.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - cadEvalButtonActionPerformed(evt); - } - }); - - facilitatorEvalButton.setText("Facilitator Evaluation"); - facilitatorEvalButton.setToolTipText(""); - facilitatorEvalButton.setFocusPainted(false); - facilitatorEvalButton.setIconTextGap(0); - facilitatorEvalButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); - facilitatorEvalButton.setPreferredSize(new java.awt.Dimension(30, 25)); - facilitatorEvalButton.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - facilitatorEvalButtonActionPerformed(evt); - } - }); - - activityLogEvalButton.setText("Activity Log Evaluation"); - activityLogEvalButton.setToolTipText(""); - activityLogEvalButton.setFocusPainted(false); - activityLogEvalButton.setIconTextGap(0); - activityLogEvalButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); - activityLogEvalButton.setPreferredSize(new java.awt.Dimension(30, 25)); - activityLogEvalButton.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - activityLogEvalButtonActionPerformed(evt); - } - }); - - radioEvalButton.setText("Radio Evaluation"); - radioEvalButton.setToolTipText(""); - radioEvalButton.setFocusPainted(false); - radioEvalButton.setIconTextGap(0); - radioEvalButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); - radioEvalButton.setPreferredSize(new java.awt.Dimension(30, 25)); - radioEvalButton.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - radioEvalButtonActionPerformed(evt); - } - }); - - javax.swing.GroupLayout evaluationEventsPanelLayout = new javax.swing.GroupLayout(evaluationEventsPanel); - evaluationEventsPanel.setLayout(evaluationEventsPanelLayout); - evaluationEventsPanelLayout.setHorizontalGroup( - evaluationEventsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(evaluationEventsPanelLayout.createSequentialGroup() - .addContainerGap() - .addGroup(evaluationEventsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(evaluationEventsPanelLayout.createSequentialGroup() - .addComponent(atmsEvalButton, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(activityLogEvalButton, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(evaluationEventsPanelLayout.createSequentialGroup() - .addComponent(cmsEvalButton, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(facilitatorEvalButton, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(evaluationEventsPanelLayout.createSequentialGroup() - .addComponent(cadEvalButton, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(radioEvalButton, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - ); - evaluationEventsPanelLayout.setVerticalGroup( - evaluationEventsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(evaluationEventsPanelLayout.createSequentialGroup() - .addGroup(evaluationEventsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(cmsEvalButton, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(facilitatorEvalButton, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(evaluationEventsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(atmsEvalButton, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(activityLogEvalButton, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(evaluationEventsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(cadEvalButton, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(radioEvalButton, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE))) - ); zoomInIcon.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/ZoomIn.png"))); // NOI18N @@ -1898,15 +1389,12 @@ .addComponent(timelinesScrollPane, 0, 0, Short.MAX_VALUE) .addComponent(timeStampScrollPane) - .addGroup(layout.createSequentialGroup() - .addComponent(selectButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addGap(0, 597, Short.MAX_VALUE) + .addComponent(zoomOutIcon) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(incidentEventsPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(zoomSlider, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(evaluationEventsPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(18, 18, 18) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(zoomInIcon) - .addComponent(zoomSlider, javax.swing.GroupLayout.PREFERRED_SIZE, 31, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(zoomOutIcon)))) + .addComponent(zoomInIcon) + .addGap(136, 136, 136))) .addContainerGap()) ); @@ -1914,24 +1402,13 @@ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addContainerGap() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(evaluationEventsPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(incidentEventsPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGroup(layout.createSequentialGroup() - .addGap(47, 47, 47) - .addComponent(selectButton, javax.swing.GroupLayout.PREFERRED_SIZE, 55, javax.swing.GroupLayout.PREFERRED_SIZE)))) - .addGroup(layout.createSequentialGroup() - .addGap(20, 20, 20) - .addComponent(zoomInIcon) - .addGap(1, 1, 1) - .addComponent(zoomSlider, javax.swing.GroupLayout.PREFERRED_SIZE, 69, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(zoomOutIcon))) + .addContainerGap() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(zoomOutIcon) + .addComponent(zoomSlider, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(zoomInIcon)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(timeStampScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(timelinesScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(timelinesScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 1289, Short.MAX_VALUE) .addContainerGap()) ); @@ -2089,63 +1566,4 @@ }//GEN-LAST:event_newIncidentActionPerformed - /** - * Deselects new event type upon click of blank "select" button. - * - * @param evt the button press event - */ - private void selectButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_selectButtonActionPerformed - currentEventType = null; - for (JButton eb : eventButtons) - { - eb.setSelected(false); - } - selectButton.setSelected(true); - }//GEN-LAST:event_selectButtonActionPerformed - - /** - * Selects CAD_EVENT as the current type of new event, upon click of "CAD - * Event" button. - * - * @param evt the button press event - */ - private void cadButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cadButtonActionPerformed - currentEventType = ScriptEventType.CAD_EVENT; - for (JButton eb : eventButtons) - { - eb.setSelected(false); - } - cadButton.setSelected(true); - }//GEN-LAST:event_cadButtonActionPerformed - - /** - * Selects CCTV_EVENT as the current type of new event, upon click of "CCTV - * Event" button. - * - * @param evt the button press event - */ - private void cctvButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cctvButtonActionPerformed - currentEventType = ScriptEventType.CCTV_EVENT; - for (JButton eb : eventButtons) - { - eb.setSelected(false); - } - cctvButton.setSelected(true); - }//GEN-LAST:event_cctvButtonActionPerformed - - /** - * Selects CHP_RADIO_EVENT as the current type of new event, upon click of - * "CHP Radio Event" button. - * - * @param evt the button press event - */ - private void chpRadioButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_chpRadioButtonActionPerformed - currentEventType = ScriptEventType.CHP_RADIO_EVENT; - for (JButton eb : eventButtons) - { - eb.setSelected(false); - } - chpRadioButton.setSelected(true); - }//GEN-LAST:event_chpRadioButtonActionPerformed - private void fileMenuActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_fileMenuActionPerformed }//GEN-LAST:event_fileMenuActionPerformed @@ -2418,214 +1836,4 @@ fc.showSaveDialog(this); }//GEN-LAST:event_generateOrganizationChartActionPerformed - - /** - * Selects WITNESS_EVENT as the current type of new event, upon click of - * "Witness Event" button. - * - * @param evt the button press event - */ - private void witnessButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_witnessButtonActionPerformed - currentEventType = ScriptEventType.WITNESS_EVENT; - for (JButton eb : eventButtons) - { - eb.setSelected(false); - } - witnessButton.setSelected(true); - }//GEN-LAST:event_witnessButtonActionPerformed - - /** - * Selects UNIT_EVENT as the current type of new event, upon click of "Unit - * Event" button. - * - * @param evt the button press event - */ - private void unitButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_unitButtonActionPerformed - currentEventType = ScriptEventType.UNIT_EVENT; - for (JButton eb : eventButtons) - { - eb.setSelected(false); - } - unitButton.setSelected(true); - }//GEN-LAST:event_unitButtonActionPerformed - - /** - * Selects TOW_EVENT as the current type of new event, upon click of "TOW - * Event" button. - * - * @param evt the button press event - */ - private void towButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_towButtonActionPerformed - currentEventType = ScriptEventType.TOW_EVENT; - for (JButton eb : eventButtons) - { - eb.setSelected(false); - } - towButton.setSelected(true); - }//GEN-LAST:event_towButtonActionPerformed - - /** - * Selects PARAMICS_EVENT as the current type of new event, upon click of - * "Paramics Event" button. - * - * @param evt the button press event - */ - private void paramicsButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_paramicsButtonActionPerformed - currentEventType = ScriptEventType.PARAMICS_EVENT; - for (JButton eb : eventButtons) - { - eb.setSelected(false); - } - paramicsButton.setSelected(true); - }//GEN-LAST:event_paramicsButtonActionPerformed - - /** - * Selects MAINTENANCE_RADIO_EVENT as the current type of new event, upon - * click of "Maintenance Radio Event" button. - * - * @param evt the button press event - */ - private void maintenanceRadioButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_maintenanceRadioButtonActionPerformed - currentEventType = ScriptEventType.MAINTENANCE_RADIO_EVENT; - for (JButton eb : eventButtons) - { - eb.setSelected(false); - } - maintenanceRadioButton.setSelected(true); - }//GEN-LAST:event_maintenanceRadioButtonActionPerformed - - /** - * Selects ATMS_EVAL_EVENT as the current type of new event, upon click of - * "ATMS Evaluation Event" button. - * - * @param evt the button press event - */ - private void atmsEvalButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_atmsEvalButtonActionPerformed - currentEventType = ScriptEventType.ATMS_EVAL_EVENT; - for (JButton eb : eventButtons) - { - eb.setSelected(false); - } - atmsEvalButton.setSelected(true); - }//GEN-LAST:event_atmsEvalButtonActionPerformed - - /** - * Selects TELEPHONE_EVENT as the current type of new event, upon click of - * "Telephone Event" button. - * - * @param evt the button press event - */ - private void telephoneButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_telephoneButtonActionPerformed - currentEventType = ScriptEventType.TELEPHONE_EVENT; - for (JButton eb : eventButtons) - { - eb.setSelected(false); - } - telephoneButton.setSelected(true); - }//GEN-LAST:event_telephoneButtonActionPerformed - - /** - * Selects TMT_RADIO_EVENT as the current type of new event, upon click of - * "TMT Radio Event" button. - * - * @param evt the button press event - */ - private void tmtRadioButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_tmtRadioButtonActionPerformed - currentEventType = ScriptEventType.TMT_RADIO_EVENT; - for (JButton eb : eventButtons) - { - eb.setSelected(false); - } - tmtRadioButton.setSelected(true); - }//GEN-LAST:event_tmtRadioButtonActionPerformed - - /** - * Selects CMS_EVAL_EVENT as the current type of new event, upon click of - * "CMS Evaluation Event" button. - * - * @param evt the button press event - */ - private void cmsEvalButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cmsEvalButtonActionPerformed - currentEventType = ScriptEventType.CMS_EVAL_EVENT; - for (JButton eb : eventButtons) - { - eb.setSelected(false); - } - cmsEvalButton.setSelected(true); - }//GEN-LAST:event_cmsEvalButtonActionPerformed - - /** - * Selects CAD_EVAL_EVENT as the current type of new event, upon click of - * "CAD Evaluation Event" button. - * - * @param evt the button press event - */ - private void cadEvalButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cadEvalButtonActionPerformed - currentEventType = ScriptEventType.CAD_EVAL_EVENT; - for (JButton eb : eventButtons) - { - eb.setSelected(false); - } - cadEvalButton.setSelected(true); - }//GEN-LAST:event_cadEvalButtonActionPerformed - - /** - * Selects ACTIVITY_LOG_EVAL_EVENT as the current type of new event, upon - * click of "Activity Log Evaluation Event" button. - * - * @param evt the button press event - */ - private void activityLogEvalButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_activityLogEvalButtonActionPerformed - currentEventType = ScriptEventType.ACTIVITY_LOG_EVAL_EVENT; - for (JButton eb : eventButtons) - { - eb.setSelected(false); - } - activityLogEvalButton.setSelected(true); - }//GEN-LAST:event_activityLogEvalButtonActionPerformed - - /** - * Selects RADIO_EVAL_EVENT as the current type of new event, upon click of - * "Radio Evaluation Event" button. - * - * @param evt the button press event - */ - private void radioEvalButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_radioEvalButtonActionPerformed - currentEventType = ScriptEventType.RADIO_EVAL_EVENT; - for (JButton eb : eventButtons) - { - eb.setSelected(false); - } - radioEvalButton.setSelected(true); - }//GEN-LAST:event_radioEvalButtonActionPerformed - - /** - * Selects FACILITATOR_EVAL_EVENT as the current type of new event, upon - * click of "Facilitator Evaluation Event" button. - * - * @param evt the button press event - */ - private void facilitatorEvalButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_facilitatorEvalButtonActionPerformed - currentEventType = ScriptEventType.FACILITATOR_EVAL_EVENT; - for (JButton eb : eventButtons) - { - eb.setSelected(false); - } - facilitatorEvalButton.setSelected(true); - }//GEN-LAST:event_facilitatorEvalButtonActionPerformed - - /** - * Selects AUDIO_EVENT as the current type of new event, upon click of - * "Audio Event" button. - * - * @param evt the button press event - */ - private void audioButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_audioButtonActionPerformed - currentEventType = ScriptEventType.AUDIO_EVENT; - for (JButton eb : eventButtons) - { - eb.setSelected(false); - } - audioButton.setSelected(true); - }//GEN-LAST:event_audioButtonActionPerformed /** @@ -2801,5 +2009,4 @@ } // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JButton activityLogEvalButton; private javax.swing.JTextArea addIncidentDescription; private javax.swing.JSpinner addIncidentLength; @@ -2808,21 +2015,12 @@ private javax.swing.JSpinner addIncidentStart; private javax.swing.JFrame addNoiseFrame; - private javax.swing.JButton atmsEvalButton; - private javax.swing.JButton audioButton; - private javax.swing.JButton cadButton; - private javax.swing.JButton cadEvalButton; private javax.swing.JMenuItem cadEvent; private javax.swing.JFrame cadEventFrame; private javax.swing.JButton cancelButton; - private javax.swing.JButton cctvButton; - private javax.swing.JButton chpRadioButton; - private javax.swing.JButton cmsEvalButton; private javax.swing.JMenuItem deleteEventList; private javax.swing.JMenuItem editEventList; private javax.swing.JMenuItem editIncident; - private javax.swing.JPanel evaluationEventsPanel; private javax.swing.JPopupMenu eventListPopupMenu; private javax.swing.JPopupMenu eventPopupMenu; - private javax.swing.JButton facilitatorEvalButton; private javax.swing.JMenu fileMenu; private javax.swing.JMenuItem fileNew; @@ -2844,5 +2042,4 @@ private javax.swing.JTextField incidentColorField; private javax.swing.JMenuItem incidentDetails; - private javax.swing.JPanel incidentEventsPanel; private javax.swing.JFrame incidentFrame; private javax.swing.JMenu incidentMenu; @@ -2904,10 +2101,7 @@ private javax.swing.JTextArea jTextArea1; private javax.swing.JMenuItem loadIncident; - private javax.swing.JButton maintenanceRadioButton; private javax.swing.JMenuItem newIncident; private javax.swing.JButton okButton; - private javax.swing.JButton paramicsButton; private javax.swing.JMenuItem popupDeleteIncident; - private javax.swing.JButton radioEvalButton; private javax.swing.JMenuItem radioEvent; private javax.swing.JFrame radioEventFrame; @@ -2918,14 +2112,8 @@ private javax.swing.JMenuItem saveIncident; private javax.swing.JMenuBar scriptBuilderMenuBar; - private javax.swing.JButton selectButton; - private javax.swing.JButton telephoneButton; private scriptbuilder.gui.panels.TimeStampPanel timeStampPanel; private javax.swing.JScrollPane timeStampScrollPane; private scriptbuilder.gui.panels.TimelineTickPanel timelineTickPanel; private javax.swing.JScrollPane timelinesScrollPane; - private javax.swing.JButton tmtRadioButton; - private javax.swing.JButton towButton; - private javax.swing.JButton unitButton; - private javax.swing.JButton witnessButton; private javax.swing.JLabel zoomInIcon; private javax.swing.JLabel zoomOutIcon; Index: trunk/src/scriptbuilder/gui/ScriptBuilderFrame.form =================================================================== --- trunk/src/scriptbuilder/gui/ScriptBuilderFrame.form (revision 53) +++ trunk/src/scriptbuilder/gui/ScriptBuilderFrame.form (revision 55) @@ -896,16 +896,12 @@ - - + + + - + - - - - - - - + + @@ -917,29 +913,14 @@ - - - - - - - - - - - - - - - - - - - - + + + + + - + - + @@ -1451,5 +1432,4 @@ - @@ -1462,450 +1442,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: trunk/src/scriptbuilder/gui/application.properties =================================================================== --- trunk/src/scriptbuilder/gui/application.properties (revision 15) +++ trunk/src/scriptbuilder/gui/application.properties (revision 55) @@ -1,5 +1,5 @@ -#Thu, 27 Jul 2017 10:39:30 -0700 +#Mon, 14 Aug 2017 08:54:10 -0700 -Application.revision=14 +Application.revision=0 Application.buildnumber=3 Index: trunk/src/scriptbuilder/gui/IncidentEditorFrame.java =================================================================== --- trunk/src/scriptbuilder/gui/IncidentEditorFrame.java (revision 54) +++ trunk/src/scriptbuilder/gui/IncidentEditorFrame.java (revision 55) @@ -710,8 +710,10 @@ ); - setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); + setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setTitle("Script Builder"); setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); - setMinimumSize(new java.awt.Dimension(800, 800)); + setMinimumSize(new java.awt.Dimension(800, 700)); + setPreferredSize(new java.awt.Dimension(945, 1545)); + setSize(new java.awt.Dimension(800, 700)); timelinesScrollPane.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_ALWAYS); @@ -796,5 +798,5 @@ scriptEventsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(scriptEventsPanelLayout.createSequentialGroup() - .addComponent(scriptEventsPane, javax.swing.GroupLayout.DEFAULT_SIZE, 197, Short.MAX_VALUE) + .addComponent(scriptEventsPane, javax.swing.GroupLayout.DEFAULT_SIZE, 215, Short.MAX_VALUE) .addContainerGap()) ); @@ -1307,9 +1309,9 @@ .addComponent(timeStampScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(timelinesScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 365, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(scriptEventsPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(scriptEventsPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(timelinesScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 324, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(scriptEventsPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(scriptEventsPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); Index: trunk/src/scriptbuilder/gui/IncidentEditorFrame.form =================================================================== --- trunk/src/scriptbuilder/gui/IncidentEditorFrame.form (revision 54) +++ trunk/src/scriptbuilder/gui/IncidentEditorFrame.form (revision 55) @@ -416,5 +416,5 @@ - + @@ -422,5 +422,11 @@ - + + + + + + + @@ -499,9 +505,9 @@ - - - - - + + + + + @@ -631,5 +637,5 @@ - +