Changeset 25 for trunk/NewView/MainForm.pas

Timestamp:

Aug 1, 2006, 8:51:54 PM (19 years ago)

Author:

RBRi

Message:

refactoring for cmd line parameters handling finished

File:

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

trunk/NewView/MainForm.pas

@@ -16 +16 @@
 // library
   ACLString, SharedMemoryUnit, ACLLanguageUnit, GenericThread,
+  CmdLineParameterUnit,
+
 // custom components
   SplitBar, Outline2, RichTextView, Coolbar2,
@@ -862 +864 @@
   T: TTopic;
   ResourceIDs: TList;
-  Level: longint;
   ImageOffsets: TList;
   ImageOffset: longint;
@@ -1900 +1901 @@
   TotalTopics: longint;
   TotalTopicIndex: longint;
-
-  Topic: TTopic;
 begin
   PrintSingle := nil;
@@ -2218 +2217 @@
 var
   i: integer;
+  tmpCmdLine: String;
+  tmpSplittedCmdLine : TStringList;
+  tmpRc : Integer;
+  tmpWindowPosition : TWindowPosition;
 Begin
   with InformationForm.InformationMemo do
   begin
+    tmpCmdLine := nativeOS2GetCmdLineParameter;
+    tmpSplittedCmdLine := TStringList.Create;
+
     Lines.Clear;
-    Lines.Add( ParameterCountLabel
-               + IntToStr( ParamCount ) );
-    for i := 1 to ParamCount do
+    Lines.Add(ParameterCountLabel +IntToStr(tmpSplittedCmdLine.count));
+    tmpRc := splitCmdLineParameter(tmpCmdLine, tmpSplittedCmdLine);
+    for i := 0 to tmpSplittedCmdLine.Count -1 do
       Lines.Add( ' '
                  + IntToStr( i )
                  + ' ['
-                 + ParamStr( i )
+                 + tmpSplittedCmdLine[i]
                  + ']' );
+
+    tmpSplittedCmdLine.Destroy;
+    Lines.Add('');
+    Lines.Add('parsed infos:');
+    Lines.Add('getShowUsageFlag: ' + boolToStr(CmdLineParameters.getShowUsageFlag));
+    Lines.Add('getSearchTextFlag: ' + boolToStr(CmdLineParameters.getSearchTextFlag));
+    Lines.Add('getSearchText: ' + CmdLineParameters.getSearchText);
+    Lines.Add('getGlobalSearchTextFlag: ' + boolToStr(CmdLineParameters.getGlobalSearchTextFlag));
+    Lines.Add('getGlobalSearchText: ' + CmdLineParameters.getGlobalSearchText);
+    Lines.Add('getLanguage: ' + CmdLineParameters.getLanguage);
+    Lines.Add('getHelpManagerFlag: ' + boolToStr(CmdLineParameters.getHelpManagerFlag));
+    Lines.Add('getHelpManagerFlag: ' + boolToStr(CmdLineParameters.getHelpManagerFlag));
+    Lines.Add('getHelpManagerWindow: ' + intToStr(CmdLineParameters.getHelpManagerWindow));
+    Lines.Add('getWindowPositionFlag: ' + boolToStr(CmdLineParameters.getWindowPositionFlag));
+
+    tmpWindowPosition := CmdLineParameters.getWindowPosition;
+    Lines.Add('getWindowPosition: ');
+    Lines.Add('    left:   ' + intToStr(tmpWindowPosition.left));
+    Lines.Add('    bottom: ' + intToStr(tmpWindowPosition.bottom));
+    Lines.Add('    width: ' + intToStr(tmpWindowPosition.width));
+    Lines.Add('    height: ' + intToStr(tmpWindowPosition.height));
+    Lines.Add('getOwnerWindow: ' + intToStr(CmdLineParameters.getOwnerWindow));
+    Lines.Add('getWindowTitle: ' + CmdLineParameters.getWindowTitle);
+    Lines.Add('getFileNames: ' + CmdLineParameters.getFileNames);
+    Lines.Add('getTopics: ' + CmdLineParameters.getTopics);
+
   end;
 
@@ -2350 +2382 @@
   FileIndex: longint;
   HelpFile: THelpFile;
-  Dummy: TNode;
 Begin
   EnableControls;
@@ -2357 +2388 @@
     begin
       // not really feasible to load contents here, as we rely
-      // on it for many things 
+      // on it for many things
       ContentsOutline.Focus;
     end;
@@ -3619 +3650 @@
   Settings.MRUList.Destroy;
 
-  Parameters.FilenamesParam.Destroy;
+  // TODO rbri maybe we have to do this
+  // Parameters.FilenamesParam.Destroy;
 
   if g_CurrentLanguageFile <> nil then
@@ -3763 +3795 @@
 
 Procedure TMainForm.MainFormOnCreate (Sender: TObject);
+var
+  tmpCmdLine: String;
+  tmpSplittedCmdLine : TStringList;
+  tmpRc : Integer;
 Begin
   ProfileEvent( 'MainFormOnCreate' );
@@ -3774 +3810 @@
   GlobalFilelist := TGlobalFilelist.Create;
 
-  ParseCommandLineParameters;
-
+  // parse parameters into Parameters object
+  tmpCmdLine := nativeOS2GetCmdLineParameter;
+  tmpSplittedCmdLine := TStringList.Create;
+  tmpRc := splitCmdLineParameter(tmpCmdLine, tmpSplittedCmdLine);
+  CmdLineParameters := TCmdLineParameters.Create;
+  CmdLineParameters.parseCmdLine(tmpSplittedCmdLine);
+  tmpSplittedCmdLine.destroy;
   RegisterForLanguages( OnLanguageEvent );
 
@@ -3849 +3890 @@
   ProfileEvent( 'Loading language' );
 
-  if Parameters.Language <> '' then
-    LoadAutoLanguage( 'newview', Parameters.Language )
+  if CmdLineParameters.getLanguage <> '' then
+    LoadAutoLanguage( 'newview', CmdLineParameters.getLanguage )
   else
     LoadDefaultLanguage( 'newview' );
@@ -3881 +3922 @@
   ProfileEvent( 'OnCreate done' );
 
-  if Parameters.SetPosition then
+  if CmdLineParameters.getWindowPositionFlag then
   begin
     SmartSetWindowPos( self,
-                       Parameters.Position.Left,
-                       Parameters.Position.Bottom,
-                       Parameters.Position.Width,
-                       Parameters.Position.Height,
+                       CmdLineParameters.getWindowPosition.Left,
+                       CmdLineParameters.getWindowPosition.Bottom,
+                       CmdLineParameters.getWindowPosition.Width,
+                       CmdLineParameters.getWindowPosition.Height,
                        false );
   end;
@@ -3973 +4014 @@
 Procedure TMainForm.ClearHelpManager;
 Begin
-  if not Parameters.IsHelpManager then
+  if not CmdLineParameters.getHelpManagerFlag then
     exit;
 
@@ -3979 +4020 @@
   PostHelpManagerMessage( NHM_FORGET_VIEWER, 0, 0 );
 
-  Parameters.IsHelpManager := false;
+  CmdLineParameters.setHelpManagerFlag(false);
 
   HelpManagerWindows.Clear;
@@ -3990 +4031 @@
   ProfileEvent( 'MainFormOnShow' );
 
-  if Parameters.OwnerWindow <> NULLHANDLE then
+  if CmdLineParameters.getOwnerWindow <> NULLHANDLE then
   begin
     ProfileEvent( 'Setting owner: '
-                  + IntToStr( Parameters.OwnerWindow ) );
+                  + IntToStr( CmdLineParameters.getOwnerWindow ) );
     WinSetOwner( Frame.Handle,
-                 Parameters.OwnerWindow );
-
-  end;
-
-  if Parameters.IsHelpManager then
+                 CmdLineParameters.getOwnerWindow );
+
+  end;
+
+  if CmdLineParameters.getHelpManagerFlag then
   begin
     ProfileEvent( '  Help Manager Title: '
@@ -4104 +4145 @@
   ProfileEvent( 'WMOpened: SetLayout' );
 
-  if Parameters.IsHelpManager then
+  if CmdLineParameters.getHelpManagerFlag then
     FShowLeftPanel := Settings.ShowLeftPanel_Help
   else
@@ -4123 +4164 @@
   Update;
 
-  if not Parameters.IsHelpManager then
+  if not CmdLineParameters.getHelpManagerFlag then
   begin
     ProfileEvent( 'Check environment vars' );
     CheckEnvironmentVars;
 
-    if Parameters.ShowUsageFlag then
+    if CmdLineParameters.getShowUsageFlag then
     begin
       ProfileEvent( 'Showing usage' );
@@ -4136 +4177 @@
   end;
 
-  HelpManagerWindows.Add( pointer( Parameters.HelpManagerWindow ) );
-
-  if Parameters.FilenamesParam.Length > 0 then
+  HelpManagerWindows.Add( pointer( CmdLineParameters.getHelpManagerWindow ) );
+
+  if length(CmdLineParameters.getFileNames) > 0 then
   begin
     // open specified files
     Filenames := TStringList.Create;
 
-    AStringToList( Parameters.FilenamesParam, Filenames, '+' );
+    // TODO rbri remove type conversion
+    StringToList(cmdLineParameters.getFileNames, Filenames, '+' );
 
     ProfileEvent( 'Call OpenFiles' );
 
     OpenFirstTopic := true;
-    if    ( Parameters.TopicParam <> '' )
-       or Parameters.SearchFlag then
+    if    ( CmdLineParameters.getTopics <> '' )
+       or CmdLineParameters.getSearchTextFlag then
       // if we're going to search, don't open first topic
       OpenFirstTopic := false;
 
-    if Parameters.IsHelpManager then
+    if CmdLineParameters.getHelpManagerFlag then
       // don't open first topic if we're online help
       // in case we are wanting to show a specific topic
@@ -4160 +4202 @@
 
     OpenFiles( Filenames,
-               Parameters.WindowTitle,
+               CmdLineParameters.getWindowTitle,
                OpenFirstTopic );
 
     Filenames.Destroy;
 
-    if Parameters.TopicParam <> '' then
+    if CmdLineParameters.getTopics <> '' then
     begin
       // search in contents only!
       ProfileEvent( 'Do startup topic search' );
 
-      StartupTopicSearch( Parameters.TopicParam );
+      StartupTopicSearch( CmdLineParameters.getTopics );
     end
-    else if Parameters.SearchFlag then
+    else if CmdLineParameters.getSearchTextFlag then
     begin
       // search in specified files
@@ -4178 +4220 @@
       DisplaySearch;
 
-      SearchFor( Parameters.SearchText );
+      SearchFor( CmdLineParameters.getSearchText );
     end;
   end;
 
-  if Parameters.GlobalSearchFlag then
+  if CmdLineParameters.getGlobalSearchTextFlag then
   begin
     // Global search
-    ProfileEvent( 'Do global search: ' + Parameters.GlobalSearchText );
-    DoGlobalSearch( Parameters.GlobalSearchText );
-  end;
-
-  if     ( Parameters.FilenamesParam.Length = 0 )
-     and ( not Parameters.GlobalSearchFlag ) then
+    ProfileEvent( 'Do global search: ' + CmdLineParameters.getGlobalSearchText );
+    DoGlobalSearch( CmdLineParameters.getGlobalSearchText );
+  end;
+
+  if     ( length(CmdLineParameters.getFileNames) = 0 )
+     and ( not CmdLineParameters.getGlobalSearchTextFlag ) then
   begin
     // user hasn't requested any particular file
@@ -4213 +4255 @@
   ProfileEvent( 'Open finished' );
 
-  if Parameters.IsHelpManager then
+  if CmdLineParameters.getHelpManagerFlag then
   begin
     // Tell helpmanager(s) our window handle
@@ -4757 +4799 @@
   begin
     SearchResultsListBox.Items.Add(   NoSearchMatchesMsg
-                                    + ': ' 
+                                    + ': '
                                     + SearchText );
     RefreshWindows( Windows ); // update to remove old highlights
@@ -6663 +6705 @@
                 FirstContentsNode );
 
-  if Parameters.IsHelpManager then
+  if CmdLineParameters.getHelpManagerFlag then
     ShowLeftPanel := Settings.ShowLeftPanel_Help
   else