Changeset 49 for trunk/NewView/MainForm.pas

Timestamp:

Jan 10, 2007, 8:49:18 PM (19 years ago)

Author:

RBRi

Message:

more command line changes

File:

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

trunk/NewView/MainForm.pas

@@ -2262 +2262 @@
 Procedure TMainForm.DebugShowParamsMIOnClick (Sender: TObject);
 var
-  i: integer;
-  tmpRc : Integer;
   tmpWindowPosition : TWindowPosition;
 Begin
@@ -3823 +3821 @@
 var
   tmpCmdLine: String;
-  tmpRc : Integer;
 Begin
   LogEvent(LogStartup, 'MainFormOnCreate');
@@ -4193 +4190 @@
       LogEvent(LogStartup, 'Showing usage');
       ShowUsage;
+
+      if FileExists( GetOwnHelpFileName ) then
+        OpenFile( GetOwnHelpFileName, '', true );
+
       exit;
     end;
@@ -4199 +4200 @@
   HelpManagerWindows.Add( pointer( CmdLineParameters.getHelpManagerWindow ) );
 
-  if length(CmdLineParameters.getFileNames) > 0 then
+  if CmdLineParameters.getFileNames <> '' then
   begin
     // open specified files
     Filenames := TStringList.Create;
 
-    // TODO rbri remove type conversion
+    // TODO use StrExtractStrings
     StringToList(cmdLineParameters.getFileNames, Filenames, '+' );
 
@@ -4210 +4211 @@
 
     OpenFirstTopic := true;
+
     if ( CmdLineParameters.getSearchText <> '' )
        or CmdLineParameters.getSearchFlag then
@@ -4216 +4218 @@
 
     if CmdLineParameters.getHelpManagerFlag then
+    begin
       // don't open first topic if we're online help
       // in case we are wanting to show a specific topic
       // - saves time/flicker
       OpenFirstTopic := false;
-
+    end;
+
+    if NOT (  CmdLineParameters.getGlobalSearchFlag
+              AND (CmdLineParameters.getSearchText = '')
+           )
+    then
+    begin
     OpenFiles( Filenames,
                CmdLineParameters.getWindowTitle,
                OpenFirstTopic );
+    end;
 
     Filenames.Destroy;
 
-    if CmdLineParameters.getSearchText <> '' then
+    if not CmdLineParameters.getSearchFlag
+       and not CmdLineParameters.getGlobalSearchFlag
+       and (CmdLineParameters.getSearchText <> '') then
     begin
       // search in contents only!
@@ -4247 +4259 @@
   begin
     // Global search
-    LogEvent(LogStartup, 'Do global search: ' + CmdLineParameters.getSearchText );
-    DoGlobalSearch( CmdLineParameters.getSearchText );
+    if (CmdLineParameters.getSearchText = '')
+      AND (CmdLineParameters.getFileNamesRaw <> '')
+    then
+    begin
+      LogEvent(LogStartup, 'Do global search: ' + CmdLineParameters.getFileNamesRaw );
+      DoGlobalSearch( CmdLineParameters.getFileNamesRaw );
+    end
+    else
+    begin
+      LogEvent(LogStartup, 'Do global search: ' + CmdLineParameters.getSearchText );
+      DoGlobalSearch( CmdLineParameters.getSearchText );
+    end;
   end;
 
@@ -4260 +4282 @@
       if FileExists( GetOwnHelpFileName ) then
         OpenFile( GetOwnHelpFileName, '', true );
-  end;
-
-  if CurrentOpenFiles.Count = 0 then
-  begin
-     // maybe...
-//    EnsureGlobalSearchFormLoaded;
-
-//    GlobalSearchForm.Parent := DisplayPanel;
-//    GlobalSearchForm.Show;
-//    GlobalSearchForm.WindowState := wsMaximized;
-
   end;