GitHub/amxmodx
2
0
Fork 0
mirror of https://github.com/alliedmodders/amxmodx.git synced 2024-12-25 22:35:37 +03:00
Code Issues Projects Releases Wiki Activity

Fixed another shortcut bug

Browse Source 
Released 1.2
This commit is contained in:
Christian Hammacher 2005-09-11 11:15:22 +00:00
parent 95ccd6078c
commit 6f8816c13f
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/studio/AMXX_Studio.dof
View File

@ -115,7 +115,7 @@ AutoIncBuild=1
MajorVer=1 MajorVer=1
MinorVer=2 MinorVer=2
Release=0 Release=0
Build=1 Build=2
Debug=0 Debug=0
PreRelease=0 PreRelease=0
Special=0 Special=0
@ -126,7 +126,7 @@ CodePage=1252
[Version Info Keys] [Version Info Keys]
CompanyName=AMX Mod X Dev Team CompanyName=AMX Mod X Dev Team
FileDescription= FileDescription=
FileVersion=1.2.0.1 FileVersion=1.2.0.2
InternalName= InternalName=
LegalCopyright= LegalCopyright=
LegalTrademarks= LegalTrademarks=

BIN
editor/studio/AMXX_Studio.exe
View File

Binary file not shown.

BIN
editor/studio/AMXX_Studio.res
View File

Binary file not shown.

23
editor/studio/UnitfrmMain.pas
View File

@ -2787,23 +2787,30 @@ begin
eShortcut := Shortcut(Msg.CharCode, KeyDataToShiftState(Msg.KeyData)); eShortcut := Shortcut(Msg.CharCode, KeyDataToShiftState(Msg.KeyData));
// Some menu commands are suppressed by the controlchars thingy, so they will be triggered manually // Some menu commands are suppressed by the controlchars thingy, so they will be triggered manually
for i := 0 to frmMain.tbxMenu.Items.Count -1 do begin for i := 0 to tbxMenu.Items.Count -1 do begin
if TriggerMenuShortcut(eShortcut, frmMain.tbxMenu.Items[i]) then if TriggerMenuShortcut(eShortcut, tbxMenu.Items[i]) then
Handled := True; Handled := True;
end; end;
for i := 0 to frmMain.tbxToolbar.Items.Count -1 do begin for i := 0 to tbxToolbar.Items.Count -1 do begin
if frmMain.tbxToolbar.Items[i].ShortCut = eShortcut then begin if tbxToolbar.Items[i].ShortCut = eShortcut then begin
Handled := True; Handled := True;
frmMain.tbxToolbar.Items[i].OnClick(Self); tbxToolbar.Items[i].OnClick(Self);
end; end;
end; end;
for i := 0 to frmMain.tbxEdit.Items.Count -1 do begin for i := 0 to tbxEdit.Items.Count -1 do begin
if frmMain.tbxEdit.Items[i].ShortCut = eShortcut then begin if tbxEdit.Items[i].ShortCut = eShortcut then begin
Handled := True; Handled := True;
frmMain.tbxEdit.Items[i].OnClick(Self); tbxEdit.Items[i].OnClick(Self);
end;
end;
for i := 0 to ppmEditor.Items.Count -1 do begin
if ppmEditor.Items[i].ShortCut = eShortcut then begin
Handled := True;
ppmEditor.Items[i].OnClick(Self);
end; end;
end; end;
Application.ProcessMessages; Application.ProcessMessages;
if Handled then exit;
// Control chars // Control chars
if (eShortcut = Shortcut(Ord('E'), [ssCtrl])) then if (eShortcut = Shortcut(Ord('E'), [ssCtrl])) then
Handled := True; Handled := True;