diff --git a/cad_source/zcad.pas b/cad_source/zcad.pas index a17833745..9980b503d 100644 --- a/cad_source/zcad.pas +++ b/cad_source/zcad.pas @@ -331,7 +331,7 @@ //инициализация drawings FontManager.EnumerateFontFiles; - uzcdrawings.startup('$(RoCfgs)/rtl/dwg/DrawingVars.pas',''); + uzcdrawings.startup('$(DistribPath)/rtl/dwg/DrawingVars.pas',''); uzcdevicebase.startup; {$IF lcl_fullversion>2001200} {$ELSE} diff --git a/cad_source/zcad/commands/uzccommand_copyclip.pas b/cad_source/zcad/commands/uzccommand_copyclip.pas index f0fdff50b..2f883c30b 100644 --- a/cad_source/zcad/commands/uzccommand_copyclip.pas +++ b/cad_source/zcad/commands/uzccommand_copyclip.pas @@ -81,7 +81,7 @@ procedure ReCreateClipboardDWG; ClipboardDWG.done; Freemem(ClipboardDWG); end; - ClipboardDWG:=drawings.CreateDWG('$(RoCfgs)/rtl/dwg/DrawingVars.pas',''); + ClipboardDWG:=drawings.CreateDWG('$(DistribPath)/rtl/dwg/DrawingVars.pas',''); //ClipboardDWG.DimStyleTable.AddItem('Standart',pds); end; diff --git a/cad_source/zcad/commands/uzccommand_dwgnew.pas b/cad_source/zcad/commands/uzccommand_dwgnew.pas index 0ac7f3567..fef32a55c 100644 --- a/cad_source/zcad/commands/uzccommand_dwgnew.pas +++ b/cad_source/zcad/commands/uzccommand_dwgnew.pas @@ -46,7 +46,7 @@ function DWGNew_com(const Context:TZCADCommandContext;operands:TCommandOperands) FileName:ansistring; dwgname:ansistring; begin - PDrawing:=drawings.CreateDWG('$(RoCfgs)/rtl/dwg/DrawingDeviceBase.pas','$(RoCfgs)/rtl/dwg/DrawingVars.pas'); + PDrawing:=drawings.CreateDWG('$(DistribPath)/rtl/dwg/DrawingDeviceBase.pas','$(DistribPath)/rtl/dwg/DrawingVars.pas'); drawings.PushBackData(PDrawing); FileName:=operands; diff --git a/cad_source/zcad/electrotech/uzccomops.pas b/cad_source/zcad/electrotech/uzccomops.pas index fd2a8e599..21930b10b 100644 --- a/cad_source/zcad/electrotech/uzccomops.pas +++ b/cad_source/zcad/electrotech/uzccomops.pas @@ -690,7 +690,7 @@ function GetNumUnit(uname:String):PTUnit; UManager.init; defaultunit.init(DefNumMetric); - units.loadunit(GetSupportPaths,InterfaceTranslate,expandpath('$(RoCfgs)/rtl/objcalc/opsmarkdef.pas'),(@defaultunit)); + units.loadunit(GetSupportPaths,InterfaceTranslate,expandpath('$(DistribPath)/rtl/objcalc/opsmarkdef.pas'),(@defaultunit)); pcabledesk:=cman.beginiterate(ir); if pcabledesk<>nil then repeat @@ -804,7 +804,7 @@ function GetNumUnit(uname:String):PTUnit; //cpGC_HDShortName.ChangedData.StoreUndoData(pvd4^.data.Addr.GetInstance); end; - units.loadunit(GetSupportPaths,InterfaceTranslate,expandpath('$(RoCfgs)/rtl/objcalc/opsmark.pas'),(currentunit)); + units.loadunit(GetSupportPaths,InterfaceTranslate,expandpath('$(DistribPath)/rtl/objcalc/opsmark.pas'),(currentunit)); //if pvd1<>nil then begin // cpGC_NumberInGroup.ChangedData.StoreDoData(pvd1^.data.Addr.GetInstance);; diff --git a/cad_source/zcad/gui/forms/uzcfcommandline.pas b/cad_source/zcad/gui/forms/uzcfcommandline.pas index 7a77c4f2a..8a2ba6b1e 100644 --- a/cad_source/zcad/gui/forms/uzcfcommandline.pas +++ b/cad_source/zcad/gui/forms/uzcfcommandline.pas @@ -26,7 +26,7 @@ interface varman,varmandef, uzegeometry,uzctnrvectorstrings,uzcinterface,uzctreenode,uzclog,strmy, uzccommandlineutil,uztoolbarsmanager,uzmenusmanager,uzccommandsabstract,gzctnrVectorTypes, - uzcctrlcommandlineprompt,uzeparsercmdprompt,uzbtypes; + uzcctrlcommandlineprompt,uzeparsercmdprompt,uzbtypes,uzcFileStructure; const cheight=48; @@ -300,7 +300,7 @@ procedure TCLine.FormCreate(Sender: TObject); //---------------BevelOuter:=bvnone; aliases.init(100); - aliases.loadfromfile(expandpath('$(RoCfgs)/menu/default.cla')); + aliases.loadfromfile(FindFileInCfgsPaths(CFSmenuDir,CFSdefaultclaFile)); //DMenu:=TDMenuWnd.Create(self); diff --git a/cad_source/zcad/gui/forms/uzcfprojecttree.pas b/cad_source/zcad/gui/forms/uzcfprojecttree.pas index 90eba3924..a5a8b9086 100644 --- a/cad_source/zcad/gui/forms/uzcfprojecttree.pas +++ b/cad_source/zcad/gui/forms/uzcfprojecttree.pas @@ -361,8 +361,8 @@ initialization ProjectTreeForm:=nil; BlockCategory.init(100); EqCategory.init(100); - BlockCategory.loadfromfile(expandpath('$(RoCfgs)/rtl/BlockCategory.cat')); - EqCategory.loadfromfile(expandpath('$(RoCfgs)/rtl/EqCategory.cat')); + BlockCategory.loadfromfile(expandpath('$(DistribPath)/rtl/BlockCategory.cat')); + EqCategory.loadfromfile(expandpath('$(DistribPath)/rtl/EqCategory.cat')); CreateZCADCommand(@ProjectTree_com,'ProjectTree',CADWG,0); end; finalization diff --git a/cad_source/zcad/register/uzcregother.pas b/cad_source/zcad/register/uzcregother.pas index 62e8f4ef7..25dd0a093 100644 --- a/cad_source/zcad/register/uzcregother.pas +++ b/cad_source/zcad/register/uzcregother.pas @@ -34,7 +34,7 @@ implementation initialization; units.loadunit(GetSupportPaths,InterfaceTranslate,FindFileInCfgsPaths(CFSconfigsDir,CFSsysvarpasFile),nil); units.loadunit(GetSupportPaths,InterfaceTranslate,FindFileInCfgsPaths(CFSconfigsDir,CFSsavedvarpasFile),nil); - units.loadunit(GetSupportPaths,InterfaceTranslate,expandpath('$(RoCfgs)/rtl/devicebase.pas'),nil); + units.loadunit(GetSupportPaths,InterfaceTranslate,expandpath('$(DistribPath)/rtl/devicebase.pas'),nil); SysVarUnit:=units.findunit(GetSupportPaths,InterfaceTranslate,'sysvar'); SavedUnit:=units.findunit(GetSupportPaths,InterfaceTranslate,'savedvar'); @@ -203,10 +203,10 @@ initialization; end; - units.loadunit(GetSupportPaths,InterfaceTranslate,expandpath('$(RoCfgs)/rtl/cables.pas'),nil); - units.loadunit(GetSupportPaths,InterfaceTranslate,expandpath('$(RoCfgs)/rtl/devices.pas'),nil); - units.loadunit(GetSupportPaths,InterfaceTranslate,expandpath('$(RoCfgs)/rtl/connectors.pas'),nil); - units.loadunit(GetSupportPaths,InterfaceTranslate,expandpath('$(RoCfgs)/rtl/styles/styles.pas'),nil); + units.loadunit(GetSupportPaths,InterfaceTranslate,expandpath('$(DistribPath)/rtl/cables.pas'),nil); + units.loadunit(GetSupportPaths,InterfaceTranslate,expandpath('$(DistribPath)/rtl/devices.pas'),nil); + units.loadunit(GetSupportPaths,InterfaceTranslate,expandpath('$(DistribPath)/rtl/connectors.pas'),nil); + units.loadunit(GetSupportPaths,InterfaceTranslate,expandpath('$(DistribPath)/rtl/styles/styles.pas'),nil); SysVar.debug.memdeb.GetMemCount:=nil; SysVar.debug.memdeb.FreeMemCount:=nil; diff --git a/cad_source/zcad/uzcfilestructure.pas b/cad_source/zcad/uzcfilestructure.pas index 20a62c990..fd11191fa 100644 --- a/cad_source/zcad/uzcfilestructure.pas +++ b/cad_source/zcad/uzcfilestructure.pas @@ -47,6 +47,9 @@ interface CFSimagesDir='images'; CFSnavigatorimaFile='navigator.ima'; + CFSmenuDir='menu'; + CFSdefaultclaFile='default.cla'; + CFSexamplesDir='examples'; CFSerrorsDir='errors'; implementation diff --git a/cad_source/zcad/uzcsysinfo.pas b/cad_source/zcad/uzcsysinfo.pas index 9b2e3f235..ad8780303 100644 --- a/cad_source/zcad/uzcsysinfo.pas +++ b/cad_source/zcad/uzcsysinfo.pas @@ -191,6 +191,7 @@ function DistribFilesExistChec(const ACheckedPath:string):boolean; programlog.LogOutFormatStr('$(BinaryPath)="%s"',[ExpandPath('$(BinaryPath)')],LM_Necessarily); programlog.LogOutFormatStr('$(DistribPath)="%s"',[ExpandPath('$(DistribPath)')],LM_Necessarily); programlog.LogOutFormatStr('$(RoCfgs)="%s"',[ExpandPath('$(RoCfgs)')],LM_Necessarily); + programlog.LogOutFormatStr('$(WrCfgs)="%s"',[ExpandPath('$(WrCfgs)')],LM_Necessarily); programlog.LogOutFormatStr('$(UserDir)="%s"',[ExpandPath('$(UserDir)')],LM_Necessarily); programlog.LogOutFormatStr('$(GlobalConfigDir)="%s"',[ExpandPath('$(GlobalConfigDir)')],LM_Necessarily); programlog.LogOutFormatStr('$(LocalConfigDir)="%s"',[ExpandPath('$(LocalConfigDir)')],LM_Necessarily);