Changeset 49

Timestamp:

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

Author:

RBRi

Message:

more command line changes

Location:

trunk

Files:

• NewView/MainForm.pas (modified) (8 diffs)
• test/tests.cmd (modified) (5 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;
 

trunk/test/tests.cmd

@@ -21 +21 @@
 say "* - 'Introduction' is selected and visible at the right                 *"
 say "*************************************************************************"
-"start newview"
+"start ..\build\newview\newview"
 pull
 
@@ -35 +35 @@
 say "* - 'Introduction' is selected and visible at the right                 *"
 say "*************************************************************************"
-"start newview cmdref"
+"start ..\build\newview\newview cmdref"
 pull
 
@@ -49 +49 @@
 say "*   and 'COPY' is selected                                              *"
 say "*************************************************************************"
-"start newview cmdref copy"
+"start ..\build\newview\newview cmdref copy"
 pull
 
@@ -64 +64 @@
 say "*   and 'COPY' is selected                                              *"
 say "*************************************************************************"
-"start newview /s:copy cmdref"
+"start ..\build\newview\newview /s cmdref copy"
+pull
+
+
+say "*************************************************************************"
+say "* newview /s cmdref                                                     *"
+say "*                                                                       *"
+say "* Expected                                                              *"
+say "* NewView start and shows the 'Command Reference' help                  *"
+say "* - left navigation is shown                                            *"
+say "* - no hits visible and the right part is empty                         *"
+say "* - 'COPY' is selected and visible at the right                         *"
+say "* - all contents are collapsed                                          *"
+say "*************************************************************************"
+"start ..\build\newview\newview /s cmdref"
+pull
+
+
+say "*************************************************************************"
+say "* newview /s cmdref net access                                          *"
+say "*                                                                       *"
+say "* Expected                                                              *"
+say "* NewView start and shows the 'Command Reference' help                  *"
+say "* - left navigation is shown                                            *"
+say "* - search tab is selected                                              *"
+say "*     ('net access' is visible in the search entry field)               *"
+say "* - search was done for net OR access                                   *"
+say "* - 'NET ACCESS' is selected and visible at the right                   *"
+say "* - on contents tab only 'LAN Server Commands' is expanded              *"
+say "*   and 'NET ACCESS' is selected                                        *"
+say "*************************************************************************"
+"start ..\build\newview\newview /s cmdref net access"
+pull
+
+
+say "*************************************************************************"
+say "* newview /s cmdref net access                                          *"
+say "*                                                                       *"
+say "* Expected                                                              *"
+say "* NewView start and shows the 'Command Reference' help                  *"
+say "* - left navigation is shown                                            *"
+say "* - search tab is selected                                              *"
+say "*     ('""net access""' is visible in the search entry field)           *"
+say "* - search was done for net AND access                                  *"
+say "* - 'NET ACCESS' is selected and visible at the right                   *"
+say "* - on contents tab only 'LAN Server Commands' is expanded              *"
+say "*   and 'NET ACCESS' is selected                                        *"
+say "*************************************************************************"
+'start ..\build\newview\newview /s cmdref "net access"'
 pull
 
@@ -79 +127 @@
 say "* - The 'Search all fieles' dialog is opend and searches for copy       *"
 say "*************************************************************************"
-"start newview /g:copy cmdref"
+"start ..\build\newview\newview /g cmdref copy"
 pull
 
+
+say "*************************************************************************"
+say "* newview /g copy                                                       *"
+say "*                                                                       *"
+say "* Expected                                                              *"
+say "* NewView start and shows the 'Command Reference' help                  *"
+say "* - left navigation is shown                                            *"
+say "* - contents tab is selected                                            *"
+say "* - all contents are collapsed                                          *"
+say "* - 'Introduction' is selected and visible at the right                 *"
+say "* - The 'Search all fieles' dialog is opend and searches for copy       *"
+say "*************************************************************************"
+"start ..\build\newview\newview /g copy"
+pull
+
+
+say "*************************************************************************"
+say "* newview -h                                                            *"
+say "*                                                                       *"
+say "* Expected                                                              *"
+say "* NewView start and shows the NewView help.                             *"
+say "* - command line dialog is shown                                        *"
+say "* - left navigation is shown                                            *"
+say "* - contents tab is selected                                            *"
+say "* - all contents are collapsed                                          *"
+say "* - 'Introduction' is selected and visible at the right                 *"
+say "*************************************************************************"
+"start ..\build\newview\newview -h"
+pull
+
+
+