Changeset 32 for trunk/Forms

Timestamp:

Nov 24, 2011, 10:31:04 AM (13 years ago)

Author:

chronos

Message:

• Modified: Better form addition to tab list. Better tab titles.

Location:

trunk/Forms

Files:

• UItemList.pas (modified) (4 diffs)
• UItemView.pas (modified) (1 diff)
• UMainForm.pas (modified) (2 diffs)

trunk/Forms/UItemList.pas

@@ -67 +67 @@
   with ListView1 do begin
     Visible := True;
-    SelectedObject.Load(SelectedObject.Id);
+    //SelectedObject.Load(SelectedObject.Id);
     Report.Load(SelectedObject);
 
@@ -86 +86 @@
     NewItemViewForm.SelectedObject.Assign(SelectedObject);
     NewItemViewForm.SelectedItemId := Integer(ListView1.Selected.Data);
+    NewItemViewForm.Caption := NewItemViewForm.Caption + ' ' + SelectedObject.Name;
     MainForm.AddTabForm(NewItemViewForm);
   end;
@@ -118 +119 @@
     NewItemEditForm.SelectedObject.Assign(SelectedObject);
     NewItemEditForm.SelectedItemId := Integer(ListView1.Selected.Data);
+    NewItemEditForm.Caption := NewItemEditForm.Caption + ' ' + SelectedObject.Name;
     MainForm.AddTabForm(NewItemEditForm);
   end;
@@ -129 +131 @@
   NewItemAddForm.SelectedObject.Assign(SelectedObject);
   NewItemAddForm.SelectedItemId := Integer(ListView1.Selected.Data);
+  NewItemAddForm.Caption := NewItemAddForm.Caption + ' ' + SelectedObject.Name;
   MainForm.AddTabForm(NewItemAddForm);
 end;

trunk/Forms/UItemView.pas

@@ -110 +110 @@
   NewItemEditForm.SelectedObject.Assign(SelectedObject);
   NewItemEditForm.SelectedItemId := SelectedItemId;
+  NewItemEditForm.Caption := NewItemEditForm.Caption + ' ' + SelectedObject.Name;
   MainForm.AddTabForm(NewItemEditForm);
 end;

trunk/Forms/UMainForm.pas

@@ -326 +326 @@
   if Assigned(TreeView1.Selected) then begin
     NewItemListForm := TItemListForm.Create(Self);
-    NewItemListForm.SelectedObject.Id := Integer(TreeView1.Selected.Data);
+    NewItemListForm.SelectedObject.Load(Integer(TreeView1.Selected.Data));
+    NewItemListForm.Caption := NewItemListForm.Caption + ' ' + NewItemListForm.SelectedObject.Name;
     AddTabForm(NewItemListForm);
   end;
@@ -384 +385 @@
   NewTabSheet.UseDockManager := True;
   NewTabSheet.Caption := Form.Caption;
+  PageControl1.TabIndex := PageControl1.PageCount - 1;
   Form.DragKind := dkDock;
   Form.DragMode := dmAutomatic;
+  Form.ManualDock(NewTabSheet);
   Form.Show;
-  Form.ManualDock(NewTabSheet);
-  PageControl1.TabIndex := PageControl1.PageCount - 1;
+
+  // Workaround for not showing content of first tab after docking
+  NewTabSheet.Visible := False;
+  NewTabSheet.Visible := True;
 end;