forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix, reload last proj and docs, projet config index not handled

This commit is contained in:
Basile Burg 2022-05-14 12:21:17 +02:00
parent 311d6a7d1a
commit 04100589e5
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -3,11 +3,12 @@
## Enhancements ## Enhancements
- Search and Replace: after a failed search give the editor the focus back. - Search and Replace: after a failed search give the editor the focus back.
- It's possible to open ".mak" or "makefile" files as projects. The project inspector will display the rules as configurations and display the content of "src", "include", "import" as source files. - It's possible to open ".mak" or "makefile" files as projects. The project inspector will display the rules as configurations and the content of "src/", "include/", "import/" as source files.
## Bugs fixed ## Bugs fixed
- Crash to desktop for certain invalid or incomplete D constructs. (#107) - Crash to desktop for certain invalid or incomplete D constructs. (#107)
- Project configuration index not handled with option "reloadLastDocuments".
## Other ## Other

1
src/u_main.lfm
View File

@ -12,6 +12,7 @@ object MainForm: TMainForm
OnDropFiles = FormDropFiles OnDropFiles = FormDropFiles
OnResize = FormResize OnResize = FormResize
ShowHint = True ShowHint = True
LCLVersion = '2.2.0.4'
object mainMenu: TMainMenu object mainMenu: TMainMenu
Top = 1 Top = 1
object MenuItem1: TMenuItem object MenuItem1: TMenuItem

7
src/u_main.pas
View File

@ -591,6 +591,7 @@ type
fDocIndex: integer; fDocIndex: integer;
fProjectGroup: string; fProjectGroup: string;
fProjectIndex: integer; fProjectIndex: integer;
fProjectConfigIndex: integer;
procedure setDocuments(value: TStringList); procedure setDocuments(value: TStringList);
protected protected
procedure beforeSave; override; procedure beforeSave; override;
@ -601,6 +602,7 @@ type
property project: string read fProjName write fProjName; property project: string read fProjName write fProjName;
property projectGroup: string read fProjectGroup write fProjectGroup; property projectGroup: string read fProjectGroup write fProjectGroup;
property projectIndex: integer read fProjectIndex write fProjectIndex; property projectIndex: integer read fProjectIndex write fProjectIndex;
property projectConfigIndex: integer read fProjectConfigIndex write fProjectConfigIndex;
public public
constructor create(aOwner: TComponent); override; constructor create(aOwner: TComponent); override;
destructor destroy; override; destructor destroy; override;
@ -1066,7 +1068,10 @@ begin
pix := grp.reloadedProjectIndex; pix := grp.reloadedProjectIndex;
prj := MainForm.fFreeProj; prj := MainForm.fFreeProj;
if prj.isAssigned then if prj.isAssigned then
begin
fProjName := prj.filename; fProjName := prj.filename;
fProjectConfigIndex := prj.getActiveConfigurationIndex;
end;
fProjectGroup := getProjectGroup.groupFilename; fProjectGroup := getProjectGroup.groupFilename;
if prj = MainForm.fProj then if prj = MainForm.fProj then
fProjectIndex := -1 fProjectIndex := -1
@ -1118,6 +1123,8 @@ begin
grp.setProjectIndex(fProjectIndex); grp.setProjectIndex(fProjectIndex);
grp.getProject(grp.getProjectIndex).activate; grp.getProject(grp.getProjectIndex).activate;
end; end;
if assigned(dst.fProj) then
dst.fProj.setActiveConfigurationIndex(fProjectConfigIndex);
end end
else inherited; else inherited;
end; end;