Changeset 214 for trunk/Components/CustomFontDialog.PAS

Timestamp:

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

Author:

RBRi

Message:

using StringUtilsUnit

File:

• trunk/Components/CustomFontDialog.PAS (modified) (4 diffs)

trunk/Components/CustomFontDialog.PAS

@@ -4 +4 @@
 
 Uses
-  Classes, Forms, Dialogs, StdCtrls, Buttons, Graphics;
+  Classes,
+  Forms,
+  Dialogs,
+  StdCtrls,
+  Buttons,
+  Graphics;
 
 Type
@@ -82 +87 @@
 
 uses
-  SysUtils, PmWin,
-  ACLStringUtility;
+  SysUtils,
+  PmWin,
+  StringUtilsUnit;
 
 // Returns true if s ends with endstr (case insensitive)
@@ -128 +134 @@
 begin
   Result := Font.Family;
-  Result := SubstituteChar( Result, '-', ' ' );
-  Result := SubstituteChar( Result, '_', ' ' );
+  SubstituteAllOccurencesOfChar( Result, '-', ' ' );
+  SubstituteAllOccurencesOfChar( Result, '_', ' ' );
 
   if Result = 'Roman' then
-    if StrStarts( 'Tms Rmn', Font.FaceName ) then
+    if StrStartsWithIgnoringCase( 'Tms Rmn', Font.FaceName ) then
       // one particularly stupid example
       Result := 'Tms Rmn';
 
   if Result = 'Swiss' then
-    if StrStarts( 'Helv', Font.FaceName ) then
+    if StrStartsWithIgnoringCase( 'Helv', Font.FaceName ) then
       // one particularly stupid example
       Result := 'Helv';
@@ -151 +157 @@
 begin
   Result := Font.FaceName;
-  Result := SubstituteChar( Result, '-', ' ' );
-  Result := SubstituteChar( Result, '_', ' ' );
+  SubstituteAllOccurencesOfChar( Result, '-', ' ' );
+  SubstituteAllOccurencesOfChar( Result, '_', ' ' );
 
   FamilyName := GetFontFamilyName( Font );
-  if StrStarts( FamilyName, Result ) then
+  if StrStartsWithIgnoringCase( FamilyName, Result ) then
   begin
-    Result := StrRightFrom( Result, length( FamilyName ) + 1 );
-    Result := TrimChars( Result, [ ' ', '-', '_' ] );
+    Result := StrSubstringFrom( Result, length( FamilyName ) + 1 );
+    Result := StrTrimChars( Result, [ ' ', '-', '_' ] );
 
     if Result = '' then