Changeset 31 for trunk/Forms/UMainForm.pas

Timestamp:

Nov 24, 2011, 10:03:48 AM (13 years ago)

Author:

chronos

Message:

• Modified: Item list is separated from MainForm as ItemListForm.
• Modified: Now it is possible to open multiple forms for same operation as View, Edit, Add, List. Open forms are listed in main windows tab list.

File:

• trunk/Forms/UMainForm.pas (modified) (15 diffs)

trunk/Forms/UMainForm.pas

@@ -29 +29 @@
     AObjectGroupAddGroup: TAction;
     AObjectGroupDelete: TAction;
-    AItemView: TAction;
-    AItemEdit: TAction;
-    AItemAdd: TAction;
-    AItemDelete: TAction;
     ActionListItem: TActionList;
-    ButtonEdit: TButton;
-    ButtonView: TButton;
-    ButtonAdd: TButton;
-    ButtonDelete: TButton;
     ImageListActions: TImageList;
     Label1: TLabel;
-    Label2: TLabel;
-    ListView1: TListView;
     MainMenu1: TMainMenu;
     MenuItem1: TMenuItem;
@@ -64 +54 @@
     MenuItem8: TMenuItem;
     MenuItem9: TMenuItem;
+    PageControl1: TPageControl;
     Panel1: TPanel;
     Panel2: TPanel;
@@ -76 +67 @@
     procedure AExitExecute(Sender: TObject);
     procedure AImportStructureExecute(Sender: TObject);
-    procedure AItemAddExecute(Sender: TObject);
-    procedure AItemDeleteExecute(Sender: TObject);
-    procedure AItemEditExecute(Sender: TObject);
-    procedure AItemViewExecute(Sender: TObject);
     procedure AObjectEditExecute(Sender: TObject);
     procedure AObjectGroupAddGroupExecute(Sender: TObject);
@@ -85 +72 @@
     procedure ASettingsExecute(Sender: TObject);
     procedure AToggleFullscreenExecute(Sender: TObject);
-    procedure ButtonAddClick(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
-    procedure ListView1Data(Sender: TObject; Item: TListItem);
-    procedure ListView1DblClick(Sender: TObject);
-    procedure ListView1KeyPress(Sender: TObject; var Key: char);
-    procedure ListView1Resize(Sender: TObject);
-    procedure ListView1SelectItem(Sender: TObject; Item: TListItem;
-      Selected: Boolean);
     procedure MenuItem17Click(Sender: TObject);
     procedure MenuItem19Click(Sender: TObject);
     procedure TreeView1Change(Sender: TObject; Node: TTreeNode);
+    procedure TreeView1DblClick(Sender: TObject);
   private
     OriginalBounds: TRect;
@@ -106 +87 @@
     procedure SaveToRegistry;
   public
-    SelectedObjectId: Integer;
-    SelectedObject: TChronisObject;
-    SelectedItem: Integer;
     PersistentForm: TPersistentForm;
     TreeState: TTreeState;
     Report: TReport;
+    TabForms: TListObject; // TListObject<TForm>
     procedure UpdateInterface;
     procedure LoadTree;
-    procedure LoadItemList;
-  end; 
+    procedure AddTabForm(Form: TForm);
+  end;
 
 var
@@ -132 +111 @@
 uses
   UItemView, UItemEdit, UItemAdd, ULoginForm, USettingForm, UApplicationInfo,
-  UCore, UImportStructureForm, UAboutForm, ULoginProfileForm, UChronisClientDirect;
+  UCore, UImportStructureForm, UAboutForm, ULoginProfileForm, UChronisClientDirect,
+  UItemList;
 
 {$R *.lfm}
@@ -175 +155 @@
 procedure TMainForm.FormCreate(Sender: TObject);
 begin
+  TabForms := TListObject.Create;
+  TabForms.OwnsObjects := False;
   TreeState := TTreeState.Create;
   Report := TReport.Create;
   Report.Base := Core.System;
-  SelectedObject := TChronisObject.Create;
-  SelectedObject.Base := Core.System;
   PersistentForm := TPersistentForm.Create;
   PersistentForm.RegistryKey := Core.RegistryKey;
@@ -189 +169 @@
   TreeState.Free;
   PersistentForm.Free;
+  TabForms.Free;
 end;
 
 procedure TMainForm.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 begin
+  ADisconnect.Execute;
   PersistentForm.Save(Self);
   SaveToRegistry;
 end;
 
-procedure TMainForm.ButtonAddClick(Sender: TObject);
-begin
-
-end;
-
-procedure TMainForm.AItemViewExecute(Sender: TObject);
-begin
-  if Assigned(ListView1.Selected) then
-    ItemViewForm.Show;
-end;
-
 procedure TMainForm.AObjectEditExecute(Sender: TObject);
 begin
-  if Assigned(TreeView1.Selected) then begin
+(*  if Assigned(TreeView1.Selected) then begin
     SelectedObjectId := 9;
     SelectedItem := Integer(TreeView1.Selected.Data);
     ItemEditForm.Show;
-  end;
+  end;*)
 end;
 
@@ -224 +195 @@
 procedure TMainForm.AObjectGroupEditExecute(Sender: TObject);
 begin
-  if Assigned(TreeView1.Selected) then begin
+(*  if Assigned(TreeView1.Selected) then begin
     SelectedObjectId := 8;
     SelectedItem := Integer(TreeView1.Selected.Data);
     ItemEditForm.Show;
-  end;
+  end;*)
 end;
 
@@ -263 +234 @@
 end;
 
-procedure TMainForm.AItemEditExecute(Sender: TObject);
-begin
-  ItemEditForm.Show;
-end;
-
 procedure TMainForm.AExitExecute(Sender: TObject);
 begin
@@ -276 +242 @@
 begin
   ImportStructureForm.ShowModal;
-end;
-
-procedure TMainForm.AItemAddExecute(Sender: TObject);
-begin
-  ItemAddForm.ShowModal;
-end;
-
-procedure TMainForm.AItemDeleteExecute(Sender: TObject);
-begin
-  if MessageDlg(SItemDeletion, SReallyWantToDelete, mtConfirmation, [mbYes, mbNo], 0) = mrYes then begin
-
-  end;
 end;
 
@@ -315 +269 @@
 procedure TMainForm.ADisconnectExecute(Sender: TObject);
 begin
-  Core.System.Database.Disconnect;
-  TreeView1.Items.Clear;
-  ListView1.Items.Clear;
-  Core.System.Types.Clear;
-  FreeAndNil(Core.Client);
+  if Core.System.Database.Connected then begin
+    Core.System.Database.Disconnect;
+    TreeView1.Items.Clear;
+    Core.System.Types.Clear;
+    FreeAndNil(Core.Client);
+  end;
 end;
 
 procedure TMainForm.AAboutExecute(Sender: TObject);
 begin
-  AboutForm.ShowModal;
+  try
+    AboutForm := TAboutForm.Create(nil);
+    AboutForm.ShowModal;
+  finally
+    FreeAndNil(AboutForm);
+  end;
 end;
 
@@ -332 +292 @@
   LoadFromRegistry;
   AConnect.Execute;
-end;
-
-procedure TMainForm.ListView1Data(Sender: TObject; Item: TListItem);
-var
-  I: Integer;
-begin
-  if Item.Index < Report.Count then
-  with TReportLine(Report[Item.Index]) do begin
-    Item.Caption := Items[0];
-    for I := 1 to Report.Columns.Count - 1 do
-    if not TReportColumn(Report.Columns[I]).VirtualItem then begin
-      Item.SubItems.Add(Items[I]);
-    end;
-  end;
-end;
-
-procedure TMainForm.ListView1DblClick(Sender: TObject);
-begin
-  AItemViewExecute(Self);
-end;
-
-procedure TMainForm.ListView1KeyPress(Sender: TObject; var Key: char);
-begin
-  if Key = #13 then AItemViewExecute(Self);
-end;
-
-procedure TMainForm.ListView1Resize(Sender: TObject);
-var
-  I: Integer;
-begin
-  for I := 0 to ListView1.Columns.Count - 1 do
-    ListView1.Columns[I].Width := ListView1.Width div ListView1.Columns.Count;
-end;
-
-procedure TMainForm.ListView1SelectItem(Sender: TObject; Item: TListItem;
-  Selected: Boolean);
-begin
-  if Assigned(ListView1.Selected) then
-    SelectedItem := TReportLine(Report[ListView1.Selected.Index]).Id
-    else SelectedItem := 0;
-
-  ButtonDelete.Enabled := Assigned(ListView1.Selected);
-  ButtonView.Enabled := Assigned(ListView1.Selected);
-  ButtonEdit.Enabled := Assigned(ListView1.Selected);
 end;
 
@@ -395 +311 @@
     if TreeView1.Selected.ImageIndex = 0 then begin
       TreeView1.PopupMenu := PopupMenuObjectGroup;
-      ListView1.Visible := False;
+      PageControl1.Visible := False;
     end;
     if TreeView1.Selected.ImageIndex = 1 then begin
       TreeView1.PopupMenu := PopupMenuObject;
-      LoadItemList;
-    end;
+      //LoadItemList;
+    end;
+  end;
+end;
+
+procedure TMainForm.TreeView1DblClick(Sender: TObject);
+var
+  NewItemListForm: TItemListForm;
+begin
+  if Assigned(TreeView1.Selected) then begin
+    NewItemListForm := TItemListForm.Create(Self);
+    NewItemListForm.SelectedObject.Id := Integer(TreeView1.Selected.Data);
+    AddTabForm(NewItemListForm);
   end;
 end;
@@ -448 +375 @@
 end;
 
-procedure TMainForm.LoadItemList;
+procedure TMainForm.AddTabForm(Form: TForm);
 var
-  NewColumn: TListColumn;
-  I: Integer;
-begin
-  SelectedObjectId := 0;
-  if Assigned(TreeView1.Selected) then
-  with ListView1 do begin
-    Visible := True;
-    SelectedObject.Load(Integer(TreeView1.Selected.Data));
-    Report.Load(SelectedObject);
-
-    Report.FillListColumns(Columns);
-    Items.Count := Report.Count;
-    Refresh;
-  end;
-  ListView1Resize(Self);
-  ListView1SelectItem(Self, nil, False);
+  NewTabSheet: TTabSheet;
+begin
+  TabForms.Add(Form);
+  NewTabSheet := PageControl1.AddTabSheet;
+  NewTabSheet.DockSite := True;
+  NewTabSheet.UseDockManager := True;
+  NewTabSheet.Caption := Form.Caption;
+  Form.DragKind := dkDock;
+  Form.DragMode := dmAutomatic;
+  Form.Show;
+  Form.ManualDock(NewTabSheet);
+  PageControl1.TabIndex := PageControl1.PageCount - 1;
 end;