Changeset 213

Timestamp:

Jun 13, 2007, 8:33:35 PM (18 years ago)

Author:

RBRi

Message:

use FileConstants

File:

• trunk/Components/CustomFileControls.pas (modified) (9 diffs)

trunk/Components/CustomFileControls.pas

@@ -350 +350 @@
   Dialogs,
   FileUtilsUnit,
-  ACLStringUtility,
   ACLUtility,
-  BitmapUtility;
+  BitmapUtility,
+  StringUtilsUnit;
 
 var
@@ -465 +465 @@
      While S<>'' Do
      Begin
-          NextFilter:=Pos(';',S);
+          NextFilter:=Pos(PATH_SEPARATOR,S);
           If NextFilter<>0 Then
           Begin
@@ -477 +477 @@
           End;
 
-          Status := SysUtils.FindFirst(FDirectory + '\' + ThisFilter, Attr,Search);
+          Status := SysUtils.FindFirst(FDirectory + DIRECTORY_SEPARATOR + ThisFilter, Attr,Search);
           While Status = 0 Do
           Begin
@@ -490 +490 @@
      While S<>'' Do
      Begin
-          If Pos(';',S)<>0 Then
+          If Pos(PATH_SEPARATOR,S)<>0 Then
           Begin
                s1:=S;
-               Delete(s1,1,Pos(';',S));
-               SetLength(S,Pos(';',S)-1);
+               Delete(s1,1,Pos(PATH_SEPARATOR,S));
+               SetLength(S,Pos(PATH_SEPARATOR,S)-1);
           End
           Else s1:='';
 
-          Status := SysUtils.FindFirst(FDirectory + '\' + S, Attr,Search);
+          Status := SysUtils.FindFirst(FDirectory + DIRECTORY_SEPARATOR + S, Attr,Search);
           While Status = 0 Do
           Begin
@@ -560 +560 @@
           GetDir(Ord(UpCase(Drive))-Ord('A')+1,s);
           {$I+}
-          If (s[length(s)])='\' Then dec(s[0]);
-          If not (NewDir[1] In ['/','\']) Then s:=s+'\';
+          If (s[length(s)])=DIRECTORY_SEPARATOR Then dec(s[0]);
+          If not (NewDir[1] In ['/',DIRECTORY_SEPARATOR]) Then s:=s+DIRECTORY_SEPARATOR;
           NewDir:=s+NewDir;
      End;
 
-     If NewDir[Length(NewDir)] = '\' Then SetLength(NewDir,Length(NewDir)-1);
+     If NewDir[Length(NewDir)] = DIRECTORY_SEPARATOR Then SetLength(NewDir,Length(NewDir)-1);
      If FDirectory=NewDir Then exit;
      FDirectory := NewDir;
@@ -608 +608 @@
      Else Result := Items[ idx ];
      s:=Directory;
-     If s[Length(s)] In ['\','/'] Then dec(s[0]);
-     If s<>'' Then If Result<>'' Then Result:=s+'\'+Result;
+     If s[Length(s)] In [DIRECTORY_SEPARATOR,'/'] Then dec(s[0]);
+     If s<>'' Then If Result<>'' Then Result:=s+DIRECTORY_SEPARATOR+Result;
 End;
 
@@ -888 +888 @@
   IndentLevel: longint;
   PathSoFar: string;
+  tmpPathElements : TStringList;
+  i : integer;
 Begin
   Screen.Cursor := crHourGlass;
@@ -903 +905 @@
   Path := Copy( Directory, 4, 255 );
   PathSoFar := Copy( Directory, 1, 3 );
-  While Path <> '' Do
-  Begin
+
+  tmpPathElements := TStringList.Create;
+  StrExtractStrings(tmpPathElements, Path, [DIRECTORY_SEPARATOR], #0);
+
+  for i := 0 to tmpPathElements.Count - 1 do
+  begin
     inc( IndentLevel );
-    S:= ExtractNextValue( Path, '\' );
+    S := tmpPathElements[i];
 
     if not DirectoryExists( PathSoFar + S ) then
@@ -915 +921 @@
     end;
     Items.AddObject( S, pointer( IndentLevel ) );
-    PathSoFar := PathSoFar + S + '\';
+    PathSoFar := PathSoFar + S + DIRECTORY_SEPARATOR;
   End;
 
+  tmpPathElements.Destroy;
   ItemIndex:= Items.Count - 1;