--- oup/current/Tools/MetaEditor.pas	2007/06/15 22:12:39	218
+++ oup/current/Tools/MetaEditor.pas	2007/06/28 09:24:08	232
@@ -4,13 +4,22 @@ interface
 
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs, _BaseTemplate, ExtCtrls, VirtualTrees, StdCtrls;
+  Dialogs, _BaseTemplate, ExtCtrls, VirtualTrees, StdCtrls, ComCtrls, Grids,
+  MPHexEditor, Wrapgrid;
 
 type
   TForm_Meta = class(TForm_BaseTemplate)
     VST: TVirtualStringTree;
-    Panel2: TPanel;
     splitter: TSplitter;
+    rightPages: TPageControl;
+    tab_hex: TTabSheet;
+    tab_meta: TTabSheet;
+    panel_hex_actions: TPanel;
+    hex: TMPHexEditor;
+    splitter_hex_1: TSplitter;
+    value_viewer: TWrapGrid;
+    splitter_hex_2: TSplitter;
+    structviewer: TVirtualStringTree;
     procedure FormCreate(Sender: TObject);
     procedure VSTInitChildren(Sender: TBaseVirtualTree; Node: PVirtualNode;
       var ChildCount: Cardinal);
@@ -30,12 +39,10 @@ type
   public
   end;
 
-var
-  Form_Meta: TForm_Meta;
 
 implementation
 {$R *.dfm}
-uses _MetaManager, _FileTypes, Data;
+uses _MetaManager, _MetaTypes, ConnectionManager, Data, _FileTypes;
 
 type
   PNodeData = ^TNodeData;
@@ -58,31 +65,23 @@ end;
 
 procedure TForm_Meta.NewCon(ID: Integer);
 var
-  a,b,c: Int64;
   i: Integer;
   data: TNodeData;
   node: PVirtualNode;
+  Meta: TMetaManager;
+  root: TExtensions;
 begin
   if ID >= 0 then
   begin
-    QueryPerformanceFrequency(c);
-    QueryPerformanceCounter(a);
-    if not Assigned(Meta) then
-      Meta := TMetaManager.Create(ID);
-    QueryPerformanceCounter(b);
-    ShowMessage('Loading Done - ' + FloatToStr((b-a)/c) + 's');
-
+    //VST
     VST.Clear;
     VST.BeginUpdate;
-    for i := 0 to Meta.FileCount - 1 do
+    root := ConManager.Connection[FConnectionID].MetaData.Root;
+    for i := 0 to High(root) do
     begin
-      if Assigned(Meta.FileById[i]) then
-      begin
-        data.Field := Meta.FileById[i];
-        node := AddVSTEntry(VST, nil, data);
-        if Meta.FileById[i].ChildCount > 0 then
-          VST.HasChildren[node] := True;
-      end;
+      data.Field := root[i];
+      node := AddVSTEntry(VST, nil, data);
+      VST.HasChildren[node] := True;
     end;
     VST.EndUpdate;
   end;
@@ -97,18 +96,47 @@ var
   newnode: PVirtualNode;
   i: Integer;
   id: Integer;
+  Meta: TMetaManager;
 begin
-  data := VST.GetNodeData(node);
-  for i := 0 to Meta.FileById[TFile(data.Field).FileID].ChildCount - 1 do
+  data := Sender.GetNodeData(node);
+  Meta := ConManager.Connection[ConnectionID].MetaData;
+  if data.Field is TFile then
   begin
-    id := Meta.FileById[TFile(data.Field).FileID].LinkByIndex[i].DestID;
-    Meta.InitFile(id);
-    newdata.Field := Meta.FileById[id];
-    newnode := AddVSTEntry(VST, Node, newdata);
-    if Meta.FileById[id].ChildCount > 0 then
-      VST.HasChildren[newnode] := True;
+    if TFile(data.Field).ChildCount > 0 then
+    begin
+      for i := 0 to TFile(data.Field).ChildCount - 1 do
+      begin
+        id := TFile(data.Field).LinkByIndex[i].DestID;
+        Meta.InitFile(id);
+        newdata.Field := Meta.FileById[id];
+        newnode := AddVSTEntry(TCustomVirtualStringTree(Sender), Node, newdata);
+        if Meta.FileById[id].ChildCount > 0 then
+          Sender.HasChildren[newnode] := True;
+      end;
+    end;
+    if TFile(data.Field).RawCount > 0 then
+    begin
+      for i := 0 to TFile(data.Field).RawCount - 1 do
+      begin
+//        Exit;
+      end;
+    end;
+  end;
+  if data.Field is TExtension then
+  begin
+    if TExtension(data.Field).FileCount = 0 then
+      TExtension(data.Field).InitList;
+    for i := 0 to TExtension(data.Field).FileCount - 1 do
+    begin
+      id := TExtension(data.Field).Files[i];
+      Meta.InitFile(id);
+      newdata.Field := Meta.FileById[id];
+      newnode := AddVSTEntry(TCustomVirtualStringTree(Sender), Node, newdata);
+      if Meta.FileById[id].ChildCount > 0 then
+        Sender.HasChildren[newnode] := True;
+    end;
   end;
-  ChildCount := Meta.FileById[TFile(data.Field).FileID].ChildCount;
+  ChildCount := Sender.ChildCount[Node];
 end;
 
 
@@ -123,7 +151,8 @@ begin
     TFile(data.Field).InitEditor;
     if Assigned(TFile(data.Field).Editor) then
     begin
-      panel2.InsertControl(TFile(data.Field).Editor);
+      TFile(data.Field).Editor.Align := alClient;
+      tab_meta.InsertControl(TFile(data.Field).Editor);
       TFile(data.Field).Opened := True;
     end;
   end;
@@ -153,9 +182,9 @@ begin
     begin
       if TFile(data.Field).Opened then
       begin
-        if panel2.ControlCount > 0 then
-          for i := 0 to panel2.ControlCount - 1 do
-            panel2.RemoveControl(panel2.Controls[i]);
+        if tab_meta.ControlCount > 0 then
+          for i := 0 to tab_meta.ControlCount - 1 do
+            tab_meta.RemoveControl(tab_meta.Controls[i]);
         TFile(data.Field).Opened := False;
       end;
     end;
@@ -177,20 +206,22 @@ begin
         begin
           if Data.Field is TFile then
           begin
-            CellText := TFile(Data.Field).FileName;
+            CellText := TFile(Data.Field).FileInfo.Name;
             if CellText = '' then
               CellText := 'Unnamed';
           end;
+          if Data.Field is TExtension then
+            CellText := TExtension(Data.Field).Ext;
         end;
       1:
         begin
           if Data.Field is TFile then
-            CellText := TFile(Data.Field).FileExt;
+            CellText := TFile(Data.Field).FileInfo.Extension;
         end;
       2:
         begin
           if Data.Field is TFile then
-            CellText := IntToStr(TFile(Data.Field).FileID);
+            CellText := IntToStr(TFile(Data.Field).FileInfo.ID);
         end;
     end;
   end;
@@ -211,9 +242,9 @@ begin
         begin
           if Data.Field is TFile then
           begin
-            if Length(TFile(Data.Field).FileName) = 0 then
+            if Length(TFile(Data.Field).FileInfo.Name) = 0 then
               TargetCanvas.Font.Color := $C06060;
-            if TFile(Data.Field).FileSize = 0 then
+            if TFile(Data.Field).FileInfo.Size = 0 then
               TargetCanvas.Font.Color := $2020A0;
           end;
         end;
@@ -225,7 +256,7 @@ end;
 
 procedure TForm_Meta.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
-  Meta.Free;
+//  Meta.Free;
   inherited;
 end;