mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-28 21:41:01 +02:00
started key combinations, fixed some range check errors
git-svn-id: trunk@4937 -
This commit is contained in:
mattias
parent
804bb15302
commit
4d53e93709
@ -451,7 +451,7 @@ end;
|
||||
|
||||
function TCustomCodeTool.NodeDescToStr(Desc: integer): string;
|
||||
begin
|
||||
Result:=NodeDescriptionAsString(Desc);
|
||||
Result:=NodeDescriptionAsString(TCodeTreeNodeDesc(Desc));
|
||||
end;
|
||||
|
||||
function TCustomCodeTool.NodeSubDescToStr(Desc, SubDesc: integer): string;
|
||||
|
||||
@ -2013,7 +2013,7 @@ var
|
||||
FuncData.Param:=MacroVariable;
|
||||
FuncData.Result:='';
|
||||
Result:=FMacroFunctions.DoDataFunction(
|
||||
@MacroVariable[1],length(MacroVariable),@FuncData);
|
||||
PChar(MacroVariable),length(MacroVariable),@FuncData);
|
||||
if Result then
|
||||
MacroVariable:=FuncData.Result;
|
||||
end;
|
||||
|
||||
@ -913,8 +913,8 @@ begin
|
||||
Windows.SetBkColor(DC, ColorToRGB(FBkColor));
|
||||
{$ELSE}
|
||||
FSavedFont := SelectObject(DC, FCrntFont);
|
||||
LCLIntf.SetTextColor(DC, FColor);
|
||||
LCLIntf.SetBkColor(DC, FBkColor);
|
||||
LCLIntf.SetTextColor(DC, ColorRef(FColor));
|
||||
LCLIntf.SetBkColor(DC, ColorRef(FBkColor));
|
||||
{$ENDIF}
|
||||
DoSetCharExtra(FCharExtra);
|
||||
end;
|
||||
@ -1006,7 +1006,7 @@ begin
|
||||
FColor := Value;
|
||||
if FDC <> 0 then
|
||||
{$IFDEF SYN_LAZARUS}
|
||||
SetTextColor(FDC, Value);
|
||||
SetTextColor(FDC, ColorRef(Value));
|
||||
{$ELSE}
|
||||
SetTextColor(FDC, ColorToRGB(Value));
|
||||
{$ENDIF}
|
||||
@ -1020,7 +1020,7 @@ begin
|
||||
FBkColor := Value;
|
||||
if FDC <> 0 then
|
||||
{$IFDEF SYN_LAZARUS}
|
||||
LCLIntf.SetBkColor(FDC, Value);
|
||||
LCLIntf.SetBkColor(FDC, ColorRef(Value));
|
||||
{$ELSE}
|
||||
Windows.SetBkColor(FDC, ColorToRGB(Value));
|
||||
{$ENDIF}
|
||||
|
||||
@ -615,7 +615,7 @@ type
|
||||
|
||||
TMethodNameTable = packed record
|
||||
Count : DWord;
|
||||
Entries : packed array[0..0] of TMethodNameRec;
|
||||
Entries : packed array[0..MaxInt div 8] of TMethodNameRec;
|
||||
end;
|
||||
|
||||
PMethodNameTable = ^TMethodNameTable;
|
||||
|
||||
@ -3008,13 +3008,14 @@ begin
|
||||
end else
|
||||
s:='';
|
||||
Result:=Result+s;
|
||||
if (Key1=VK_UNKNOWN) and (Key2=VK_UNKNOWN) then
|
||||
if (KeyA.Key1=VK_UNKNOWN) and (KeyB.Key1=VK_UNKNOWN) then
|
||||
Result:=Result+'none'
|
||||
else if (Key2=VK_UNKNOWN) then
|
||||
Result:=Result+KeyAndShiftStateToEditorKeyString(Key1,Shift1)
|
||||
else if (KeyB.Key1=VK_UNKNOWN) then
|
||||
Result:=Result+KeyAndShiftStateToEditorKeyString(KeyA.Key1,KeyA.Shift1)
|
||||
else
|
||||
Result:=Result+KeyAndShiftStateToEditorKeyString(Key1,Shift1)+' or '+
|
||||
KeyAndShiftStateToEditorKeyString(Key2,Shift2);
|
||||
Result:=Result+KeyAndShiftStateToEditorKeyString(KeyA.Key1,KeyA.Shift1)
|
||||
+' or '+
|
||||
KeyAndShiftStateToEditorKeyString(KeyB.Key1,KeyB.Shift1);
|
||||
end;
|
||||
end;
|
||||
|
||||
|
||||
@ -41,8 +41,8 @@ uses
|
||||
{$ENDIF}
|
||||
Classes, SysUtils, LCLType, Controls, Forms, Buttons, StdCtrls, ComCtrls,
|
||||
Dialogs, ExtCtrls, LResources, Laz_XMLCfg, ExtToolEditDlg, Process,
|
||||
KeyMapping, TransferMacros, IDEProcs, CompilerOptions, OutputFilter, FileCtrl,
|
||||
LazarusIDEStrConsts;
|
||||
IDECommands, KeyMapping, TransferMacros, IDEProcs, CompilerOptions,
|
||||
OutputFilter, FileCtrl, LazarusIDEStrConsts;
|
||||
|
||||
const
|
||||
MaxExtTools = ecExtToolLast-ecExtToolFirst+1;
|
||||
@ -244,8 +244,8 @@ begin
|
||||
for i:=0 to Count-1 do begin
|
||||
KeyCommandRelation:=KeyCommandRelationList.FindByCommand(ecExtToolFirst+i);
|
||||
if KeyCommandRelation<>nil then begin
|
||||
Items[i].Key:=KeyCommandRelation.Key1;
|
||||
Items[i].Shift:=KeyCommandRelation.Shift1;
|
||||
Items[i].Key:=KeyCommandRelation.KeyA.Key1;
|
||||
Items[i].Shift:=KeyCommandRelation.KeyA.Shift1;
|
||||
end else begin
|
||||
Items[i].Key:=VK_UNKNOWN;
|
||||
Items[i].Shift:=[];
|
||||
@ -388,8 +388,8 @@ begin
|
||||
for i:=0 to Count-1 do begin
|
||||
KeyCommandRelation:=KeyCommandRelationList.FindByCommand(ecExtToolFirst+i);
|
||||
if KeyCommandRelation<>nil then begin
|
||||
KeyCommandRelation.Key1:=Items[i].Key;
|
||||
KeyCommandRelation.Shift1:=Items[i].Shift;
|
||||
KeyCommandRelation.KeyA:=IDECommandKey(Items[i].Key,Items[i].Shift,
|
||||
VK_UNKNOWN,[]);
|
||||
end else begin
|
||||
writeln('[TExternalToolList.SaveShortCuts] Error: '
|
||||
+'unable to save shortcut for external tool "',Items[i].Title,'"');
|
||||
|
||||
@ -52,7 +52,7 @@ const
|
||||
IDE experts: They are handled in the IDE interface units.
|
||||
|
||||
}
|
||||
ecNone = SynEditKeyCmds.ecNone;
|
||||
ecNone = 0;
|
||||
|
||||
// search
|
||||
ecFind = ecUserFirst + 1;
|
||||
@ -262,25 +262,9 @@ type
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
// class for storing the keys of a single command (key-command relationship)
|
||||
TKeyCommandRelation = class
|
||||
private
|
||||
fParent: TKeyCommandCategory;
|
||||
procedure SetParent(const AValue: TKeyCommandCategory);
|
||||
TKeyCommandRelation = class(TIDECommandKeys)
|
||||
public
|
||||
Name: ShortString;
|
||||
Command: word; // see the ecXXX constants above
|
||||
Key1: word;
|
||||
Shift1: TShiftState;
|
||||
Key2: word;
|
||||
Shift2: TShiftState;
|
||||
property Parent: TKeyCommandCategory read fParent write SetParent;
|
||||
constructor Create(AParent: TKeyCommandCategory; AName:ShortString;
|
||||
ACommand: word;
|
||||
AKey1:Word; AShift1:TShiftState; AKey2:Word; AShift2:TShiftState);
|
||||
function AsShortCut: TShortCut;
|
||||
procedure GetDefaultValues(var AKey1:Word; var AShift1:TShiftState;
|
||||
var AKey2:Word; var AShift2:TShiftState);
|
||||
function LocalizedName: string;
|
||||
function GetLocalizedName: string; override;
|
||||
end;
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
@ -295,11 +279,9 @@ type
|
||||
function GetRelation(Index:integer):TKeyCommandRelation;
|
||||
function AddCategory(const Name, Description: string;
|
||||
TheAreas: TCommandAreas): integer;
|
||||
function Add(Category: TKeyCommandCategory; const Name:shortstring;
|
||||
Command:word;
|
||||
Key1:Word; Shift1:TShiftState;
|
||||
Key2:Word; Shift2:TShiftState):integer;
|
||||
function AddDefault(Category: TKeyCommandCategory; const Name:shortstring;
|
||||
function Add(Category: TKeyCommandCategory; const Name: string;
|
||||
Command:word; const TheKeyA, TheKeyB: TIDECommandKey):integer;
|
||||
function AddDefault(Category: TKeyCommandCategory; const Name: string;
|
||||
Command:word):integer;
|
||||
procedure SetCustomKeyCount(const NewCount: integer);
|
||||
procedure SetExtToolCount(NewCount: integer);
|
||||
@ -377,16 +359,13 @@ function EditorCommandLocalizedName(cmd: word;
|
||||
function EditorKeyStringToVKCode(const s: string): integer;
|
||||
|
||||
procedure GetDefaultKeyForCommand(Command: word;
|
||||
var Key1: word; var Shift1: TShiftState;
|
||||
var Key2: word; var Shift2: TShiftState);
|
||||
var TheKeyA, TheKeyB: TIDECommandKey);
|
||||
procedure GetDefaultKeyForClassicScheme(Command: word;
|
||||
var Key1: word; var Shift1: TShiftState;
|
||||
var Key2: word; var Shift2: TShiftState);
|
||||
var TheKeyA, TheKeyB: TIDECommandKey);
|
||||
function KeySchemeNameToSchemeType(const SchemeName: string): TKeyMapScheme;
|
||||
|
||||
function ShiftStateToStr(Shift:TShiftState):AnsiString;
|
||||
function KeyValuesToStr(Key1: word; Shift1: TShiftState;
|
||||
Key2: word; Shift2: TShiftState): string;
|
||||
function KeyValuesToStr(const KeyA, KeyB: TIDECommandKey): string;
|
||||
function EditorKeyStringIsIrregular(const s: string): boolean;
|
||||
|
||||
var KeyMappingEditForm: TKeyMappingEditForm;
|
||||
@ -438,26 +417,21 @@ begin
|
||||
end;
|
||||
|
||||
procedure GetDefaultKeyForCommand(Command: word;
|
||||
var Key1: word; var Shift1: TShiftState;
|
||||
var Key2: word; var Shift2: TShiftState);
|
||||
var TheKeyA, TheKeyB: TIDECommandKey);
|
||||
|
||||
procedure SetResult(NewKey1: word; NewShift1: TShiftState;
|
||||
NewKey2: word; NewShift2: TShiftState);
|
||||
procedure SetResult(NewKeyA: word; NewShiftA: TShiftState;
|
||||
NewKeyB: word; NewShiftB: TShiftState);
|
||||
begin
|
||||
Key1:=NewKey1;
|
||||
Shift1:=NewShift1;
|
||||
Key2:=NewKey2;
|
||||
Shift2:=NewShift2;
|
||||
TheKeyA:=IDECommandKey(NewKeyA,NewShiftA,VK_UNKNOWN,[]);
|
||||
TheKeyB:=IDECommandKey(NewKeyB,NewShiftB,VK_UNKNOWN,[]);
|
||||
end;
|
||||
|
||||
procedure SetResult(NewKey1: word; NewShift1: TShiftState);
|
||||
procedure SetResult(NewKeyA: word; NewShiftA: TShiftState);
|
||||
begin
|
||||
SetResult(NewKey1,NewShift1,VK_UNKNOWN,[]);
|
||||
SetResult(NewKeyA,NewShiftA,VK_UNKNOWN,[]);
|
||||
end;
|
||||
|
||||
begin
|
||||
SetResult(VK_UNKNOWN,[]);
|
||||
|
||||
case Command of
|
||||
// moving
|
||||
ecWordLeft: SetResult(VK_LEFT, [ssCtrl],VK_UNKNOWN,[]);
|
||||
@ -703,27 +677,27 @@ begin
|
||||
ecCutComponents: SetResult(VK_X,[ssCtrl],VK_Delete,[ssShift]);
|
||||
ecPasteComponents: SetResult(VK_V,[ssCtrl],VK_Insert,[ssShift]);
|
||||
ecSelectParentComponent: SetResult(VK_ESCAPE,[],VK_UNKNOWN,[]);
|
||||
|
||||
else
|
||||
SetResult(VK_UNKNOWN,[]);
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure GetDefaultKeyForClassicScheme(Command: word;
|
||||
var Key1: word; var Shift1: TShiftState;
|
||||
var Key2: word; var Shift2: TShiftState);
|
||||
var TheKeyA, TheKeyB: TIDECommandKey);
|
||||
|
||||
procedure SetResult(NewKey1: word; NewShift1: TShiftState;
|
||||
NewKey2: word; NewShift2: TShiftState);
|
||||
procedure SetResult(NewKeyA: word; NewShiftA: TShiftState;
|
||||
NewKeyB: word; NewShiftB: TShiftState);
|
||||
begin
|
||||
Key1:=NewKey1;
|
||||
Shift1:=NewShift1;
|
||||
Key2:=NewKey2;
|
||||
Shift2:=NewShift2;
|
||||
TheKeyA:=IDECommandKey(NewKeyA,NewShiftA,VK_UNKNOWN,[]);
|
||||
TheKeyB:=IDECommandKey(NewKeyB,NewShiftB,VK_UNKNOWN,[]);
|
||||
end;
|
||||
|
||||
procedure SetResult(NewKey1: word; NewShift1: TShiftState);
|
||||
|
||||
procedure SetResult(NewKeyA: word; NewShiftA: TShiftState);
|
||||
begin
|
||||
SetResult(NewKey1,NewShift1,VK_UNKNOWN,[]);
|
||||
SetResult(NewKeyA,NewShiftA,VK_UNKNOWN,[]);
|
||||
end;
|
||||
|
||||
|
||||
begin
|
||||
SetResult(VK_UNKNOWN,[]);
|
||||
|
||||
@ -908,7 +882,7 @@ begin
|
||||
//Ctrl+S Incremental search
|
||||
//Ctrl+T Displays the Type Cast dialog
|
||||
else
|
||||
GetDefaultKeyForCommand(Command,Key1,Shift1,Key2,Shift2);
|
||||
GetDefaultKeyForCommand(Command,TheKeyA,TheKeyB);
|
||||
end;
|
||||
end;
|
||||
|
||||
@ -932,11 +906,10 @@ begin
|
||||
Result:=IntToStr(i);
|
||||
end;
|
||||
|
||||
function KeyValuesToStr(Key1: word; Shift1: TShiftState;
|
||||
Key2: word; Shift2: TShiftState): string;
|
||||
function KeyValuesToStr(const KeyA, KeyB: TIDECommandKey): string;
|
||||
begin
|
||||
Result:=IntToStr(Key1)+','+ShiftStateToStr(Shift1)
|
||||
+','+IntToStr(Key2)+','+ShiftStateToStr(Shift2);
|
||||
Result:=IntToStr(KeyA.Key1)+','+ShiftStateToStr(KeyA.Shift1)
|
||||
+','+IntToStr(KeyB.Key1)+','+ShiftStateToStr(KeyB.Shift1);
|
||||
end;
|
||||
|
||||
function EditorKeyStringIsIrregular(const s: string): boolean;
|
||||
@ -950,7 +923,7 @@ begin
|
||||
end;
|
||||
|
||||
function ShowKeyMappingEditForm(Index:integer;
|
||||
AKeyCommandRelationList:TKeyCommandRelationList):TModalResult;
|
||||
AKeyCommandRelationList: TKeyCommandRelationList):TModalResult;
|
||||
|
||||
procedure InitComboBox(AComboBox: TComboBox; AKey: integer);
|
||||
var s: string;
|
||||
@ -980,19 +953,19 @@ begin
|
||||
with KeyCommandRelationList.Relations[Index] do
|
||||
begin
|
||||
CommandLabel.Caption:=srkmCommand+LocalizedName;
|
||||
if Key1<>VK_UNKNOWN then
|
||||
if (KeyA.Key1<>VK_UNKNOWN) then
|
||||
begin
|
||||
Key1CtrlCheckBox.Checked:=ssCtrl in Shift1;
|
||||
Key1AltCheckBox.Checked:=ssAlt in Shift1;
|
||||
Key1ShiftCheckBox.Checked:=ssShift in Shift1;
|
||||
InitComboBox(Key1KeyComboBox,Key1);
|
||||
Key1CtrlCheckBox.Checked:=ssCtrl in KeyA.Shift1;
|
||||
Key1AltCheckBox.Checked:=ssAlt in KeyA.Shift1;
|
||||
Key1ShiftCheckBox.Checked:=ssShift in KeyA.Shift1;
|
||||
InitComboBox(Key1KeyComboBox,KeyA.Key1);
|
||||
end;
|
||||
if Key2<>VK_UNKNOWN then
|
||||
if (KeyB.Key1<>VK_UNKNOWN) then
|
||||
begin
|
||||
Key2CtrlCheckBox.Checked:=ssCtrl in Shift2;
|
||||
Key2AltCheckBox.Checked:=ssAlt in Shift2;
|
||||
Key2ShiftCheckBox.Checked:=ssShift in Shift2;
|
||||
InitComboBox(Key2KeyComboBox,Key2);
|
||||
Key2CtrlCheckBox.Checked:=ssCtrl in KeyB.Shift1;
|
||||
Key2AltCheckBox.Checked:=ssAlt in KeyB.Shift1;
|
||||
Key2ShiftCheckBox.Checked:=ssShift in KeyB.Shift1;
|
||||
InitComboBox(Key2KeyComboBox,KeyB.Key1);
|
||||
end;
|
||||
end;
|
||||
Result:=ShowModal;
|
||||
@ -1267,9 +1240,8 @@ begin
|
||||
then
|
||||
continue;
|
||||
if ((Key1.Key=Key2.Key) and (Key1.Shift=Key2.Shift))
|
||||
or ((Key1.Key2<>VK_UNKNOWN)
|
||||
and (Key1.Key2=Key2.Key) and (Key1.Shift2=Key2.Shift2)) then
|
||||
begin
|
||||
and ((Key1.Key2=Key2.Key2) and (Key1.Shift2=Key2.Shift2))
|
||||
then begin
|
||||
// consistency error
|
||||
if Result=0 then begin
|
||||
Index1:=a;
|
||||
@ -1640,12 +1612,13 @@ begin
|
||||
|
||||
// search for conflict
|
||||
DummyRelation:=KeyCommandRelationList.Find(NewKey1,NewShiftState1,
|
||||
CurRelation.Parent.Areas);
|
||||
CurRelation.Category.Areas);
|
||||
if (DummyRelation<>nil)
|
||||
and (DummyRelation<>KeyCommandRelationList.Relations[KeyIndex]) then
|
||||
begin
|
||||
AText:=Format(srkmAlreadyConnected,
|
||||
[KeyAndShiftStateToEditorKeyString(NewKey1,NewShiftState1),DummyRelation.Name]);
|
||||
[KeyAndShiftStateToEditorKeyString(NewKey1,NewShiftState1),
|
||||
DummyRelation.Name]);
|
||||
MessageDlg(AText,mtError,[mbok],0);
|
||||
exit;
|
||||
end;
|
||||
@ -1660,13 +1633,14 @@ begin
|
||||
if Key2ShiftCheckBox.Checked then include(NewShiftState2,ssShift);
|
||||
end;
|
||||
DummyRelation:=KeyCommandRelationList.Find(NewKey2,NewShiftState2,
|
||||
CurRelation.Parent.Areas);
|
||||
CurRelation.Category.Areas);
|
||||
|
||||
if (DummyRelation<>nil)
|
||||
and (DummyRelation<>KeyCommandRelationList.Relations[KeyIndex]) then
|
||||
begin
|
||||
AText:=Format(srkmAlreadyConnected,
|
||||
[KeyAndShiftStateToEditorKeyString(NewKey2,NewShiftState2),DummyRelation.Name]);
|
||||
[KeyAndShiftStateToEditorKeyString(NewKey2,NewShiftState2),
|
||||
DummyRelation.Name]);
|
||||
MessageDlg(AText,mterror,[mbok],0);
|
||||
exit;
|
||||
end;
|
||||
@ -1678,13 +1652,8 @@ begin
|
||||
NewKey2:=VK_UNKNOWN;
|
||||
end;
|
||||
|
||||
with CurRelation do
|
||||
begin
|
||||
Key1:=NewKey1;
|
||||
Shift1:=NewShiftState1;
|
||||
Key2:=NewKey2;
|
||||
Shift2:=NewShiftState2;
|
||||
end;
|
||||
CurRelation.KeyA:=IDECommandKey(NewKey1,NewShiftState1,VK_UNKNOWN,[]);
|
||||
CurRelation.KeyB:=IDECommandKey(NewKey2,NewShiftState2,VK_UNKNOWN,[]);
|
||||
ModalResult:=mrOk;
|
||||
end;
|
||||
|
||||
@ -1792,55 +1761,7 @@ end;
|
||||
|
||||
{ TKeyCommandRelation }
|
||||
|
||||
constructor TKeyCommandRelation.Create(AParent: TKeyCommandCategory;
|
||||
AName:ShortString; ACommand:word;
|
||||
AKey1:Word;AShift1:TShiftState;AKey2:Word;AShift2:TShiftState);
|
||||
begin
|
||||
Name:=AName;
|
||||
Command:=ACommand;
|
||||
Key1:=AKey1;
|
||||
Shift1:=AShift1;
|
||||
Key2:=AKey2;
|
||||
Shift2:=AShift2;
|
||||
Parent:=AParent;
|
||||
end;
|
||||
|
||||
procedure TKeyCommandRelation.SetParent(const AValue: TKeyCommandCategory);
|
||||
begin
|
||||
if Parent<>AValue then
|
||||
begin
|
||||
// unbind
|
||||
if Parent<>nil then
|
||||
begin
|
||||
Parent.Remove(Self);
|
||||
end;
|
||||
// bind
|
||||
fParent:=AValue;
|
||||
if Parent<>nil then
|
||||
begin
|
||||
Parent.Add(Self);
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
|
||||
function TKeyCommandRelation.AsShortCut: TShortCut;
|
||||
begin
|
||||
Result:=Key1;
|
||||
if ssCtrl in Shift1 then
|
||||
Result:=Result+scCtrl;
|
||||
if ssShift in Shift1 then
|
||||
Result:=Result+scShift;
|
||||
if ssAlt in Shift1 then
|
||||
Result:=Result+scAlt;
|
||||
end;
|
||||
|
||||
procedure TKeyCommandRelation.GetDefaultValues(var AKey1: Word;
|
||||
var AShift1: TShiftState; var AKey2: Word; var AShift2: TShiftState);
|
||||
begin
|
||||
GetDefaultKeyForCommand(Command,AKey1,AShift1,AKey2,AShift2);
|
||||
end;
|
||||
|
||||
function TKeyCommandRelation.LocalizedName: string;
|
||||
function TKeyCommandRelation.GetLocalizedName: string;
|
||||
begin
|
||||
Result:=EditorCommandLocalizedName(Command,Name);
|
||||
end;
|
||||
@ -2165,22 +2086,20 @@ begin
|
||||
end;
|
||||
|
||||
function TKeyCommandRelationList.Add(Category: TKeyCommandCategory;
|
||||
const Name:shortstring;
|
||||
Command:word;
|
||||
Key1:Word; Shift1:TShiftState; Key2:Word; Shift2:TShiftState):integer;
|
||||
const Name: string;
|
||||
Command:word; const TheKeyA, TheKeyB: TIDECommandKey):integer;
|
||||
begin
|
||||
Result:=FRelations.Add(TKeyCommandRelation.Create(Category,Name,Command
|
||||
,Key1,Shift1,Key2,Shift2));
|
||||
,TheKeyA, TheKeyB));
|
||||
end;
|
||||
|
||||
function TKeyCommandRelationList.AddDefault(Category: TKeyCommandCategory;
|
||||
const Name: shortstring; Command: word): integer;
|
||||
const Name: string; Command: word): integer;
|
||||
var
|
||||
Key1:Word; Shift1:TShiftState;
|
||||
Key2:Word; Shift2:TShiftState;
|
||||
TheKeyA, TheKeyB: TIDECommandKey;
|
||||
begin
|
||||
GetDefaultKeyForCommand(Command,Key1,Shift1,Key2,Shift2);
|
||||
Result:=Add(Category,Name,Command,Key1,Shift1,Key2,Shift2);
|
||||
GetDefaultKeyForCommand(Command,TheKeyA,TheKeyB);
|
||||
Result:=Add(Category,Name,Command,TheKeyA,TheKeyB);
|
||||
end;
|
||||
|
||||
procedure TKeyCommandRelationList.SetCustomKeyCount(const NewCount: integer);
|
||||
@ -2194,7 +2113,8 @@ begin
|
||||
// increase available custom commands
|
||||
while NewCount>FCustomKeyCount do begin
|
||||
Add(CustomCat,Format(srkmecCustomTool,[FCustomKeyCount]),
|
||||
ecCustomToolFirst+FCustomKeyCount,VK_UNKNOWN,[],VK_UNKNOWN,[]);
|
||||
ecCustomToolFirst+FCustomKeyCount,
|
||||
CleanIDECommandKey,CleanIDECommandKey);
|
||||
inc(FCustomKeyCount);
|
||||
end;
|
||||
end else begin
|
||||
@ -2226,7 +2146,7 @@ begin
|
||||
// increase available external tool commands
|
||||
while NewCount>fExtToolCount do begin
|
||||
Add(ExtToolCat,Format(srkmecExtTool,[fExtToolCount]),
|
||||
ecExtToolFirst+fExtToolCount,VK_UNKNOWN,[],VK_UNKNOWN,[]);
|
||||
ecExtToolFirst+fExtToolCount,CleanIDECommandKey,CleanIDECommandKey);
|
||||
inc(fExtToolCount);
|
||||
end;
|
||||
end else begin
|
||||
@ -2275,7 +2195,11 @@ var a,b,p:integer;
|
||||
end;
|
||||
|
||||
// LoadFromXMLConfig
|
||||
var FileVersion: integer;
|
||||
var
|
||||
FileVersion: integer;
|
||||
TheKeyA, TheyKeyB: TIDECommandKey;
|
||||
Key: word;
|
||||
Shift: TShiftState;
|
||||
begin
|
||||
FileVersion:=XMLConfig.GetValue(Prefix+'Version/Value',0);
|
||||
ExtToolCount:=XMLConfig.GetValue(Prefix+'ExternalToolCount/Value',0);
|
||||
@ -2283,20 +2207,21 @@ begin
|
||||
Name:=lowercase(Relations[a].Name);
|
||||
for b:=1 to length(Name) do
|
||||
if not (Name[b] in ['a'..'z','A'..'Z','0'..'9']) then Name[b]:='_';
|
||||
with Relations[a] do
|
||||
DefaultStr:=IntToStr(Key1)+','+ShiftStateToStr(Shift1)
|
||||
+','+IntToStr(Key2)+','+ShiftStateToStr(Shift2);
|
||||
with Relations[a] do begin
|
||||
GetDefaultKeyForCommand(Command,TheKeyA,TheyKeyB);
|
||||
DefaultStr:=KeyValuesToStr(TheKeyA, TheyKeyB);
|
||||
end;
|
||||
if FileVersion<2 then
|
||||
NewValue:=XMLConfig.GetValue(Prefix+Name,DefaultStr)
|
||||
else
|
||||
NewValue:=XMLConfig.GetValue(Prefix+Name+'/Value',DefaultStr);
|
||||
p:=1;
|
||||
with Relations[a] do begin
|
||||
Key1:=ReadNextInt;
|
||||
Shift1:=IntToShiftState(ReadNextInt);
|
||||
Key2:=ReadNextInt;
|
||||
Shift2:=IntToShiftState(ReadNextInt);
|
||||
end;
|
||||
Key:=ReadNextInt;
|
||||
Shift:=IntToShiftState(ReadNextInt);
|
||||
Relations[a].KeyA:=IDECommandKey(Key,Shift,VK_UNKNOWN,[]);
|
||||
Key:=ReadNextInt;
|
||||
Shift:=IntToShiftState(ReadNextInt);
|
||||
Relations[a].KeyB:=IDECommandKey(Key,Shift,VK_UNKNOWN,[]);
|
||||
end;
|
||||
Result:=true;
|
||||
end;
|
||||
@ -2307,8 +2232,7 @@ var a,b: integer;
|
||||
Name: String;
|
||||
CurKeyStr: String;
|
||||
DefaultKeyStr: string;
|
||||
AKey1: Word; AShift1: TShiftState;
|
||||
AKey2: Word; AShift2: TShiftState;
|
||||
TheKeyA, TheyKeyB: TIDECommandKey;
|
||||
begin
|
||||
XMLConfig.SetValue(Prefix+'Version/Value',KeyMappingFormatVersion);
|
||||
XMLConfig.SetDeleteValue(Prefix+'ExternalToolCount/Value',ExtToolCount,0);
|
||||
@ -2317,9 +2241,9 @@ begin
|
||||
for b:=1 to length(Name) do
|
||||
if not (Name[b] in ['a'..'z','A'..'Z','0'..'9']) then Name[b]:='_';
|
||||
with Relations[a] do begin
|
||||
CurKeyStr:=KeyValuesToStr(Key1,Shift1,Key2,Shift2);
|
||||
GetDefaultValues(AKey1,AShift1,AKey2,AShift2);
|
||||
DefaultKeyStr:=KeyValuesToStr(AKey1,AShift1,AKey2,AShift2);;
|
||||
CurKeyStr:=KeyValuesToStr(KeyA,KeyB);
|
||||
GetDefaultKeyForCommand(Command,TheKeyA,TheyKeyB);
|
||||
DefaultKeyStr:=KeyValuesToStr(TheKeyA, TheyKeyB);
|
||||
end;
|
||||
//writeln('TKeyCommandRelationList.SaveToXMLConfig A ',Prefix+Name,' ',CurKeyStr=DefaultKeyStr);
|
||||
XMLConfig.SetDeleteValue(Prefix+Name+'/Value',CurKeyStr,DefaultKeyStr);
|
||||
@ -2334,9 +2258,9 @@ begin
|
||||
Result:=nil;
|
||||
if AKey=VK_UNKNOWN then exit;
|
||||
for a:=0 to FRelations.Count-1 do with Relations[a] do begin
|
||||
if Parent.Areas*Areas=[] then continue;
|
||||
if ((Key1=AKey) and (Shift1=AShiftState))
|
||||
or ((Key2=AKey) and (Shift2=AShiftState)) then begin
|
||||
if Category.Areas*Areas=[] then continue;
|
||||
if ((KeyA.Key1=AKey) and (KeyA.Shift1=AShiftState))
|
||||
or ((KeyB.Key1=AKey) and (KeyB.Shift1=AShiftState)) then begin
|
||||
Result:=Relations[a];
|
||||
exit;
|
||||
end;
|
||||
@ -2364,10 +2288,10 @@ var
|
||||
begin
|
||||
for a:=0 to FRelations.Count-1 do begin
|
||||
CurRelation:=Relations[a];
|
||||
if (CurRelation.Key1=VK_UNKNOWN)
|
||||
or ((CurRelation.Parent.Areas*Areas)=[]) then
|
||||
if (CurRelation.KeyA.Key1=VK_UNKNOWN)
|
||||
or ((CurRelation.Category.Areas*Areas)=[]) then
|
||||
MaxKeyCnt:=0
|
||||
else if CurRelation.Key2=VK_UNKNOWN then
|
||||
else if CurRelation.KeyB.Key1=VK_UNKNOWN then
|
||||
MaxKeyCnt:=1
|
||||
else
|
||||
MaxKeyCnt:=2;
|
||||
@ -2383,16 +2307,16 @@ begin
|
||||
Key.Free;
|
||||
end else if KeyCnt=1 then begin
|
||||
// Define key1 for this command
|
||||
Key.Key:=CurRelation.Key1;
|
||||
Key.Shift:=CurRelation.Shift1;
|
||||
Key.Key2:=VK_UNKNOWN;
|
||||
Key.Shift2:=[];
|
||||
Key.Key:=CurRelation.KeyA.Key1;
|
||||
Key.Shift:=CurRelation.KeyA.Shift1;
|
||||
Key.Key2:=CurRelation.KeyA.Key2;
|
||||
Key.Shift2:=CurRelation.KeyA.Shift2;
|
||||
end else if KeyCnt=2 then begin
|
||||
// Define key2 for this command
|
||||
Key.Key:=CurRelation.Key2;
|
||||
Key.Shift:=CurRelation.Shift2;
|
||||
Key.Key2:=VK_UNKNOWN;
|
||||
Key.Shift2:=[];
|
||||
Key.Key:=CurRelation.KeyB.Key1;
|
||||
Key.Shift:=CurRelation.KeyB.Shift1;
|
||||
Key.Key2:=CurRelation.KeyB.Key2;
|
||||
Key.Shift2:=CurRelation.KeyB.Shift2;
|
||||
end;
|
||||
inc(KeyCnt);
|
||||
end;
|
||||
@ -2403,14 +2327,16 @@ begin
|
||||
Key:=ASynEditKeyStrokes.Add;
|
||||
Key.Command:=CurRelation.Command;
|
||||
if KeyCnt=1 then begin
|
||||
Key.Key:=CurRelation.Key1;
|
||||
Key.Shift:=CurRelation.Shift1;
|
||||
Key.Key:=CurRelation.KeyA.Key1;
|
||||
Key.Shift:=CurRelation.KeyA.Shift1;
|
||||
Key.Key2:=CurRelation.KeyA.Key2;
|
||||
Key.Shift2:=CurRelation.KeyA.Shift2;
|
||||
end else begin
|
||||
Key.Key:=CurRelation.Key2;
|
||||
Key.Shift:=CurRelation.Shift2;
|
||||
Key.Key:=CurRelation.KeyB.Key1;
|
||||
Key.Shift:=CurRelation.KeyB.Shift1;
|
||||
Key.Key2:=CurRelation.KeyB.Key2;
|
||||
Key.Shift2:=CurRelation.KeyB.Shift2;
|
||||
end;
|
||||
Key.Key2:=VK_UNKNOWN;
|
||||
Key.Shift2:=[];
|
||||
inc(KeyCnt);
|
||||
end;
|
||||
end;
|
||||
@ -2433,9 +2359,9 @@ begin
|
||||
// copy keys
|
||||
for i:=0 to List.Count-1 do begin
|
||||
CurRelation:=List.Relations[i];
|
||||
CurCategory:=FindCategoryByName(CurRelation.fParent.Name);
|
||||
CurCategory:=FindCategoryByName(CurRelation.Category.Name);
|
||||
Add(CurCategory,CurRelation.Name,CurRelation.Command,
|
||||
CurRelation.Key1,CurRelation.Shift1,CurRelation.Key2,CurRelation.Shift2);
|
||||
CurRelation.KeyA,CurRelation.KeyB);
|
||||
end;
|
||||
|
||||
// copy ExtToolCount
|
||||
@ -2447,24 +2373,20 @@ var
|
||||
i: Integer;
|
||||
CurRelation: TKeyCommandRelation;
|
||||
NewScheme: TKeyMapScheme;
|
||||
Key1: word; Shift1: TShiftState;
|
||||
Key2: word; Shift2: TShiftState;
|
||||
TheKeyA, TheKeyB: TIDECommandKey;
|
||||
begin
|
||||
NewScheme:=KeySchemeNameToSchemeType(SchemeName);
|
||||
// set all keys to new scheme
|
||||
for i:=0 to Count-1 do begin
|
||||
CurRelation:=Relations[i];
|
||||
case NewScheme of
|
||||
kmsLazarus: GetDefaultKeyForCommand(CurRelation.Command,
|
||||
Key1,Shift1,Key2,Shift2);
|
||||
kmsLazarus: GetDefaultKeyForCommand(CurRelation.Command,TheKeyA,TheKeyB);
|
||||
kmsClassic: GetDefaultKeyForClassicScheme(CurRelation.Command,
|
||||
Key1,Shift1,Key2,Shift2);
|
||||
TheKeyA,TheKeyB);
|
||||
kmsCustom: ;
|
||||
end;
|
||||
CurRelation.Key1:=Key1;
|
||||
CurRelation.Shift1:=Shift1;
|
||||
CurRelation.Key2:=Key2;
|
||||
CurRelation.Shift2:=Shift2;
|
||||
CurRelation.KeyA:=TheKeyA;
|
||||
CurRelation.KeyB:=TheKeyB;
|
||||
end;
|
||||
end;
|
||||
|
||||
|
||||
@ -20,11 +20,47 @@ unit IDECommands;
|
||||
interface
|
||||
|
||||
uses
|
||||
Classes, SysUtils;
|
||||
Classes, SysUtils, LCLType;
|
||||
|
||||
type
|
||||
TIDECommandCategory = class;
|
||||
|
||||
TCommandArea = (caSourceEditor, caDesigner);
|
||||
TCommandAreas = set of TCommandArea;
|
||||
|
||||
TIDECommandKey = record
|
||||
Key1: word;
|
||||
Shift1: TShiftState;
|
||||
Key2: word;
|
||||
Shift2: TShiftState;
|
||||
end;
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
// class for storing the keys of a single command (key-command relationship)
|
||||
TIDECommandKeys = class
|
||||
private
|
||||
FCategory: TIDECommandCategory;
|
||||
FCommand: word;
|
||||
FLocalizedName: string;
|
||||
FName: String;
|
||||
protected
|
||||
function GetLocalizedName: string; virtual;
|
||||
procedure SetLocalizedName(const AValue: string); virtual;
|
||||
procedure SetCategory(const AValue: TIDECommandCategory); virtual;
|
||||
public
|
||||
function AsShortCut: TShortCut; virtual;
|
||||
constructor Create(TheCategory: TIDECommandCategory; const TheName: String;
|
||||
TheCommand: word; const TheKeyA, TheKeyB: TIDECommandKey);
|
||||
public
|
||||
KeyA: TIDECommandKey;
|
||||
KeyB: TIDECommandKey;
|
||||
DefaultKeyA: TIDECommandKey;
|
||||
DefaultKeyB: TIDECommandKey;
|
||||
property Name: String read FName;
|
||||
property Command: word read FCommand; // see the ecXXX constants above
|
||||
property LocalizedName: string read GetLocalizedName write SetLocalizedName;
|
||||
property Category: TIDECommandCategory read FCategory write SetCategory;
|
||||
end;
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
// TIDECommandCategory is used to divide the key commands in handy packets
|
||||
@ -41,10 +77,27 @@ type
|
||||
property Areas: TCommandAreas read FAreas;
|
||||
procedure Delete(Index: Integer); virtual;
|
||||
end;
|
||||
|
||||
const
|
||||
CleanIDECommandKey: TIDECommandKey =
|
||||
(Key1: VK_UNKNOWN; Shift1: []; Key2: VK_UNKNOWN; Shift2: []);
|
||||
|
||||
function IDECommandKey(Key1: word; Shift1: TShiftState;
|
||||
Key2: word; Shift2: TShiftState): TIDECommandKey;
|
||||
|
||||
|
||||
implementation
|
||||
|
||||
|
||||
function IDECommandKey(Key1: word; Shift1: TShiftState;
|
||||
Key2: word; Shift2: TShiftState): TIDECommandKey;
|
||||
begin
|
||||
Result.Key1:=Key1;
|
||||
Result.Shift1:=Shift1;
|
||||
Result.Key2:=Key2;
|
||||
Result.Shift2:=Shift2;
|
||||
end;
|
||||
|
||||
{ TIDECommandCategory }
|
||||
|
||||
procedure TIDECommandCategory.Delete(Index: Integer);
|
||||
@ -52,5 +105,65 @@ begin
|
||||
inherited Delete(Index);
|
||||
end;
|
||||
|
||||
{ TIDECommandKeys }
|
||||
|
||||
function TIDECommandKeys.GetLocalizedName: string;
|
||||
begin
|
||||
if FLocalizedName<>'' then
|
||||
Result:=FLocalizedName
|
||||
else
|
||||
Result:=Name;
|
||||
end;
|
||||
|
||||
procedure TIDECommandKeys.SetLocalizedName(const AValue: string);
|
||||
begin
|
||||
if FLocalizedName=AValue then exit;
|
||||
FLocalizedName:=AValue;
|
||||
end;
|
||||
|
||||
procedure TIDECommandKeys.SetCategory(const AValue: TIDECommandCategory);
|
||||
begin
|
||||
if FCategory=AValue then exit;
|
||||
// unbind
|
||||
if Category<>nil then
|
||||
Category.Remove(Self);
|
||||
// bind
|
||||
fCategory:=AValue;
|
||||
if Category<>nil then
|
||||
Category.Add(Self);
|
||||
end;
|
||||
|
||||
function TIDECommandKeys.AsShortCut: TShortCut;
|
||||
var
|
||||
CurKey: TIDECommandKey;
|
||||
begin
|
||||
if (KeyA.Key1<>VK_UNKNOWN) and (KeyA.Key2=VK_UNKNOWN) then
|
||||
CurKey:=KeyA
|
||||
else if (KeyB.Key1<>VK_UNKNOWN) and (KeyB.Key2=VK_UNKNOWN) then
|
||||
CurKey:=KeyB
|
||||
else
|
||||
CurKey:=CleanIDECommandKey;
|
||||
Result:=CurKey.Key1;
|
||||
if ssCtrl in CurKey.Shift1 then
|
||||
Result:=Result+scCtrl;
|
||||
if ssShift in CurKey.Shift1 then
|
||||
Result:=Result+scShift;
|
||||
if ssAlt in CurKey.Shift1 then
|
||||
Result:=Result+scAlt;
|
||||
end;
|
||||
|
||||
constructor TIDECommandKeys.Create(TheCategory: TIDECommandCategory;
|
||||
const TheName: String; TheCommand: word;
|
||||
const TheKeyA, TheKeyB: TIDECommandKey);
|
||||
begin
|
||||
fCommand:=TheCommand;
|
||||
fName:=TheName;
|
||||
KeyA:=TheKeyA;
|
||||
KeyB:=TheKeyB;
|
||||
DefaultKeyA:=KeyA;
|
||||
DefaultKeyB:=KeyB;
|
||||
Category:=TheCategory;
|
||||
end;
|
||||
|
||||
end.
|
||||
|
||||
|
||||
@ -166,7 +166,7 @@ begin
|
||||
lbHatch := Ord(FBrushData.Style) - Ord(bsHorizontal);
|
||||
end;
|
||||
end;
|
||||
lbColor := FBrushData.Color;
|
||||
lbColor := ColorRef(FBrushData.Color);
|
||||
end;
|
||||
FBrushData.Handle := CreateBrushIndirect(LogBrush);
|
||||
end;
|
||||
@ -194,6 +194,9 @@ end;
|
||||
{ =============================================================================
|
||||
|
||||
$Log$
|
||||
Revision 1.5 2003/12/23 11:16:41 mattias
|
||||
started key combinations, fixed some range check errors
|
||||
|
||||
Revision 1.4 2002/10/31 04:27:59 lazarus
|
||||
AJ: added TShape
|
||||
|
||||
|
||||
@ -135,7 +135,7 @@ begin
|
||||
if (OldHandle<>Brush.Handle) and (FSavedBrushHandle=0) then
|
||||
FSavedBrushHandle:=OldHandle;
|
||||
Include(FState, csBrushValid);
|
||||
SetBkColor(FHandle, Brush.Color);
|
||||
SetBkColor(FHandle, ColorRef(Brush.Color));
|
||||
SetBkMode(FHandle, TRANSPARENT);
|
||||
end;
|
||||
|
||||
@ -772,7 +772,7 @@ begin
|
||||
FillRect(fRect);
|
||||
end;
|
||||
If Style.SystemFont then
|
||||
SetTextColor(Self.Handle, Font.Color);
|
||||
SetTextColor(Self.Handle, ColorRef(Font.Color));
|
||||
DrawText(Self.Handle, pChar(Text), Length(Text), fRect, Options);
|
||||
Changed;
|
||||
end;
|
||||
@ -1254,6 +1254,9 @@ end;
|
||||
{ =============================================================================
|
||||
|
||||
$Log$
|
||||
Revision 1.57 2003/12/23 11:16:41 mattias
|
||||
started key combinations, fixed some range check errors
|
||||
|
||||
Revision 1.56 2003/12/02 12:25:17 micha
|
||||
try: gdi memory leak fix for pen
|
||||
|
||||
|
||||
@ -172,7 +172,7 @@ begin
|
||||
begin
|
||||
lopnStyle := PEN_STYLES[FPenData.Style];
|
||||
lopnWidth.X := FPenData.Width;
|
||||
lopnColor := FPenData.Color;
|
||||
lopnColor := ColorRef(FPenData.Color);
|
||||
end;
|
||||
FPenData.Handle := CreatePenIndirect(LogPen);
|
||||
end;
|
||||
@ -201,6 +201,9 @@ end;
|
||||
{ =============================================================================
|
||||
|
||||
$Log$
|
||||
Revision 1.7 2003/12/23 11:16:41 mattias
|
||||
started key combinations, fixed some range check errors
|
||||
|
||||
Revision 1.6 2003/12/02 12:25:17 micha
|
||||
try: gdi memory leak fix for pen
|
||||
|
||||
|
||||
@ -3176,7 +3176,8 @@ begin
|
||||
csEdit, csMemo:
|
||||
begin
|
||||
Widget:= GetWidgetInfo(Pointer(Handle), true)^.ImplementationWidget;
|
||||
Result:= Abs(PGtkOldEditable(Widget)^.selection_end_pos - PGtkOldEditable(Widget)^.selection_start_pos);
|
||||
Result:= Abs(PGtkOldEditable(Widget)^.selection_end_pos
|
||||
- PGtkOldEditable(Widget)^.selection_start_pos);
|
||||
end;
|
||||
{$EndIf}
|
||||
end;
|
||||
@ -8465,6 +8466,9 @@ end;
|
||||
{ =============================================================================
|
||||
|
||||
$Log$
|
||||
Revision 1.442 2003/12/23 11:16:41 mattias
|
||||
started key combinations, fixed some range check errors
|
||||
|
||||
Revision 1.441 2003/12/16 14:01:27 mattias
|
||||
fixed compilation gtk and fpc 1.9
|
||||
|
||||
|
||||
@ -3494,7 +3494,7 @@ begin
|
||||
if Widget<>nil then begin
|
||||
if GtkWidgetIsA(Widget,GTK_TYPE_WINDOW) then begin
|
||||
AWindow:=PGtkWindow(Widget);
|
||||
IsModal:=gtk_window_get_modal(AWindow);
|
||||
IsModal:=(gtk_window_get_modal(AWindow) = true);
|
||||
if IsModal then
|
||||
Widget:=nil;
|
||||
end;
|
||||
@ -9036,6 +9036,9 @@ end;
|
||||
{ =============================================================================
|
||||
|
||||
$Log$
|
||||
Revision 1.305 2003/12/23 11:16:41 mattias
|
||||
started key combinations, fixed some range check errors
|
||||
|
||||
Revision 1.304 2003/11/29 15:23:23 mattias
|
||||
ct parser now understands interconst:const
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user