Index: trunk/src/scriptbuilder/gui/IncidentEditorFrame.java
===================================================================
--- trunk/src/scriptbuilder/gui/IncidentEditorFrame.java	(revision 89)
+++ trunk/src/scriptbuilder/gui/IncidentEditorFrame.java	(revision 98)
@@ -22,4 +22,5 @@
 import javax.swing.DefaultListModel;
 import javax.swing.JButton;
+import scriptbuilder.gui.panels.IncidentTimelinePanel;
 import scriptbuilder.structures.ScriptEvent;
 import scriptbuilder.structures.ScriptEvent.ScriptEventType;
@@ -310,6 +311,6 @@
             theIncident = (ScriptIncident) arg;
             
-            timelineTickPanel.update(theIncident);
-            timeStampPanel.update(theIncident);
+            timelineTickPanel.update(theIncident, incidentTimelinePanel1);
+            timeStampPanel.update(theIncident, incidentTimelinePanel1);
 
             incidentTimelinePanel1.timelinePanelUpdate(theIncident);
@@ -438,4 +439,5 @@
         timeStampScrollPane = new javax.swing.JScrollPane();
         timeStampPanel = new scriptbuilder.gui.panels.TimeStampPanel();
+        btnAddTime = new javax.swing.JButton();
 
         cadEvent.setText("CAD Event");
@@ -1245,5 +1247,5 @@
         timeStampPanelLayout.setHorizontalGroup(
             timeStampPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGap(0, 1032, Short.MAX_VALUE)
+            .addGap(0, 1036, Short.MAX_VALUE)
         );
         timeStampPanelLayout.setVerticalGroup(
@@ -1253,4 +1255,13 @@
 
         timeStampScrollPane.setViewportView(timeStampPanel);
+
+        btnAddTime.setText("+15:00");
+        btnAddTime.addActionListener(new java.awt.event.ActionListener()
+        {
+            public void actionPerformed(java.awt.event.ActionEvent evt)
+            {
+                btnAddTimeActionPerformed(evt);
+            }
+        });
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
@@ -1261,10 +1272,4 @@
                 .addContainerGap()
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(timelinesScrollPane, 0, 0, Short.MAX_VALUE)
-                    .addComponent(timeStampScrollPane)
-                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
-                        .addComponent(scriptEventsPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(scriptEventsPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                     .addGroup(layout.createSequentialGroup()
                         .addComponent(selectButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -1275,7 +1280,19 @@
                         .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))))
+                            .addGroup(layout.createSequentialGroup()
+                                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                                    .addComponent(zoomInIcon)
+                                    .addComponent(zoomOutIcon))
+                                .addGap(0, 0, Short.MAX_VALUE))
+                            .addGroup(layout.createSequentialGroup()
+                                .addComponent(zoomSlider, javax.swing.GroupLayout.PREFERRED_SIZE, 31, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                                .addComponent(btnAddTime, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
+                    .addComponent(timelinesScrollPane, 0, 0, Short.MAX_VALUE)
+                    .addComponent(timeStampScrollPane)
+                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+                        .addComponent(scriptEventsPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(scriptEventsPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
                 .addContainerGap())
         );
@@ -1295,6 +1312,11 @@
                         .addGap(20, 20, 20)
                         .addComponent(zoomInIcon)
-                        .addGap(1, 1, 1)
-                        .addComponent(zoomSlider, javax.swing.GroupLayout.PREFERRED_SIZE, 69, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addGroup(layout.createSequentialGroup()
+                                .addGap(1, 1, 1)
+                                .addComponent(zoomSlider, javax.swing.GroupLayout.PREFERRED_SIZE, 69, javax.swing.GroupLayout.PREFERRED_SIZE))
+                            .addGroup(layout.createSequentialGroup()
+                                .addGap(17, 17, 17)
+                                .addComponent(btnAddTime, javax.swing.GroupLayout.PREFERRED_SIZE, 44, javax.swing.GroupLayout.PREFERRED_SIZE)))
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(zoomOutIcon)))
@@ -1691,4 +1713,10 @@
         zoomSlider.setValue(zoomSlider.getValue() <= 5 ? 5 : zoomSlider.getValue() - 1);
     }//GEN-LAST:event_zoomOutIconMouseClicked
+
+    private void btnAddTimeActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_btnAddTimeActionPerformed
+    {//GEN-HEADEREND:event_btnAddTimeActionPerformed
+        incidentTimelinePanel1.requestedEditorFillerTime += IncidentTimelinePanel.FILLER_INTERVAL_SECONDS;
+        this.update(null, theIncident);
+    }//GEN-LAST:event_btnAddTimeActionPerformed
 
     /**
@@ -1781,4 +1809,5 @@
     private javax.swing.JButton atmsEvalButton;
     private javax.swing.JButton audioButton;
+    private javax.swing.JButton btnAddTime;
     private javax.swing.JButton cadButton;
     private javax.swing.JButton cadEvalButton;