Changeset 49 for trunk/Client/Forms/UFormMain.pas

Timestamp:

Mar 21, 2012, 12:54:06 PM (13 years ago)

Author:

chronos

Message:

• Modified: Navigation menu moved to separated docked form.

File:

• trunk/Client/Forms/UFormMain.pas (modified) (14 diffs)

trunk/Client/Forms/UFormMain.pas

@@ -23 +23 @@
     AToggleFullscreen: TAction;
     AExit: TAction;
-    AObjectEdit: TAction;
-    AObjectDelete: TAction;
-    AObjectGroupEdit: TAction;
-    AObjectGroupAddObject: TAction;
-    AObjectGroupAddGroup: TAction;
-    AObjectGroupDelete: TAction;
     ActionListItem: TActionList;
     ImageListActions: TImageList;
-    Label1: TLabel;
-    MainMenu1: TMainMenu;
+    MainMenuMain: TMainMenu;
     MenuItem1: TMenuItem;
-    MenuItem10: TMenuItem;
     MenuItem11: TMenuItem;
     MenuItem12: TMenuItem;
@@ -49 +41 @@
     MenuItem3: TMenuItem;
     MenuItem4: TMenuItem;
-    MenuItem5: TMenuItem;
-    MenuItem6: TMenuItem;
-    MenuItem7: TMenuItem;
-    MenuItem8: TMenuItem;
-    MenuItem9: TMenuItem;
     PanelMenu: TPanel;
     PanelData: TPanel;
-    PopupMenuObjectGroup: TPopupMenu;
-    PopupMenuObject: TPopupMenu;
     PopupMenuItem: TPopupMenu;
     Splitter1: TSplitter;
@@ -67 +52 @@
     ToolButton4: TToolButton;
     ToolButton5: TToolButton;
-    TreeView1: TTreeView;
     procedure AAboutExecute(Sender: TObject);
     procedure AConnectExecute(Sender: TObject);
@@ -73 +57 @@
     procedure AExitExecute(Sender: TObject);
     procedure AImportStructureExecute(Sender: TObject);
-    procedure AObjectEditExecute(Sender: TObject);
-    procedure AObjectGroupAddGroupExecute(Sender: TObject);
-    procedure AObjectGroupDeleteExecute(Sender: TObject);
-    procedure AObjectGroupEditExecute(Sender: TObject);
     procedure ASettingsExecute(Sender: TObject);
     procedure AToggleFullscreenExecute(Sender: TObject);
@@ -83 +63 @@
     procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
-    procedure MenuItem17Click(Sender: TObject);
-    procedure MenuItem19Click(Sender: TObject);
-    procedure TreeView1Change(Sender: TObject; Node: TTreeNode);
-    procedure TreeView1DblClick(Sender: TObject);
   private
     OriginalBounds: TRect;
@@ -97 +73 @@
     MainPanelForm: TItemListForm;
     PersistentForm: TPersistentForm;
-    TreeState: TTreeState;
     Report: TReport;
     procedure UpdateInterface;
-    procedure LoadTree;
   end;
 
@@ -119 +93 @@
   UFormItemView, UFormItemEdit, UFormItemAdd, UFormLogin, UFormSetting, UApplicationInfo,
   UCore, UFormImportStructure, UFormAbout, UFormLoginProfile, UChronisClientDirect,
-  UChronisClient, UChronisClientMySQL, UChronisClientXMLRPC;
+  UChronisClient, UChronisClientMySQL, UChronisClientXMLRPC, UFormMenu;
 
 {$R *.lfm}
@@ -158 +132 @@
   MainPanelForm.ManualDock(PanelData, nil, alClient);
   MainPanelForm.Align := alClient;
+  FormMenu.ManualDock(PanelMenu, nil, alClient);
+  FormMenu.Align := alClient;
+  FormMenu.Show;
 end;
 
@@ -181 +158 @@
 procedure TMainForm.FormCreate(Sender: TObject);
 begin
-  TreeState := TTreeState.Create;
   Report := TReport.Create;
   Report.Base := Core.System;
@@ -192 +168 @@
   FreeAndNil(MainPanelForm);
   FreeAndNil(Report);
-  FreeAndNil(TreeState);
   FreeAndNil(PersistentForm);
 end;
@@ -201 +176 @@
   PersistentForm.Save(Self);
   SaveToRegistry;
-end;
-
-procedure TMainForm.AObjectEditExecute(Sender: TObject);
-begin
-(*  if Assigned(TreeView1.Selected) then begin
-    SelectedObjectId := 9;
-    SelectedItem := Integer(TreeView1.Selected.Data);
-    ItemEditForm.Show;
-  end;*)
-end;
-
-procedure TMainForm.AObjectGroupAddGroupExecute(Sender: TObject);
-begin
-
-end;
-
-procedure TMainForm.AObjectGroupDeleteExecute(Sender: TObject);
-begin
-
-end;
-
-procedure TMainForm.AObjectGroupEditExecute(Sender: TObject);
-begin
-(*  if Assigned(TreeView1.Selected) then begin
-    SelectedObjectId := 8;
-    SelectedItem := Integer(TreeView1.Selected.Data);
-    ItemEditForm.Show;
-  end;*)
 end;
 
@@ -302 +249 @@
       try
         Core.System.Active := True;
-        LoadTree;
+        FormMenu.LoadTree;
       except
         on E: Exception do ShowMessage(E.Message);
@@ -318 +265 @@
   if Core.System.Active then begin
     Core.System.Active := False;
-    TreeView1.Items.Clear;
+    FormMenu.TreeViewMenu.Items.Clear;
   end;
   UpdateInterface;
@@ -341 +288 @@
 end;
 
-procedure TMainForm.MenuItem17Click(Sender: TObject);
-begin
-  try
-    LoginForm := TLoginForm.Create(MainForm);
-    LoginForm.ShowModal;
-  finally
-    LoginForm.Free;
-  end;
-end;
-
-procedure TMainForm.MenuItem19Click(Sender: TObject);
-begin
-
-end;
-
-procedure TMainForm.TreeView1Change(Sender: TObject; Node: TTreeNode);
-begin
-  AObjectGroupDelete.Enabled := Assigned(TreeView1.Selected);
-  AObjectGroupEdit.Enabled := Assigned(TreeView1.Selected);
-  if Assigned(TreeView1.Selected) then begin
-    if TreeView1.Selected.ImageIndex = 0 then begin
-      TreeView1.PopupMenu := PopupMenuObjectGroup;
-      PanelData.Visible := False;
-    end;
-    if TreeView1.Selected.ImageIndex = 1 then begin
-      TreeView1.PopupMenu := PopupMenuObject;
-      //LoadItemList;
-    end;
-  end;
-end;
-
-procedure TMainForm.TreeView1DblClick(Sender: TObject);
-begin
-  if Assigned(TreeView1.Selected) then begin
-    MainPanelForm.SelectedObject.Load(Integer(TreeView1.Selected.Data));
-    MainPanelForm.Caption := MainPanelForm.SelectedObject.Name;
-    MainPanelForm.Show;
-    MainPanelForm.Reload;
-    UpdateInterface;
-  end;
-end;
-
-procedure TMainForm.LoadTree;
-var
-  Groups: TListProxy;
-  Obj: TObjectProxy;
-  Objects: TListProxy;
-  Obj2: TObjectProxy;
-  I: Integer;
-  O: Integer;
-  NewNode: TTreeNode;
-  NewObjectNode: TTreeNode;
-begin
-  with TreeView1, Items do begin
-    TreeState.SaveTree(TreeView1);
-    Clear;
-    AddChild(nil, SGroup);
-    TopItem.ImageIndex := 0;
-    TopItem.SelectedIndex := 0;
-    try
-      Groups := TListProxy.Create;
-      Groups.Client := Core.System.Client;
-      Groups.ObjectName := ObjectGroupTable;
-      Groups.SchemaName := Core.System.Client.Schema;
-      Groups.Load;
-      for I := 0 to Groups.Objects.Count - 1 do begin
-        Obj := TObjectProxy(Groups.Objects[I]);
-        NewNode := AddChild(TopItem, Obj.Properties.Values['Name']);
-        NewNode.ImageIndex := 0;
-        NewNode.SelectedIndex := 0;
-        NewNode.Data := Pointer(StrToInt(Obj.Properties.Values['Id']));
-        try
-          Objects := TListProxy.Create;
-          Objects.Client := Core.System.Client;
-          Objects.ObjectName := ObjectTable;
-          Objects.SchemaName := Core.System.Client.Schema;
-          Objects.Condition := '`Group`="' + Obj.Properties.Values['Id'] + '"';
-          Objects.Load;
-          for O := 0 to Objects.Objects.Count - 1 do begin
-            Obj2 := TObjectProxy(Objects.Objects[O]);
-            NewObjectNode := AddChild(NewNode, Obj2.Properties.Values['Name']);
-            NewObjectNode.Data := Pointer(StrToInt(Obj2.Properties.Values['Id']));
-            NewObjectNode.ImageIndex := 1;
-            NewObjectNode.SelectedIndex := 1;
-          end;
-        finally
-          Objects.Free;
-        end;
-      end;
-      TopItem.Expand(True);
-    finally
-      Groups.Free;
-    end;
-    TreeState.LoadTree(TreeView1);
-  end;
-end;
-
 end.