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

Merge branch 'IDE/Recent/Packages' into 'main'

Browse Source 
Improved features of recent packages (IDE toolbar, options)

See merge request freepascal.org/lazarus/lazarus!416
This commit is contained in:
n7800 2025-04-01 12:44:16 +00:00
commit 00f3a5c40e
7 changed files with 255 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/favorites/favorites.lpk
View File

@ -28,7 +28,7 @@
</Debugging>
</Linking>
</CompilerOptions>
<Description Value="Creates a third section (on the top) in the Open tool button drop-down menu where you can register your favorite projects."/>
<Description Value="Creates an additional section for favorite projects in the &quot;Open&quot; tool button drop-down menu."/>
<License Value="GPL-2"/>
<Version Minor="1" Release="1"/>
<Files Count="2">

11
components/favorites/favorites_impl.pas
View File

@ -164,7 +164,7 @@ end;
procedure TOpenFileFavToolButton.RefreshMenu(Sender: TObject);
var
xM, xSep: TMenuItem;
xM, xSep, xHeader: TMenuItem;
xFavoriteFile: string;
xMI, xAddToFav: TFileNameMenuItem;
xProj: TLazProject;
@ -210,10 +210,15 @@ begin
if xMIndex > 0 then
begin
// separator
xSep := TMenuItem.Create(Self);
xSep.Caption := '-';
xSep.Caption := cLineCaption;
xM.Insert(xMIndex, xSep);
Inc(xMIndex);
// header
xHeader := TMenuItem.Create(Self);
xHeader.Caption := sFavoritesHeaderS;
xHeader.Enabled := false;
xM.Insert(0, xHeader);
end;
end;

1
components/favorites/favoritesstr.pas
View File

@ -5,6 +5,7 @@ unit favoritesstr;
interface
resourcestring
sFavoritesHeaderS = 'Favorites:';
sAddToFavoritesS = 'Add to favorites: %s';
sRemoveFromFavoritesS = 'Remove from favorites: %s';

335
ide/frames/files_options.lfm
View File

@ -11,50 +11,13 @@ object FilesOptionsFrame: TFilesOptionsFrame
Visible = False
DesignLeft = 395
DesignTop = 121
object MaxRecentOpenFilesLabel: TLabel
AnchorSideLeft.Control = MaxRecentOpenFilesSpin
AnchorSideTop.Control = Owner
Left = 317
Height = 15
Top = 2
Width = 138
Caption = 'MaxRecentOpenFilesLabel'
ParentColor = False
end
object MaxRecentProjectFilesLabel: TLabel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Owner
Left = 3
Height = 15
Top = 2
Width = 146
BorderSpacing.Left = 3
Caption = 'MaxRecentProjectFilesLabel'
ParentColor = False
end
object ShowCompileDialogCheckBox: TCheckBox
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = MaxRecentProjectFilesSpin
AnchorSideTop.Side = asrBottom
AnchorSideRight.Side = asrBottom
Left = 2
Height = 19
Top = 53
Width = 178
BorderSpacing.Top = 11
Caption = 'ShowCompileDialogCheckBox'
TabOrder = 2
OnChange = ShowCompileDialogCheckBoxChange
end
object LazarusDirLabel: TLabel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = AutoCloseCompileDialogCheckBox
AnchorSideTop.Side = asrBottom
AnchorSideTop.Control = Owner
Left = 2
Height = 15
Top = 101
Width = 82
BorderSpacing.Top = 10
Height = 13
Top = 2
Width = 75
Caption = 'LazarusDirLabel'
ParentColor = False
ParentShowHint = False
@ -68,14 +31,14 @@ object FilesOptionsFrame: TFilesOptionsFrame
AnchorSideBottom.Control = LazarusDirComboBox
AnchorSideBottom.Side = asrBottom
Left = 597
Height = 23
Top = 116
Height = 21
Top = 15
Width = 23
Anchors = [akTop, akRight, akBottom]
Caption = '...'
ParentShowHint = False
ShowHint = True
TabOrder = 5
TabOrder = 1
OnClick = DirectoriesButtonClick
end
object LazarusDirComboBox: TComboBox
@ -84,14 +47,14 @@ object FilesOptionsFrame: TFilesOptionsFrame
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = LazarusDirButton
Left = 2
Height = 23
Top = 116
Height = 21
Top = 15
Width = 595
Anchors = [akTop, akLeft, akRight]
ItemHeight = 15
ItemHeight = 13
ParentShowHint = False
ShowHint = True
TabOrder = 4
TabOrder = 0
Text = 'LazarusDirComboBox'
end
object CompilerPathComboBox: TComboBox
@ -100,12 +63,12 @@ object FilesOptionsFrame: TFilesOptionsFrame
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = CompilerPathButton
Left = 2
Height = 23
Top = 160
Height = 21
Top = 55
Width = 595
Anchors = [akTop, akLeft, akRight]
ItemHeight = 15
TabOrder = 6
ItemHeight = 13
TabOrder = 2
Text = 'CompilerPathComboBox'
end
object CompilerPathButton: TButton
@ -115,12 +78,12 @@ object FilesOptionsFrame: TFilesOptionsFrame
AnchorSideBottom.Control = CompilerPathComboBox
AnchorSideBottom.Side = asrBottom
Left = 597
Height = 23
Top = 160
Height = 21
Top = 55
Width = 23
Anchors = [akTop, akRight, akBottom]
Caption = '...'
TabOrder = 7
TabOrder = 3
OnClick = FilesButtonClick
end
object CompilerPathLabel: TLabel
@ -128,9 +91,9 @@ object FilesOptionsFrame: TFilesOptionsFrame
AnchorSideTop.Control = LazarusDirComboBox
AnchorSideTop.Side = asrBottom
Left = 2
Height = 15
Top = 145
Width = 101
Height = 13
Top = 42
Width = 88
BorderSpacing.Top = 6
Caption = 'CompilerPathLabel'
ParentColor = False
@ -141,12 +104,12 @@ object FilesOptionsFrame: TFilesOptionsFrame
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = FPCSourceDirButton
Left = 2
Height = 23
Top = 204
Height = 21
Top = 95
Width = 595
Anchors = [akTop, akLeft, akRight]
ItemHeight = 15
TabOrder = 8
ItemHeight = 13
TabOrder = 4
Text = 'FPCSourceDirComboBox'
end
object FPCSourceDirButton: TButton
@ -156,12 +119,12 @@ object FilesOptionsFrame: TFilesOptionsFrame
AnchorSideBottom.Control = FPCSourceDirComboBox
AnchorSideBottom.Side = asrBottom
Left = 597
Height = 23
Top = 204
Height = 21
Top = 95
Width = 23
Anchors = [akTop, akRight, akBottom]
Caption = '...'
TabOrder = 9
TabOrder = 5
OnClick = DirectoriesButtonClick
end
object FPCSourceDirLabel: TLabel
@ -169,9 +132,9 @@ object FilesOptionsFrame: TFilesOptionsFrame
AnchorSideTop.Control = CompilerPathComboBox
AnchorSideTop.Side = asrBottom
Left = 2
Height = 15
Top = 189
Width = 100
Height = 13
Top = 82
Width = 90
BorderSpacing.Top = 6
Caption = 'FPCSourceDirLabel'
ParentColor = False
@ -181,9 +144,9 @@ object FilesOptionsFrame: TFilesOptionsFrame
AnchorSideTop.Control = FPCSourceDirComboBox
AnchorSideTop.Side = asrBottom
Left = 2
Height = 15
Top = 233
Width = 81
Height = 13
Top = 122
Width = 72
BorderSpacing.Top = 6
Caption = 'MakePathLabel'
ParentColor = False
@ -193,9 +156,9 @@ object FilesOptionsFrame: TFilesOptionsFrame
AnchorSideTop.Control = MakePathComboBox
AnchorSideTop.Side = asrBottom
Left = 2
Height = 15
Top = 277
Width = 91
Height = 13
Top = 162
Width = 81
BorderSpacing.Top = 6
Caption = 'TestBuildDirLabel'
ParentColor = False
@ -206,12 +169,12 @@ object FilesOptionsFrame: TFilesOptionsFrame
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = MakePathButton
Left = 2
Height = 23
Top = 248
Height = 21
Top = 135
Width = 595
Anchors = [akTop, akLeft, akRight]
ItemHeight = 15
TabOrder = 10
ItemHeight = 13
TabOrder = 6
Text = 'MakePathComboBox'
end
object MakePathButton: TButton
@ -221,12 +184,12 @@ object FilesOptionsFrame: TFilesOptionsFrame
AnchorSideBottom.Control = MakePathComboBox
AnchorSideBottom.Side = asrBottom
Left = 597
Height = 23
Top = 248
Height = 21
Top = 135
Width = 23
Anchors = [akTop, akRight, akBottom]
Caption = '...'
TabOrder = 11
TabOrder = 7
OnClick = FilesButtonClick
end
object TestBuildDirComboBox: TComboBox
@ -235,12 +198,12 @@ object FilesOptionsFrame: TFilesOptionsFrame
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = TestBuildDirButton
Left = 2
Height = 23
Top = 292
Height = 21
Top = 175
Width = 595
Anchors = [akTop, akLeft, akRight]
ItemHeight = 15
TabOrder = 12
ItemHeight = 13
TabOrder = 8
Text = 'TestBuildDirComboBox'
end
object TestBuildDirButton: TButton
@ -250,35 +213,22 @@ object FilesOptionsFrame: TFilesOptionsFrame
AnchorSideBottom.Control = TestBuildDirComboBox
AnchorSideBottom.Side = asrBottom
Left = 597
Height = 23
Top = 292
Height = 21
Top = 175
Width = 23
Anchors = [akTop, akRight, akBottom]
Caption = '...'
TabOrder = 13
TabOrder = 9
OnClick = DirectoriesButtonClick
end
object AutoCloseCompileDialogCheckBox: TCheckBox
AnchorSideLeft.Control = ShowCompileDialogCheckBox
AnchorSideTop.Control = ShowCompileDialogCheckBox
AnchorSideTop.Side = asrBottom
AnchorSideRight.Side = asrBottom
Left = 32
Height = 19
Top = 72
Width = 204
BorderSpacing.Left = 30
Caption = 'AutoCloseCompileDialogCheckBox'
TabOrder = 3
end
object CompilerTranslationFileLabel: TLabel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = TestBuildDirComboBox
AnchorSideTop.Side = asrBottom
Left = 2
Height = 15
Top = 321
Width = 153
Height = 13
Top = 202
Width = 135
Alignment = taRightJustify
BorderSpacing.Top = 6
Caption = 'CompilerTranslationFileLabel'
@ -293,14 +243,14 @@ object FilesOptionsFrame: TFilesOptionsFrame
AnchorSideBottom.Control = CompilerTranslationFileComboBox
AnchorSideBottom.Side = asrBottom
Left = 597
Height = 23
Top = 336
Height = 21
Top = 215
Width = 23
Anchors = [akTop, akRight, akBottom]
Caption = '...'
ParentShowHint = False
ShowHint = True
TabOrder = 15
TabOrder = 11
OnClick = CompilerTranslationFileButtonClick
end
object CompilerTranslationFileComboBox: TComboBox
@ -309,69 +259,24 @@ object FilesOptionsFrame: TFilesOptionsFrame
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = CompilerTranslationFileButton
Left = 2
Height = 23
Top = 336
Height = 21
Top = 215
Width = 595
Anchors = [akTop, akLeft, akRight]
ItemHeight = 15
ItemHeight = 13
ParentShowHint = False
ShowHint = True
TabOrder = 14
TabOrder = 10
Text = 'CompilerTranslationFileComboBox'
end
object lblCenter: TLabel
AnchorSideLeft.Control = Owner
AnchorSideLeft.Side = asrCenter
Left = 311
Height = 1
Top = 105
Width = 1
ParentColor = False
end
object MaxRecentOpenFilesSpin: TSpinEdit
AnchorSideLeft.Control = lblCenter
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = MaxRecentOpenFilesLabel
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 317
Height = 23
Hint = 'Value 0 means unlimited.'
Top = 19
Width = 303
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 3
BorderSpacing.Around = 2
ParentShowHint = False
ShowHint = True
TabOrder = 1
end
object MaxRecentProjectFilesSpin: TSpinEdit
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = MaxRecentProjectFilesLabel
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = lblCenter
Left = 2
Height = 23
Hint = 'Value 0 means unlimited.'
Top = 19
Width = 304
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Right = 3
BorderSpacing.Around = 2
ParentShowHint = False
ShowHint = True
TabOrder = 0
end
object FppkgConfigurationFileLabel: TLabel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = CompilerTranslationFileComboBox
AnchorSideTop.Side = asrBottom
Left = 2
Height = 15
Top = 365
Width = 153
Height = 13
Top = 242
Width = 135
Alignment = taRightJustify
BorderSpacing.Top = 6
Caption = 'FppkgConfigurationFileLabel'
@ -385,14 +290,14 @@ object FilesOptionsFrame: TFilesOptionsFrame
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = FppkgConfigurationFileButton
Left = 2
Height = 23
Top = 380
Height = 21
Top = 255
Width = 595
Anchors = [akTop, akLeft, akRight]
ItemHeight = 15
ItemHeight = 13
ParentShowHint = False
ShowHint = True
TabOrder = 16
TabOrder = 12
Text = 'FppkgConfigurationFileComboBox'
end
object FppkgConfigurationFileButton: TButton
@ -402,14 +307,112 @@ object FilesOptionsFrame: TFilesOptionsFrame
AnchorSideBottom.Control = FppkgConfigurationFileComboBox
AnchorSideBottom.Side = asrBottom
Left = 597
Height = 23
Top = 380
Height = 21
Top = 255
Width = 23
Anchors = [akTop, akRight, akBottom]
Caption = '...'
ParentShowHint = False
ShowHint = True
TabOrder = 17
TabOrder = 13
OnClick = FppkgConfigurationFileButtonClick
end
object RecentDividerBevel: TDividerBevel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = FppkgConfigurationFileComboBox
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 2
Height = 13
Top = 282
Width = 618
Caption = 'RecentDividerBevel'
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6
Font.Style = [fsBold]
ParentFont = False
end
object RecentMaxCountGroupBox: TGroupBox
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = RecentDividerBevel
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 2
Height = 64
Top = 301
Width = 618
Anchors = [akTop, akLeft, akRight]
AutoSize = True
BorderSpacing.Top = 6
Caption = 'RecentMaxCountGroupBox'
ChildSizing.LeftRightSpacing = 6
ChildSizing.TopBottomSpacing = 6
ChildSizing.HorizontalSpacing = 6
ChildSizing.EnlargeHorizontal = crsSameSize
ChildSizing.Layout = cclTopToBottomThenLeftToRight
ChildSizing.ControlsPerLine = 2
ClientHeight = 46
ClientWidth = 614
TabOrder = 14
object MaxRecentProjectFilesLabel: TLabel
Left = 6
Height = 13
Top = 6
Width = 197
Caption = 'MaxRecentProjectFilesLabel'
ParentColor = False
end
object MaxRecentProjectFilesSpin: TSpinEdit
AnchorSideRight.Side = asrBottom
Left = 6
Height = 21
Hint = 'Value 0 means unlimited.'
Top = 19
Width = 197
ParentShowHint = False
ShowHint = True
TabOrder = 0
end
object MaxRecentPackageFilesLabel: TLabel
AnchorSideTop.Side = asrBottom
Left = 209
Height = 13
Top = 6
Width = 196
Caption = 'MaxRecentPackageFilesLabel'
end
object MaxRecentPackageFilesSpin: TSpinEdit
AnchorSideRight.Side = asrBottom
Left = 209
Height = 21
Hint = 'Value 0 means unlimited.'
Top = 19
Width = 196
ParentShowHint = False
ShowHint = True
TabOrder = 1
end
object MaxRecentOpenFilesLabel: TLabel
AnchorSideTop.Side = asrBottom
Left = 411
Height = 13
Top = 6
Width = 197
Caption = 'MaxRecentOpenFilesLabel'
ParentColor = False
end
object MaxRecentOpenFilesSpin: TSpinEdit
AnchorSideRight.Side = asrBottom
Left = 411
Height = 21
Hint = 'Value 0 means unlimited.'
Top = 19
Width = 197
ParentShowHint = False
ShowHint = True
TabOrder = 2
end
end
end

41
ide/frames/files_options.pas
View File

@ -31,7 +31,9 @@ interface
uses
Classes, SysUtils,
// LCL
StdCtrls, Dialogs, Controls, Spin,
StdCtrls, Dialogs, Controls, Spin, ExtCtrls,
// LazControls
DividerBevel,
// LazUtils
FileUtil, LazFileUtils,
// CodeTools
@ -52,7 +54,6 @@ type
{ TFilesOptionsFrame }
TFilesOptionsFrame = class(TAbstractIDEOptionsEditor)
AutoCloseCompileDialogCheckBox: TCheckBox;
CompilerTranslationFileButton:TButton;
CompilerTranslationFileComboBox:TComboBox;
CompilerTranslationFileLabel:TLabel;
@ -62,18 +63,20 @@ type
FPCSourceDirButton:TButton;
FPCSourceDirComboBox:TComboBox;
FPCSourceDirLabel:TLabel;
lblCenter: TLabel;
LazarusDirButton:TButton;
LazarusDirComboBox:TComboBox;
LazarusDirLabel:TLabel;
MakePathButton:TButton;
MakePathComboBox:TComboBox;
MakePathLabel:TLabel;
RecentDividerBevel: TDividerBevel;
RecentMaxCountGroupBox: TGroupBox;
MaxRecentOpenFilesSpin: TSpinEdit;
MaxRecentOpenFilesLabel: TLabel;
MaxRecentProjectFilesSpin: TSpinEdit;
MaxRecentProjectFilesLabel: TLabel;
ShowCompileDialogCheckBox: TCheckBox;
MaxRecentPackageFilesLabel: TLabel;
MaxRecentPackageFilesSpin: TSpinEdit;
TestBuildDirButton:TButton;
TestBuildDirComboBox:TComboBox;
TestBuildDirLabel:TLabel;
@ -84,7 +87,6 @@ type
procedure FilesButtonClick(Sender: TObject);
procedure DirectoriesButtonClick(Sender: TObject);
procedure FppkgConfigurationFileButtonClick(Sender: TObject);
procedure ShowCompileDialogCheckBoxChange(Sender: TObject);
private
FOldLazarusDir: string;
FOldRealLazarusDir: string;
@ -101,6 +103,7 @@ type
fOldFppkgConfigurationFilename: string;
FOldMaxRecentOpenFiles: integer;
FOldMaxRecentProjectFiles: integer;
FOldMaxRecentPackageFiles: integer;
function CheckLazarusDir(Buttons: TMsgDlgButtons): boolean;
function CheckCompiler(Buttons: TMsgDlgButtons): boolean;
function CheckFPCSourceDir(Buttons: TMsgDlgButtons): boolean;
@ -301,19 +304,8 @@ begin
end;
end;
procedure TFilesOptionsFrame.ShowCompileDialogCheckBoxChange(Sender: TObject);
begin
AutoCloseCompileDialogCheckBox.Enabled := ShowCompileDialogCheckBox.Checked;
end;
procedure TFilesOptionsFrame.Setup(ADialog: TAbstractOptionsEditorDialog);
begin
MaxRecentOpenFilesLabel.Caption:=dlgMaxRecentFiles;
MaxRecentOpenFilesLabel.Hint:=dlgMaxRecentHint;
MaxRecentProjectFilesLabel.Caption:=dlgMaxRecentProjs;
MaxRecentProjectFilesLabel.Hint:=dlgMaxRecentHint;
ShowCompileDialogCheckBox.Visible:=false;
AutoCloseCompileDialogCheckBox.Visible:=false;
LazarusDirLabel.Caption:=dlgLazarusDir;
LazarusDirLabel.Hint:=Format(lisLazarusDirHint,[GetPrimaryConfigPath]);
LazarusDirComboBox.Hint:=LazarusDirLabel.Hint;
@ -361,6 +353,19 @@ begin
begin
Add(GetForcedPathDelims('$(FPCSrcDir)/compiler/msg/errordu.msg'));
end;
{ Recent }
RecentDividerBevel.Caption := dlgRecent;
RecentMaxCountGroupBox.Caption := dlgMaxRecentCount;
MaxRecentProjectFilesLabel.Caption := dlgMaxRecentProjs;
MaxRecentPackageFilesLabel.Caption := dlgMaxRecentPacks;
MaxRecentOpenFilesLabel .Caption := dlgMaxRecentFiles;
MaxRecentProjectFilesLabel.Hint := dlgMaxRecentHint;
MaxRecentPackageFilesLabel.Hint := dlgMaxRecentHint;
MaxRecentOpenFilesLabel .Hint := dlgMaxRecentHint;
end;
function TFilesOptionsFrame.GetTitle: String;
@ -474,6 +479,8 @@ begin
MaxRecentOpenFilesSpin.Value := MaxRecentOpenFiles;
FOldMaxRecentProjectFiles := MaxRecentProjectFiles;
MaxRecentProjectFilesSpin.Value := MaxRecentProjectFiles;
FOldMaxRecentPackageFiles := MaxRecentPackageFiles;
MaxRecentPackageFilesSpin.Value := MaxRecentPackageFiles;
end;
end;
@ -499,6 +506,7 @@ begin
// recent files and directories
MaxRecentOpenFiles := MaxRecentOpenFilesSpin.Value;
MaxRecentProjectFiles := MaxRecentProjectFilesSpin.Value;
MaxRecentPackageFiles := MaxRecentPackageFilesSpin.Value;
end;
end;
@ -518,6 +526,7 @@ begin
// recent files and directories
MaxRecentOpenFiles := FOldMaxRecentOpenFiles;
MaxRecentProjectFiles := FOldMaxRecentProjectFiles;
MaxRecentPackageFiles := FOldMaxRecentPackageFiles;
end;
end;

10
ide/lazarusidestrconsts.pas
View File

@ -1351,8 +1351,14 @@ resourcestring
dlgMaxCntr = 'Maximum counter';
dlgEdBSubDir = 'Sub directory';
dlgEnvOtherFiles = 'Other Files';
dlgMaxRecentFiles = 'Max recent files';
dlgMaxRecentProjs = 'Max recent project files';
dlgRecent = 'Recent';
dlgMaxRecentCount = 'Max count of recent items';
dlgMaxRecentFiles = 'Files';
dlgMaxRecentProjs = 'Projects';
dlgMaxRecentPacks = 'Packages';
dlgRecentProjects = 'Recent Projects:';
dlgRecentPackages = 'Recent Packages:';
dlgRecentFiles = 'Recent Files:';
dlgMaxRecentHint = 'Value 0 means unlimited.';
dlgLazarusDir = 'Lazarus directory (default for all projects)';
lisLazarusDirHint = 'Lazarus sources. This path is relative to primary config directory (%s).';

57
ide/mainbase.pas
View File

@ -74,10 +74,17 @@ uses
IdeDebuggerStringConstants,
// IdeConfig
LazConf, EnvironmentOpts, CompilerOptions,
// IdeProject
Project, RunParamOptions,
// IdeDebugger
Debugger,
// Packager
BasePkgManager,
// Designer
Designer,
// IDE
LazarusIDEStrConsts, EditorOptions, EnvGuiOptions,
Project, SourceEditor, SourceSynEditor, FindInFilesDlg,
Splash, MainBar, MainIntf, Designer, Debugger, RunParamsOpts, FindInFilesWnd, RunParamOptions;
LazarusIDEStrConsts, EditorOptions, EnvGuiOptions, SourceEditor, SourceSynEditor,
FindInFilesDlg, Splash, MainBar, MainIntf, RunParamsOpts, FindInFilesWnd;
type
TResetToolFlag = (
@ -230,6 +237,7 @@ type
procedure RefreshMenu(Sender: TObject);
procedure mnuOpenFile(Sender: TObject);
procedure mnuProjectFile(Sender: TObject);
procedure mnuPackageFile(Sender: TObject);
public
constructor Create(aOwner: TComponent); override;
destructor Destroy; override;
@ -505,6 +513,11 @@ begin
MainIDE.DoOpenProjectFile((Sender as TOpenFileMenuItem).Hint, [ofAddToRecent]);
end;
procedure TOpenFileToolButton.mnuPackageFile(Sender: TObject);
begin
PkgBoss.DoOpenPackageFile((Sender as TOpenFileMenuItem).Hint, [pofAddToRecent], false);
end;
procedure TOpenFileToolButton.RefreshMenu(Sender: TObject);
procedure AddFile(const AFileName: string; const AOnClick: TNotifyEvent);
@ -521,27 +534,43 @@ procedure TOpenFileToolButton.RefreshMenu(Sender: TObject);
AMenuItem.ImageIndex := LoadProjectIconIntoImages(AFileName, DropdownMenu.Images, FIndex);
end;
procedure AddFiles(List: TStringList; MaxCount: integer; const AOnClick: TNotifyEvent);
procedure AddHeader(const ACaption: string);
var
AMenuItem: TOpenFileMenuItem;
begin
AMenuItem := TOpenFileMenuItem.Create(DropdownMenu);
AMenuItem.Caption := ACaption;
AMenuItem.Enabled := false;
DropdownMenu.Items.Add(AMenuItem);
end;
procedure AddRecentItemsGroup(List: TStringList; MaxCount: integer; const AOnClick: TNotifyEvent; const AHeader: string);
var
i: integer;
begin
if List.Count <= 0 then
exit;
// separator
if DropdownMenu.Items.Count > 0 then
DropdownMenu.Items.AddSeparator;
// header
AddHeader(AHeader);
// value 0 means unlimited
if MaxCount <= 0 then
MaxCount := List.Count;
// files
for i := 0 to Min(MaxCount, List.Count) - 1 do
AddFile(List[i], AOnClick);
end;
begin
DropdownMenu.Items.Clear;
// first add recent projects
AddFiles(EnvironmentOptions.RecentProjectFiles, EnvironmentOptions.MaxRecentProjectFiles,
@mnuProjectFile);
// add a separator
DropdownMenu.Items.AddSeparator;
// then add recent files
AddFiles(EnvironmentOptions.RecentOpenFiles, EnvironmentOptions.MaxRecentOpenFiles,
@mnuOpenFile);
with EnvironmentOptions do
begin
DropdownMenu.Items.Clear;
AddRecentItemsGroup(RecentProjectFiles, MaxRecentProjectFiles, @mnuProjectFile, dlgRecentProjects);
AddRecentItemsGroup(RecentPackageFiles, MaxRecentPackageFiles, @mnuPackageFile, dlgRecentPackages);
AddRecentItemsGroup(RecentOpenFiles, MaxRecentOpenFiles, @mnuOpenFile, dlgRecentFiles);
end;
end;
// Variables and functions used by TMainIDEBase