paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-29 09:30:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed compilation

Browse Source 
git-svn-id: trunk@7818 -
This commit is contained in:
mattias 2005-09-25 10:36:23 +00:00
parent ad6bcc11a7
commit 23c3181131
7 changed files with 71 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -937,7 +937,6 @@ ide/splash.pp svneol=native#text/pascal
ide/startlazarus.lpr svneol=native#text/pascal
ide/startlazarus.rc svneol=native#text/plain
ide/startlazopts.pas svneol=native#text/pascal
ide/staticpackages.inc svneol=native#text/plain
ide/sysvaruseroverridedlg.pas svneol=native#text/pascal
ide/todolist.pp svneol=native#text/pascal
ide/transfermacros.pp svneol=native#text/pascal

3
ide/Makefile
View File

@ -255,9 +255,6 @@ export LAZARUS_CONFIG_DIR
LAZARUS_IDE_CONFIG=$(LAZARUS_CONFIG_DIR)/idemake.cfg
LAZARUS_OPT=$(LAZARUS_LIBPATHS)
ifdef LAZARUS_BIG
LAZARUS_IDE_CONFIG=bigidemake.cfg
LAZARUS_CONFIG_DIR=.
LAZARUS_BIG_COMPONENT_DIRS=rtticontrols
endif
ifeq ($(OS_TARGET),win32)
LAZARUS_OPT+= -WG

6
ide/Makefile.fpc
View File

@ -86,9 +86,9 @@ LAZARUS_OPT=$(LAZARUS_LIBPATHS)
#
# big ide
ifdef LAZARUS_BIG
LAZARUS_IDE_CONFIG=bigidemake.cfg
LAZARUS_CONFIG_DIR=.
LAZARUS_BIG_COMPONENT_DIRS=rtticontrols
#LAZARUS_IDE_CONFIG=bigidemake.cfg
#LAZARUS_CONFIG_DIR=.
#LAZARUS_BIG_COMPONENT_DIRS=rtticontrols
endif
#

3
ide/editoroptions.pp
View File

@ -2809,7 +2809,8 @@ var Protocol:TStringList;
begin
Protocol:=TStringList.Create;
try
ErrorCount:=KeyStrokesConsistencyErrors(DisplayPreview.KeyStrokes
ErrorCount:=KeyStrokesConsistencyErrors(
{$IFDEF UseIDEScopes}EditingKeyMap{$ELSE}DisplayPreview.KeyStrokes{$ENDIF}
,Protocol, Index1, Index2);
if ErrorCount>0 then begin
KeyMapErrorsForm:=TKeyMapErrorsForm.Create(nil);

69
ide/keymapping.pp
View File

@ -353,7 +353,7 @@ type
{$ENDIF}
public
property ExtToolCount: integer read fExtToolCount write SetExtToolCount;// in menu
property Relations[Index:integer]:TKeyCommandRelation read GetRelation;
property Relations[Index:integer]:TKeyCommandRelation read GetRelation; default;
property RelationCount:integer read GetRelationCount;
property Categories[Index: integer]: TKeyCommandCategory read GetCategory;
end;
@ -394,12 +394,17 @@ type
KeyIndex:integer;
end;
function KeyAndShiftStateToEditorKeyString(Key: word; ShiftState: TShiftState):AnsiString;
function KeyAndShiftStateToEditorKeyString(Key: TIDEShortCut):AnsiString;
function KeyAndShiftStateToEditorKeyString(Key: word; ShiftState: TShiftState): String;
function KeyAndShiftStateToEditorKeyString(Key: TIDEShortCut): String;
function ShowKeyMappingEditForm(Index:integer;
AKeyCommandRelationList:TKeyCommandRelationList):TModalResult;
{$IFDEF UseIDEScopes}
function KeyStrokesConsistencyErrors(Keymap: TKeyCommandRelationList;
Protocol: TStrings; var Index1,Index2:integer):integer;
{$ELSE}
function KeyStrokesConsistencyErrors(ASynEditKeyStrokes:TSynEditKeyStrokes;
Protocol: TStrings; var Index1,Index2:integer):integer;
{$ENDIF}
function EditorCommandToDescriptionString(cmd: word): String;
function EditorCommandLocalizedName(cmd: word;
const DefaultName: string): string;
@ -1630,6 +1635,61 @@ begin
end;
end;
{$IFDEF UseIDEScopes}
function KeyStrokesConsistencyErrors(Keymap: TKeyCommandRelationList;
Protocol: TStrings; var Index1,Index2:integer):integer;
// 0 = ok, no errors
// >0 number of errors found
var
a,b:integer;
Key1: TKeyCommandRelation;
Key2: TKeyCommandRelation;
procedure Check(const ShortCut1, ShortCut2: TIDEShortCut);
begin
if (ShortCut1.Key1<>VK_UNKNOWN)
and (ShortCut1.Key1=ShortCut2.Key1) and (ShortCut1.Shift1=ShortCut2.Shift1)
and (((ShortCut1.Key2=ShortCut2.Key2) and (ShortCut1.Shift2=ShortCut2.Shift2))
or (ShortCut1.Key2=VK_UNKNOWN) or (ShortCut2.Key2=VK_UNKNOWN))
then begin
// conflict found
if Result=0 then begin
Index1:=a;
Index2:=b;
end;
inc(Result);
if Protocol<>nil then
begin
Protocol.Add(srkmConflic+IntToStr(Result));
Protocol.Add(srkmCommand1+Key1.Category.Description+' '
+EditorCommandToDescriptionString(Key1.Command)+'"'
+'->'+KeyAndShiftStateToEditorKeyString(ShortCut1));
Protocol.Add(srkmConflicW);
Protocol.Add(srkmCommand2+Key2.Category.Description+' '
+EditorCommandToDescriptionString(Key2.Command)+'"'
+'->'+KeyAndShiftStateToEditorKeyString(ShortCut2)
);
Protocol.Add('');
end;
end;
end;
begin
Result:=0;
for a:=0 to Keymap.Count-1 do begin
Key1:=Keymap[a];
for b:=a+1 to Keymap.Count-1 do begin
Key2:=Keymap[b];
if (not Key1.Category.ScopeIntersects(Key2.Category.Scope)) then
continue;
Check(Key1.ShortcutA,Key2.ShortcutA);
Check(Key1.ShortcutA,Key2.ShortcutB);
Check(Key1.ShortcutB,Key2.ShortcutA);
Check(Key1.ShortcutB,Key2.ShortcutB);
end;
end;
end;
{$ELSE}
function KeyStrokesConsistencyErrors(ASynEditKeyStrokes:TSynEditKeyStrokes;
Protocol: TStrings; var Index1,Index2:integer):integer;
// 0 = ok, no errors
@ -1673,6 +1733,7 @@ begin
end;
end;
end;
{$ENDIF}
function KeyAndShiftStateToEditorKeyString(Key: word; ShiftState: TShiftState): AnsiString;
var
@ -2216,7 +2277,7 @@ begin
// moving
C:=Categories[AddCategory('CursorMoving',srkmCatCursorMoving,
{$IFDEF UseIDEScopes}IDECmdScopeSrcEdit{$ELSE}caSrcEdit{$ENDIF})];
{$IFDEF UseIDEScopes}IDECmdScopeSrcEditOnly{$ELSE}caSrcEdit{$ENDIF})];
AddDefault(C,'Move cursor word left',ecWordLeft);
AddDefault(C,'Move cursor word right',ecWordRight);
AddDefault(C,'Move cursor to line start',ecLineStart);

1
ide/staticpackages.inc
View File

@ -1 +0,0 @@
RunTimeTypeInfoControls,

3
ideintf/idecommands.pas
View File

@ -165,7 +165,7 @@ type
FCategory: TIDECommandCategory;
FCommand: word;
FLocalizedName: string;
FName: String;
FName: String;
FShortcutA: TIDEShortCut;
FShortcutB: TIDEShortCut;
protected
@ -239,7 +239,6 @@ procedure ExecuteIDECommand(Sender: TObject; Command: word);
function IDEShortCutToMenuShortCut(const IDEShortCut: TIDEShortCut): TShortCut;
var
// will be set by the IDE
IDECommandList: TIDECommands;