--- oup/current/Tools/BinEdit.pas	2007/05/02 15:16:00	174
+++ oup/current/Tools/BinEdit.pas	2007/06/18 14:20:33	221
@@ -1,18 +1,25 @@
 unit BinEdit;
+
 interface
+
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs, Template, StdCtrls, ExtCtrls, VirtualTrees, Grids, Wrapgrid,
-  MPHexEditor, VTHeaderPopup, Menus, StrUtils, Clipbrd,
-  Data, TypeDefs, ConnectionManager, Buttons;
+  Dialogs, VirtualTrees, Grids, Wrapgrid, MPHexEditor,
+  StdCtrls, Menus, ExtCtrls, Buttons,
+  Data, TypeDefs, ConnectionManager, Template,
+  _TemplateFileList, VTHeaderPopup, ComCtrls;
 
 type
-  TForm_BinEdit = class(TForm_ToolTemplate)
+  TForm_BinEdit = class(TForm_TemplateFileList)
+    panel_imexport: TPanel;
+    btn_export: TButton;
+    btn_import: TButton;
     hex: TMPHexEditor;
     Splitter2: TSplitter;
     value_viewer: TWrapGrid;
-    VST: TVirtualStringTree;
     Splitter3: TSplitter;
+    VST: TVirtualStringTree;
+    VTHPopup: TVTHeaderPopupMenu;
     value_viewer_context: TPopupMenu;
     value_viewer_context_copy: TMenuItem;
     value_viewer_context_copyasdec: TMenuItem;
@@ -20,17 +27,8 @@ type
     value_viewer_context_copyasbitset: TMenuItem;
     value_viewer_context_copyasstring: TMenuItem;
     value_viewer_context_copyashex: TMenuItem;
-    VTHPopup: TVTHeaderPopupMenu;
-    procedure FormCreate(Sender: TObject);
     procedure NewFile(fileinfo: TFileInfo);
 
-    procedure FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
-    procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
-
-    procedure hexKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
-    procedure hexSelectionChanged(Sender: TObject);
-    procedure hexChange(Sender: TObject);
-
     procedure LoadDat(_fileid: Integer);
     function Save: Boolean;
     function GetValue(datatype: Word; offset: Integer): String;
@@ -38,36 +36,42 @@ type
 
     procedure WriteStructureInfos;
     procedure ClearStructViewer;
-    procedure VSTDblClick(Sender: TObject);
-    procedure VSTFocusChanged(Sender: TBaseVirtualTree; Node: PVirtualNode;
-      Column: TColumnIndex);
-    procedure VTHPopupColumnChange(const Sender: TBaseVirtualTree;
-      const Column: TColumnIndex; Visible: Boolean);
-    procedure VSTHeaderDragged(Sender: TVTHeader; Column: TColumnIndex;
-      OldPosition: Integer);
-    procedure VSTGetText(Sender: TBaseVirtualTree; Node: PVirtualNode;
-      Column: TColumnIndex; TextType: TVSTTextType; var CellText: WideString);
 
     procedure ClearValues;
     procedure WriteValues;
+
+    procedure FormCreate(Sender: TObject);
+    procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
+    procedure hexChange(Sender: TObject);
+    procedure hexKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
+    procedure hexSelectionChanged(Sender: TObject);
     procedure value_viewerDblClick(Sender: TObject);
-    procedure value_viewer_context_copyClick(Sender: TObject);
+    procedure FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
+    procedure value_viewer_contextPopup(Sender: TObject);
     procedure value_viewerMouseDown(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
-    procedure value_viewer_contextPopup(Sender: TObject);
+    procedure value_viewer_context_copyClick(Sender: TObject);
+    procedure VSTDblClick(Sender: TObject);
+    procedure VSTFocusChanged(Sender: TBaseVirtualTree; Node: PVirtualNode;
+      Column: TColumnIndex);
+    procedure VSTGetText(Sender: TBaseVirtualTree; Node: PVirtualNode;
+      Column: TColumnIndex; TextType: TVSTTextType; var CellText: WideString);
+    procedure VSTHeaderDragged(Sender: TVTHeader; Column: TColumnIndex;
+      OldPosition: Integer);
+    procedure VTHPopupColumnChange(const Sender: TBaseVirtualTree;
+      const Column: TColumnIndex; Visible: Boolean);
   private
     fileid: Integer;
     ConID: Integer;
+    rawlist: TRawDataList;
   public
   end;
 
-var
-  Form_BinEdit: TForm_BinEdit;
-
 implementation
-
-uses ValueEdit, Main, Functions, DatStructureLoader{, RawEdit};
 {$R *.dfm}
+uses ValueEdit, Main, Functions, DatStructureLoader, RawEdit, RawList, 
+  StrUtils, Clipbrd;
+
 
 type
   PNodeData = ^TNodeData;
@@ -114,6 +118,7 @@ begin
   //
 end;
 
+
 procedure TForm_BinEdit.NewFile(fileinfo: TFileInfo);
 begin
   LoadDat(fileinfo.ID);
@@ -160,6 +165,7 @@ begin
     Self.ClearStructViewer;
     mem := nil;
     ConManager.Connection[ConID].LoadDatFile(fileid, TStream(mem));
+    rawlist := ConManager.Connection[ConID].GetRawList(fileid);
     hex.LoadFromStream(mem);
     mem.Free;
     ClearValues;
@@ -172,6 +178,7 @@ begin
     Self.ClearStructViewer;
     ClearValues;
     hex.DataSize := 0;
+    SetLength(rawlist, 0);
   end;
 end;
 
@@ -180,8 +187,7 @@ end;
 function TForm_BinEdit.GetValue(datatype: Word; offset: Integer): String;
 var
   Data: TByteData;
-  i:    Word;
-  tempi: Integer;
+  i:    Integer;
   floatformat: TFormatSettings;
 begin
   floatformat.DecimalSeparator := '.';
@@ -218,11 +224,20 @@ begin
       Result := IntToBin(hex.Data[offset]);
     11:
     begin
-      tempi := ConManager.Connection[ConID].GetRawInfo(fileid, offset).RawAddr;
-      if tempi >= 0 then
-        Result := '0x' + IntToHex(tempi, 8)
-      else
-        Result := 'unused';
+      if Length(rawlist) > 0 then
+      begin
+        for i := 0 to High(rawlist) do
+          if rawlist[i].SrcOffset = offset then
+          begin
+            if rawlist[i].RawAddr > 0 then
+              Result := '0x' + IntToHex(rawlist[i].RawAddr, 8)
+            else
+              Result := 'unused';
+            Break;
+          end;
+        if i > High(rawlist) then
+          Result := 'unused';
+      end;
     end;
     12:
       if hex.Data[offset] = 1 then
@@ -744,7 +759,8 @@ procedure TForm_BinEdit.VSTDblClick(Send
 var
   node: PVirtualNode;
   nodedata: PNodeData;
-  form: TForm_ToolTemplate;
+  rawinfo: TRawDataInfo;
+  form: TForm_TemplateFileList;
 begin
   if VST.FocusedColumn = 3 then
   begin
@@ -761,8 +777,14 @@ begin
     begin
       if (nodedata.DataType = 11) and (nodedata.Value <> 'unused') then
       begin
-        if ConManager.Connection[ConID].GetRawInfo(fileid, nodedata.offset).RawSize > 0 then
-          Form_Main.open_child('rawedit', ConID, fileid);
+        rawinfo := ConManager.Connection[ConID].GetRawInfo(fileid, nodedata.offset);
+        if rawinfo.RawSize > 0 then
+        begin
+          form := nil;
+          form := TForm_TemplateFileList(Form_Main.open_child('rawedit', ConID, fileid));
+          if Assigned(form) then
+            TForm_RawEdit(form).LoadRaw(rawinfo);
+        end;
       end;
       if (nodedata.DataType = 12) and (nodedata.Value <> 'no link') then
       begin
@@ -778,7 +800,7 @@ begin
       end;
       if (nodedata.DataType >= 100) and (nodedata.DataType <= 300) then
       begin
-        form := Form_Main.open_child('binedit', ConID, -1);
+        form := TForm_TemplateFileList(Form_Main.open_child('binedit', ConID));
         if Assigned(form) then
           form.SetFileFilters(nodedata.Value, '', False);
       end;
@@ -968,7 +990,6 @@ end;
 
 
 
-
 procedure TForm_BinEdit.FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
 begin
   if (Shift = [ssCtrl]) and (Key = 83) then