fixed TControl.Show in design mode

git-svn-id: trunk@3918 -
This commit is contained in:
mattias 2003-03-13 10:11:41 +00:00
parent d382db658a
commit 20d0673089
7 changed files with 82 additions and 63 deletions

View File

@ -1,41 +1,44 @@
object AboutForm: TAboutForm
Caption = 'About Lazarus'
ClientHeight = 245
ClientWidth = 577
Position = poscreencenter
HorzScrollBar.Page = 578
VertScrollBar.Page = 246
Left = 351
Height = 245
Top = 389
Width = 577
object Memo1: TMemo
Color = -2147483643
ReadOnly = True
ScrollBars = ssautoboth
WordWrap = True
Left = 225
Height = 219
Top = 14
Width = 339
CAPTION = 'About Lazarus'
CLIENTHEIGHT = 245
CLIENTWIDTH = 577
POSITION = poscreencenter
HORZSCROLLBAR.PAGE = 578
VERTSCROLLBAR.PAGE = 246
LEFT = 351
HEIGHT = 245
TOP = 389
WIDTH = 577
object Memo1: TMEMO
ANCHORS = [aktop, akleft]
COLOR = -2147483643
READONLY = True
SCROLLBARS = ssautoboth
WORDWRAP = True
LEFT = 225
HEIGHT = 219
TOP = 14
WIDTH = 339
end
object Button1: TButton
ModalResult = 1
Caption = 'Close'
TabOrder = 1
Left = 78
Height = 25
Top = 184
Width = 75
object Button1: TBUTTON
ANCHORS = [aktop, akleft]
MODALRESULT = 1
CAPTION = 'Close'
TABORDER = 1
LEFT = 78
HEIGHT = 25
TOP = 184
WIDTH = 75
end
object Label1: TLabel
Alignment = tacenter
Caption = 'Version #:'
Color = -2147483643
Layout = tltop
Left = 14
Height = 17
Top = 6
Width = 200
object Label1: TLABEL
ALIGNMENT = tacenter
ANCHORS = [aktop, akleft]
CAPTION = 'Version #:'
COLOR = -2147483643
LAYOUT = tltop
LEFT = 14
HEIGHT = 17
TOP = 6
WIDTH = 200
end
end

View File

@ -1,15 +1,16 @@
{ This is an automatically generated lazarus resource file }
LazarusResources.Add('TAboutForm','FORMDATA',[
'TPF0'#10'TAboutForm'#9'AboutForm'#7'Caption'#6#13'About Lazarus'#12'ClientHe'
+'ight'#3#245#0#11'ClientWidth'#3'A'#2#8'Position'#7#14'poscreencenter'#18'Ho'
+'rzScrollBar.Page'#3'B'#2#18'VertScrollBar.Page'#3#246#0#4'Left'#3'_'#1#6'He'
+'ight'#3#245#0#3'Top'#3#133#1#5'Width'#3'A'#2#0#5'TMemo'#5'Memo1'#5'Color'#4
+#5#0#0#128#8'ReadOnly'#9#10'ScrollBars'#7#10'ssautoboth'#8'WordWrap'#9#4'Lef'
+'t'#3#225#0#6'Height'#3#219#0#3'Top'#2#14#5'Width'#3'S'#1#0#0#7'TButton'#7'B'
+'utton1'#11'ModalResult'#2#1#7'Caption'#6#5'Close'#8'TabOrder'#2#1#4'Left'#2
+'N'#6'Height'#2#25#3'Top'#3#184#0#5'Width'#2'K'#0#0#6'TLabel'#6'Label1'#9'Al'
+'ignment'#7#8'tacenter'#7'Caption'#6#10'Version #:'#5'Color'#4#5#0#0#128#6'L'
+'ayout'#7#5'tltop'#4'Left'#2#14#6'Height'#2#17#3'Top'#2#6#5'Width'#3#200#0#0
+#0#0
'TPF0'#10'TAboutForm'#9'AboutForm'#7'CAPTION'#6#13'About Lazarus'#12'CLIENTHE'
+'IGHT'#3#245#0#11'CLIENTWIDTH'#3'A'#2#8'POSITION'#7#14'poscreencenter'#18'HO'
+'RZSCROLLBAR.PAGE'#3'B'#2#18'VERTSCROLLBAR.PAGE'#3#246#0#4'LEFT'#3'_'#1#6'HE'
+'IGHT'#3#245#0#3'TOP'#3#133#1#5'WIDTH'#3'A'#2#0#5'TMEMO'#5'Memo1'#7'ANCHORS'
+#11#5'aktop'#6'akleft'#0#5'COLOR'#4#5#0#0#128#8'READONLY'#9#10'SCROLLBARS'#7
+#10'ssautoboth'#8'WORDWRAP'#9#4'LEFT'#3#225#0#6'HEIGHT'#3#219#0#3'TOP'#2#14#5
+'WIDTH'#3'S'#1#0#0#7'TBUTTON'#7'Button1'#7'ANCHORS'#11#5'aktop'#6'akleft'#0
+#11'MODALRESULT'#2#1#7'CAPTION'#6#5'Close'#8'TABORDER'#2#1#4'LEFT'#2'N'#6'HE'
+'IGHT'#2#25#3'TOP'#3#184#0#5'WIDTH'#2'K'#0#0#6'TLABEL'#6'Label1'#9'ALIGNMENT'
+#7#8'tacenter'#7'ANCHORS'#11#5'aktop'#6'akleft'#0#7'CAPTION'#6#10'Version #:'
+#5'COLOR'#4#5#0#0#128#6'LAYOUT'#7#5'tltop'#4'LEFT'#2#14#6'HEIGHT'#2#17#3'TOP'
+#2#6#5'WIDTH'#3#200#0#0#0#0
]);

View File

@ -26,7 +26,7 @@ interface
uses
Classes, SysUtils, Forms, Controls, Graphics, Dialogs, LResources, StdCtrls,
Buttons, ExtCtrls, LazarusIDEStrConsts;
Buttons, ExtCtrls, IDEProcs, LazarusIDEStrConsts;
type
TAboutForm = class(TForm)
@ -68,10 +68,11 @@ begin
FPixmap := TPixmap.Create;
FPixmap.LoadFromLazarusResource('lazarus_about_logo');
Label1.Caption := 'Version #: 0.8.5a';
Memo1.Lines.Text:=lisAboutLazarusMsg;
Label1.Caption := lisVersion+' #: '+lisLazarusVersionString;
Memo1.Lines.Text:=Format(lisAboutLazarusMsg,[EmptyLine,EmptyLine,EmptyLine]);
Button1.Caption:=lisClose;
OnResize:=@AboutFormResize;
end;

View File

@ -41,6 +41,9 @@ uses
Classes, SysUtils;
resourcestring
// version
lisLazarusVersionString = '0.8.5 alpha';
// command line help
lisCmdLineHlpHeader = 'lazarus [options] <project-filename>' + LineEnding
+ LineEnding
@ -235,20 +238,22 @@ resourcestring
lisCompilerError = 'Compiler error';
lisPlzCheckTheCompilerName = 'Please check the compiler name';
lisAboutLazarus = 'About Lazarus';
lisVersion = 'Version';
lisClose = 'Close';
lisAboutLazarusMsg =
'License: GPL/LGPL'
+LineEnding+LineEnding
+'%s'
+'Lazarus are the class libraries for Free Pascal that '
+'emulate Delphi. Free Pascal is a (L)GPL''ed compiler that '
+'runs on Linux, Win32, OS/2, 68K and more. Free Pascal '
+'is designed to be able to understand and compile Delphi '
+'syntax, which is of course OOP.'
+LineEnding+LineEnding
+'%s'
+'Lazarus is the missing part of the puzzle that will allow '
+'you to develop Delphi like programs in all of the above '
+'platforms. The IDE will eventually become a RAD tool like '
+'Delphi.'
+LineEnding+LineEnding
+'%s'
+'As Lazarus is growing we need more developers.';
lisUnitNameAlreadyExistsCap = 'Unitname already in project';
lisUnitNameAlreadyExistsText = 'The unit "%s" already exists.' + LineEnding
@ -962,6 +967,7 @@ resourcestring
dlgUnitDepBrowse = 'Browse...';
dlgUnitDepRefresh = 'Refresh';
implementation
end.

View File

@ -47,7 +47,7 @@ interface
uses
SysUtils, Classes, FileCtrl, IDEProcs;
{ Config Path Functions }
{ The primary config path is the local or user specific path.
@ -124,6 +124,9 @@ end.
{
$Log$
Revision 1.14 2003/03/13 10:11:41 mattias
fixed TControl.Show in design mode
Revision 1.13 2003/02/19 23:17:45 mattias
added warnings when fpc source dir invalid

View File

@ -47,9 +47,6 @@ uses
MsgView, EnvironmentOpts, EditorOptions, IDEComp, FormEditor,
KeyMapping, IDEProcs, UnitEditor, Debugger, IDEOptionDefs, CodeToolsDefines;
const
Version_String = '0.8.5 alpha';
type
// The IDE is at anytime in a specific state:
TIDEToolStatus = (

View File

@ -925,10 +925,7 @@ Begin
ControlStyle := ControlStyle + [csAcceptsControls, csCaptureMouse,
csClickEvents, csSetCaption, csDoubleClicks];
Left := 0;
Top := 0;
Width := 320;
Height := 240;
SetBounds(0,0,320,240);
Visible := False;
ParentColor := False;
ParentFont := False;
@ -1234,6 +1231,14 @@ end;
{ TCustomForm ShowModal }
{------------------------------------------------------------------------------}
Function TCustomForm.ShowModal : Integer;
procedure RaiseShowModalImpossible;
begin
writeln('TCustomForm.ShowModal Visible=',Visible,' Enabled=',Enabled,
' fsModal=',fsModal in FFormState,' MDIChild=',FormStyle = fsMDIChild);
raise EInvalidOperation.Create('TCustomForm.ShowModal impossible ');
end;
var
//WindowList: Pointer;
SaveFocusCount: Integer;
@ -1245,7 +1250,7 @@ begin
//writeln('[TCustomForm.ShowModal] START ',Classname);
if Visible or not Enabled or (fsModal in FFormState)
or (FormStyle = fsMDIChild) then
raise EInvalidOperation.Create('TCustomForm.ShowModal impossible');
RaiseShowModalImpossible;
// Kill capture when opening another dialog
if GetCapture <> 0 then SendMessage(GetCapture,LM_CANCELMODE,0,0);
ReleaseCapture;
@ -1307,6 +1312,9 @@ end;
{ =============================================================================
$Log$
Revision 1.89 2003/03/13 10:11:41 mattias
fixed TControl.Show in design mode
Revision 1.88 2003/03/11 22:56:41 mattias
added visiblechanging