Changeset 185 for Docking/CoolDocking/Demo/IDE/UMainForm.pas

Timestamp:

Mar 10, 2011, 11:20:08 AM (13 years ago)

Author:

george

Message:

• Added: ConjoinForm cleanup if not necessary.

File:

• Docking/CoolDocking/Demo/IDE/UMainForm.pas (modified) (2 diffs)

Docking/CoolDocking/Demo/IDE/UMainForm.pas

@@ -127 +127 @@
 procedure TMainForm.ComboBox1Select(Sender: TObject);
 begin
-  if ComboBox1.ItemIndex <> - 1 then
+  if (ComboBox1.ItemIndex <> - 1) and (ComboBox1.ItemIndex < CoolDockLayoutList1.Items.Count) then
     TCoolDockLayout(CoolDockLayoutList1.Items[ComboBox1.ItemIndex]).Restore;
 end;
@@ -217 +217 @@
   NewLayout: TCoolDockLayout;
 begin
-  if ComboBox1.Items.IndexOf(ComboBox1.Text) = -1 then begin
-    NewLayout := TCoolDockLayout.Create;
-    NewLayout.Name := ComboBox1.Text;
-    NewLayout.Store;
-    CoolDockLayoutList1.Items.Add(NewLayout);
-  end else
-    TCoolDockLayout(CoolDockLayoutList1.Items[ComboBox1.Items.IndexOf(ComboBox1.Text)]).Store;
-  CoolDockLayoutList1.SaveToFile(DockLayoutFileName);
-  CoolDockLayoutList1.PopulateStringList(ComboBox1.Items);
+  if ComboBox1.Text <> '' then begin
+    if ComboBox1.Items.IndexOf(ComboBox1.Text) = -1 then begin
+      NewLayout := TCoolDockLayout.Create;
+      NewLayout.Name := ComboBox1.Text;
+      NewLayout.Store;
+      CoolDockLayoutList1.Items.Add(NewLayout);
+    end else
+      TCoolDockLayout(CoolDockLayoutList1.Items[ComboBox1.Items.IndexOf(ComboBox1.Text)]).Store;
+    CoolDockLayoutList1.SaveToFile(DockLayoutFileName);
+    CoolDockLayoutList1.PopulateStringList(ComboBox1.Items);
+  end else ShowMessage('Enter layout name');
 end;