This commit is contained in:
Basile Burg 2014-07-20 12:38:38 +02:00
parent 99325b3db4
commit be7ba8d1a2
7 changed files with 20 additions and 16 deletions

View File

@ -149,7 +149,7 @@ begin
sheet := pageControl.AddTabSheet; sheet := pageControl.AddTabSheet;
memo := TCESynMemo.Create(sheet); memo := TCESynMemo.Create(sheet);
// //
memo.Align:=alClient; memo.Align := alClient;
memo.Parent := sheet; memo.Parent := sheet;
// //
memo.OnKeyDown := @memoKeyDown; memo.OnKeyDown := @memoKeyDown;

View File

@ -367,7 +367,7 @@ begin
DockMaster.GetAnchorSite(fProjWidg), alBottom, fProjWidg); DockMaster.GetAnchorSite(fProjWidg), alBottom, fProjWidg);
DockMaster.GetAnchorSite(fEditWidg).Header.HeaderPosition := adlhpTop; DockMaster.GetAnchorSite(fEditWidg).Header.HeaderPosition := adlhpTop;
//DockMaster.GetAnchorSite(fExplWidg).Close; DockMaster.GetAnchorSite(fExplWidg).Close;
end; end;
procedure TCEMainForm.InitSettings; procedure TCEMainForm.InitSettings;
@ -1076,6 +1076,7 @@ begin
fMesgWidg.addCeInf( 'compiling ' + aProject.fileName, msProject); fMesgWidg.addCeInf( 'compiling ' + aProject.fileName, msProject);
application.ProcessMessages;
prjpath := extractFilePath(aProject.fileName); prjpath := extractFilePath(aProject.fileName);
if directoryExists(prjpath) then chDir(prjpath); if directoryExists(prjpath) then chDir(prjpath);

View File

@ -67,8 +67,8 @@ implementation
uses uses
ce_main, ce_common; ce_main, ce_common;
//TODO-cbugfix: click on the expander glyph, sometime the subdirs are not scanned but the //TODO-cbugfix: click on the expander glyph, sometime the subdirs are not scanned but the fake sub item is still displayed
//fake sub still displayed //TODO-cfeature: the linux version doesnt work at all
{$REGION Standard Comp/Obj------------------------------------------------------} {$REGION Standard Comp/Obj------------------------------------------------------}
constructor TCEMiniExplorerWidget.create(aIwner: TComponent); constructor TCEMiniExplorerWidget.create(aIwner: TComponent);
@ -321,7 +321,7 @@ begin
itm.SelectedIndex := 1; itm.SelectedIndex := 1;
// //
if hasFolder(fold) then if hasFolder(fold) then
Tree.Items.AddChild(itm,''); //...created here to show the expander glyph Tree.Items.AddChild(itm, ''); //...created here to show the expander glyph
end; end;
finally finally
lst.Free; lst.Free;

View File

@ -67,7 +67,7 @@ end;
procedure TCEProjectConfigurationWidget.projClose(const aProject: TCEProject); procedure TCEProjectConfigurationWidget.projClose(const aProject: TCEProject);
begin begin
Grid.TIObject := nil; Grid.TIObject := nil;
Grid.ItemIndex :=-1; Grid.ItemIndex := -1;
fProj := nil; fProj := nil;
end; end;

View File

@ -275,6 +275,7 @@ begin
end; end;
{$ENDREGION} {$ENDREGION}
{$REGION Misc. -----------------------------------------------------------------}
procedure TCESearchWidget.cbToFindChange(Sender: TObject); procedure TCESearchWidget.cbToFindChange(Sender: TObject);
begin begin
if Updating then exit; if Updating then exit;
@ -306,6 +307,7 @@ begin
cbToFind.Items.Assign(fSearchMru); cbToFind.Items.Assign(fSearchMru);
cbReplaceWth.Items.Assign(fReplaceMru); cbReplaceWth.Items.Assign(fReplaceMru);
end; end;
{$ENDREGION}
end. end.

View File

@ -76,6 +76,8 @@ type
implementation implementation
{$R *.lfm} {$R *.lfm}
uses ce_main;
{$REGION Standard Comp/Obj------------------------------------------------------} {$REGION Standard Comp/Obj------------------------------------------------------}
constructor TCEStaticExplorerWidget.create(aOwner: TComponent); constructor TCEStaticExplorerWidget.create(aOwner: TComponent);
begin begin
@ -321,7 +323,7 @@ var
jsf, scf: string; jsf, scf: string;
ndCat: TTreeNode; ndCat: TTreeNode;
ln: PInt64; ln: PInt64;
nme: string; nme, knd: string;
i: NativeInt; i: NativeInt;
// recursively display members, without master categories. // recursively display members, without master categories.
@ -435,7 +437,8 @@ begin
ln^ := memb.Items[i].GetPath('line').AsInt64; ln^ := memb.Items[i].GetPath('line').AsInt64;
nme := memb.Items[i].GetPath('name').AsString; nme := memb.Items[i].GetPath('name').AsString;
case memb.Items[i].GetPath('kind').AsString of knd := memb.Items[i].GetPath('kind').AsString;
case knd of
'alias' :ndCat := Tree.Items.AddChildObject(ndAlias, nme, ln); 'alias' :ndCat := Tree.Items.AddChildObject(ndAlias, nme, ln);
'class' :ndCat := Tree.Items.AddChildObject(ndClass, nme, ln); 'class' :ndCat := Tree.Items.AddChildObject(ndClass, nme, ln);
'enum' :ndCat := Tree.Items.AddChildObject(ndEnum, nme, ln); 'enum' :ndCat := Tree.Items.AddChildObject(ndEnum, nme, ln);
@ -447,6 +450,7 @@ begin
'struct' :ndCat := Tree.Items.AddChildObject(ndStruct, nme, ln); 'struct' :ndCat := Tree.Items.AddChildObject(ndStruct, nme, ln);
'template' :ndCat := Tree.Items.AddChildObject(ndTmp, nme, ln); 'template' :ndCat := Tree.Items.AddChildObject(ndTmp, nme, ln);
'variable' :ndCat := Tree.Items.AddChildObject(ndVar, nme, ln); 'variable' :ndCat := Tree.Items.AddChildObject(ndVar, nme, ln);
else CEMainForm.MessageWidget.addCeWarn('static explorer does not handle this kind: ' + knd);
end; end;
if ndCat = nil then if ndCat = nil then

View File

@ -14,7 +14,6 @@ type
private private
fFilename: string; fFilename: string;
fModified: boolean; fModified: boolean;
fNoDateCheck: boolean;
fFileDate: double; fFileDate: double;
fAssocProject: TCEProject; fAssocProject: TCEProject;
fIsDSource: boolean; fIsDSource: boolean;
@ -52,7 +51,7 @@ var
implementation implementation
uses uses
graphics, ce_main; graphics, ce_main, forms, ExtendedNotebook, comctrls;
constructor TCESynMemo.Create(aOwner: TComponent); constructor TCESynMemo.Create(aOwner: TComponent);
begin begin
@ -124,7 +123,6 @@ begin
Lines.LoadFromFile(aFilename); Lines.LoadFromFile(aFilename);
fFilename := aFilename; fFilename := aFilename;
FileAge(fFilename, fFileDate); FileAge(fFilename, fFileDate);
fNoDateCheck := false;
fModified := false; fModified := false;
end; end;
@ -133,7 +131,6 @@ begin
Lines.SaveToFile(aFilename); Lines.SaveToFile(aFilename);
fFilename := aFilename; fFilename := aFilename;
FileAge(fFilename, fFileDate); FileAge(fFilename, fFileDate);
fNoDateCheck := false;
fModified := false; fModified := false;
end; end;
@ -141,7 +138,6 @@ procedure TCESynMemo.save;
begin begin
Lines.SaveToFile(fFilename); Lines.SaveToFile(fFilename);
FileAge(fFilename, fFileDate); FileAge(fFilename, fFileDate);
fNoDateCheck := false;
fModified := false; fModified := false;
end; end;
@ -158,8 +154,8 @@ begin
begin begin
Lines.LoadFromFile(fFilename); Lines.LoadFromFile(fFilename);
fModified := false; fModified := false;
end end;
else fNoDateCheck := true; //TODO-cbugfix: the cursor is incorrectly set to crDragSomething.
end; end;
fFileDate := newDate; fFileDate := newDate;
end; end;
@ -173,7 +169,8 @@ end;
procedure TCESynMemo.MouseMove(Shift: TShiftState; X, Y: Integer); procedure TCESynMemo.MouseMove(Shift: TShiftState; X, Y: Integer);
begin begin
inherited; inherited;
identifierToD2Syn; if ssLeft in Shift then
identifierToD2Syn;
end; end;
procedure TCESynMemo.MouseDown(Button: TMouseButton; Shift: TShiftState; X, Y:Integer); procedure TCESynMemo.MouseDown(Button: TMouseButton; Shift: TShiftState; X, Y:Integer);