paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-05 00:37:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

MG: TNoteBook now starts with no Page and TPage has no auto names

Browse Source 
git-svn-id: trunk@2753 -
This commit is contained in:
lazarus 2002-08-18 08:53:33 +00:00
parent 6735048a36
commit 98399ff1a9
9 changed files with 125 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
examples/notebku.pp
View File

@ -72,7 +72,10 @@ begin
Top :=0;
Width := Self.Width;
Height := Self.Height;
Pages.Strings[0] := 'Page 1';
if Pages.PageCount>0 then
Pages.Strings[0] := 'Page 1'
else
Pages.Add('Page 1');
Pages.Add('Page 2');
Pages.Add('Page 3');
Pages.Add('Page 4');
@ -89,7 +92,10 @@ begin
Top := 50;
Width := Parent.Width - 50;
Height := Parent.Height - 80;
Pages.Strings[0] := 'Page 1';
if Pages.PageCount>0 then
Pages.Strings[0] := 'Page 1'
else
Pages.Add('Page 1');
Pages.Add('Page 2');
Pages.Add('Page 3');
Pages.Add('Page 4');
@ -258,6 +264,9 @@ end.
{
$Log$
Revision 1.3 2002/09/02 19:10:27 lazarus
MG: TNoteBook now starts with no Page and TPage has no auto names
Revision 1.2 2002/05/10 06:57:50 lazarus
MG: updated licenses

8
examples/testallform.pp
View File

@ -1955,7 +1955,10 @@ NoteBook1 := TNoteBook.Create(Self); // TODO : Add all properties
Width := 377;
Name := 'NoteBook1';
Align := alNone;
Pages.Strings[0] := 'Page0'; //Pege 0
if Pages.PageCount>0 then
Pages.Strings[0] := 'Page0' //Page 0
else
Pages.Add('Page0');
Pages.Add('Page1');
Pages.Add('Page2');
Pages.Add('Page3');
@ -2576,6 +2579,9 @@ END.
{
$Log$
Revision 1.9 2002/09/02 19:10:28 lazarus
MG: TNoteBook now starts with no Page and TPage has no auto names
Revision 1.8 2002/05/10 06:57:50 lazarus
MG: updated licenses

5
ide/codetoolsdefines.pas
View File

@ -1444,7 +1444,10 @@ begin
CreateWinControl(ValueNoteBook,TNoteBook,'ValueNoteBook',
SelectedItemGroupBox);
with ValueNoteBook do begin
Pages[0]:='Value as Text';
if PageCount>0 then
Pages[0]:='Value as Text'
else
Pages.Add('Value as Text');
Pages.Add('Value as File Paths');
OnPageChanged:=@ValueNoteBookPageChanged;
OnResize:=@ValueNoteBookResize;

5
ide/codetoolsoptions.pas
View File

@ -591,7 +591,10 @@ begin
Name:='NoteBook';
Parent:=Self;
SetBounds(0,0,Self.ClientWidth,Self.ClientHeight-50);
Pages[0]:='General';
if PageCount>0 then
Pages[0]:='General'
else
Pages.Add('General');;
Pages.Add('Code Creation');
Pages.Add('Line Splitting');
Pages.Add('Space');

5
ide/compileroptions.pp
View File

@ -1361,7 +1361,10 @@ begin
nbmain.Left := 0;
// Add the pages
nbMain.Pages.Strings[0] := 'Search Paths';
if nbMain.PageCount>0 then
nbMain.Pages[0] := 'Search Paths'
else
nbMain.Pages.Add('Search Paths');
nbMain.Pages.Add('Parsing');
nbMain.Pages.Add('Code Generation');
nbMain.Pages.Add('Linking');

5
ide/editoroptions.pp
View File

@ -1860,7 +1860,10 @@ begin
Left:=0;
Width:=Self.Width;
Height:=Self.Height-50;
Pages.Strings[0]:='General';
if PageCount>0 then
Pages.Strings[0]:='General'
else
Pages.Add('General');
Pages.Add('Display');
Pages.Add('Key Mappings');
Pages.Add('Color');

5
ide/main.pp
View File

@ -911,7 +911,7 @@ begin
RegCompPage := RegCompList.Pages[i];
if RegCompPage.Name <> '' then
Begin
if (PageCount = 0) then
if (PageCount = 0) and (ComponentNotebook.PageCount>0) then
ComponentNotebook.Pages.Strings[PageCount] := RegCompPage.Name
else
ComponentNotebook.Pages.Add(RegCompPage.Name);
@ -6731,6 +6731,9 @@ end.
{ =============================================================================
$Log$
Revision 1.358 2002/09/02 19:10:25 lazarus
MG: TNoteBook now starts with no Page and TPage has no auto names
Revision 1.357 2002/08/31 11:37:07 lazarus
MG: fixed destroying combobox

5
ide/projectopts.pp
View File

@ -138,7 +138,10 @@ begin
Name:='NoteBook';
Parent:=Self;
SetBounds(0,0,Self.ClientWidth,Self.ClientHeight-50);
Pages[0]:='Application';
if PageCount>0 then
Pages[0]:='Application'
else
Pages.Add('Application');
Pages.Add('Forms');
Pages.Add('Info');
Visible:=true;

143
lcl/include/customnotebook.inc
View File

@ -64,9 +64,9 @@ var
Msg: TLMNotebookEvent;
begin
TPage(fPageList[Index]).Caption := S;
TPage(fPageList[Index]).Name := S;
if FNoteBook.HandleAllocated
if (FNoteBook.HandleAllocated)
and (not (csLoading in FNoteBook.ComponentState))
then begin
Msg.Parent := fNotebook;
Msg.Child := TPage(fPageList[Index]);
@ -116,16 +116,16 @@ begin
if NewPageIndex<fPageList.Count-1 then
// switch current page to next (right) page
inc(NewPageIndex)
else if fPageList.Count>1 then
else if fPageList.Count>0 then
// switch to previous (left) page
dec(NewPageIndex)
else
// deleting last page
// TODO: delete contents but not last page
exit;
NewPageIndex:=-1;
end;
fNoteBook.PageIndex:=NewPageIndex;
if FNoteBook.HandleAllocated then begin
if (FNoteBook.HandleAllocated)
and (not (csLoading in FNoteBook.ComponentState)) then begin
Msg.Parent := fNotebook;
Msg.fCompStyle := fNotebook.fCompStyle;
Msg.Page := Index;
@ -152,7 +152,6 @@ begin
tmpPage := TPage.Create(fNotebook);
with tmpPage do
begin
Name := S;
Parent := fNotebook;
Caption := S;
Visible := true;
@ -171,6 +170,7 @@ begin
fPageList.Insert(Index,APage);
if FNoteBook.HandleAllocated
and (not (csLoading in FNoteBook.ComponentState))
then begin
Msg.Parent := TControl(fNotebook);
Msg.Child := APage;
@ -218,13 +218,10 @@ begin
fAccess := TNBPages.Create(fPageList, Self);
fPageIndex := -1;
{ Create the first notebook page }
fAccess.Add('Default');
fPageIndex := 0;
//Exclude(fComponentStyle, csInheritable);
fPageIndex := -1;
TabPosition := tpTop;
ShowTabs := False;
ShowTabs := True;
end;
{------------------------------------------------------------------------------
@ -253,9 +250,9 @@ begin
CNSendMessage(LM_ADDPAGE, Self, @Msg);
end;
SetShowTabs(FShowTabs);
SetTabPosition(fTabPosition);
SetPageIndex(FPageIndex);
DoSendShowTabs;
DoSendTabPosition;
DoSendPageIndex;
end;
{------------------------------------------------------------------------------
@ -315,7 +312,6 @@ procedure TCustomNotebook.SetImages(const AValue: TImageList);
begin
if FImages=AValue then exit;
FImages:=AValue;
if (csLoading in ComponentState) then exit;
UpdateTabProperties;
end;
@ -325,7 +321,6 @@ begin
if FOptions=AValue then exit;
ChangedOptions:=(FOptions-AValue)+(AValue-FOptions);
FOptions:=AValue;
if (csLoading in ComponentState) then exit;
if nboShowCloseButtons in ChangedOptions then
UpdateTabProperties;
end;
@ -334,22 +329,10 @@ end;
TCustomNotebook SetPageIndex
------------------------------------------------------------------------------}
procedure TCustomNotebook.SetPageIndex(Value: Integer);
var
Msg: TLMNotebookEvent;
begin
if fPageIndex = Value then exit;
fPageIndex := Value;
if HandleAllocated then begin
Msg.Parent := Self;
Msg.fCompStyle := fCompStyle;
Msg.Page := Value;
{$IFDEF NOTEBOOK_DEBUG}
writeln('[TCustomNotebook.SetPageIndex] A');
{$ENDIF}
CNSendMessage(LM_SETITEMINDEX, Self, @Msg);
{$IFDEF NOTEBOOK_DEBUG}
writeln('[TCustomNotebook.SetPageIndex] B');
{$ENDIF}
end;
DoSendPageIndex;
end;
{------------------------------------------------------------------------------
@ -399,42 +382,21 @@ end;
{------------------------------------------------------------------------------
TCustomNotebook SetShowTabs
------------------------------------------------------------------------------}
procedure TCustomNotebook.SetShowTabs(Value: Boolean);
var
Msg: TLMNotebookEvent;
procedure TCustomNotebook.SetShowTabs(AValue: Boolean);
begin
fShowTabs := Value;
if HandleAllocated
then begin
Msg.Parent := Self;
Msg.fCompStyle := fCompStyle;
Msg.ShowTabs := fShowTabs;
{$IFDEF NOTEBOOK_DEBUG}
writeln('[TCustomNotebook.SetShowTabs] A');
{$ENDIF}
CNSendMessage(LM_SHOWTABS, Self, @Msg);
{$IFDEF NOTEBOOK_DEBUG}
writeln('[TCustomNotebook.SetShowTabs] B');
{$ENDIF}
end;
if fShowTabs=AValue then exit;
fShowTabs := AValue;
DoSendShowTabs;
end;
{------------------------------------------------------------------------------
TCustomNotebook SetTabPosition
------------------------------------------------------------------------------}
procedure TCustomNotebook.SetTabPosition(tabPos: TTabPosition);
var
Msg: TLMNotebookEvent;
begin
if fTabPosition = tabPos then exit;
fTabPosition := tabPos;
if HandleAllocated
then begin
Msg.Parent := Self;
Msg.fCompStyle := fCompStyle;
Msg.TabPosition := @fTabPosition;
//InterfaceObject.IntCNSendMessage2(LM_SETTABPOSITION, Self, nil, @fTabPosition);
CNSendMessage(LM_SetTabPosition, Self, @Msg);
end;
DoSendTabPosition;
end;
{------------------------------------------------------------------------------
@ -478,7 +440,7 @@ end;
{------------------------------------------------------------------------------
TCustomNotebook ShowControl
------------------------------------------------------------------------------}
procedure TCustomNotebook.ShowControl(AControl: TControl);
procedure TCustomNotebook.ShowControl(APage: TControl);
var
i: LongInt;
begin
@ -487,7 +449,7 @@ begin
the page that contains that control. This method is necessary
for compatibility with Delphi }
for i := 0 to fPageList.Count - 1 do begin
if TControl(fPageList[i]) = AControl then begin
if TControl(fPageList[i]) = APage then begin
PageIndex := i;
Exit;
end;
@ -504,6 +466,7 @@ end;
procedure TCustomNotebook.UpdateTabProperties;
var i: integer;
begin
if not HandleAllocated or (csLoading in ComponentState) then exit;
for i := 0 to PageCount - 1 do
CNSendMessage(LM_NB_UpdateTab, Page[i], nil);
end;
@ -527,6 +490,8 @@ Begin
Begin
//set the page from the NMHDR^.idfrom
FPageIndex := NMHDR^.idfrom;
if FPageIndex>=PageCount then
FPageIndex:=-1;
Change;
end;
else
@ -538,6 +503,61 @@ Begin
end;
end;
{------------------------------------------------------------------------------
procedure TCustomNotebook.DoSendPageIndex;
------------------------------------------------------------------------------}
procedure TCustomNotebook.DoSendPageIndex;
var
Msg: TLMNotebookEvent;
begin
if not HandleAllocated or (csLoading in ComponentState) then exit;
Msg.Parent := Self;
Msg.fCompStyle := fCompStyle;
Msg.Page := FPageIndex;
{$IFDEF NOTEBOOK_DEBUG}
writeln('[TCustomNotebook.SetPageIndex] A');
{$ENDIF}
CNSendMessage(LM_SETITEMINDEX, Self, @Msg);
{$IFDEF NOTEBOOK_DEBUG}
writeln('[TCustomNotebook.SetPageIndex] B');
{$ENDIF}
end;
{------------------------------------------------------------------------------
procedure TCustomNotebook.DoSendShowTabs;
------------------------------------------------------------------------------}
procedure TCustomNotebook.DoSendShowTabs;
var
Msg: TLMNotebookEvent;
begin
if not HandleAllocated or (csLoading in ComponentState) then exit;
Msg.Parent := Self;
Msg.fCompStyle := fCompStyle;
Msg.ShowTabs := fShowTabs;
{$IFDEF NOTEBOOK_DEBUG}
writeln('[TCustomNotebook.SetShowTabs] A');
{$ENDIF}
CNSendMessage(LM_SHOWTABS, Self, @Msg);
{$IFDEF NOTEBOOK_DEBUG}
writeln('[TCustomNotebook.SetShowTabs] B');
{$ENDIF}
end;
{------------------------------------------------------------------------------
procedure TCustomNotebook.DoSendTabPosition;
------------------------------------------------------------------------------}
procedure TCustomNotebook.DoSendTabPosition;
var
Msg: TLMNotebookEvent;
begin
if not HandleAllocated or (csLoading in ComponentState) then exit;
Msg.Parent := Self;
Msg.fCompStyle := fCompStyle;
Msg.TabPosition := @fTabPosition;
//InterfaceObject.IntCNSendMessage2(LM_SETTABPOSITION, Self, nil, @fTabPosition);
CNSendMessage(LM_SetTabPosition, Self, @Msg);
end;
{------------------------------------------------------------------------------
TCustomNotebook InternalSetMultiLine
------------------------------------------------------------------------------}
@ -566,6 +586,9 @@ end;}
{ =============================================================================
$Log$
Revision 1.19 2002/09/02 19:10:28 lazarus
MG: TNoteBook now starts with no Page and TPage has no auto names
Revision 1.18 2002/06/08 17:16:02 lazarus
MG: added close buttons and images to TNoteBook and close buttons to source editor