fixed package ID string to ID conversion

git-svn-id: trunk@5308 -

ide/compileroptions.pp

@@ -2920,6 +2920,7 @@ begin
   chkOptionsLinkOpt.Checked := Options.PassLinkerOptions;
   edtOptionsLinkOpt.Text := Options.LinkerOptions;
   chkWin32GraphicApp.Checked := Options.Win32GraphicApp;
+  chkWin32GraphicApp.Enabled:=EnabledLinkerOpts;
   grpOptions.Enabled:=EnabledLinkerOpts;
 
   // messages

ide/main.pp

@@ -4741,8 +4741,10 @@ begin
   // read form data
   if FilenameIsPascalUnit(AFilename) then begin
     // this could be a unit with a form
-    if EnvironmentOptions.AutoCreateFormsOnOpen
+    if (not Project1.AutoOpenDesignerFormsDisabled)
-    or (NewUnitInfo.Component<>nil) then begin
+    and (EnvironmentOptions.AutoCreateFormsOnOpen
+         or (NewUnitInfo.Component<>nil))
+    then begin
       // -> try to (re)load the lfm file
       Result:=DoLoadLFM(NewUnitInfo,Flags);
       if Result<>mrOk then exit;
@@ -7460,7 +7462,7 @@ begin
   ExeExt:=LazConf.GetDefaultExecutableExt;
   if OldExt<>ExeExt then
     Result:=copy(Result,1,length(Result)-length(OldExt))+ExeExt;
-writeln('TMainIDE.OnMacroFuncMakeExe A ',Filename,' ',Result);
+  writeln('TMainIDE.OnMacroFuncMakeExe A ',Filename,' ',Result);
 end;
 
 procedure TMainIDE.OnCmdLineCreate(var CmdLine: string; var Abort:boolean);
@@ -10337,6 +10339,9 @@ end.
 
 { =============================================================================
   $Log$
+  Revision 1.716  2004/03/15 15:56:24  mattias
+  fixed package ID string to ID conversion
+
   Revision 1.715  2004/03/13 16:37:00  mattias
   implemented: showing broken project dependencies on open project
 

ide/project.pp

@@ -304,6 +304,7 @@ type
   private
     fActiveEditorIndexAtStart: integer;
     FAutoCreateForms: boolean;
+    FAutoOpenDesignerFormsDisabled: boolean;
     fBookmarks: TProjectBookmarkList;
     fChanged: boolean;
     fCompilerOptions: TProjectCompilerOptions;
@@ -355,6 +356,7 @@ type
     procedure OnUnitNameChange(AnUnitInfo: TUnitInfo;
                                const OldUnitName, NewUnitName: string;
                                CheckIfAllowed: boolean; var Allowed: boolean);
+    procedure SetAutoOpenDesignerFormsDisabled(const AValue: boolean);
     procedure SetFlags(const AValue: TProjectFlags);
     procedure SetMainUnitID(const AValue: Integer);
     procedure SetModified(const AValue: boolean);
@@ -465,6 +467,7 @@ type
                                                write fActiveEditorIndexAtStart;
     property AutoCreateForms: boolean
                                    read FAutoCreateForms write FAutoCreateForms;
+    property AutoOpenDesignerFormsDisabled: boolean read FAutoOpenDesignerFormsDisabled write SetAutoOpenDesignerFormsDisabled;
     property Bookmarks: TProjectBookmarkList read fBookmarks write fBookmarks;
     property CompilerOptions: TProjectCompilerOptions
                                    read fCompilerOptions write fCompilerOptions;
@@ -1726,6 +1729,7 @@ begin
   fRunParameterOptions.Clear;
 
   fActiveEditorIndexAtStart := -1;
+  FAutoOpenDesignerFormsDisabled := false;
   fBookmarks.Clear;
   fCompilerOptions.Clear;
   FDefineTemplates.Clear;
@@ -2499,6 +2503,12 @@ begin
   end;
 end;
 
+procedure TProject.SetAutoOpenDesignerFormsDisabled(const AValue: boolean);
+begin
+  if FAutoOpenDesignerFormsDisabled=AValue then exit;
+  FAutoOpenDesignerFormsDisabled:=AValue;
+end;
+
 function TProject.JumpHistoryCheckPosition(
   APosition:TProjectJumpHistoryPosition): boolean;
 var i: integer;
@@ -2823,6 +2833,9 @@ end.
 
 {
   $Log$
+  Revision 1.150  2004/03/15 15:56:24  mattias
+  fixed package ID string to ID conversion
+
   Revision 1.149  2004/02/22 15:39:43  mattias
   fixed error handling on saving lpi file
 

packager/basepkgmanager.pas

@@ -89,6 +89,7 @@ type
                           ARegisteredComponent: TRegisteredComponent); virtual; abstract;
     procedure AddProjectLCLDependency(AProject: TProject); virtual; abstract;
     function CheckProjectHasInstalledPackages(AProject: TProject): TModalResult; virtual; abstract;
+    function CanOpenDesignerForm(AnUnitInfo: TUnitInfo): TModalResult; virtual; abstract;
 
     function ShowConfigureCustomComponents: TModalResult; virtual; abstract;
     function DoNewPackage: TModalResult; virtual; abstract;

packager/packagedefs.pas

@@ -2856,7 +2856,7 @@ begin
   Result:=false;
   IdentEndPos:=1;
   while (IdentEndPos<=length(s))
-  and (s[IdentEndPos] in ['a'..'z','A'..'Z','0'..'9'])
+  and (s[IdentEndPos] in ['a'..'z','A'..'Z','0'..'9','_'])
   do
     inc(IdentEndPos);
   if IdentEndPos=1 then exit;

packager/pkgmanager.pas

@@ -181,6 +181,7 @@ type
     function OpenProjectDependencies(AProject: TProject;
                                 ReportMissing: boolean): TModalResult; override;
     function CheckProjectHasInstalledPackages(AProject: TProject): TModalResult; override;
+    function CanOpenDesignerForm(AnUnitInfo: TUnitInfo): TModalResult; override;
     procedure AddDefaultDependencies(AProject: TProject); override;
     procedure AddProjectDependency(AProject: TProject; APackage: TLazPackage); override;
     procedure AddProjectRegCompDependency(AProject: TProject;
@@ -1214,7 +1215,11 @@ begin
     if APackage<>nil then begin
       FuncData^.Result:=APackage.SourceDirectories.CreateSearchPathFromAllFiles;
       Result:=true;
+    end else begin
+      writeln('WARNING: TPkgManager.MacroFunctionPkgSrcPath unknown package id: ',FuncData^.Param);
     end;
+  end else begin
+    writeln('WARNING: TPkgManager.MacroFunctionPkgSrcPath invalid package id: ',FuncData^.Param);
   end;
   PkgID.Free;
 end;
@@ -1233,7 +1238,11 @@ begin
     if APackage<>nil then begin
       FuncData^.Result:=APackage.GetUnitPath(false);
       Result:=true;
+    end else begin
+      writeln('WARNING: TPkgManager.MacroFunctionPkgUnitPath unknown package id: ',FuncData^.Param);
     end;
+  end else begin
+    writeln('WARNING: TPkgManager.MacroFunctionPkgUnitPath invalid package id: ',FuncData^.Param);
   end;
   PkgID.Free;
 end;
@@ -1763,6 +1772,8 @@ begin
     end;
     Result:=MessageDlg('Package needs installation',
       Msg,mtWarning,[mbIgnore,mbCancel],0);
+    if Result<>mrIgnore then
+      AProject.AutoOpenDesignerFormsDisabled:=true;
     MissingUnits.Free;
   end;
 end;
@@ -2842,6 +2853,17 @@ begin
   DoOpenPackage(Dependency.RequiredPackage);
 end;
 
+function TPkgManager.CanOpenDesignerForm(AnUnitInfo: TUnitInfo): TModalResult;
+var
+  AProject: TProject;
+begin
+  Result:=mrCancel;
+  if AnUnitInfo=nil then exit;
+  AProject:=AnUnitInfo.Project;
+  if AProject=nil then exit;
+  Result:=CheckProjectHasInstalledPackages(AProject);
+end;
+
 function TPkgManager.DoClosePackageEditor(APackage: TLazPackage): TModalResult;
 begin
   if APackage.Editor<>nil then begin