paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-13 16:49:07 +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 begin
inherited Create(TheOwner); inherited Create(TheOwner);
Name:=NonModalIDEWindowNames[nmiwClipbrdHistoryName]; Name:=NonModalIDEWindowNames[nmiwClipbrdHistory];
Caption := 'Clipboard History'; Caption := 'Clipboard History';
CopyToIDEBitBtn:=TBitBtn.Create(Self); CopyToIDEBitBtn:=TBitBtn.Create(Self);

2
ide/codeexplorer.pas
View File

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

2
ide/etmessageswnd.pas
View File

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

2
ide/fpdoceditwindow.pas
View File

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

22
ide/ideoptiondefs.pas
View File

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

34
ide/main.pp
View File

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

2
ide/searchresultview.pp
View File

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

21
ide/sourceeditor.pp
View File

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

2
ide/unitdependencies.pas
View File

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