Index: trunk/src/scriptbuilder/gui/IncidentEditorFrame.java
===================================================================
--- trunk/src/scriptbuilder/gui/IncidentEditorFrame.java	(revision 155)
+++ trunk/src/scriptbuilder/gui/IncidentEditorFrame.java	(revision 160)
@@ -139,8 +139,8 @@
             switch (e.getKeyChar())
             {
-                case 'u':
-                    currentEventType = ScriptEventType.AUDIO_EVENT;
-                    newButton = audioButton;
-                    break;
+//                case 'u':
+//                    currentEventType = ScriptEventType.AUDIO_EVENT;
+//                    newButton = audioButton;
+//                    break;
                 case 'c':
                     currentEventType = ScriptEventType.CAD_EVENT;
@@ -313,5 +313,5 @@
         eventButtons.add(witnessButton);
         eventButtons.add(unitButton);
-        eventButtons.add(audioButton);
+        //eventButtons.add(audioButton);
         eventButtons.add(cadButton);
         eventButtons.add(cctvButton);
@@ -386,5 +386,5 @@
         {
             //this seems to be only called when the window is initialized again
-            System.out.println("you got the hover over a timeslice");
+            //System.out.println("you got the hover over a timeslice");
             TimeSlice slice = ((SliceChangedEvent) arg).slice;
 
@@ -489,5 +489,4 @@
         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();
@@ -1016,16 +1015,4 @@
         });
 
-        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("");
@@ -1085,7 +1072,5 @@
                             .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)))
+                            .addComponent(witnessButton, 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)
@@ -1109,6 +1094,5 @@
                             .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(witnessButton, 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)
@@ -1661,14 +1645,4 @@
 
     /**
-     * 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
-        toggleEventButton(audioButton, ScriptEventType.AUDIO_EVENT);
-    }//GEN-LAST:event_audioButtonActionPerformed
-
-    /**
      * Increases zoom level upon click of the "Zoom in" icon.
      *
@@ -1777,5 +1751,4 @@
     private javax.swing.JPanel addTimePanel;
     private javax.swing.JButton atmsEvalButton;
-    private javax.swing.JButton audioButton;
     private javax.swing.JButton btnAddTime;
     private javax.swing.JButton btnCancelNoise;