cleanup, smaller layout fixes and fixed issue #1861

git-svn-id: trunk@9599 -
This commit is contained in:
mattias 2006-07-12 20:52:07 +00:00
parent ea32192248
commit d7bb813f84
7 changed files with 117 additions and 102 deletions

View File

@ -1,41 +1,51 @@
object CondForm: TCondForm
ActiveControl = ListBox
Caption = 'Conditional Defines'
ClientHeight = 239
ClientWidth = 218
ClientHeight = 238
ClientWidth = 213
OnClose = CondFormCLOSE
OnCreate = CondFormCREATE
OnDestroy = FormDestroy
OnShow = FormShow
Position = poMainFormCenter
PixelsPerInch = 95
Position = poDesktopCenter
TextHeight = 13
HorzScrollBar.Page = 219
HorzScrollBar.Page = 212
HorzScrollBar.Range = 186
VertScrollBar.Page = 240
VertScrollBar.Page = 237
VertScrollBar.Range = 157
Left = 776
Height = 239
Top = 158
Width = 218
object Label1: TLabel
Left = 360
Height = 238
Top = 344
Width = 213
object FirstLabel: TLabel
Caption = '&First test'
Color = clNone
FocusControl = FirstTest
ParentColor = False
Left = 6
Height = 13
Top = 2
Width = 50
Width = 57
end
object Label2: TLabel
object SecondLabel: TLabel
BorderSpacing.Top = 6
Caption = '&Second test'
Color = clNone
FocusControl = SecondTest
ParentColor = False
AnchorSideTop.Control = FirstTest
AnchorSideTop.Side = asrBottom
Left = 6
Height = 13
Top = 34
Width = 73
Top = 42
Width = 76
end
object FirstTest: TComboBox
Anchors = [akTop, akLeft, akRight]
AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
ItemHeight = 13
ItemIndex = 0
Items.Strings = (
'MSWINDOWS'
'UNIX'
@ -52,25 +62,32 @@ object CondForm: TCondForm
ParentCtl3D = False
TabOrder = 0
Text = 'MSWINDOWS'
AnchorSideTop.Control = FirstLabel
AnchorSideTop.Side = asrBottom
Left = 5
Height = 21
Top = 14
Width = 123
Top = 15
Width = 118
end
object ListBox: TListBox
Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Top = 6
ItemHeight = 13
OnKeyDown = ListBoxKeyDown
TabOrder = 2
TopIndex = -1
AnchorSideTop.Control = SecondTest
AnchorSideTop.Side = asrBottom
Left = 5
Height = 160
Top = 72
Width = 123
Height = 149
Top = 82
Width = 118
end
object SecondTest: TComboBox
Anchors = [akTop, akLeft, akRight]
AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
ItemHeight = 13
ItemIndex = 0
Items.Strings = (
'NONE'
'ELSE'
@ -79,70 +96,68 @@ object CondForm: TCondForm
ParentCtl3D = False
TabOrder = 1
Text = 'NONE'
AnchorSideTop.Control = SecondLabel
AnchorSideTop.Side = asrBottom
Left = 5
Height = 21
Top = 47
Width = 123
Top = 55
Width = 118
end
object AddBtn: TBitBtn
Anchors = [akTop, akRight]
OnClick = AddBtnClick
Anchors = [akTop, akRight]
Caption = '&Add'
TabOrder = 3
NumGlyphs = 0
OnClick = AddBtnClick
Left = 134
TabOrder = 3
Left = 129
Height = 25
Top = 6
Width = 82
end
object RemoveBtn: TBitBtn
Anchors = [akTop, akRight]
OnClick = RemoveBtnClick
Anchors = [akTop, akRight]
Caption = '&Remove'
TabOrder = 5
NumGlyphs = 0
OnClick = RemoveBtnClick
Left = 134
TabOrder = 5
Left = 129
Height = 25
Top = 64
Width = 82
end
object OkBtn: TBitBtn
Anchors = [akTop, akRight]
Caption = '&OK'
Default = True
Kind = bkOK
ModalResult = 1
Anchors = [akTop, akRight]
Default = True
ModalResult = 1
Caption = '&OK'
NumGlyphs = 0
TabOrder = 6
Left = 134
Left = 129
Height = 25
Top = 95
Width = 82
end
object BitBtn1: TBitBtn
Anchors = [akTop, akRight]
Kind = bkCancel
ModalResult = 2
Anchors = [akTop, akRight]
ModalResult = 2
Cancel = True
Caption = 'Cancel'
Kind = bkCancel
ModalResult = 2
NumGlyphs = 0
TabOrder = 7
Left = 134
Left = 129
Height = 25
Top = 125
Width = 82
end
object AddInverse: TButton
Anchors = [akTop, akRight]
BorderSpacing.InnerBorder = 4
Caption = 'Add Inverse'
TabOrder = 4
OnClick = AddInverseCLICK
Left = 134
TabOrder = 4
Left = 129
Height = 25
Top = 34
Width = 82

View File

@ -1,41 +1,50 @@
{ This is an automatically generated lazarus resource file }
LazarusResources.Add('TCondForm','FORMDATA',[
'TPF0'#9'TCondForm'#8'CondForm'#13'ActiveControl'#7#7'ListBox'#7'Caption'#6#19
+'Conditional Defines'#12'ClientHeight'#3#239#0#11'ClientWidth'#3#218#0#7'OnC'
+'Conditional Defines'#12'ClientHeight'#3#238#0#11'ClientWidth'#3#213#0#7'OnC'
+'lose'#7#13'CondFormCLOSE'#8'OnCreate'#7#14'CondFormCREATE'#9'OnDestroy'#7#11
+'FormDestroy'#6'OnShow'#7#8'FormShow'#8'Position'#7#16'poMainFormCenter'#10
+'TextHeight'#2#13#18'HorzScrollBar.Page'#3#219#0#19'HorzScrollBar.Range'#3
+#186#0#18'VertScrollBar.Page'#3#240#0#19'VertScrollBar.Range'#3#157#0#4'Left'
+#3#8#3#6'Height'#3#239#0#3'Top'#3#158#0#5'Width'#3#218#0#0#6'TLabel'#6'Label'
+'1'#7'Caption'#6#11'&First test'#12'FocusControl'#7#9'FirstTest'#4'Left'#2#6
+#6'Height'#2#13#3'Top'#2#2#5'Width'#2'2'#0#0#6'TLabel'#6'Label2'#7'Caption'#6
+#12'&Second test'#12'FocusControl'#7#10'SecondTest'#4'Left'#2#6#6'Height'#2
+#13#3'Top'#2'"'#5'Width'#2'I'#0#0#9'TComboBox'#9'FirstTest'#7'Anchors'#11#5
+'akTop'#6'akLeft'#7'akRight'#0#10'ItemHeight'#2#13#13'Items.Strings'#1#6#9'M'
+'SWINDOWS'#6#4'UNIX'#6#5'LINUX'#6#5'WIN32'#6#4'CLX_'#6#4'LCL_'#6#4'VCL_'#6#3
+'FormDestroy'#6'OnShow'#7#8'FormShow'#13'PixelsPerInch'#2'_'#8'Position'#7#15
+'poDesktopCenter'#10'TextHeight'#2#13#18'HorzScrollBar.Page'#3#212#0#19'Horz'
+'ScrollBar.Range'#3#186#0#18'VertScrollBar.Page'#3#237#0#19'VertScrollBar.Ra'
+'nge'#3#157#0#4'Left'#3'h'#1#6'Height'#3#238#0#3'Top'#3'X'#1#5'Width'#3#213#0
+#0#6'TLabel'#10'FirstLabel'#7'Caption'#6#11'&First test'#5'Color'#7#6'clNone'
+#12'FocusControl'#7#9'FirstTest'#11'ParentColor'#8#4'Left'#2#6#6'Height'#2#13
+#3'Top'#2#2#5'Width'#2'9'#0#0#6'TLabel'#11'SecondLabel'#17'BorderSpacing.Top'
+#2#6#7'Caption'#6#12'&Second test'#5'Color'#7#6'clNone'#12'FocusControl'#7#10
+'SecondTest'#11'ParentColor'#8#21'AnchorSideTop.Control'#7#9'FirstTest'#18'A'
+'nchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#13#3'Top'#2'*'#5
+'Width'#2'L'#0#0#9'TComboBox'#9'FirstTest'#7'Anchors'#11#5'akTop'#6'akLeft'#7
+'akRight'#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearc'
+'hAscending'#0#10'ItemHeight'#2#13#9'ItemIndex'#2#0#13'Items.Strings'#1#6#9
+'MSWINDOWS'#6#4'UNIX'#6#5'LINUX'#6#5'WIN32'#6#4'CLX_'#6#4'LCL_'#6#4'VCL_'#6#3
+'FPC'#6#5'KYLIX'#6#6'VER1_0'#0#9'MaxLength'#2#0#11'ParentCtl3D'#8#8'TabOrder'
+#2#0#4'Text'#6#9'MSWINDOWS'#4'Left'#2#5#6'Height'#2#21#3'Top'#2#14#5'Width'#2
+'{'#0#0#8'TListBox'#7'ListBox'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8
+'akBottom'#0#10'ItemHeight'#2#13#9'OnKeyDown'#7#14'ListBoxKeyDown'#8'TabOrde'
+'r'#2#2#8'TopIndex'#2#255#4'Left'#2#5#6'Height'#3#160#0#3'Top'#2'H'#5'Width'
+#2'{'#0#0#9'TComboBox'#10'SecondTest'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akR'
+'ight'#0#10'ItemHeight'#2#13#13'Items.Strings'#1#6#4'NONE'#6#4'ELSE'#0#9'Max'
+'Length'#2#0#11'ParentCtl3D'#8#8'TabOrder'#2#1#4'Text'#6#4'NONE'#4'Left'#2#5
+#6'Height'#2#21#3'Top'#2'/'#5'Width'#2'{'#0#0#7'TBitBtn'#6'AddBtn'#7'Anchors'
+#11#5'akTop'#7'akRight'#0#7'OnClick'#7#11'AddBtnClick'#7'Anchors'#11#5'akTop'
+#7'akRight'#0#7'Caption'#6#4'&Add'#8'TabOrder'#2#3#7'OnClick'#7#11'AddBtnCli'
+'ck'#4'Left'#3#134#0#6'Height'#2#25#3'Top'#2#6#5'Width'#2'R'#0#0#7'TBitBtn'#9
+'RemoveBtn'#7'Anchors'#11#5'akTop'#7'akRight'#0#7'OnClick'#7#14'RemoveBtnCli'
+'ck'#7'Anchors'#11#5'akTop'#7'akRight'#0#7'Caption'#6#7'&Remove'#8'TabOrder'
+#2#5#7'OnClick'#7#14'RemoveBtnClick'#4'Left'#3#134#0#6'Height'#2#25#3'Top'#2
+'@'#5'Width'#2'R'#0#0#7'TBitBtn'#5'OkBtn'#7'Anchors'#11#5'akTop'#7'akRight'#0
+#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#7'Anchors'#11#5'akTop'#7
+'akRight'#0#7'Default'#9#11'ModalResult'#2#1#7'Caption'#6#3'&OK'#8'TabOrder'
+#2#6#4'Left'#3#134#0#6'Height'#2#25#3'Top'#2'_'#5'Width'#2'R'#0#0#7'TBitBtn'
+#7'BitBtn1'#7'Anchors'#11#5'akTop'#7'akRight'#0#4'Kind'#7#8'bkCancel'#11'Mod'
+'alResult'#2#2#7'Anchors'#11#5'akTop'#7'akRight'#0#11'ModalResult'#2#2#6'Can'
+'cel'#9#7'Caption'#6#6'Cancel'#8'TabOrder'#2#7#4'Left'#3#134#0#6'Height'#2#25
+#3'Top'#2'}'#5'Width'#2'R'#0#0#7'TButton'#10'AddInverse'#7'Anchors'#11#5'akT'
+'op'#7'akRight'#0#7'Caption'#6#11'Add Inverse'#8'TabOrder'#2#4#7'OnClick'#7
+#15'AddInverseCLICK'#4'Left'#3#134#0#6'Height'#2#25#3'Top'#2'"'#5'Width'#2'R'
+#8'HelpType'#7#9'htKeyword'#0#0#0
+#2#0#4'Text'#6#9'MSWINDOWS'#21'AnchorSideTop.Control'#7#10'FirstLabel'#18'An'
+'chorSideTop.Side'#7#9'asrBottom'#4'Left'#2#5#6'Height'#2#21#3'Top'#2#15#5'W'
+'idth'#2'v'#0#0#8'TListBox'#7'ListBox'#7'Anchors'#11#5'akTop'#6'akLeft'#7'ak'
+'Right'#8'akBottom'#0#17'BorderSpacing.Top'#2#6#10'ItemHeight'#2#13#9'OnKeyD'
+'own'#7#14'ListBoxKeyDown'#8'TabOrder'#2#2#8'TopIndex'#2#255#21'AnchorSideTo'
+'p.Control'#7#10'SecondTest'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2
+#5#6'Height'#3#149#0#3'Top'#2'R'#5'Width'#2'v'#0#0#9'TComboBox'#10'SecondTes'
+'t'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22
+'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#10'ItemHeight'#2#13#9'It'
+'emIndex'#2#0#13'Items.Strings'#1#6#4'NONE'#6#4'ELSE'#0#9'MaxLength'#2#0#11
+'ParentCtl3D'#8#8'TabOrder'#2#1#4'Text'#6#4'NONE'#21'AnchorSideTop.Control'#7
+#11'SecondLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#5#6'Height'
+#2#21#3'Top'#2'7'#5'Width'#2'v'#0#0#7'TBitBtn'#6'AddBtn'#7'Anchors'#11#5'akT'
+'op'#7'akRight'#0#7'Caption'#6#4'&Add'#9'NumGlyphs'#2#0#7'OnClick'#7#11'AddB'
+'tnClick'#8'TabOrder'#2#3#4'Left'#3#129#0#6'Height'#2#25#3'Top'#2#6#5'Width'
+#2'R'#0#0#7'TBitBtn'#9'RemoveBtn'#7'Anchors'#11#5'akTop'#7'akRight'#0#7'Capt'
+'ion'#6#7'&Remove'#9'NumGlyphs'#2#0#7'OnClick'#7#14'RemoveBtnClick'#8'TabOrd'
+'er'#2#5#4'Left'#3#129#0#6'Height'#2#25#3'Top'#2'@'#5'Width'#2'R'#0#0#7'TBit'
+'Btn'#5'OkBtn'#7'Anchors'#11#5'akTop'#7'akRight'#0#7'Caption'#6#3'&OK'#7'Def'
+'ault'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2
+#6#4'Left'#3#129#0#6'Height'#2#25#3'Top'#2'_'#5'Width'#2'R'#0#0#7'TBitBtn'#7
+'BitBtn1'#7'Anchors'#11#5'akTop'#7'akRight'#0#6'Cancel'#9#7'Caption'#6#6'Can'
+'cel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'
+#2#7#4'Left'#3#129#0#6'Height'#2#25#3'Top'#2'}'#5'Width'#2'R'#0#0#7'TButton'
+#10'AddInverse'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBo'
+'rder'#2#4#7'Caption'#6#11'Add Inverse'#7'OnClick'#7#15'AddInverseCLICK'#8'T'
+'abOrder'#2#4#4'Left'#3#129#0#6'Height'#2#25#3'Top'#2'"'#5'Width'#2'R'#8'Hel'
+'pType'#7#9'htKeyword'#0#0#0
]);

View File

@ -36,8 +36,8 @@ interface
to:
OnCreate := {$IFDEF FPC} @ {$ENDIF} CreateHandler
select @ and then use Edit, Insert $IFDEF (default shortcut Ctrl+Shift+D),
select "FPC,NONE" and hit rerurn. If you select one or more complete lines then the
conditional defines are put on sepearate lines as in:
select "FPC,NONE" and hit return. If you select one or more complete lines
then the conditional defines are put on sepearate lines as in:
{$IFDEF DEBUG}
Writeln('State= ', State)
{$ENDIF}
@ -45,10 +45,11 @@ interface
MSWINDOWS,UNIX => {$IFDEF MSWINDOWS} ... {$ENDIF} {$IFDEF UNIX} ... {$ENDIF}
FPC,ELSE => {$IFDEF FPC} ... {$ELSE} ... {$ENDIF}
DEBUG,NONE => {$IFDEF DEBUG} ... {$ENDIF}
This tool is most useful when you need to put several identical conditionals in a file,
You can add to the possible conditionals by selecting or typing the required symbols
in "First test" and /or "Second test" and using the Add button.
Your additons are saved in the condef.xml file in the lazarus configuration directory.
This tool is most useful when you need to put several identical conditionals
in a file, You can add to the possible conditionals by selecting or typing
the required symbols in "First test" and /or "Second test" and using the
Add button. Your additons are saved in the condef.xml file in the lazarus
configuration directory.
*)
uses
@ -63,8 +64,8 @@ type
AddInverse: TButton;
FirstTest: TComboBox;
ListBox: TListBox;
Label1: TLabel;
Label2: TLabel;
FirstLabel: TLabel;
SecondLabel: TLabel;
SecondTest: TComboBox;
AddBtn: TBitBtn;
RemoveBtn: TBitBtn;

View File

@ -397,7 +397,6 @@ begin
Parent:=OptionsGroupBox;
SetBounds(5,2,400,20);
Caption:=lisEdtExtToolScanOutputForFreePascalCompilerMessages;
Visible:=true;
end;
OptionScanOutputForMakeMessagesCheckBox:=TCheckBox.Create(Self);
@ -407,7 +406,6 @@ begin
SetBounds(5,OptionScanOutputForFPCMessagesCheckBox.Top
+OptionScanOutputForFPCMessagesCheckBox.Height+4,400,20);
Caption:=lisEdtExtToolScanOutputForMakeMessages;
Visible:=true;
end;
KeyGroupBox:=TGroupBox.Create(Self);
@ -419,7 +417,6 @@ begin
Top:=OptionsGroupBox.Top+OptionsGroupBox.Height+12;
Width:=Self.ClientWidth-Left-Left;
Height:=50;
Visible:=true;
end;
KeyCtrlCheckBox:=TCheckBox.Create(Self);
@ -431,7 +428,6 @@ begin
Top:=2;
Width:=50;
Height:=20;
Visible:=true;
end;
KeyAltCheckBox:=TCheckBox.Create(Self);
@ -443,7 +439,6 @@ begin
Top:=KeyCtrlCheckBox.Top;
Height:=20;
Width:=KeyCtrlCheckBox.Width;
Visible:=true;
end;
KeyShiftCheckBox:=TCheckBox.Create(Self);
@ -455,7 +450,6 @@ begin
Top:=KeyCtrlCheckBox.Top;
Height:=20;
Width:=KeyCtrlCheckBox.Width;
Visible:=true;
end;
KeyComboBox:=TComboBox.Create(Self);
@ -474,7 +468,6 @@ begin
end;
Items.EndUpdate;
ItemIndex:=0;
Visible:=true;
end;
KeyGrabButton:=TButton.Create(Self);
@ -487,7 +480,6 @@ begin
Caption:=srkmGrabKey;
Name:='KeyGrabButton';
OnClick:=@KeyGrabButtonClick;
Visible:=true;
end;
MacrosGroupbox:=TGroupbox.Create(Self);
@ -528,6 +520,7 @@ begin
SetBounds(270,Self.ClientHeight-40,100,25);
Caption:=lisLazBuildOk;
OnClick:=@OkButtonClick;
Default:=true;
end;
CancelButton:=TButton.Create(Self);
@ -537,6 +530,7 @@ begin
SetBounds(390,OkButton.Top,100,25);
Caption:=dlgCancel;
OnClick:=@CancelButtonClick;
Cancel:=true;
end;
OnResize:=@ExternalToolOptionDlgResize;

View File

@ -312,9 +312,7 @@ var
OldTop: Integer;
OldWidth: Integer;
OldHeight: Integer;
CurBounds: TRect;
NewBounds: TRect;
CurClientSize: TPoint;
function UpdatePosSizeChanged: boolean;
begin
@ -2935,7 +2933,7 @@ Procedure TControl.MouseDown(Button: TMouseButton; Shift: TShiftState;
var
P: TPoint;
begin
if (Button in [mbLeft,mbRight]) and Dragging and (DragObject<>nil) then begin
if (Button in [mbLeft,mbRight]) and (DragObject<>nil) then begin
P:=ClientToScreen(Point(X,Y));
DragObject.MouseDown(Button,Shift,P.X,P.Y);
end;
@ -2998,7 +2996,7 @@ end;
------------------------------------------------------------------------------}
procedure TControl.CaptureChanged;
begin
if Dragging and (DragObject<>nil) then DragObject.CaptureChanged(Self);
if (DragObject<>nil) then DragObject.CaptureChanged(Self);
end;
{------------------------------------------------------------------------------

View File

@ -73,7 +73,7 @@ end;
procedure TDragObject.CaptureChanged(OldCaptureControl: TControl);
begin
DragDone(False);
DragDone(OldCaptureControl.Dragging);
end;
procedure TDragObject.KeyDown(var Key: Word; Shift: TShiftState);

View File

@ -40,7 +40,7 @@ interface
uses
Classes, SysUtils, Forms, Controls, StdCtrls, ComCtrls, Buttons, LResources,
Graphics, LCLType, LCLProc, Menus, Dialogs, FileUtil,
AVL_Tree, Laz_XMLCfg, LazIDEIntf, ProjectIntf, FormEditingIntf,
HelpIntfs, AVL_Tree, Laz_XMLCfg, LazIDEIntf, ProjectIntf, FormEditingIntf,
IDEProcs, LazConf, LazarusIDEStrConsts, IDEOptionDefs, IDEDefs,
CompilerOptions, CompilerOptionsDlg, ComponentReg, PackageDefs, PkgOptionsDlg,
AddToPackageDlg, PkgVirtualUnitEditor, PackageSystem;
@ -599,9 +599,7 @@ end;
procedure TPackageEditorForm.HelpBitBtnClick(Sender: TObject);
begin
MessageDlg(lisPkgEdOnlineHelpNotYetImplemented,
lisPkgEdRightClickOnTheItemsTreeToGetThePopupmenuWithAllAv,
mtInformation,[mbOk],0);
Application.ShowHelpForObjecct(HelpBitBtn)
end;
procedure TPackageEditorForm.InstallBitBtnClick(Sender: TObject);