applied patch from Vasily

git-svn-id: trunk@2229 -
This commit is contained in:
mattias 2002-08-17 23:41:09 +00:00
parent 3862245cc3
commit c0a8b03eb1

View File

@ -39,7 +39,7 @@ uses
Classes, LCLType, LCLLinux, Forms, Controls, LMessages, GraphType, Graphics, Classes, LCLType, LCLLinux, Forms, Controls, LMessages, GraphType, Graphics,
Dialogs, ControlSelection, CustomFormEditor, UnitEditor, CompReg, Menus, Dialogs, ControlSelection, CustomFormEditor, UnitEditor, CompReg, Menus,
AlignCompsDlg, SizeCompsDlg, ScaleCompsDlg, ExtCtrls, EnvironmentOpts, AlignCompsDlg, SizeCompsDlg, ScaleCompsDlg, ExtCtrls, EnvironmentOpts,
DesignerProcs, PropEdits, ComponentEditors, KeyMapping; DesignerProcs, PropEdits, ComponentEditors, KeyMapping,LazarusIDEStrConsts;
type type
TDesigner = class; TDesigner = class;
@ -745,7 +745,7 @@ var
and (ControlSelection.SelectionForm<>nil) and (ControlSelection.SelectionForm<>nil)
and (ControlSelection.SelectionForm<>Form) and (ControlSelection.SelectionForm<>Form)
then begin then begin
MessageDlg('Invalid mutliselection', MessageDlg(fdInvalidMutliselectionCap,
'Multiselected components must be of a single form.', 'Multiselected components must be of a single form.',
mtInformation,[mbOk],0); mtInformation,[mbOk],0);
exit; exit;
@ -1578,7 +1578,7 @@ begin
FAlignMenuItem := TMenuItem.Create(FPopupMenu); FAlignMenuItem := TMenuItem.Create(FPopupMenu);
with FAlignMenuItem do begin with FAlignMenuItem do begin
Caption := 'Align'; Caption := fdmAlignWord;
OnClick := @OnAlignPopupMenuClick; OnClick := @OnAlignPopupMenuClick;
Enabled := CompsAreSelected; Enabled := CompsAreSelected;
end; end;
@ -1586,7 +1586,7 @@ begin
FMirrorHorizontalMenuItem := TMenuItem.Create(FPopupMenu); FMirrorHorizontalMenuItem := TMenuItem.Create(FPopupMenu);
with FMirrorHorizontalMenuItem do begin with FMirrorHorizontalMenuItem do begin
Caption := 'Mirror horizontal'; Caption := fdmMirrorHorizontal;
OnClick := @OnMirrorHorizontalPopupMenuClick; OnClick := @OnMirrorHorizontalPopupMenuClick;
Enabled := CompsAreSelected; Enabled := CompsAreSelected;
end; end;
@ -1594,7 +1594,7 @@ begin
FMirrorVerticalMenuItem := TMenuItem.Create(FPopupMenu); FMirrorVerticalMenuItem := TMenuItem.Create(FPopupMenu);
with FMirrorVerticalMenuItem do begin with FMirrorVerticalMenuItem do begin
Caption := 'Mirror vertical'; Caption := fdmMirrorVertical;
OnClick := @OnMirrorVerticalPopupMenuClick; OnClick := @OnMirrorVerticalPopupMenuClick;
Enabled := CompsAreSelected; Enabled := CompsAreSelected;
end; end;
@ -1602,7 +1602,7 @@ begin
FScaleMenuItem := TMenuItem.Create(FPopupMenu); FScaleMenuItem := TMenuItem.Create(FPopupMenu);
with FScaleMenuItem do begin with FScaleMenuItem do begin
Caption := 'Scale'; Caption := fdmScaleWord;
OnClick := @OnScalePopupMenuClick; OnClick := @OnScalePopupMenuClick;
Enabled := CompsAreSelected and not OnlyNonVisualCompsAreSelected; Enabled := CompsAreSelected and not OnlyNonVisualCompsAreSelected;
end; end;
@ -1610,7 +1610,7 @@ begin
FSizeMenuItem := TMenuItem.Create(FPopupMenu); FSizeMenuItem := TMenuItem.Create(FPopupMenu);
with FSizeMenuItem do begin with FSizeMenuItem do begin
Caption := 'Size'; Caption := fdmSizeWord;
OnClick := @OnSizePopupMenuClick; OnClick := @OnSizePopupMenuClick;
Enabled := CompsAreSelected and not OnlyNonVisualCompsAreSelected; Enabled := CompsAreSelected and not OnlyNonVisualCompsAreSelected;
end; end;
@ -1620,7 +1620,7 @@ begin
FBringToFrontMenuItem := TMenuItem.Create(FPopupMenu); FBringToFrontMenuItem := TMenuItem.Create(FPopupMenu);
with FBringToFrontMenuItem do begin with FBringToFrontMenuItem do begin
Caption:= 'Bring to front'; Caption:= fdmBringTofront;
OnClick:= @OnBringToFrontMenuClick; OnClick:= @OnBringToFrontMenuClick;
Enabled:= CompsAreSelected; Enabled:= CompsAreSelected;
end; end;
@ -1628,7 +1628,7 @@ begin
FSendToBackMenuItem:= TMenuItem.Create(FPopupMenu); FSendToBackMenuItem:= TMenuItem.Create(FPopupMenu);
with FSendToBackMenuItem do begin with FSendToBackMenuItem do begin
Caption:= 'Send to back'; Caption:= fdmSendtoback;
OnClick:= @OnSendToBackMenuClick; OnClick:= @OnSendToBackMenuClick;
Enabled:= CompsAreSelected; Enabled:= CompsAreSelected;
end; end;
@ -1638,7 +1638,7 @@ begin
FDeleteSelectionMenuItem:=TMenuItem.Create(FPopupMenu); FDeleteSelectionMenuItem:=TMenuItem.Create(FPopupMenu);
with FDeleteSelectionMenuItem do begin with FDeleteSelectionMenuItem do begin
Caption:= 'Delete selection'; Caption:= fdmDeleteSelection;
OnClick:=@OnDeleteSelectionMenuClick; OnClick:=@OnDeleteSelectionMenuClick;
Enabled:= ControlSelIsNotEmpty and (not FormIsSelected); Enabled:= ControlSelIsNotEmpty and (not FormIsSelected);
end; end;