IDE: Improve logic for updating Application.Title statement. Now it gets removed, too. Issue #34318.

git-svn-id: trunk@59147 -

ide/main.pp

@@ -4933,89 +4933,78 @@ end;
 procedure TMainIDE.ProjectOptionsAfterWrite(Sender: TObject; Restore: boolean);
 var
   AProject: TProject;
-  aFilename: String;
-
-  function GetTitle: String;
-  begin
-    Result := '';
-    if (AProject = nil) or (AProject.MainUnitID < 0) then
-      Exit;
-    CodeToolBoss.GetApplicationTitleStatement(AProject.MainUnitInfo.Source, Result);
-  end;
 
   function SetTitle: Boolean;
   var
-    OldTitle: String;
+    TitleStat, ProjTitle: String;
-    NewTitle: String;
   begin
     Result := True;
-    if (AProject.MainUnitID < 0) or
+    TitleStat := '';
-      (not (pfMainUnitHasTitleStatement in AProject.Flags)) then
+    CodeToolBoss.GetApplicationTitleStatement(AProject.MainUnitInfo.Source, TitleStat);
+    ProjTitle:=AProject.GetTitle;
+    //DebugLn(['ProjectOptionsAfterWrite: Project title=',ProjTitle,
+    //         ', Default=',AProject.GetDefaultTitle,', Title Statement=',TitleStat]);
+    if pfMainUnitHasTitleStatement in AProject.Flags then
+    begin                            // Add Title statement if not there already.
+      if ((TitleStat = '') or (TitleStat = ProjTitle)) and AProject.TitleIsDefault then
         Exit;
-    OldTitle := GetTitle;
+      //DebugLn(['ProjectOptionsAfterWrite: Setting Title to ',ProjTitle]);
-    if (OldTitle = '') and AProject.TitleIsDefault then
+      if not CodeToolBoss.SetApplicationTitleStatement(AProject.MainUnitInfo.Source, ProjTitle) then
-      Exit;
-
-    NewTitle:=AProject.GetTitle;
-    if (OldTitle <> NewTitle) and (not AProject.TitleIsDefault) then
-      if not CodeToolBoss.SetApplicationTitleStatement(AProject.MainUnitInfo.Source, NewTitle) then
       begin
         IDEMessageDialog(lisProjOptsError,
           Format(lisUnableToChangeProjectTitleInSource, [LineEnding, CodeToolBoss.ErrorMessage]),
           mtWarning, [mbOk]);
         Result := False;
+      end;
+    end
+    else begin                          // Remove Title statement if it is there.
+      if TitleStat <> ProjTitle then
         Exit;
-      end;// set Application.Title:= statement
+      //DebugLn(['ProjectOptionsAfterWrite: Removing Title']);
-
-    if (OldTitle <> '') and AProject.TitleIsDefault then
       if not CodeToolBoss.RemoveApplicationTitleStatement(AProject.MainUnitInfo.Source) then
       begin
         IDEMessageDialog(lisProjOptsError,
           Format(lisUnableToRemoveProjectTitleFromSource, [LineEnding, CodeToolBoss.ErrorMessage]),
           mtWarning, [mbOk]);
         Result := False;
-        Exit;
-      end;// delete title
       end;
-
+    end;
-  function GetScaled: Boolean;
-  begin
-    Result := False;
-    if (AProject = nil) or (AProject.MainUnitID < 0) then
-      Exit;
-    CodeToolBoss.GetApplicationScaledStatement(AProject.MainUnitInfo.Source, Result);
   end;
 
   function SetScaled: Boolean;
   var
-    OldScaled, NewScaled: Boolean;
+    ScaledStat, ProjScaled: Boolean;
   begin
     Result := True;
-    if (AProject.MainUnitID < 0) or
+    ScaledStat := False;
-      (not (pfMainUnitHasScaledStatement in AProject.Flags)) then
+    CodeToolBoss.GetApplicationScaledStatement(AProject.MainUnitInfo.Source, ScaledStat);
+    ProjScaled:=AProject.Scaled;
+    //DebugLn(['ProjectOptionsAfterWrite: Project Scaled=',ProjScaled,', Scaled Statement=',ScaledStat]);
+    if pfMainUnitHasScaledStatement in AProject.Flags then
+    begin                           // Add Scaled statement if not there already.
+      if (ScaledStat = ProjScaled) or not ProjScaled then
         Exit;
-    OldScaled := GetScaled;
+      //DebugLn(['ProjectOptionsAfterWrite: Setting Scaled to ',ProjScaled]);
-
+      if not CodeToolBoss.SetApplicationScaledStatement(AProject.MainUnitInfo.Source, ProjScaled) then
-    NewScaled:=AProject.Scaled;
-    if (OldScaled <> NewScaled) and NewScaled then
-      if not CodeToolBoss.SetApplicationScaledStatement(AProject.MainUnitInfo.Source, NewScaled) then
       begin
         IDEMessageDialog(lisProjOptsError,
           Format(lisUnableToChangeProjectScaledInSource, [LineEnding, CodeToolBoss.ErrorMessage]),
           mtWarning, [mbOk]);
         Result := False;
+      end;
+    end
+    else begin                      // Remove Scaled statement if it is there.
+      if ScaledStat <> ProjScaled then
         Exit;
-      end;// set Application.Scaled:= statement
+      //DebugLn(['ProjectOptionsAfterWrite: Removing Scaled']);
-
-    if OldScaled and not NewScaled then
       if not CodeToolBoss.RemoveApplicationScaledStatement(AProject.MainUnitInfo.Source) then
       begin
         IDEMessageDialog(lisProjOptsError,
           Format(lisUnableToRemoveProjectScaledFromSource, [LineEnding, CodeToolBoss.ErrorMessage]),
           mtWarning, [mbOk]);
         Result := False;
-        Exit;
+      end;
-      end;// delete Scaled
+    end;
   end;
 
   function SetAutoCreateForms: boolean;
@@ -5024,8 +5013,7 @@ var
     OldList: TStrings;
   begin
     Result := True;
-    if (AProject.MainUnitID < 0) or
+    if not (pfMainUnitHasCreateFormStatements in AProject.Flags) then
-      (not (pfMainUnitHasCreateFormStatements in AProject.Flags)) then
       Exit;
     OldList := AProject.GetAutoCreatedFormsList;
     if (OldList = nil) then
@@ -5056,23 +5044,26 @@ var
     end;
   end;
 
+var
+  aFilename: String;
 begin
   //debugln(['TMainIDE.DoProjectOptionsAfterWrite ',DbgSName(Sender),' Restore=',Restore]);
   if not (Sender is TProjectIDEOptions) then exit;
   AProject:=TProjectIDEOptions(Sender).Project;
+  Assert(Assigned(AProject), 'TMainIDE.ProjectOptionsAfterWrite: Project=Nil.');
   if Restore then
   begin
     AProject.RestoreBuildModes;
     AProject.RestoreSession;
   end
   else begin
+    if AProject.MainUnitID >= 0 then
+    begin
       SetTitle;
       SetScaled;
       SetAutoCreateForms;
-    // extend include path
+      AProject.AutoAddOutputDirToIncPath;  // extend include path
-    AProject.AutoAddOutputDirToIncPath;
+      if AProject.ProjResources.Modified then
-    if AProject.ProjResources.Modified and (AProject.MainUnitID >= 0) then
-    begin
         if not AProject.ProjResources.Regenerate(AProject.MainFilename, True, False, '') then
           IDEMessageDialog(lisCCOWarningCaption, AProject.ProjResources.Messages.Text,
                            mtWarning, [mbOk]);