Minor fixes, plus Screen crash fix that are going in 047

Author: VaughnRupp

Plugins/OSAE.CM11A/install.sql

@@ -10,6 +10,30 @@ CALL osae_sp_object_type_method_add('CM11A','RESET','Reset the CM11A','','','','
 CALL osae_sp_object_type_method_add('CM11A','SET POLL RATE','Set CM11a Poll Rate','Rate in ms','','30000','');
 CALL osae_sp_object_type_method_add('CM11A','SET LEARNING MODE','Set Learning Mode','TRUE/FALSE','','TRUE','');
 CALL osae_sp_object_type_property_add('CM11A','Port','Integer','','',0);
-CALL osae_sp_object_type_property_add('CM11A','Poll Rate','Integer','120','',0);
-CALL osae_sp_object_type_property_add('CM11A','Learning Mode','Boolean','TRUE','',0);
-CALL osae_sp_object_type_property_add('CM11A','System Plugin','Boolean','FALSE','',0);
+CALL osae_sp_object_type_property_add('CM11A','Poll Rate','Integer','','120',0);
+CALL osae_sp_object_type_property_add('CM11A','Learning Mode','Boolean',',','TRUE',0);
+CALL osae_sp_object_type_property_add('CM11A','System Plugin','Boolean','','FALSE',0);
+
+CALL osae_sp_object_type_add ('X10 DIMMER','X10 Dimmer','','SWITCH',0,0,0,0);
+CALL osae_sp_object_type_state_add('X10 DIMMER','ON','On');
+CALL osae_sp_object_type_state_add('X10 DIMMER','OFF','Off');
+CALL osae_sp_object_type_event_add('X10 DIMMER','ON','On');
+CALL osae_sp_object_type_event_add('X10 DIMMER','OFF','Off');
+CALL osae_sp_object_type_method_add('X10 DIMMER','ON','On','Dim Level in %','','100','');
+CALL osae_sp_object_type_method_add('X10 DIMMER','OFF','Off','','','','');
+CALL osae_sp_object_type_method_add('X10 DIMMER','BRIGHT','Bright','','','','');
+CALL osae_sp_object_type_method_add('X10 DIMMER','DIM','Dim','','','','');
+CALL osae_sp_object_type_property_add('X10 DIMMER','Off Timer','Integer','','',0);
+CALL osae_sp_object_type_property_add('X10 DIMMER','Level','Integer','','',0);
+
+CALL osae_sp_object_type_add ('X10 RELAY','X10 Relay','','SWITCH',0,0,0,0);
+CALL osae_sp_object_type_state_add('X10 RELAY','ON','On');
+CALL osae_sp_object_type_state_add('X10 RELAY','OFF','Off');
+CALL osae_sp_object_type_event_add('X10 RELAY','ON','On');
+CALL osae_sp_object_type_event_add('X10 RELAY','OFF','Off');
+CALL osae_sp_object_type_method_add('X10 RELAY','ON','On','','','100','');
+CALL osae_sp_object_type_method_add('X10 RELAY','OFF','Off','','','','');
+CALL osae_sp_object_type_property_add('X10 RELAY','Off Timer','Integer','','',0);
+
+
+

UI/OSAE.UI.Controls/AddControlTimerLabel.xaml.cs

@@ -43,15 +43,15 @@ public AddControlTimerLabel(string screen, string controlName = "")
             }
             if (controlName == "") 
             {
-                sWorkingName = currentScreen + " - New State Image";
+                sWorkingName = currentScreen + " - New Off Timer Label";
                 DataSet dsScreenControl = OSAESql.RunSQL("SELECT COUNT(object_name) FROM osae_v_object where object_name = '" + sWorkingName + "'");
                 int iCount = 0;
 
                 while (dsScreenControl.Tables[0].Rows[0][0].ToString() == "1")
                 {
                     // We have a duplicate name, we must get a unique name
                     iCount += 1;
-                    sWorkingName = currentScreen + " - New State Image" + iCount;
+                    sWorkingName = currentScreen + " - New Off Timer Label " + iCount;
                     dsScreenControl = OSAESql.RunSQL("SELECT COUNT(object_name) FROM osae_v_object where object_name = '" + sWorkingName + "'");
                 }
                 controlName = sWorkingName;
@@ -116,6 +116,7 @@ private void txtFont_MouseLeftButtonUp(object sender, System.Windows.Input.Mouse
         private void btnAdd_Click(object sender, RoutedEventArgs e)
         {
             string sName = txtControlName.Text;
+
             OSAEObjectManager.ObjectAdd(sName, sName, sName, "CONTROL TIMER LABEL", "", currentScreen, true);
             OSAEObjectPropertyManager.ObjectPropertySet(sName, "Font Name", txtFont.Text, "GUI");
             OSAEObjectPropertyManager.ObjectPropertySet(sName, "Font Size", txtSize.Text, "GUI");