forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'a11_2_a12'

This commit is contained in:
Basile Burg 2015-01-27 21:57:01 +01:00
parent f4f8c6358f db55163001
commit df024cdbff
4 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cetodo/cetodo.d
View File

@ -43,7 +43,7 @@ import std.stdio, std.getopt, std.string;
import std.array, std.conv, std.traits; import std.array, std.conv, std.traits;
import std.file, std.path, std.range; import std.file, std.path, std.range;
// libdparse // libdparse
import std.d.ast, std.d.lexer, std.d.parser; import std.d.lexer;
/// Encapsulates the fields of a _TODO comment_. /// Encapsulates the fields of a _TODO comment_.
private struct TodoItem private struct TodoItem

17
src/ce_editor.pas
View File

@ -36,7 +36,6 @@ type
private private
fKeyChanged: boolean; fKeyChanged: boolean;
fDoc: TCESynMemo; fDoc: TCESynMemo;
// http://bugs.freepascal.org/view.php?id=26329
// TODO-cbugfix: syncro-edit partially broken, undetermined condition // TODO-cbugfix: syncro-edit partially broken, undetermined condition
// TODO-cbugfix: syncro-edit icon hidden after deletion, if doc is saved (as temp file, by the static explorer) // TODO-cbugfix: syncro-edit icon hidden after deletion, if doc is saved (as temp file, by the static explorer)
fSyncEdit: TSynPluginSyncroEdit; fSyncEdit: TSynPluginSyncroEdit;
@ -51,7 +50,6 @@ type
procedure memoKeyPress(Sender: TObject; var Key: char); procedure memoKeyPress(Sender: TObject; var Key: char);
procedure memoKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); procedure memoKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure memoMouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); procedure memoMouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
procedure memoChange(Sender: TObject);
procedure memoCtrlClick(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); procedure memoCtrlClick(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
procedure memoMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer); procedure memoMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer);
function getEditor(index: NativeInt): TCESynMemo; function getEditor(index: NativeInt): TCESynMemo;
@ -59,15 +57,15 @@ type
function getEditorIndex: NativeInt; function getEditorIndex: NativeInt;
procedure getCompletionList; procedure getCompletionList;
procedure getSymbolLoc; procedure getSymbolLoc;
public
constructor create(aOwner: TComponent); override;
destructor destroy; override;
procedure focusedEditorChanged; procedure focusedEditorChanged;
// //
procedure docNew(aDoc: TCESynMemo); procedure docNew(aDoc: TCESynMemo);
procedure docClosing(aDoc: TCESynMemo); procedure docClosing(aDoc: TCESynMemo);
procedure docFocused(aDoc: TCESynMemo); procedure docFocused(aDoc: TCESynMemo);
procedure docChanged(aDoc: TCESynMemo); procedure docChanged(aDoc: TCESynMemo);
public
constructor create(aOwner: TComponent); override;
destructor destroy; override;
// //
property editor[index: NativeInt]: TCESynMemo read getEditor; property editor[index: NativeInt]: TCESynMemo read getEditor;
property editorCount: NativeInt read getEditorCount; property editorCount: NativeInt read getEditorCount;
@ -80,7 +78,6 @@ implementation
uses uses
ce_main; ce_main;
procedure TCEEditorPage.SetVisible(Value: Boolean); procedure TCEEditorPage.SetVisible(Value: Boolean);
var var
i: integer; i: integer;
@ -102,7 +99,7 @@ begin
// //
completion.OnPaintItem := @completionItemPaint; completion.OnPaintItem := @completionItemPaint;
fSyncEdit := TSynPluginSyncroEdit.Create(self); fSyncEdit := TSynPluginSyncroEdit.Create(self);
//TODO: activate this after enxt Laz release //TODO: activate this after next Laz release
//fSyncEdit.CaseSensitive:=true; //fSyncEdit.CaseSensitive:=true;
bmp := TBitmap.Create; bmp := TBitmap.Create;
try try
@ -295,10 +292,6 @@ begin
UpdateByEvent; UpdateByEvent;
end; end;
procedure TCEEditorWidget.memoChange(Sender: TObject);
begin
end;
procedure TCEEditorWidget.memoCtrlClick(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); procedure TCEEditorWidget.memoCtrlClick(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
begin begin
getSymbolLoc; getSymbolLoc;
@ -358,8 +351,6 @@ end;
procedure TCEEditorWidget.UpdateByDelay; procedure TCEEditorWidget.UpdateByDelay;
var var
//dt: PMessageItemData;
//err: TLexError;
md: string; md: string;
begin begin
if fDoc = nil then exit; if fDoc = nil then exit;

2
src/ce_main.pas
View File

@ -523,7 +523,7 @@ begin
for i := 0 to fWidgList.Count-1 do for i := 0 to fWidgList.Count-1 do
begin begin
DockMaster.MakeDockable(fWidgList.widget[i],true); DockMaster.MakeDockable(fWidgList.widget[i], false);
DockMaster.GetAnchorSite(fWidgList.widget[i]).Header.HeaderPosition := adlhpTop; DockMaster.GetAnchorSite(fWidgList.widget[i]).Header.HeaderPosition := adlhpTop;
end; end;

1
src/ce_todolist.pas
View File

@ -292,6 +292,7 @@ begin
fToolProcess.Executable := ToolExeName; fToolProcess.Executable := ToolExeName;
fToolProcess.Options := [poUsePipes]; fToolProcess.Options := [poUsePipes];
fToolProcess.ShowWindow := swoHIDE; fToolProcess.ShowWindow := swoHIDE;
fToolProcess.CurrentDirectory := ExtractFileDir(Application.ExeName);
// Something not quite clear: // Something not quite clear:
// -------------------------- // --------------------------