Changeset 105 for trunk/NewView/FileDialogForm.pas

Timestamp:

Apr 5, 2007, 8:34:33 PM (18 years ago)

Author:

RBRi

Message:

%more stringutils refactoring

File:

• trunk/NewView/FileDialogForm.pas (modified) (8 diffs)

trunk/NewView/FileDialogForm.pas

@@ -123 +123 @@
   PmWin,
   SysUtils,
-  ACLStringUtility,
   FileUtilsUnit,
   ACLDialogs,
@@ -131 +130 @@
   SettingsUnit,
   HelpFile,
+  StringUtilsUnit,
   DebugUnit;
 
@@ -286 +286 @@
   filename: string;
   ShowList: boolean;
-  NameAndTitle: string;
+  tmpNameAndTitle: string;
 Begin
   CompletionsListBox.Items.Clear;
@@ -295 +295 @@
     for i := 0 to FileListBox.Items.Count - 1 do
     begin
-      NameAndTitle := FileListBox.Items[ i ];
-      Filename := ExtractNextValue( NameAndTitle, #9 );
-
-      if StrStarts( search, filename ) then
+      tmpNameAndTitle := FileListBox.Items[ i ];
+      Filename := StrLeftUntil(tmpNameAndTitle, [StrTAB]);
+
+      if StrStartsWithIgnoringCase(filename, search) then
         CompletionsListBox.Items.Add( filename );
     end;
@@ -306 +306 @@
   if CompletionsListBox.Items.Count = 1 then
   begin
-    if not StringsSame( CompletionsListBox.Items[ 0 ], search ) then
+    if not StrEqualIgnoringCase(CompletionsListBox.Items[0], search) then
       ShowList := true;
   end
@@ -436 +436 @@
     begin
       NameAndTitle := FileListBox.Items[ FileIndex ];
-      FileNames.Add( ExtractNextValue( NameAndTitle, #9 ) );
+      FileNames.Add(StrLeftUntil(NameAndTitle, [StrTAB]));
     end;
   end;
@@ -471 +471 @@
     begin
       DoErrorDlg( InvalidFilterErrorTitle,
-                  StrDoubleQuote( FileNameText )
+                  StrInDoubleQuotes(FileNameText)
                   + InvalidFilterError
-                  + EndLine
+                  + StrCRLF
                   + '  \ / :' );
       exit;
@@ -611 +611 @@
                                + Filename );
 
-    FileListBox.Items.Add( Filename
-                           + #9
-                           + Title );
+    FileListBox.Items.Add(Filename + StrTAB + Title );
   end;
   FileListBox.Items.EndUpdate;