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

changed TMenuItem.Graphic to TMenuItem.Bitmap

Browse Source 
git-svn-id: trunk@4808 -
This commit is contained in:
mattias 2003-11-16 01:56:15 +00:00
parent 84d8091301
commit 9226158b72
8 changed files with 92 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ide/frmsearch.pas
View File

@ -216,6 +216,7 @@ procedure TSearchForm.SearchFile(TheFileName: string);
ThisFile.LoadFromFile(TheFileName); ThisFile.LoadFromFile(TheFileName);
for Lines:= 0 to ThisFile.Count -1 do for Lines:= 0 to ThisFile.Count -1 do
begin begin
Application.ProcessMessages;
TheLine:= ThisFile.Strings[Lines]; TheLine:= ThisFile.Strings[Lines];
if not fCaseSensitive then if not fCaseSensitive then
TheLine:= UpperCase(TheLine); TheLine:= UpperCase(TheLine);
@ -289,6 +290,7 @@ procedure TSearchForm.SearchFile(TheFileName: string);
ThisFile.LoadFromFile(TheFileName); ThisFile.LoadFromFile(TheFileName);
for Lines:= 0 to ThisFile.Count - 1 do for Lines:= 0 to ThisFile.Count - 1 do
begin begin
Application.ProcessMessages;
TheLine:= ThisFile[Lines]; TheLine:= ThisFile[Lines];
if RE.Exec(TheLine) then if RE.Exec(TheLine) then
begin begin
@ -317,10 +319,15 @@ procedure TSearchForm.SearchFile(TheFileName: string);
{Start SearchFile ============================================================} {Start SearchFile ============================================================}
begin begin
if not fRegExp then try
DoNormalSearch fResultsList.BeginUpdate;
else if not fRegExp then
DoRegExpSearch; DoNormalSearch
else
DoRegExpSearch;
finally
fResultsList.EndUpdate;
end;//finally
end;//SearchFile end;//SearchFile
@ -450,7 +457,6 @@ begin
Application.ProcessMessages; Application.ProcessMessages;
inc(fMatches); inc(fMatches);
lblMatches.Caption:= IntToStr(fMatches); lblMatches.Caption:= IntToStr(fMatches);
Application.ProcessMessages;
end;//UpdateMatches end;//UpdateMatches
@ -458,14 +464,12 @@ procedure TSearchForm.UpdateProgress(FileName: string);
var var
DisplayFileName: string; DisplayFileName: string;
begin begin
Application.ProcessMessages;
DisplayFileName:= FileName; DisplayFileName:= FileName;
While ((Length(DisplayFileName) * fCharWidth) >= lblProgress.Width) do While ((Length(DisplayFileName) * fCharWidth) >= lblProgress.Width) do
begin begin
DisplayFileName:= PadAndShorten(DisplayFileName); DisplayFileName:= PadAndShorten(DisplayFileName);
end;//while end;//while
lblProgress.Caption:= DisplayFileName; lblProgress.Caption:= DisplayFileName;
Application.ProcessMessages;
end;//UpdateProgress end;//UpdateProgress
function TSearchForm.PadAndShorten(FileName: string): string; function TSearchForm.PadAndShorten(FileName: string): string;

5
ide/main.pp
View File

@ -925,7 +925,7 @@ procedure TMainIDE.CreateSearchResultWindow;
begin begin
if SearchResultsView<>nil then exit; if SearchResultsView<>nil then exit;
Application.CreateForm(TSearchResultsView, SearchResultsView); Application.CreateForm(TSearchResultsView, SearchResultsView);
SearchResultsView.OnSelectionChanged:= @SearchresultsViewSelectionChanged; SearchResultsView.OnSelectionChanged:= @SearchResultsViewSelectionChanged;
end; end;
procedure TMainIDE.OIOnSelectComponents(Sender: TObject); procedure TMainIDE.OIOnSelectComponents(Sender: TObject);
@ -10091,6 +10091,9 @@ end.
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.669 2003/11/16 01:56:15 mattias
changed TMenuItem.Graphic to TMenuItem.Bitmap
Revision 1.668 2003/11/15 14:04:16 mattias Revision 1.668 2003/11/15 14:04:16 mattias
added searchresultsview.lfm added searchresultsview.lfm

80
ide/mainbar.pas
View File

@ -572,19 +572,19 @@ begin
itmFileNewUnit := TMenuItem.Create(Self); itmFileNewUnit := TMenuItem.Create(Self);
itmFileNewUnit.Name:='itmFileNewUnit'; itmFileNewUnit.Name:='itmFileNewUnit';
itmFileNewUnit.Caption := lisMenuNewUnit; itmFileNewUnit.Caption := lisMenuNewUnit;
itmFileNewUnit.Graphic:=LoadPixmap('menu_new'); itmFileNewUnit.Bitmap:=LoadPixmap('menu_new');
mnuFile.Add(itmFileNewUnit); mnuFile.Add(itmFileNewUnit);
itmFileNewForm := TMenuItem.Create(Self); itmFileNewForm := TMenuItem.Create(Self);
itmFileNewForm.Name:='itmFileNewForm'; itmFileNewForm.Name:='itmFileNewForm';
itmFileNewForm.Caption := lisMenuNewForm; itmFileNewForm.Caption := lisMenuNewForm;
itmFileNewForm.Graphic:=LoadPixmap('menu_new'); itmFileNewForm.Bitmap:=LoadPixmap('menu_new');
mnuFile.Add(itmFileNewForm); mnuFile.Add(itmFileNewForm);
itmFileNewOther := TMenuItem.Create(Self); itmFileNewOther := TMenuItem.Create(Self);
itmFileNewOther.Name:='itmFileNewOther'; itmFileNewOther.Name:='itmFileNewOther';
itmFileNewOther.Caption := lisMenuNewOther; itmFileNewOther.Caption := lisMenuNewOther;
itmFileNewOther.Graphic:=LoadPixmap('menu_new'); itmFileNewOther.Bitmap:=LoadPixmap('menu_new');
mnuFile.Add(itmFileNewOther); mnuFile.Add(itmFileNewOther);
mnuFile.Add(CreateMenuSeparator); mnuFile.Add(CreateMenuSeparator);
@ -592,13 +592,13 @@ begin
itmFileOpen := TMenuItem.Create(Self); itmFileOpen := TMenuItem.Create(Self);
itmFileOpen.Name:='itmFileOpen'; itmFileOpen.Name:='itmFileOpen';
itmFileOpen.Caption := lisMenuOpen; itmFileOpen.Caption := lisMenuOpen;
itmFileOpen.Graphic:=LoadPixmap('menu_open'); itmFileOpen.Bitmap:=LoadPixmap('menu_open');
mnuFile.Add(itmFileOpen); mnuFile.Add(itmFileOpen);
itmFileRevert := TMenuItem.Create(Self); itmFileRevert := TMenuItem.Create(Self);
itmFileRevert.Name:='itmFileRevert'; itmFileRevert.Name:='itmFileRevert';
itmFileRevert.Caption := lisMenuRevert; itmFileRevert.Caption := lisMenuRevert;
itmFileRevert.Graphic:=LoadPixmap('menu_undo'); itmFileRevert.Bitmap:=LoadPixmap('menu_undo');
mnuFile.Add(itmFileRevert); mnuFile.Add(itmFileRevert);
itmFileRecentOpen := TMenuItem.Create(Self); itmFileRecentOpen := TMenuItem.Create(Self);
@ -609,19 +609,19 @@ begin
itmFileSave := TMenuItem.Create(Self); itmFileSave := TMenuItem.Create(Self);
itmFileSave.Name:='itmFileSave'; itmFileSave.Name:='itmFileSave';
itmFileSave.Caption := lisMenuSave; itmFileSave.Caption := lisMenuSave;
itmFileSave.Graphic:=LoadPixmap('menu_save'); itmFileSave.Bitmap:=LoadPixmap('menu_save');
mnuFile.Add(itmFileSave); mnuFile.Add(itmFileSave);
itmFileSaveAs := TMenuItem.Create(Self); itmFileSaveAs := TMenuItem.Create(Self);
itmFileSaveAs.Name:='itmFileSaveAs'; itmFileSaveAs.Name:='itmFileSaveAs';
itmFileSaveAs.Caption := lisMenuSaveAs; itmFileSaveAs.Caption := lisMenuSaveAs;
itmFileSaveAs.Graphic:=LoadPixmap('menu_save'); itmFileSaveAs.Bitmap:=LoadPixmap('menu_save');
mnuFile.Add(itmFileSaveAs); mnuFile.Add(itmFileSaveAs);
itmFileSaveAll := TMenuItem.Create(Self); itmFileSaveAll := TMenuItem.Create(Self);
itmFileSaveAll.Name:='itmFileSaveAll'; itmFileSaveAll.Name:='itmFileSaveAll';
itmFileSaveAll.Caption := lisMenuSaveAll; itmFileSaveAll.Caption := lisMenuSaveAll;
itmFileSaveAll.Graphic:=LoadPixmap('menu_save'); itmFileSaveAll.Bitmap:=LoadPixmap('menu_save');
mnuFile.Add(itmFileSaveAll); mnuFile.Add(itmFileSaveAll);
itmFileClose := TMenuItem.Create(Self); itmFileClose := TMenuItem.Create(Self);
@ -649,13 +649,13 @@ begin
itmEditUndo := TMenuItem.Create(Self); itmEditUndo := TMenuItem.Create(Self);
itmEditUndo.Name:='itmEditUndo'; itmEditUndo.Name:='itmEditUndo';
itmEditUndo.Caption := lisMenuUndo; itmEditUndo.Caption := lisMenuUndo;
itmEditUndo.Graphic:=LoadPixmap('menu_undo'); itmEditUndo.Bitmap:=LoadPixmap('menu_undo');
mnuEdit.Add(itmEditUndo); mnuEdit.Add(itmEditUndo);
itmEditRedo := TMenuItem.Create(Self); itmEditRedo := TMenuItem.Create(Self);
itmEditRedo.Name:='itmEditRedo'; itmEditRedo.Name:='itmEditRedo';
itmEditRedo.Caption := lisMenuRedo; itmEditRedo.Caption := lisMenuRedo;
itmEditRedo.Graphic:=LoadPixmap('menu_redo'); itmEditRedo.Bitmap:=LoadPixmap('menu_redo');
mnuEdit.Add(itmEditRedo); mnuEdit.Add(itmEditRedo);
mnuEdit.Add(CreateMenuSeparator); mnuEdit.Add(CreateMenuSeparator);
@ -663,19 +663,19 @@ begin
itmEditCut := TMenuItem.Create(Self); itmEditCut := TMenuItem.Create(Self);
itmEditCut.Name:='itmEditCut'; itmEditCut.Name:='itmEditCut';
itmEditCut.Caption := lisMenuCut; itmEditCut.Caption := lisMenuCut;
itmEditCut.Graphic:=LoadPixmap('menu_cut'); itmEditCut.Bitmap:=LoadPixmap('menu_cut');
mnuEdit.Add(itmEditCut); mnuEdit.Add(itmEditCut);
itmEditCopy := TMenuItem.Create(Self); itmEditCopy := TMenuItem.Create(Self);
itmEditCopy.Name:='itmEditCopy'; itmEditCopy.Name:='itmEditCopy';
itmEditCopy.Caption := lisMenuCopy; itmEditCopy.Caption := lisMenuCopy;
itmEditCopy.Graphic:=LoadPixmap('menu_copy'); itmEditCopy.Bitmap:=LoadPixmap('menu_copy');
mnuEdit.Add(itmEditCopy); mnuEdit.Add(itmEditCopy);
itmEditPaste := TMenuItem.Create(Self); itmEditPaste := TMenuItem.Create(Self);
itmEditPaste.Name:='itmEditPaste'; itmEditPaste.Name:='itmEditPaste';
itmEditPaste.Caption := lisMenuPaste; itmEditPaste.Caption := lisMenuPaste;
itmEditPaste.Graphic:=LoadPixmap('menu_paste'); itmEditPaste.Bitmap:=LoadPixmap('menu_paste');
mnuEdit.Add(itmEditPaste); mnuEdit.Add(itmEditPaste);
mnuEdit.Add(CreateMenuSeparator); mnuEdit.Add(CreateMenuSeparator);
@ -683,13 +683,13 @@ begin
itmEditIndentBlock := TMenuItem.Create(Self); itmEditIndentBlock := TMenuItem.Create(Self);
itmEditIndentBlock.Name:='itmEditIndentBlock'; itmEditIndentBlock.Name:='itmEditIndentBlock';
itmEditIndentBlock.Caption := lisMenuIndentSelection; itmEditIndentBlock.Caption := lisMenuIndentSelection;
itmEditIndentBlock.Graphic:=LoadPixmap('menu_indent'); itmEditIndentBlock.Bitmap:=LoadPixmap('menu_indent');
mnuEdit.Add(itmEditIndentBlock); mnuEdit.Add(itmEditIndentBlock);
itmEditUnindentBlock := TMenuItem.Create(Self); itmEditUnindentBlock := TMenuItem.Create(Self);
itmEditUnindentBlock.Name:='itmEditUnindentBlock'; itmEditUnindentBlock.Name:='itmEditUnindentBlock';
itmEditUnindentBlock.Caption := lisMenuUnindentSelection; itmEditUnindentBlock.Caption := lisMenuUnindentSelection;
itmEditUnindentBlock.Graphic:=LoadPixmap('menu_unindent'); itmEditUnindentBlock.Bitmap:=LoadPixmap('menu_unindent');
mnuEdit.Add(itmEditUnindentBlock); mnuEdit.Add(itmEditUnindentBlock);
itmEditEncloseBlock := TMenuItem.Create(Self); itmEditEncloseBlock := TMenuItem.Create(Self);
@ -1028,19 +1028,19 @@ begin
itmViewDebugWindows := TMenuItem.Create(Self); itmViewDebugWindows := TMenuItem.Create(Self);
itmViewDebugWindows.Name := 'itmViewDebugWindows'; itmViewDebugWindows.Name := 'itmViewDebugWindows';
itmViewDebugWindows.Caption := lisMenuDebugWindows; itmViewDebugWindows.Caption := lisMenuDebugWindows;
itmViewDebugWindows.Graphic:=LoadPixmap('menu_debugger'); itmViewDebugWindows.Bitmap:=LoadPixmap('menu_debugger');
mnuView.Add(itmViewDebugWindows); mnuView.Add(itmViewDebugWindows);
itmViewWatches := TMenuItem.Create(Self); itmViewWatches := TMenuItem.Create(Self);
itmViewWatches.Name:='itmViewWatches'; itmViewWatches.Name:='itmViewWatches';
itmViewWatches.Caption := lisMenuViewWatches; itmViewWatches.Caption := lisMenuViewWatches;
itmViewWatches.Graphic:=LoadPixmap('menu_watches'); itmViewWatches.Bitmap:=LoadPixmap('menu_watches');
itmViewDebugWindows.Add(itmViewWatches); itmViewDebugWindows.Add(itmViewWatches);
itmViewBreakPoints := TMenuItem.Create(Self); itmViewBreakPoints := TMenuItem.Create(Self);
itmViewBreakPoints.Name:='itmViewBreakPoints'; itmViewBreakPoints.Name:='itmViewBreakPoints';
itmViewBreakPoints.Caption := lisMenuViewBreakPoints; itmViewBreakPoints.Caption := lisMenuViewBreakPoints;
itmViewBreakPoints.Graphic:=LoadPixmap('menu_breakpoints'); itmViewBreakPoints.Bitmap:=LoadPixmap('menu_breakpoints');
itmViewDebugWindows.Add(itmViewBreakPoints); itmViewDebugWindows.Add(itmViewBreakPoints);
itmViewLocals := TMenuItem.Create(Self); itmViewLocals := TMenuItem.Create(Self);
@ -1051,13 +1051,13 @@ begin
itmViewCallStack := TMenuItem.Create(Self); itmViewCallStack := TMenuItem.Create(Self);
itmViewCallStack.Name:='itmViewCallStack'; itmViewCallStack.Name:='itmViewCallStack';
itmViewCallStack.Caption := lisMenuViewCallStack; itmViewCallStack.Caption := lisMenuViewCallStack;
itmViewCallStack.Graphic:=LoadPixmap('menu_callstack'); itmViewCallStack.Bitmap:=LoadPixmap('menu_callstack');
itmViewDebugWindows.Add(itmViewCallStack); itmViewDebugWindows.Add(itmViewCallStack);
itmViewDebugOutput := TMenuItem.Create(Self); itmViewDebugOutput := TMenuItem.Create(Self);
itmViewDebugOutput.Name:='itmViewDebugOutput'; itmViewDebugOutput.Name:='itmViewDebugOutput';
itmViewDebugOutput.Caption := lisMenuViewDebugOutput; itmViewDebugOutput.Caption := lisMenuViewDebugOutput;
itmViewDebugOutput.Graphic:=LoadPixmap('menu_debugoutput'); itmViewDebugOutput.Bitmap:=LoadPixmap('menu_debugoutput');
itmViewDebugWindows.Add(itmViewDebugOutput); itmViewDebugWindows.Add(itmViewDebugOutput);
end; end;
@ -1078,7 +1078,7 @@ begin
itmProjectOpen := TMenuItem.Create(Self); itmProjectOpen := TMenuItem.Create(Self);
itmProjectOpen.Name:='itmProjectOpen'; itmProjectOpen.Name:='itmProjectOpen';
itmProjectOpen.Caption := lisMenuOpenProject; itmProjectOpen.Caption := lisMenuOpenProject;
itmProjectOpen.Graphic:=LoadPixmap('menu_openproject'); itmProjectOpen.Bitmap:=LoadPixmap('menu_openproject');
mnuProject.Add(itmProjectOpen); mnuProject.Add(itmProjectOpen);
itmProjectRecentOpen := TMenuItem.Create(Self); itmProjectRecentOpen := TMenuItem.Create(Self);
@ -1108,7 +1108,7 @@ begin
itmProjectInspector := TMenuItem.Create(Self); itmProjectInspector := TMenuItem.Create(Self);
itmProjectInspector.Name:='itmProjectInspector'; itmProjectInspector.Name:='itmProjectInspector';
itmProjectInspector.Caption := lisMenuProjectInspector; itmProjectInspector.Caption := lisMenuProjectInspector;
itmProjectInspector.Graphic:=LoadPixmap('menu_projectinspector'); itmProjectInspector.Bitmap:=LoadPixmap('menu_projectinspector');
{$IFNDEF DisablePkgs} {$IFNDEF DisablePkgs}
mnuProject.Add(itmProjectInspector); mnuProject.Add(itmProjectInspector);
{$ENDIF} {$ENDIF}
@ -1140,7 +1140,7 @@ begin
itmProjectOptions := TMenuItem.Create(Self); itmProjectOptions := TMenuItem.Create(Self);
itmProjectOptions.Name:='itmProjectOptions'; itmProjectOptions.Name:='itmProjectOptions';
itmProjectOptions.Caption := lisMenuProjectOptions; itmProjectOptions.Caption := lisMenuProjectOptions;
itmProjectOptions.Graphic:=LoadPixmap('menu_projectoptions'); itmProjectOptions.Bitmap:=LoadPixmap('menu_projectoptions');
mnuProject.Add(itmProjectOptions); mnuProject.Add(itmProjectOptions);
end; end;
@ -1149,13 +1149,13 @@ begin
itmRunMenuBuild := TMenuItem.Create(Self); itmRunMenuBuild := TMenuItem.Create(Self);
itmRunMenuBuild.Name:='itmRunMenuBuild'; itmRunMenuBuild.Name:='itmRunMenuBuild';
itmRunMenuBuild.Caption := lisMenuBuild; itmRunMenuBuild.Caption := lisMenuBuild;
itmRunMenuBuild.Graphic:=LoadPixmap('menu_build'); itmRunMenuBuild.Bitmap:=LoadPixmap('menu_build');
mnuRun.Add(itmRunMenuBuild); mnuRun.Add(itmRunMenuBuild);
itmRunMenuBuildAll := TMenuItem.Create(Self); itmRunMenuBuildAll := TMenuItem.Create(Self);
itmRunMenuBuildAll.Name:='itmRunMenuBuildAll'; itmRunMenuBuildAll.Name:='itmRunMenuBuildAll';
itmRunMenuBuildAll.Caption := lisMenuBuildAll; itmRunMenuBuildAll.Caption := lisMenuBuildAll;
itmRunMenuBuildAll.Graphic:=LoadPixmap('menu_buildall'); itmRunMenuBuildAll.Bitmap:=LoadPixmap('menu_buildall');
mnuRun.Add(itmRunMenuBuildAll); mnuRun.Add(itmRunMenuBuildAll);
itmRunMenuAbortBuild := TMenuItem.Create(Self); itmRunMenuAbortBuild := TMenuItem.Create(Self);
@ -1173,26 +1173,26 @@ begin
itmRunMenuRun := TMenuItem.Create(Self); itmRunMenuRun := TMenuItem.Create(Self);
itmRunMenuRun.Name:='itmRunMenuRun'; itmRunMenuRun.Name:='itmRunMenuRun';
itmRunMenuRun.Caption := lisMenuProjectRun; itmRunMenuRun.Caption := lisMenuProjectRun;
itmRunMenuRun.Graphic:=LoadPixmap('menu_run'); itmRunMenuRun.Bitmap:=LoadPixmap('menu_run');
mnuRun.Add(itmRunMenuRun); mnuRun.Add(itmRunMenuRun);
itmRunMenuPause := TMenuItem.Create(Self); itmRunMenuPause := TMenuItem.Create(Self);
itmRunMenuPause.Name:='itmRunMenuPause'; itmRunMenuPause.Name:='itmRunMenuPause';
itmRunMenuPause.Caption := lisMenuPause; itmRunMenuPause.Caption := lisMenuPause;
itmRunMenuPause.Enabled := false; itmRunMenuPause.Enabled := false;
itmRunMenuPause.Graphic:=LoadPixmap('menu_pause'); itmRunMenuPause.Bitmap:=LoadPixmap('menu_pause');
mnuRun.Add(itmRunMenuPause); mnuRun.Add(itmRunMenuPause);
itmRunMenuStepInto := TMenuItem.Create(Self); itmRunMenuStepInto := TMenuItem.Create(Self);
itmRunMenuStepInto.Name:='itmRunMenuStepInto'; itmRunMenuStepInto.Name:='itmRunMenuStepInto';
itmRunMenuStepInto.Caption := lisMenuStepInto; itmRunMenuStepInto.Caption := lisMenuStepInto;
itmRunMenuStepInto.Graphic:=LoadPixmap('menu_stepinto'); itmRunMenuStepInto.Bitmap:=LoadPixmap('menu_stepinto');
mnuRun.Add(itmRunMenuStepInto); mnuRun.Add(itmRunMenuStepInto);
itmRunMenuStepOver := TMenuItem.Create(Self); itmRunMenuStepOver := TMenuItem.Create(Self);
itmRunMenuStepOver.Name:='itmRunMenuStepOver'; itmRunMenuStepOver.Name:='itmRunMenuStepOver';
itmRunMenuStepOver.Caption := lisMenuStepOver; itmRunMenuStepOver.Caption := lisMenuStepOver;
itmRunMenuStepOver.Graphic:=LoadPixmap('menu_stepover'); itmRunMenuStepOver.Bitmap:=LoadPixmap('menu_stepover');
mnuRun.Add(itmRunMenuStepOver); mnuRun.Add(itmRunMenuStepOver);
itmRunMenuRunToCursor := TMenuItem.Create(Self); itmRunMenuRunToCursor := TMenuItem.Create(Self);
@ -1240,7 +1240,7 @@ begin
itmPkgOpenPackage := TMenuItem.Create(Self); itmPkgOpenPackage := TMenuItem.Create(Self);
itmPkgOpenPackage.Name:='itmPkgOpenPackage'; itmPkgOpenPackage.Name:='itmPkgOpenPackage';
itmPkgOpenPackage.Caption := lisMenuOpenPackage; itmPkgOpenPackage.Caption := lisMenuOpenPackage;
itmPkgOpenPackage.Graphic:=LoadPixmap('pkg_package'); itmPkgOpenPackage.Bitmap:=LoadPixmap('pkg_package');
{$IFNDEF DisablePkgs} {$IFNDEF DisablePkgs}
mnuComponents.Add(itmPkgOpenPackage); mnuComponents.Add(itmPkgOpenPackage);
{$ENDIF} {$ENDIF}
@ -1248,7 +1248,7 @@ begin
itmPkgOpenPackageFile := TMenuItem.Create(Self); itmPkgOpenPackageFile := TMenuItem.Create(Self);
itmPkgOpenPackageFile.Name:='itmPkgOpenPackageFile'; itmPkgOpenPackageFile.Name:='itmPkgOpenPackageFile';
itmPkgOpenPackageFile.Caption := lisMenuOpenPackageFile; itmPkgOpenPackageFile.Caption := lisMenuOpenPackageFile;
itmPkgOpenPackageFile.Graphic:=LoadPixmap('pkg_package'); itmPkgOpenPackageFile.Bitmap:=LoadPixmap('pkg_package');
{$IFNDEF DisablePkgs} {$IFNDEF DisablePkgs}
mnuComponents.Add(itmPkgOpenPackageFile); mnuComponents.Add(itmPkgOpenPackageFile);
{$ENDIF} {$ENDIF}
@ -1256,7 +1256,7 @@ begin
itmPkgOpenRecent := TMenuItem.Create(Self); itmPkgOpenRecent := TMenuItem.Create(Self);
itmPkgOpenRecent.Name:='itmPkgOpenRecent'; itmPkgOpenRecent.Name:='itmPkgOpenRecent';
itmPkgOpenRecent.Caption := lisMenuOpenRecentPkg; itmPkgOpenRecent.Caption := lisMenuOpenRecentPkg;
itmPkgOpenRecent.Graphic:=LoadPixmap('pkg_package'); itmPkgOpenRecent.Bitmap:=LoadPixmap('pkg_package');
{$IFNDEF DisablePkgs} {$IFNDEF DisablePkgs}
mnuComponents.Add(itmPkgOpenRecent); mnuComponents.Add(itmPkgOpenRecent);
{$ENDIF} {$ENDIF}
@ -1268,7 +1268,7 @@ begin
itmPkgAddCurUnitToPkg := TMenuItem.Create(Self); itmPkgAddCurUnitToPkg := TMenuItem.Create(Self);
itmPkgAddCurUnitToPkg.Name:='itmPkgAddCurUnitToPkg'; itmPkgAddCurUnitToPkg.Name:='itmPkgAddCurUnitToPkg';
itmPkgAddCurUnitToPkg.Caption := lisMenuAddCurUnitToPkg; itmPkgAddCurUnitToPkg.Caption := lisMenuAddCurUnitToPkg;
itmPkgAddCurUnitToPkg.Graphic:=LoadPixmap('pkg_addunittopackage'); itmPkgAddCurUnitToPkg.Bitmap:=LoadPixmap('pkg_addunittopackage');
{$IFNDEF DisablePkgs} {$IFNDEF DisablePkgs}
mnuComponents.Add(itmPkgAddCurUnitToPkg); mnuComponents.Add(itmPkgAddCurUnitToPkg);
{$ENDIF} {$ENDIF}
@ -1280,7 +1280,7 @@ begin
itmPkgPkgGraph := TMenuItem.Create(Self); itmPkgPkgGraph := TMenuItem.Create(Self);
itmPkgPkgGraph.Name:='itmPkgPkgGraph'; itmPkgPkgGraph.Name:='itmPkgPkgGraph';
itmPkgPkgGraph.Caption := lisMenuPackageGraph; itmPkgPkgGraph.Caption := lisMenuPackageGraph;
itmPkgPkgGraph.Graphic:=LoadPixmap('pkg_packagegraph'); itmPkgPkgGraph.Bitmap:=LoadPixmap('pkg_packagegraph');
{$IFNDEF DisablePkgs} {$IFNDEF DisablePkgs}
mnuComponents.Add(itmPkgPkgGraph); mnuComponents.Add(itmPkgPkgGraph);
{$ENDIF} {$ENDIF}
@ -1351,7 +1351,7 @@ begin
itmToolBuildLazarus := TMenuItem.Create(Self); itmToolBuildLazarus := TMenuItem.Create(Self);
itmToolBuildLazarus.Name:='itmToolBuildLazarus'; itmToolBuildLazarus.Name:='itmToolBuildLazarus';
itmToolBuildLazarus.Caption := lisMenuBuildLazarus; itmToolBuildLazarus.Caption := lisMenuBuildLazarus;
itmToolBuildLazarus.Graphic:=LoadPixmap('menu_buildlazarus'); itmToolBuildLazarus.Bitmap:=LoadPixmap('menu_buildlazarus');
mnuTools.Add(itmToolBuildLazarus); mnuTools.Add(itmToolBuildLazarus);
itmToolConfigureBuildLazarus := TMenuItem.Create(Self); itmToolConfigureBuildLazarus := TMenuItem.Create(Self);
@ -1365,31 +1365,31 @@ begin
itmEnvGeneralOptions := TMenuItem.Create(Self); itmEnvGeneralOptions := TMenuItem.Create(Self);
itmEnvGeneralOptions.Name:='itmEnvGeneralOptions'; itmEnvGeneralOptions.Name:='itmEnvGeneralOptions';
itmEnvGeneralOptions.Caption := lisMenuGeneralOptions; itmEnvGeneralOptions.Caption := lisMenuGeneralOptions;
itmEnvGeneralOptions.Graphic:=LoadPixmap('menu_environmentoptions'); itmEnvGeneralOptions.Bitmap:=LoadPixmap('menu_environmentoptions');
mnuEnvironment.Add(itmEnvGeneralOptions); mnuEnvironment.Add(itmEnvGeneralOptions);
itmEnvEditorOptions := TMenuItem.Create(Self); itmEnvEditorOptions := TMenuItem.Create(Self);
itmEnvEditorOptions.Name:='itmEnvEditorOptions'; itmEnvEditorOptions.Name:='itmEnvEditorOptions';
itmEnvEditorOptions.Caption := lisMenuEditorOptions; itmEnvEditorOptions.Caption := lisMenuEditorOptions;
itmEnvEditorOptions.Graphic:=LoadPixmap('menu_editoroptions'); itmEnvEditorOptions.Bitmap:=LoadPixmap('menu_editoroptions');
mnuEnvironment.Add(itmEnvEditorOptions); mnuEnvironment.Add(itmEnvEditorOptions);
itmEnvDebuggerOptions := TMenuItem.Create(Self); itmEnvDebuggerOptions := TMenuItem.Create(Self);
itmEnvDebuggerOptions.Name:='itmEnvDebuggerOptions'; itmEnvDebuggerOptions.Name:='itmEnvDebuggerOptions';
itmEnvDebuggerOptions.Caption := lisMenDebuggerOptions; itmEnvDebuggerOptions.Caption := lisMenDebuggerOptions;
// itmEnvDebuggerOptions.Graphic:=LoadPixmap('menu_editoroptions'); // itmEnvDebuggerOptions.Bitmap:=LoadPixmap('menu_editoroptions');
mnuEnvironment.Add(itmEnvDebuggerOptions); mnuEnvironment.Add(itmEnvDebuggerOptions);
itmEnvCodeToolsOptions := TMenuItem.Create(Self); itmEnvCodeToolsOptions := TMenuItem.Create(Self);
itmEnvCodeToolsOptions.Name:='itmEnvCodeToolsOptions'; itmEnvCodeToolsOptions.Name:='itmEnvCodeToolsOptions';
itmEnvCodeToolsOptions.Caption := lisMenuCodeToolsOptions; itmEnvCodeToolsOptions.Caption := lisMenuCodeToolsOptions;
itmEnvCodeToolsOptions.Graphic:=LoadPixmap('menu_codetoolsoptions'); itmEnvCodeToolsOptions.Bitmap:=LoadPixmap('menu_codetoolsoptions');
mnuEnvironment.Add(itmEnvCodeToolsOptions); mnuEnvironment.Add(itmEnvCodeToolsOptions);
itmEnvCodeToolsDefinesEditor := TMenuItem.Create(Self); itmEnvCodeToolsDefinesEditor := TMenuItem.Create(Self);
itmEnvCodeToolsDefinesEditor.Name:='itmEnvCodeToolsDefinesEditor'; itmEnvCodeToolsDefinesEditor.Name:='itmEnvCodeToolsDefinesEditor';
itmEnvCodeToolsDefinesEditor.Caption := lisMenuCodeToolsDefinesEditor; itmEnvCodeToolsDefinesEditor.Caption := lisMenuCodeToolsDefinesEditor;
itmEnvCodeToolsDefinesEditor.Graphic:=LoadPixmap('menu_codetoolsdefineseditor'); itmEnvCodeToolsDefinesEditor.Bitmap:=LoadPixmap('menu_codetoolsdefineseditor');
mnuEnvironment.Add(itmEnvCodeToolsDefinesEditor); mnuEnvironment.Add(itmEnvCodeToolsDefinesEditor);
end; end;

12
ide/searchresultview.pp
View File

@ -68,6 +68,7 @@ type
function GetSourcePositon: TPoint; function GetSourcePositon: TPoint;
function GetSourceFileName: string; function GetSourceFileName: string;
function GetSelectedText: string; function GetSelectedText: string;
procedure BringResultsToFront(APageName: string);
procedure BeginUpdate; procedure BeginUpdate;
procedure EndUpdate; procedure EndUpdate;
property OnSelectionChanged: TNotifyEvent read fOnSelectionChanged property OnSelectionChanged: TNotifyEvent read fOnSelectionChanged
@ -148,6 +149,16 @@ begin
fUpdating:= false; fUpdating:= false;
end;//EndUpdate end;//EndUpdate
{Brings The results tab named APageName to front if APageName does not exist
does nothing}
procedure TSearchResultsView.BringResultsToFront(APageName: string);
begin
if PageExists(APageName) then
begin
ResultsNoteBook.PageIndex:= GetPageIndex(APageName);
end;//if
end;//BringResultsToFront
procedure TSearchResultsView.ResultsNoteBookClosetabclicked(Sender: TObject); procedure TSearchResultsView.ResultsNoteBookClosetabclicked(Sender: TObject);
var var
TheObject: TObject; TheObject: TObject;
@ -212,6 +223,7 @@ begin
if i > -1 then if i > -1 then
begin begin
NewListBox:= GetListBox(i); NewListBox:= GetListBox(i);
ResultsNoteBook.PageIndex:= i;
end//if end//if
else else
begin begin

1
ide/uniteditor.pp
View File

@ -3440,6 +3440,7 @@ Begin
finally finally
FreeAndNil(SearchForm); FreeAndNil(SearchForm);
SearchResultsView.EndUpdate; SearchResultsView.EndUpdate;
SearchResultsView.ShowOnTop;
end;//finally end;//finally
finally finally
FreeAndNil(TheFileList); FreeAndNil(TheFileList);

20
lcl/include/menuitem.inc
View File

@ -163,8 +163,8 @@ destructor TMenuItem.Destroy;
var var
i : integer; i : integer;
begin begin
if FGraphic<>nil then if FBitmap<>nil then
FreeAndNil(FGraphic); FreeAndNil(FBitmap);
DestroyHandle; DestroyHandle;
if assigned (FItems) then begin if assigned (FItems) then begin
i := FItems.Count-1; i := FItems.Count-1;
@ -426,7 +426,7 @@ end;
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
function TMenuItem.HasIcon: boolean; function TMenuItem.HasIcon: boolean;
begin begin
Result:=(FGraphic<>nil) or ((ImageIndex>=0) and (GetImageList<>nil)); Result:=(FBitmap<>nil) or ((ImageIndex>=0) and (GetImageList<>nil));
end; end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
@ -666,14 +666,14 @@ begin
end; end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
procedure TMenuItem.SetGraphic(const AValue: TGraphic); procedure TMenuItem.SetBitmap(const AValue: TBitmap);
Reposition the MenuItem Reposition the MenuItem
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
procedure TMenuItem.SetGraphic(const AValue: TGraphic); procedure TMenuItem.SetBitmap(const AValue: TBitmap);
begin begin
if FGraphic=AValue then exit; if FBitmap=AValue then exit;
FGraphic:=AValue; FBitmap:=AValue;
if HandleAllocated then RecreateHandle; if HandleAllocated then RecreateHandle;
MenuChanged(False); MenuChanged(False);
end; end;
@ -983,6 +983,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.40 2003/11/16 01:56:15 mattias
changed TMenuItem.Graphic to TMenuItem.Bitmap
Revision 1.39 2003/10/22 17:50:16 mattias Revision 1.39 2003/10/22 17:50:16 mattias
updated rpm scripts updated rpm scripts
@ -1128,6 +1131,9 @@ end;
$Log$ $Log$
Revision 1.40 2003/11/16 01:56:15 mattias
changed TMenuItem.Graphic to TMenuItem.Bitmap
Revision 1.39 2003/10/22 17:50:16 mattias Revision 1.39 2003/10/22 17:50:16 mattias
updated rpm scripts updated rpm scripts

7
lcl/interfaces/gtk/gtkproc.inc
View File

@ -3475,8 +3475,8 @@ begin
Width:=0; Width:=0;
Height:=0; Height:=0;
if LCLMenuItem=nil then exit; if LCLMenuItem=nil then exit;
if LCLMenuItem.Graphic<>nil then if LCLMenuItem.Bitmap<>nil then
GetGdkPixmapFromGraphic(LCLMenuItem.Graphic,IconImg,IconMask,Width,Height); GetGdkPixmapFromGraphic(LCLMenuItem.Bitmap,IconImg,IconMask,Width,Height);
end; end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
@ -5539,6 +5539,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.227 2003/11/16 01:56:15 mattias
changed TMenuItem.Graphic to TMenuItem.Bitmap
Revision 1.226 2003/11/15 15:30:34 marc Revision 1.226 2003/11/15 15:30:34 marc
* Fixed range chek errors in KeySymtoVKeyArray * Fixed range chek errors in KeySymtoVKeyArray

9
lcl/menus.pp
View File

@ -101,7 +101,7 @@ type
FCommand: integer; FCommand: integer;
FDefault: Boolean; FDefault: Boolean;
FEnabled: Boolean; FEnabled: Boolean;
FGraphic: TGraphic; FBitmap: TBitmap;
FGroupIndex: Byte; FGroupIndex: Byte;
FHandle: HMenu; FHandle: HMenu;
FHint: String; FHint: String;
@ -131,7 +131,7 @@ type
procedure SetChecked(AValue: Boolean); procedure SetChecked(AValue: Boolean);
procedure SetDefault(AValue: Boolean); procedure SetDefault(AValue: Boolean);
procedure SetEnabled(AValue: Boolean); procedure SetEnabled(AValue: Boolean);
procedure SetGraphic(const AValue: TGraphic); procedure SetBitmap(const AValue: TBitmap);
procedure SetMenuIndex(AValue: Integer); procedure SetMenuIndex(AValue: Integer);
procedure SetRadioItem(const AValue: Boolean); procedure SetRadioItem(const AValue: Boolean);
procedure SetRightJustify(const AValue: boolean); procedure SetRightJustify(const AValue: boolean);
@ -198,7 +198,7 @@ type
property Default: Boolean read FDefault write SetDefault default False; property Default: Boolean read FDefault write SetDefault default False;
property Enabled: Boolean read FEnabled write SetEnabled property Enabled: Boolean read FEnabled write SetEnabled
stored IsEnabledStored default True; stored IsEnabledStored default True;
property Graphic: TGraphic read FGraphic write SetGraphic; property Bitmap: TBitmap read FBitmap write SetBitmap;
property GroupIndex: Byte read FGroupIndex write SetGroupIndex default 0; property GroupIndex: Byte read FGroupIndex write SetGroupIndex default 0;
property Hint: String read FHint write FHint; property Hint: String read FHint write FHint;
property ImageIndex: Integer read FImageIndex write SetImageIndex; property ImageIndex: Integer read FImageIndex write SetImageIndex;
@ -388,6 +388,9 @@ end.
{ {
$Log$ $Log$
Revision 1.55 2003/11/16 01:56:15 mattias
changed TMenuItem.Graphic to TMenuItem.Bitmap
Revision 1.54 2003/11/10 16:15:31 micha Revision 1.54 2003/11/10 16:15:31 micha
cleanups; win32 fpimage support cleanups; win32 fpimage support