Changeset 259

Timestamp:

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

Author:

RBRi

Message:

support -i option

Location:

trunk/NewView

Files:

• CmdLineParameterUnit.pas (modified) (6 diffs)
• MainForm.pas (modified) (8 diffs)
• StartupUnit.pas (modified) (2 diffs)

trunk/NewView/CmdLineParameterUnit.pas

@@ -41 +41 @@
        globalSearchFlag : boolean;
        language : string;
+       showIndexFlag : boolean;
        helpManagerFlag : boolean;
        helpManagerWindow : HWND;
@@ -66 +67 @@
        PROPERTY getGlobalSearchFlag : boolean read globalSearchFlag;
        PROPERTY getLanguage : string read language;
+       PROPERTY getShowIndexFlag : boolean read showIndexFlag;
        PROPERTY getHelpManagerFlag : boolean read helpManagerFlag;
        FUNCTION setHelpManagerFlag(const aNewValue : boolean) : boolean;
@@ -118 +120 @@
     aStrings.Add('  globalSearchFlag: ' + boolToStr(getGlobalSearchFlag));
     aStrings.Add('  language: ' + getLanguage);
+    aStrings.Add('  showIndexFlag: ' + boolToStr(getShowIndexFlag));
     aStrings.Add('  helpManagerFlag: ' + boolToStr(getHelpManagerFlag));
     aStrings.Add('  helpManagerWindow: ' + LongWordToStr(getHelpManagerWindow));
@@ -162 +165 @@
     LogEvent(LogStartup, '  globalSearchFlag: ' + boolToStr(getGlobalSearchFlag));
     LogEvent(LogStartup, '  language: ' + getLanguage);
+    LogEvent(LogStartup, '  showIndexFlag: ' + boolToStr(getShowIndexFlag));
     LogEvent(LogStartup, '  helpManagerFlag: ' + boolToStr(getHelpManagerFlag));
     LogEvent(LogStartup, '  helpManagerWindow: ' + LongWordToStr(getHelpManagerWindow));
@@ -216 +220 @@
     globalSearchFlag := false;
     language := '';
+    showIndexFlag := false;
     helpManagerFlag := false;
     helpManagerWindow := 0;
@@ -608 +613 @@
         end;
 
+      'i', 'I' :
+        begin
+          showIndexFlag := true;
+        end;
+
       'g', 'G' :
         begin

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;

trunk/NewView/StartupUnit.pas

@@ -62 +62 @@
   for i := 0 to Items.Count - 1 do
   begin
-    tmpItem := Items[ i ];
+    tmpItem := Items[i];
 
     tmpItem := StrTrimChars(tmpItem, [StrSingleQuote]); // remove single quotes
@@ -78 +78 @@
     begin
       // not an environment var
-      ExpandedItems.Add( tmpItem );
+      ExpandedItems.Add(tmpItem);
     end;
   end;