Changeset 82 for trunk/NewView/MainForm.pas

Timestamp:

Feb 25, 2007, 4:15:10 PM (18 years ago)

Author:

RBRi

Message:

file util refactoring and many more unit tests

File:

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

trunk/NewView/MainForm.pas

@@ -827 +827 @@
   // Library
   ACLStringUtility,
-  ACLFileUtility,
   ACLFileIOUtility,
   ACLUtility,
@@ -834 +833 @@
   StringUtilsUnit,
   DebugUnit,
+
+  FileUtilsUnit,
 
   // Components
@@ -1318 +1319 @@
   DropObject := Source as TExternalDragDropObject;
 
-  g_ExternalLinkFileName := AddSlash( DropObject.ContainerName )
+  g_ExternalLinkFileName := AddDirectorySeparator( DropObject.ContainerName )
                             + DropObject.SourceFilename;
   g_ExternalLinkTopic := '';
@@ -2682 +2683 @@
 begin
   // try in same dir as source file
-  FilePath := AddSlash( ExtractFilePath( g_ExternalLinkSourceFilename ) )
+  FilePath := AddDirectorySeparator( ExtractFilePath( g_ExternalLinkSourceFilename ) )
               + g_ExternalLinkFilename;
 
@@ -3807 +3808 @@
   StartingUp := true;
 
-  Application.HelpFile := GetOwnHelpFilename; // OWN_HELP_MARKER;
-  Application.OnHelp := OnHelp;
-
   SharedMemory := AccessSharedMemory;
   GlobalFilelist := TGlobalFilelist.Create;
@@ -3817 +3815 @@
   CmdLineParameters := TCmdLineParameters.Create;
   CmdLineParameters.parseCmdLine(tmpCmdLine);
+
+  Application.HelpFile := CmdLineParameters.GetOwnHelpFilename; // OWN_HELP_MARKER;
+  Application.OnHelp := OnHelp;
 
   RegisterForLanguages( OnLanguageEvent );
@@ -6485 +6486 @@
 
     // Find the help file, if possible
-    FullFilePath := FindHelpFile( Filename );
+    if Filename = OWN_HELP_MARKER then
+    begin
+      FullFilePath := CmdLineParameters.GetOwnHelpFileName;
+    end
+    else
+    begin
+      FullFilePath := FindHelpFile( Filename );
+    end;
+
     if FullFilePath <> '' then
     begin
@@ -6788 +6797 @@
   if Settings.UseOriginalDialogs then
   begin
-    SystemOpenDialog.Filename := AddSlash( Settings.LastOpenDirectory ) + '*.hlp;*.inf';
+    SystemOpenDialog.Filename := AddDirectorySeparator( Settings.LastOpenDirectory ) + '*.hlp;*.inf';
     if not SystemOpenDialog.Execute then
       exit;