Changeset 259 for trunk/NewView/MainForm.pas

Timestamp:

Sep 25, 2007, 1:30:41 PM (18 years ago)

Author:

RBRi

Message:

support -i option

File:

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

trunk/NewView/MainForm.pas

@@ -1668 +1668 @@
                                           const DisplayFirstTopic: boolean ): boolean;
 var
-  Filenames: TStringList;
-begin
-  Filenames := TStringList.Create;
-  StrExtractStringsIgnoreEmpty(Filenames, TextList, ['+'], #0);
-  if Filenames.Count > 0 then
-  begin
-    result := OpenFiles( Filenames, '', DisplayFirstTopic );
+  tmpFileNames: TStringList;
+begin
+  tmpFileNames := TStringList.Create;
+
+  StrExtractStringsIgnoreEmpty(tmpFileNames, TextList, [HELP_FILE_DELIMITER], #0);
+  if tmpFileNames.Count > 0 then
+  begin
+    result := OpenFiles(tmpFileNames, '', DisplayFirstTopic );
   end
   else
@@ -1680 +1681 @@
     CloseFile;
   end;
-  Filenames.Destroy;
+  tmpFileNames.Destroy;
 end;
 
@@ -4167 +4168 @@
   M1: longword;
   OpenFirstTopic: boolean;
+  tmpFileNames : AnsiString;
 begin
   if Application.HelpFile = '' then
@@ -4209 +4211 @@
   HelpManagerWindows.Add( pointer( CmdLineParameters.getHelpManagerWindow ) );
 
-  if CmdLineParameters.getFileNames(Settings.StartupHelp) <> '' then
+  if CmdLineParameters.getShowIndexFlag then
+  begin
+    DisplayIndex;
+  end;
+
+  tmpFileNames := CmdLineParameters.getFileNames(Settings.StartupHelp);
+  if tmpFileNames <> '' then
   begin
     // open specified files
     Filenames := TStringList.Create;
 
-    StrExtractStringsIgnoreEmpty(Filenames, cmdLineParameters.getFileNames(Settings.StartupHelp), ['+'], #0);
+    StrExtractStringsIgnoreEmpty(Filenames, tmpFileNames, [HELP_FILE_DELIMITER], #0);
 
     LogEvent(LogStartup, 'Call OpenFiles');
@@ -4279 +4287 @@
   LogEvent(LogStartup, 'RUN PROGRAM');
 end;
+
 
 Procedure TMainForm.MainFormOnResize (Sender: TObject);
@@ -5670 +5679 @@
         if FileNameIndex > 0 then
         begin
-          MRUText := MRUText + '+';
+          MRUText := MRUText + HELP_FILE_DELIMITER;
         end;
         MRUText := MRUText + FileName;
@@ -5677 +5686 @@
         if Length( MRUText ) > 50 then
         begin
-          MRUText := MRUText + '+ ...';
+          MRUText := MRUText + HELP_FILE_DELIMITER + ' ...';
           break;
         end;
@@ -6725 +6734 @@
   HelpFiles := TList.Create;
 
-  if not LoadFiles( FileNames,
-                    HelpFiles ) then
+  if not LoadFiles(FileNames, HelpFiles ) then
   begin
     ClearWaitCursor;