paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-03 19:38:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed localization bug

Browse Source 
git-svn-id: trunk@3881 -
This commit is contained in:
mattias 2003-02-28 10:32:30 +00:00
parent 34922c5310
commit a6bb0fa35e
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ide/keymapping.pp
View File

@ -222,6 +222,7 @@ type
ACommand: word; ACommand: word;
AKey1:Word; AShift1:TShiftState; AKey2:Word; AShift2:TShiftState); AKey1:Word; AShift1:TShiftState; AKey2:Word; AShift2:TShiftState);
function AsShortCut: TShortCut; function AsShortCut: TShortCut;
function LocalizedName: string;
end; end;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -325,7 +326,7 @@ const
function EditorCommandLocalizedName(cmd: word; function EditorCommandLocalizedName(cmd: word;
const DefaultName: string): string; const DefaultName: string): string;
begin begin
Result:=DefaultName; Result:=DefaultName+'i';
end; end;
function StrToVKCode(const s: string): integer; function StrToVKCode(const s: string): integer;
@ -381,7 +382,7 @@ begin
KeyIndex:=Index; KeyIndex:=Index;
Caption:='Edit Keys'; Caption:='Edit Keys';
with KeyCommandRelationList.Relations[Index] do begin with KeyCommandRelationList.Relations[Index] do begin
CommandLabel.Caption:='Command: '+Name; CommandLabel.Caption:='Command: '+LocalizedName;
if Key1<>VK_UNKNOWN then begin if Key1<>VK_UNKNOWN then begin
Key1CtrlCheckBox.Checked:=ssCtrl in Shift1; Key1CtrlCheckBox.Checked:=ssCtrl in Shift1;
Key1AltCheckBox.Checked:=ssAlt in Shift1; Key1AltCheckBox.Checked:=ssAlt in Shift1;
@ -829,7 +830,6 @@ begin
Top:=Self.ClientHeight-Height-15; Top:=Self.ClientHeight-Height-15;
Width:=80; Width:=80;
OnClick:=@OkButtonClick; OnClick:=@OkButtonClick;
Show;
end; end;
CancelButton:=TButton.Create(Self); CancelButton:=TButton.Create(Self);
@ -841,7 +841,6 @@ begin
Top:=OkButton.Top; Top:=OkButton.Top;
Width:=OkButton.Width; Width:=OkButton.Width;
OnClick:=@CancelButtonClick; OnClick:=@CancelButtonClick;
Show;
end; end;
CommandLabel:=TLabel.Create(Self); CommandLabel:=TLabel.Create(Self);
@ -853,7 +852,6 @@ begin
Top:=5; Top:=5;
Width:=Self.ClientWidth-Left-Left; Width:=Self.ClientWidth-Left-Left;
Height:=20; Height:=20;
Show;
end; end;
Key1GroupBox:=TGroupBox.Create(Self); Key1GroupBox:=TGroupBox.Create(Self);
@ -865,7 +863,6 @@ begin
Top:=CommandLabel.Top+CommandLabel.Height+8; Top:=CommandLabel.Top+CommandLabel.Height+8;
Width:=Self.ClientWidth-Left-Left; Width:=Self.ClientWidth-Left-Left;
Height:=110; Height:=110;
Show;
end; end;
Key1CtrlCheckBox:=TCheckBox.Create(Self); Key1CtrlCheckBox:=TCheckBox.Create(Self);
@ -877,7 +874,6 @@ begin
Top:=2; Top:=2;
Width:=55; Width:=55;
Height:=20; Height:=20;
Show;
end; end;
Key1AltCheckBox:=TCheckBox.Create(Self); Key1AltCheckBox:=TCheckBox.Create(Self);
@ -889,7 +885,6 @@ begin
Top:=Key1CtrlCheckBox.Top; Top:=Key1CtrlCheckBox.Top;
Height:=20; Height:=20;
Width:=Key1CtrlCheckBox.Width; Width:=Key1CtrlCheckBox.Width;
Show;
end; end;
Key1ShiftCheckBox:=TCheckBox.Create(Self); Key1ShiftCheckBox:=TCheckBox.Create(Self);
@ -901,7 +896,6 @@ begin
Top:=Key1CtrlCheckBox.Top; Top:=Key1CtrlCheckBox.Top;
Height:=20; Height:=20;
Width:=Key1CtrlCheckBox.Width; Width:=Key1CtrlCheckBox.Width;
Show;
end; end;
Key1KeyComboBox:=TComboBox.Create(Self); Key1KeyComboBox:=TComboBox.Create(Self);
@ -920,7 +914,6 @@ begin
end; end;
Items.EndUpdate; Items.EndUpdate;
ItemIndex:=0; ItemIndex:=0;
Show;
end; end;
Key1GrabButton:=TButton.Create(Self); Key1GrabButton:=TButton.Create(Self);
@ -933,7 +926,6 @@ begin
Caption:='Grab Key'; Caption:='Grab Key';
Name:='Key1GrabButton'; Name:='Key1GrabButton';
OnClick:=@Key1GrabButtonClick; OnClick:=@Key1GrabButtonClick;
Show;
end; end;
Key2GroupBox:=TGroupBox.Create(Self); Key2GroupBox:=TGroupBox.Create(Self);
@ -945,7 +937,6 @@ begin
Top:=Key1GroupBox.Top+Key1GroupBox.Height+8; Top:=Key1GroupBox.Top+Key1GroupBox.Height+8;
Width:=Key1GroupBox.Width; Width:=Key1GroupBox.Width;
Height:=110; Height:=110;
Show;
end; end;
Key2CtrlCheckBox:=TCheckBox.Create(Self); Key2CtrlCheckBox:=TCheckBox.Create(Self);
@ -957,7 +948,6 @@ begin
Top:=2; Top:=2;
Width:=55; Width:=55;
Height:=20; Height:=20;
Show;
end; end;
Key2AltCheckBox:=TCheckBox.Create(Self); Key2AltCheckBox:=TCheckBox.Create(Self);
@ -969,7 +959,6 @@ begin
Top:=Key2CtrlCheckBox.Top; Top:=Key2CtrlCheckBox.Top;
Height:=20; Height:=20;
Width:=Key2CtrlCheckBox.Width; Width:=Key2CtrlCheckBox.Width;
Show;
end; end;
Key2ShiftCheckBox:=TCheckBox.Create(Self); Key2ShiftCheckBox:=TCheckBox.Create(Self);
@ -981,7 +970,6 @@ begin
Top:=Key2CtrlCheckBox.Top; Top:=Key2CtrlCheckBox.Top;
Height:=20; Height:=20;
Width:=Key2CtrlCheckBox.Width; Width:=Key2CtrlCheckBox.Width;
Show;
end; end;
Key2KeyComboBox:=TComboBox.Create(Self); Key2KeyComboBox:=TComboBox.Create(Self);
@ -1000,7 +988,6 @@ begin
end; end;
Items.EndUpdate; Items.EndUpdate;
ItemIndex:=0; ItemIndex:=0;
Show;
end; end;
Key2GrabButton:=TButton.Create(Self); Key2GrabButton:=TButton.Create(Self);
@ -1013,7 +1000,6 @@ begin
Caption:='Grab Key'; Caption:='Grab Key';
Name:='Key2GrabButton'; Name:='Key2GrabButton';
OnClick:=@Key2GrabButtonClick; OnClick:=@Key2GrabButtonClick;
Show;
end; end;
end; end;
@ -1212,6 +1198,11 @@ begin
Result:=Result+scAlt; Result:=Result+scAlt;
end; end;
function TKeyCommandRelation.LocalizedName: string;
begin
Result:=EditorCommandLocalizedName(Command,Name);
end;
{ TKeyCommandRelationList } { TKeyCommandRelationList }
constructor TKeyCommandRelationList.Create; constructor TKeyCommandRelationList.Create;