Changeset 403 for trunk/Components/CustomFileControls.pas

Timestamp:

May 22, 2016, 2:09:18 PM (9 years ago)

Author:

RBRi

Message:

use stuff from the libs

File:

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

trunk/Components/CustomFileControls.pas

@@ -7 +7 @@
 
 Uses
-  Dos, SysUtils, Classes, Forms, StdCtrls, CustomListBox, Graphics;
+  Dos,
+  SysUtils,
+  Classes,
+  Forms,
+  StdCtrls,
+  CustomListBox,
+  Graphics;
 
 
@@ -337 +343 @@
 
 Uses
-{$IFDEF OS2}
-  BseDos, OS2Def, DriveInfoUnit,
-  BseDev, BseErr,
-{$ENDIF}
-
-{$IFDEF Win95}
-  WinBase,
-{$ENDIF}
+  BseDos,
+  OS2Def,
+  BseDev,
+  BseErr,
+
   Dialogs,
-  ACLStringUtility, ACLUtility, ACLFileUtility, BitmapUtility;
+  FileUtilsUnit,
+  ACLUtility,
+  BitmapUtility,
+  StringUtilsUnit;
 
 var
@@ -459 +465 @@
      While S<>'' Do
      Begin
-          NextFilter:=Pos(';',S);
+          NextFilter:=Pos(PATH_SEPARATOR,S);
           If NextFilter<>0 Then
           Begin
@@ -471 +477 @@
           End;
 
-          Status := SysUtils.FindFirst(FDirectory + '\' + ThisFilter, Attr,Search);
+          Status := SysUtils.FindFirst(FDirectory + DIRECTORY_SEPARATOR + ThisFilter, Attr,Search);
           While Status = 0 Do
           Begin
@@ -484 +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
@@ -554 +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;
@@ -602 +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;
 
@@ -864 +870 @@
     Data:= longint( Items.Objects[ Index ] );
     if ( Data and dfSubDir ) = 0 then
-      FullPath:= AddSlash( S ) + FullPath;
+      FullPath:= AddDirectorySeparator( S ) + FullPath;
     dec( Index );
   end;
@@ -882 +888 @@
   IndentLevel: longint;
   PathSoFar: string;
+  tmpPathElements : TStringList;
+  i : integer;
 Begin
   Screen.Cursor := crHourGlass;
@@ -897 +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
@@ -909 +921 @@
     end;
     Items.AddObject( S, pointer( IndentLevel ) );
-    PathSoFar := PathSoFar + S + '\';
+    PathSoFar := PathSoFar + S + DIRECTORY_SEPARATOR;
   End;
 
+  tmpPathElements.Destroy;
   ItemIndex:= Items.Count - 1;
 
@@ -918 +931 @@
   SubDirs:= TStringList.Create;
 
-  Status := SysUtils.FindFirst( AddSlash( Directory ) + '*.*', faDirectory, Search);
+  Status := SysUtils.FindFirst( AddDirectorySeparator( Directory ) + '*.*', faDirectory, Search);
   While Status = 0 Do
   Begin
@@ -967 +980 @@
     GetDir(Ord(UpCase(Drive))-Ord('A')+1,s);
     {$I+}
-    S:= RemoveSlash( S );
-    S:= AddSlash( S );
+    S:= RemoveRightDirectorySeparator( S );
+    S:= AddDirectorySeparator( S );
     NewDir:=s+NewDir;
   End;
 
-  NewDir:= RemoveSlash( NewDir );
+  NewDir:= RemoveRightDirectorySeparator( NewDir );
 
   FDirectory := NewDir;
@@ -1116 +1129 @@
       begin
         try
-          DriveLabel := GetVolumeLabel( DriveNumberToLetter( DriveNumber ) );
+          DriveLabel := GetVolumeLabel( DriveNumberToDriveLetter( DriveNumber ) );
           DriveString := DriveString + DriveLabel;
         except
@@ -1142 +1155 @@
     on EInOutError do
       // Current drive inaccessible
-      Drive := GetBootDrive;
+      Drive := GetBootDriveLetter;
   end;
 End;
@@ -1261 +1274 @@
                                 // and the user doesn't want to retry,
                                 // so go back to boot drive.
-                                SetDrive( GetBootDrive );
+                                SetDrive(GetBootDriveLetter);
                                 Screen.Cursor := crDefault;
                                 Exit;