diff --git a/designer/tediterform.tsf b/designer/tediterform.tsf index 14e45c4..773f015 100644 --- a/designer/tediterform.tsf +++ b/designer/tediterform.tsf @@ -62,6 +62,7 @@ type TEditerForm = class(TVCform) // FFindhistroypath := basepath+"editer"+sp+"findhistory.tsm"; FFormatpath := basepath+"editer"+sp+"tslformat.tsm"; Fhighlightpath := basepath+"editer"+sp+"highlight.tsm"; + feditorglobalpath := basepath+"editer"+sp+"feditorglobalpath.tsm"; Fremotepath := basepath+"editer"+sp; CreateDirWithFileName(basepath+"editer"+sp+"1.txt"); CreateDirWithFileName(basepath+"editer"+sp+"cmpCaches"+sp+"1.txt"); @@ -350,6 +351,12 @@ type TEditerForm = class(TVCform) // FEdter.TslExe := tslexefile; FEdter.align := alClient; + if (importfile(ftstream(),"",feditorglobalpath,ginfo)=1) and ifarray(ginfo) then + begin + global g_editer_font_size := ginfo["font"]; + FEdter.getpage().font := ginfo["font"]; + //Fdirview.addrootdirs(dirs); + end if importfile(ftstream(),"",fdirspath,dirs)=1 then begin Fdirview.addrootdirs(dirs); @@ -599,6 +606,7 @@ type TEditerForm = class(TVCform) // end break; end + end d := Fdirview.getrootdirs(); if d and ifarray(d) then @@ -624,7 +632,12 @@ type TEditerForm = class(TVCform) // if ifarray(d) and d then begin Exportfile(ftstream(),"",Fhighlightpath,d); - end + end + global g_editer_font_size; + if ifarray(g_editer_font_size) and g_editer_font_size then + begin + Exportfile(ftstream(),"",feditorglobalpath,array("font":g_editer_font_size)); + end global g_dotsavehistory; if g_dotsavehistory then return ; d := FEdter.GetAllPagesInfo(); @@ -1547,6 +1560,7 @@ end Fremotepath; fdirspath; Fhighlightpath; + feditorglobalpath; FEdter; FSearchDir; FCache; diff --git a/designer/utslcodeeditor.tsf b/designer/utslcodeeditor.tsf index 5f09788..663e0eb 100644 --- a/designer/utslcodeeditor.tsf +++ b/designer/utslcodeeditor.tsf @@ -1089,6 +1089,12 @@ type TFTSLScriptMemo = class(TFTSLScriptcustomMemo) function create(AOwner); begin inherited; + global g_editer_font_size; + if g_editer_font_size and ifarray(g_editer_font_size) then + begin + ft := array("width":g_editer_font_size["width"]+1,"height":g_editer_font_size["height"]+2); + font := ft; + end end function SetFocus();override; begin @@ -1762,6 +1768,7 @@ type TEditer=class(TCustomcontrol) // FInfoShowWnd := new TEditerAuxiliary(self); FPageEditer := new TPageEditer(self); FPageEditer.onscrollfont := function(o,ft)begin + global g_editer_font_size := ft; self.Notification(self,array("font",ft)); FinCodemap.FTree.font := ft; FinCodemap.FTree.ItemHeight := ft["height"]+6; @@ -3758,6 +3765,10 @@ type TEditer=class(TCustomcontrol) // property TabChar read FTabChar; property Tslexe read FTslExe write FTslExe; property ReadOnlyDirs read FReadDirs write FReadDirs; + function getpage(); + begin + return FPageEditer; + end protected class function Sinit();override; begin