Changeset 231 for oup/current/Tools

Timestamp:

Jun 21, 2007, 12:24:04 AM (17 years ago)

Author:

alloc

Message:

 

Location:

oup/current/Tools

Files:

• BinEdit.dfm (modified) (3 diffs)
• BinEdit.pas (modified) (5 diffs)
• FileManager.dfm (modified) (1 diff)
• MetaEditor.pas (modified) (7 diffs)
• _TemplateFileList.dfm (modified) (3 diffs)
• _TemplateFileList.pas (modified) (6 diffs)

oup/current/Tools/BinEdit.dfm

@@ -4 +4 @@
   OnCreate = FormCreate
   OnKeyUp = FormKeyUp
-  ExplicitWidth = 320
-  ExplicitHeight = 240
   PixelsPerInch = 96
   TextHeight = 13
@@ -19 +17 @@
             ExplicitHeight = 318
           end
+        end
+        inherited tab_meta: TTabSheet
+          ExplicitLeft = 0
+          ExplicitTop = 0
+          ExplicitWidth = 0
+          ExplicitHeight = 0
         end
       end
@@ -133 +137 @@
         OnDblClick = value_viewerDblClick
         OnMouseDown = value_viewerMouseDown
-        ExplicitHeight = 218
       end
       object VST: TVirtualStringTree

oup/current/Tools/BinEdit.pas

@@ -30 +30 @@
     procedure NewFile(fileinfo: TFileInfo);
 
-    procedure LoadDat(_fileid: Integer);
     function Save: Boolean;
     function GetValue(datatype: Word; offset: Integer): String;
@@ -121 +120 @@
 
 procedure TForm_BinEdit.NewFile(fileinfo: TFileInfo);
-begin
-  LoadDat(fileinfo.ID);
-end;
-
-
-
-
-function AddVSTEntry(AVST: TCustomVirtualStringTree; ANode: PVirtualNode;
-  ARecord: TNodeData): PVirtualNode;
-var
-  Data: PNodeData;
-begin
-  Result := AVST.AddChild(ANode);
-  Data   := AVST.GetNodeData(Result);
-  AVST.ValidateNode(Result, False);
-  Data^ := ARecord;
-end;
-
-
-
-
-procedure TForm_BinEdit.LoadDat(_fileid: Integer);
 var
   mem:  TMemoryStream;
@@ -157 +134 @@
     end;
   end;
-  if _fileid >= 0 then
-  begin
-    fileid := _fileid;
+  if fileinfo.ID >= 0 then
+  begin
+    fileid := fileinfo.ID;
     ConID := ConnectionID;
-    if ConManager.Connection[ConID].ExtractFileIDOfName(filelist.Items.Strings[filelist.ItemIndex]) <> fileid then
-      Self.SelectFileID(ConnectionID, fileid);
+//    if ConManager.Connection[ConID].ExtractFileIDOfName(filelist.Items.Strings[filelist.ItemIndex]) <> fileid then
+//      Self.SelectFileID(ConnectionID, fileid);
     Self.ClearStructViewer;
     mem := nil;
@@ -174 +151 @@
   else
   begin
-    fileid := _fileid;
+    fileid := -1;
     ConID := -1;
     Self.ClearStructViewer;
@@ -182 +159 @@
   end;
 end;
+
+
+
+
+function AddVSTEntry(AVST: TCustomVirtualStringTree; ANode: PVirtualNode;
+  ARecord: TNodeData): PVirtualNode;
+var
+  Data: PNodeData;
+begin
+  Result := AVST.AddChild(ANode);
+  Data   := AVST.GetNodeData(Result);
+  AVST.ValidateNode(Result, False);
+  Data^ := ARecord;
+end;
+
+
 
 

oup/current/Tools/FileManager.dfm

@@ -3 +3 @@
   PixelsPerInch = 96
   TextHeight = 13
+  inherited panel_basecontent: TPanel
+    inherited panel_files: TPanel
+      inherited FilePages: TPageControl
+        inherited tab_files: TTabSheet
+          Caption = 'File list'
+        end
+      end
+    end
+  end
 end

oup/current/Tools/MetaEditor.pas

@@ -34 +34 @@
 implementation
 {$R *.dfm}
-uses _MetaManager, _FileTypes, Data;
+uses _MetaManager, _MetaTypes, ConnectionManager, Data;
 
 type
@@ -57 +57 @@
 procedure TForm_Meta.NewCon(ID: Integer);
 var
-  a,b,c: Int64;
   i: Integer;
   data: TNodeData;
   node: PVirtualNode;
-begin
-{
+  Meta: TMetaManager;
+begin
   if ID >= 0 then
   begin
-    QueryPerformanceFrequency(c);
-    QueryPerformanceCounter(a);
-    if not Assigned(Meta) then
-      Meta := TMetaManager.Create(ID, Self);
-    QueryPerformanceCounter(b);
-    ShowMessage('Loading Done - ' + FloatToStr((b-a)/c) + 's');
-
     VST.Clear;
     VST.BeginUpdate;
+    Meta := ConManager.Connection[ID].MetaData;
     for i := 0 to Meta.FileCount - 1 do
     begin
@@ -86 +79 @@
     VST.EndUpdate;
   end;
-}
 end;
 
@@ -98 +90 @@
   i: Integer;
   id: Integer;
-begin
-{
-  data := VST.GetNodeData(node);
-  for i := 0 to Meta.FileById[TFile(data.Field).FileID].ChildCount - 1 do
-  begin
-    id := Meta.FileById[TFile(data.Field).FileID].LinkByIndex[i].DestID;
+  Meta: TMetaManager;
+begin
+  data := Sender.GetNodeData(node);
+  Meta := ConManager.Connection[ID].MetaData;
+  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(VST, Node, newdata);
+    newnode := AddVSTEntry(TCustomVirtualStringTree(Sender), Node, newdata);
     if Meta.FileById[id].ChildCount > 0 then
-      VST.HasChildren[newnode] := True;
-  end;
-  ChildCount := Meta.FileById[TFile(data.Field).FileID].ChildCount;
-}
+      Sender.HasChildren[newnode] := True;
+  end;
+  ChildCount := Sender.ChildCount[Node];
 end;
 
@@ -180 +172 @@
           if Data.Field is TFile then
           begin
-            CellText := TFile(Data.Field).FileName;
+            CellText := TFile(Data.Field).FileInfo.Name;
             if CellText = '' then
               CellText := 'Unnamed';
@@ -188 +180 @@
         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;
@@ -214 +206 @@
           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;

oup/current/Tools/_TemplateFileList.dfm

@@ -37 +37 @@
         TabOrder = 0
         object tab_files: TTabSheet
-          Caption = 'Files'
+          Caption = 'Filelist'
           object panel_extension: TPanel
             Left = 0
@@ -267 +267 @@
         end
         object tab_meta: TTabSheet
-          Caption = 'Meta'
+          Caption = 'Tree'
           ImageIndex = 1
           object filelist_meta: TVirtualStringTree
@@ -284 +284 @@
             Header.Options = [hoColumnResize, hoDrag]
             TabOrder = 0
+            OnFocusChanged = filelist_metaFocusChanged
+            OnFocusChanging = filelist_metaFocusChanging
             OnGetText = filelist_metaGetText
             OnPaintText = filelist_metaPaintText

oup/current/Tools/_TemplateFileList.pas

@@ -9 +9 @@
 
 type
+  TNewFileSelectingEvent = procedure(FileInfo: TFileInfo; var allowed: Boolean) of object;
+
   TForm_TemplateFileList = class(TForm_TemplateFile)
     panel_files: TPanel;
@@ -62 +64 @@
       const TargetCanvas: TCanvas; Node: PVirtualNode; Column: TColumnIndex;
       TextType: TVSTTextType);
+    procedure filelist_metaFocusChanging(Sender: TBaseVirtualTree; OldNode,
+      NewNode: PVirtualNode; OldColumn, NewColumn: TColumnIndex;
+      var Allowed: Boolean);
+    procedure filelist_metaFocusChanged(Sender: TBaseVirtualTree;
+      Node: PVirtualNode; Column: TColumnIndex);
   private
     FSortBy: TSortType;
     FAllowedExts: String;
     FAllowMultiSelect: Boolean;
+    FOnNewFileSelecting: TNewFileSelectingEvent;
     procedure SetAllowedExts(exts: String);
     procedure SetMultiSelect(allow: Boolean);
@@ -75 +83 @@
     property AllowedExts: String read FAllowedExts write SetAllowedExts;
     property AllowMultiSelect: Boolean read FAllowMultiSelect write SetMultiSelect;
+    property OnNewFileSelecting: TNewFileSelectingEvent read FOnNewFileSelecting write FOnNewFileSelecting;
   end;
 
@@ -404 +413 @@
 
 
+procedure TForm_TemplateFileList.filelist_metaFocusChanged(
+  Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex);
+var
+  data: PNodeData;
+begin
+  inherited;
+  data := Sender.GetNodeData(Node);
+  if data.Field is TFile then
+  begin
+    if Assigned(FOnNewFileSelected) then
+    begin
+      FOnNewFileSelected(TFile(data.Field).FileInfo);
+    end;
+  end;
+end;
+
+procedure TForm_TemplateFileList.filelist_metaFocusChanging(
+  Sender: TBaseVirtualTree; OldNode, NewNode: PVirtualNode; OldColumn,
+  NewColumn: TColumnIndex; var Allowed: Boolean);
+var
+  data: PNodeData;
+begin
+  inherited;
+  data := Sender.GetNodeData(NewNode);
+  if data.Field is TFile then
+  begin
+    if Assigned(FOnNewFileSelecting) then
+    begin
+      FOnNewFileSelecting(TFile(data.Field).FileInfo, Allowed);
+    end;
+  end;
+end;
+
 procedure TForm_TemplateFileList.filelist_metaGetText(Sender: TBaseVirtualTree;
   Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType;
@@ -418 +460 @@
   if data.Field is TFile then
   begin
-    if TFile(data.Field).FileName = '' then
-      CellText := TFile(data.Field).FileExt + ' (unnamed)'
+    if TFile(data.Field).FileInfo.Name = '' then
+      CellText := TFile(data.Field).FileInfo.Extension + ' (unnamed)'
     else
-      CellText := TFile(data.Field).FileExt + ': ' + TFile(data.Field).FileName;
+      CellText := TFile(data.Field).FileInfo.Extension + ': ' + TFile(data.Field).FileInfo.Name;
   end;
 end;
@@ -479 +521 @@
   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;