Changeset 128 for trunk/NewView/CmdLineParameterUnit.pas

Timestamp:

Apr 28, 2007, 9:12:56 PM (18 years ago)

Author:

RBRi

Message:

% file name handling to be more flexible for settings

File:

• trunk/NewView/CmdLineParameterUnit.pas (modified) (7 diffs)

trunk/NewView/CmdLineParameterUnit.pas

@@ -2 +2 @@
 
 // NewView - a new OS/2 Help Viewer
-// Copyright 2006 Ronald Brill (rbri at rbri dot de)
+// Copyright 2006, 2007 Ronald Brill (rbri at rbri dot de)
 // This software is released under the GNU Public License - see readme.txt
 
@@ -72 +72 @@
        PROPERTY getOwnerWindow : integer read ownerWindow;
        PROPERTY getWindowTitle : AnsiString read windowTitle;
-       PROPERTY getFileNames : AnsiString read fileNames;
        PROPERTY getSearchText : AnsiString read searchText;
+
+       FUNCTION getFileNames(const aShowNewViewHelpIfNoFileSpecifiedFlag : Boolean) : AnsiString;
 
        PROCEDURE writeDetailsTo(aStrings : TStrings);
@@ -97 +98 @@
     aStrings.Add('''' + commandLine + '''');
     aStrings.Add('isDebugEnabled: ' + boolToStr(isDebugEnabled));
+
     aStrings.Add('parsed infos:');
-
     aStrings.Add('  showUsageFlag: ' + boolToStr(getShowUsageFlag));
     aStrings.Add('  searchFlag: ' + boolToStr(getSearchFlag));
-    aStrings.Add('  fileNames: ' + getFileNames);
+    aStrings.Add('  fileNames(true): ' + getFileNames(true));
+    aStrings.Add('  fileNames(false): ' + getFileNames(false));
     aStrings.Add('  parsedFileNames: ' + getParsedFileNames);
     aStrings.Add('  searchText: ' + getSearchText);
@@ -133 +135 @@
     LogEvent(LogStartup, '  showUsageFlag: ' + boolToStr(getShowUsageFlag));
     LogEvent(LogStartup, '  searchFlag: ' + boolToStr(getSearchFlag));
-    LogEvent(LogStartup, '  fileNames: ' + getFileNames);
+    LogEvent(LogStartup, '  fileNames(true): ' + getFileNames(true));
+    LogEvent(LogStartup, '  fileNames(false): ' + getFileNames(false));
     LogEvent(LogStartup, '  parsedFileNames: ' + getParsedFileNames);
     LogEvent(LogStartup, '  searchText: ' + getSearchText);
@@ -171 +174 @@
     tmpQuote : AnsiString;
     tmpSwitch : AnsiString;
-    tmpOwnHelpFileName : AnsiString;
     tmpEnvDebug : String;
   begin
@@ -420 +422 @@
       fileNames := '';
       searchText := parsedRawFileNames;
-    end
-    else
-    begin
-      if fileNames = '' then
-      begin
-        tmpOwnHelpFileName := getOwnHelpFileName;
-        if FileExists(tmpOwnHelpFileName)
-        then
-          fileNames := tmpOwnHelpFileName;
-      end;
     end;
 
@@ -601 +593 @@
         end;
       end;
+  end;
+
+
+  FUNCTION TCmdLineParameters.getFileNames(const aShowNewViewHelpIfNoFileSpecifiedFlag : Boolean) : AnsiString;
+  var
+    tmpOwnHelpFileName : String;
+  begin
+    // user hasn't requested any particular file
+    // at startup, so if the option is set,
+    // load the NewView help file
+    if aShowNewViewHelpIfNoFileSpecifiedFlag
+       AND (fileNames = '')
+       AND not getGlobalSearchFlag then
+    begin
+      tmpOwnHelpFileName := getOwnHelpFileName;
+      if FileExists(tmpOwnHelpFileName) then
+      begin
+        result := tmpOwnHelpFileName;
+      end;
+    end
+    else
+    begin
+      result := fileNames;
+    end;
   end;