Index: trunk/src/scriptbuilder/gui/ScriptBuilderFrame.form
===================================================================
--- trunk/src/scriptbuilder/gui/ScriptBuilderFrame.form	(revision 151)
+++ trunk/src/scriptbuilder/gui/ScriptBuilderFrame.form	(revision 177)
@@ -258,8 +258,8 @@
                               <Component id="addIncidentName" pref="199" max="32767" attributes="0"/>
                               <Component id="addIncidentNumber" alignment="0" pref="199" max="32767" attributes="0"/>
-                              <Group type="102" alignment="1" attributes="0">
-                                  <Component id="incidentColorField" pref="97" max="32767" attributes="0"/>
+                              <Group type="102" alignment="0" attributes="0">
+                                  <Component id="incidentColorField" min="-2" pref="55" max="-2" attributes="0"/>
                                   <EmptySpace max="-2" attributes="0"/>
-                                  <Component id="btnChooseColor" min="-2" pref="93" max="-2" attributes="0"/>
+                                  <Component id="colorComboBox" max="32767" attributes="0"/>
                               </Group>
                           </Group>
@@ -320,6 +320,6 @@
                   <Group type="103" groupAlignment="3" attributes="0">
                       <Component id="labelIncidentColor" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="btnChooseColor" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="incidentColorField" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="colorComboBox" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
@@ -336,5 +336,5 @@
                   <Component id="labelIncidentDescription" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
-                  <Component id="incidentPropertiesScrollPane" pref="130" max="32767" attributes="0"/>
+                  <Component id="incidentPropertiesScrollPane" pref="132" max="32767" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="3" attributes="0">
@@ -444,12 +444,4 @@
           </Properties>
         </Component>
-        <Component class="javax.swing.JButton" name="btnChooseColor">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Choose..."/>
-          </Properties>
-          <Events>
-            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnChooseColorActionPerformed"/>
-          </Events>
-        </Component>
         <Component class="javax.swing.JTextField" name="incidentColorField">
           <Properties>
@@ -483,4 +475,17 @@
         </Component>
         <Component class="javax.swing.JTextField" name="addIncidentType">
+        </Component>
+        <Component class="javax.swing.JComboBox" name="colorComboBox">
+          <Properties>
+            <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+              <Connection code="new DefaultComboBoxModel(colorModel)" type="code"/>
+            </Property>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="colorSelectedHandler"/>
+          </Events>
+          <AuxValues>
+            <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
+          </AuxValues>
         </Component>
       </SubComponents>