paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-12 09:16:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Harmonize TNonModalIDEWindow enum identifiers in IdeOptionDefs.

Browse Source 
git-svn-id: trunk@62361 -
This commit is contained in:
juha 2019-12-09 14:23:37 +00:00
parent e8a4f9b175
commit 8ebda25a9b
9 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ide/clipboardhistory.pas
View File

@ -96,7 +96,7 @@ constructor TClipBoardHistory.Create(TheOwner: TComponent);
begin
inherited Create(TheOwner);
Name:=NonModalIDEWindowNames[nmiwClipbrdHistoryName];
Name:=NonModalIDEWindowNames[nmiwClipbrdHistory];
Caption := 'Clipboard History';
CopyToIDEBitBtn:=TBitBtn.Create(Self);

2
ide/codeexplorer.pas
View File

@ -472,7 +472,7 @@ begin
FMode := CodeExplorerOptions.Mode;
UpdateMode;
Name:=NonModalIDEWindowNames[nmiwCodeExplorerName];
Name:=NonModalIDEWindowNames[nmiwCodeExplorer];
UpdateCaption;
case CodeExplorerOptions.Page of

2
ide/etmessageswnd.pas
View File

@ -96,7 +96,7 @@ implementation
procedure TMessagesView.FormCreate(Sender: TObject);
begin
Name := NonModalIDEWindowNames[nmiwMessagesViewName];
Name := NonModalIDEWindowNames[nmiwMessagesView];
IDEMessagesWindow:=Self;
Caption:=lisMenuViewMessages;
{$IFNDEF LCLGtk2}

2
ide/fpdoceditwindow.pas
View File

@ -291,7 +291,7 @@ begin
CodeHelpBoss.AddHandlerOnChanging(@OnFPDocChanging);
CodeHelpBoss.AddHandlerOnChanged(@OnFPDocChanged);
Name := NonModalIDEWindowNames[nmiwFPDocEditorName];
Name := NonModalIDEWindowNames[nmiwFPDocEditor];
IDEImages.AssignImage(BoldFormatButton, 'formatbold');
IDEImages.AssignImage(UnderlineFormatButton, 'formatunderline');

22
ide/ideoptiondefs.pas
View File

@ -78,17 +78,17 @@ type
type
TNonModalIDEWindow = (
nmiwNone, // empty/none/undefined
nmiwMainIDEName,
nmiwSourceNoteBookName,
nmiwMessagesViewName,
nmiwUnitDependenciesName,
nmiwCodeExplorerName,
nmiwFPDocEditorName,
nmiwClipbrdHistoryName,
nmiwMainIDE,
nmiwSourceNoteBook,
nmiwMessagesView,
nmiwUnitDependencies,
nmiwCodeExplorer,
nmiwFPDocEditor,
nmiwClipbrdHistory,
nmiwPkgGraphExplorer,
nmiwProjectInspector,
nmiwEditorFileManager,
nmiwSearchResultsViewName,
nmiwSearchResultsView,
nmiwAnchorEditor,
nmiwTabOrderEditor,
nmiwCodeBrowser,
@ -102,11 +102,11 @@ const
// on startup. These windows are opened automatically when needed.
{ NonModalIDEWindowManualOpen = [
nmiwNone,
nmiwMainIDEName,
nmiwSourceNoteBookName,
nmiwMainIDE,
nmiwSourceNoteBook,
//nmiwDbgOutput,
//nmiwDbgEvents,
nmiwSearchResultsViewName,
nmiwSearchResultsView,
nmiwAnchorEditor
];
}

34
ide/main.pp
View File

@ -1545,7 +1545,7 @@ begin
// build and position the MainIDE form
Application.CreateForm(TMainIDEBar,MainIDEBar);
MainIDEBar.Name := NonModalIDEWindowNames[nmiwMainIDEName];
MainIDEBar.Name := NonModalIDEWindowNames[nmiwMainIDE];
FormCreator:=IDEWindowCreators.Add(MainIDEBar.Name);
FormCreator.Right:='100%';
FormCreator.Bottom:='+90';
@ -2452,22 +2452,22 @@ end;
procedure TMainIDE.SetupIDEWindowsLayout;
begin
IDEWindowCreators.Add(NonModalIDEWindowNames[nmiwMessagesViewName],
IDEWindowCreators.Add(NonModalIDEWindowNames[nmiwMessagesView],
nil,@CreateIDEWindow,'250','75%','+70%','+100',
NonModalIDEWindowNames[nmiwSourceNoteBookName],alBottom,false,@GetLayoutHandler);
IDEWindowCreators.Add(NonModalIDEWindowNames[nmiwCodeExplorerName],
NonModalIDEWindowNames[nmiwSourceNoteBook],alBottom,false,@GetLayoutHandler);
IDEWindowCreators.Add(NonModalIDEWindowNames[nmiwCodeExplorer],
nil,@CreateIDEWindow,'72%','120','+170','-200',
NonModalIDEWindowNames[nmiwMainIDEName],alRight);
NonModalIDEWindowNames[nmiwMainIDE],alRight);
IDEWindowCreators.Add(NonModalIDEWindowNames[nmiwUnitDependenciesName],
IDEWindowCreators.Add(NonModalIDEWindowNames[nmiwUnitDependencies],
nil,@CreateIDEWindow,'200','200','','');
IDEWindowCreators.Add(NonModalIDEWindowNames[nmiwFPDocEditorName],
IDEWindowCreators.Add(NonModalIDEWindowNames[nmiwFPDocEditor],
nil,@CreateIDEWindow,'250','75%','+70%','+120');
//IDEWindowCreators.Add(NonModalIDEWindowNames[nmiwClipbrdHistoryName],
//IDEWindowCreators.Add(NonModalIDEWindowNames[nmiwClipbrdHistory],
// nil,@CreateIDEWindow,'250','200','','');
IDEWindowCreators.Add(NonModalIDEWindowNames[nmiwProjectInspector],
nil,@CreateIDEWindow,'200','150','+300','+400');
IDEWindowCreators.Add(NonModalIDEWindowNames[nmiwSearchResultsViewName],
IDEWindowCreators.Add(NonModalIDEWindowNames[nmiwSearchResultsView],
nil,@CreateIDEWindow,'250','250','+70%','+300');
IDEWindowCreators.Add(NonModalIDEWindowNames[nmiwAnchorEditor],
nil,@CreateIDEWindow,'250','250','','');
@ -6254,30 +6254,30 @@ begin
State:=iwgfDisabled
else
State:=iwgfEnabled;
if ItIs(NonModalIDEWindowNames[nmiwMessagesViewName]) then
if ItIs(NonModalIDEWindowNames[nmiwMessagesView]) then
AForm:=MessagesView
else if ItIs(NonModalIDEWindowNames[nmiwUnitDependenciesName]) then
else if ItIs(NonModalIDEWindowNames[nmiwUnitDependencies]) then
begin
ShowUnitDependencies(State);
AForm:=UnitDependenciesWindow;
end
else if ItIs(NonModalIDEWindowNames[nmiwCodeExplorerName]) then
else if ItIs(NonModalIDEWindowNames[nmiwCodeExplorer]) then
begin
DoShowCodeExplorer(State);
AForm:=CodeExplorerView;
end
else if ItIs(NonModalIDEWindowNames[nmiwFPDocEditorName]) then
else if ItIs(NonModalIDEWindowNames[nmiwFPDocEditor]) then
begin
DoShowFPDocEditor(State);
AForm:=FPDocEditor;
end
// ToDo: nmiwClipbrdHistoryName:
// ToDo: nmiwClipbrdHistory:
else if ItIs(NonModalIDEWindowNames[nmiwProjectInspector]) then
begin
DoShowProjectInspector(State);
AForm:=ProjInspector;
end
else if ItIs(NonModalIDEWindowNames[nmiwSearchResultsViewName]) then
else if ItIs(NonModalIDEWindowNames[nmiwSearchResultsView]) then
begin
DoShowSearchResultsView(State);
AForm:=SearchResultsView;
@ -12802,7 +12802,7 @@ begin
ScreenR.Bottom-MainIDEBar.Scale96ToForm(50));
// do not dock object inspector, because this would hide the floating designers
end
else if (aFormName=NonModalIDEWindowNames[nmiwMessagesViewName]) then begin
else if (aFormName=NonModalIDEWindowNames[nmiwMessagesView]) then begin
// place messages below source editor
ScreenR:=IDEWindowCreators.GetScreenrectForDefaults;
if SourceEditorManager.SourceWindowCount>0 then begin
@ -12818,7 +12818,7 @@ begin
ScreenR.Bottom-MainIDEBar.Scale96ToForm(50));
end;
if IDEDockMaster<>nil then begin
DockSibling:=NonModalIDEWindowNames[nmiwSourceNoteBookName];
DockSibling:=NonModalIDEWindowNames[nmiwSourceNoteBook];
DockAlign:=alBottom;
end;
end;

2
ide/searchresultview.pp
View File

@ -295,7 +295,7 @@ begin
ResultsNoteBook.Options:= ResultsNoteBook.Options+[nboShowCloseButtons];
ResultsNoteBook.Update;
Name:=NonModalIDEWindowNames[nmiwSearchResultsViewName];
Name:=NonModalIDEWindowNames[nmiwSearchResultsView];
Caption:=lisMenuViewSearchResults;
SearchAgainButton.Hint:=rsStartANewSearch;

21
ide/sourceeditor.pp
View File

@ -6345,10 +6345,10 @@ var
begin
FPageIndex := -1;
i := 1;
n := AOwner.FindComponent(NonModalIDEWindowNames[nmiwSourceNoteBookName]);
n := AOwner.FindComponent(NonModalIDEWindowNames[nmiwSourceNoteBook]);
while (n <> nil) do begin
inc(i);
n := AOwner.FindComponent(NonModalIDEWindowNames[nmiwSourceNoteBookName]+IntToStr(i));
n := AOwner.FindComponent(NonModalIDEWindowNames[nmiwSourceNoteBook]+IntToStr(i));
end;
Create(AOwner, i-1);
@ -6364,9 +6364,9 @@ begin
FIsClosing := False;
FWindowID := AWindowID;
if AWindowID > 0 then
Name := NonModalIDEWindowNames[nmiwSourceNoteBookName] + IntToStr(AWindowID+1)
Name := NonModalIDEWindowNames[nmiwSourceNoteBook] + IntToStr(AWindowID+1)
else
Name := NonModalIDEWindowNames[nmiwSourceNoteBookName];
Name := NonModalIDEWindowNames[nmiwSourceNoteBook];
if AWindowID > 0 then
FBaseCaption := locWndSrcEditor + ' (' + IntToStr(AWindowID+1) + ')'
@ -9199,7 +9199,7 @@ begin
SRCED_CLOSE := DebugLogger.RegisterLogGroup('SRCED_CLOSE' {$IFDEF SRCED_CLOSE} , True {$ENDIF} );
SRCED_PAGES := DebugLogger.RegisterLogGroup('SRCED_PAGES' {$IFDEF SRCED_PAGES} , True {$ENDIF} );
IDEWindowsGlobalOptions.Add(NonModalIDEWindowNames[nmiwSourceNoteBookName], False);
IDEWindowsGlobalOptions.Add(NonModalIDEWindowNames[nmiwSourceNoteBook], False);
end;
procedure InternalFinal;
@ -10016,8 +10016,8 @@ begin
DockSibling:='';
DockAlign:=alNone;
i:=StrToIntDef(
copy(aFormName,length(NonModalIDEWindowNames[nmiwSourceNoteBookName])+1,
length(aFormName)),0);
copy(aFormName,length(NonModalIDEWindowNames[nmiwSourceNoteBook])+1,length(aFormName)),
0);
{$IFDEF VerboseIDEDocking}
debugln(['TSourceEditorManager.GetDefaultLayout ',aFormName,' i=',i]);
{$ENDIF}
@ -10037,7 +10037,7 @@ begin
aBounds.Right:=ScreenR.Right-MulDiv(30, Screen.PixelsPerInch, 96);
aBounds.Bottom:=ScreenR.Bottom-MulDiv(200, Screen.PixelsPerInch, 96);
if (i=0) and (IDEDockMaster<>nil) then begin
DockSibling:=NonModalIDEWindowNames[nmiwMainIDEName];
DockSibling:=NonModalIDEWindowNames[nmiwMainIDE];
DockAlign:=alBottom;
end;
end;
@ -11197,10 +11197,9 @@ begin
CreateEditorToolBar(@DoConfigureEditorToolbar);
// layout
IDEWindowCreators.Add(NonModalIDEWindowNames[nmiwSourceNoteBookName],
IDEWindowCreators.Add(NonModalIDEWindowNames[nmiwSourceNoteBook],
nil,@CreateSourceWindow,'250','100','+70%','+70%',
NonModalIDEWindowNames[nmiwMainIDEName],alBottom,
true,@GetDefaultLayout);
NonModalIDEWindowNames[nmiwMainIDE],alBottom,true,@GetDefaultLayout);
Application.AddOnIdleHandler(@OnIdle);
Application.AddOnUserInputHandler(@OnUserInput);

2
ide/unitdependencies.pas
View File

@ -563,7 +563,7 @@ end;
procedure TUnitDependenciesWindow.FormCreate(Sender: TObject);
begin
Name := NonModalIDEWindowNames[nmiwUnitDependenciesName];
Name := NonModalIDEWindowNames[nmiwUnitDependencies];
FGroupLvlGraphSelectionsList := TStringList.Create;
FPendingUnitDependencyRoute:=TStringList.Create;