Changeset 160 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder

Timestamp:

12/04/2019 02:41:53 PM (6 years ago)

Author:

sdanthin

Message:

IncidentEditorFrame?.java removed Audio button from GUI and removed associated functionality.

Location:

trunk/src/scriptbuilder/gui

Files:

• IncidentEditorFrame.form (modified) (3 diffs)
• IncidentEditorFrame.java (modified) (9 diffs)
• application.properties (modified) (1 diff)

trunk/src/scriptbuilder/gui/IncidentEditorFrame.form

@@ -834 +834 @@
                               <EmptySpace max="-2" attributes="0"/>
                               <Component id="witnessButton" min="-2" pref="120" max="-2" attributes="0"/>
-                              <EmptySpace max="-2" attributes="0"/>
-                              <Component id="audioButton" min="-2" pref="120" max="-2" attributes="0"/>
                           </Group>
                       </Group>
@@ -865 +863 @@
                               <Component id="unitButton" alignment="3" min="-2" pref="30" max="-2" attributes="0"/>
                               <Component id="witnessButton" alignment="3" min="-2" pref="30" max="-2" attributes="0"/>
-                              <Component id="audioButton" alignment="3" min="-2" pref="30" max="-2" attributes="0"/>
                           </Group>
                       </Group>
@@ -1000 +997 @@
           <Events>
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="towButtonActionPerformed"/>
-          </Events>
-        </Component>
-        <Component class="javax.swing.JButton" name="audioButton">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Audio"/>
-            <Property name="toolTipText" type="java.lang.String" value=""/>
-            <Property name="focusPainted" type="boolean" value="false"/>
-            <Property name="iconTextGap" type="int" value="0"/>
-            <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
-              <Insets value="[2, 10, 2, 10]"/>
-            </Property>
-            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[30, 25]"/>
-            </Property>
-          </Properties>
-          <Events>
-            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="audioButtonActionPerformed"/>
           </Events>
         </Component>

trunk/src/scriptbuilder/gui/IncidentEditorFrame.java

@@ -139 +139 @@
             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 +313 @@
         eventButtons.add(witnessButton);
         eventButtons.add(unitButton);
-        eventButtons.add(audioButton);
+        //eventButtons.add(audioButton);
         eventButtons.add(cadButton);
         eventButtons.add(cctvButton);
@@ -386 +386 @@
         {
             //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 +489 @@
         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 +1015 @@
         });
 
-        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 +1072 @@
                             .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 +1094 @@
                             .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 +1645 @@
 
     /**
-     * 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 +1751 @@
     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;

trunk/src/scriptbuilder/gui/application.properties

@@ -1 @@
-#Fri, 22 Nov 2019 17:54:32 -0800
+#Wed, 04 Dec 2019 16:03:12 -0800
 
-Application.revision=156
+Application.revision=158
 
 Application.buildnumber=52