Changeset 54 for trunk/NewView/CmdLineParameterUnit.pas

Timestamp:

Jan 11, 2007, 9:08:05 PM (19 years ago)

Author:

RBRi

Message:

refactoring to simplify command line handling in MainForm
some tests fixed

File:

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

trunk/NewView/CmdLineParameterUnit.pas

@@ -74 +74 @@
 
        PROCEDURE parseCmdLine(aCmdLineString : String);
+
+       FUNCTION getInterpretedFileNames: String;
+       FUNCTION getInterpretedSearchText: String;
      private
        PROCEDURE parseSwitch(aCmdLineString : String);
   end;
 
+  FUNCTION getOwnHelpFileName: String;
+
   // returns a string containing the whole
   // command line parametes
-  FUNCTION nativeOS2GetCmdLineParameter : STRING;
+  FUNCTION nativeOS2GetCmdLineParameter : String;
 
 
 Implementation
+uses
+  ACLFileUtility;
+
+  FUNCTION TCmdLineParameters.getInterpretedFileNames: String;
+  var
+    tmpOwnHelpFileName : String;
+  begin
+    result := getFileNames;
+
+    if getGlobalSearchFlag
+       AND (getSearchText = '')
+    then
+    begin
+      result := '';
+      exit;
+    end;
+
+
+    tmpOwnHelpFileName := FindDefaultLanguageHelpFile('NewView');
+    if (result = '') AND
+      FileExists(tmpOwnHelpFileName)
+    then
+      result := tmpOwnHelpFileName;
+  end;
+
+
+  FUNCTION TCmdLineParameters.getInterpretedSearchText: String;
+  begin
+    result := getSearchText;
+
+    if getGlobalSearchFlag
+       AND (result = '')
+    then
+      result := getFileNamesRaw;
+  end;
+
 
   FUNCTION TCmdLineParameters.setHelpManagerFlag(aNewValue : boolean) : boolean;
@@ -456 +497 @@
 
 
+  FUNCTION getOwnHelpFileName: String;
+  begin
+    result := FindDefaultLanguageHelpFile('NewView');
+  end;
+
+
   FUNCTION nativeOS2GetCmdLineParameter : STRING;
   VAR